Merge branch 'hotfix/Hotfix-zh-309' into develop

src/views/supply/sales/components/sales_detail.vue

@@ -37,7 +37,7 @@
           <el-col :span="16" class="item">
             <div class="label">备注</div>
             <div class="value">
-              <el-input v-model="detailData.remark" :readonly="!edit" placeholder="请输入备注"></el-input>
+              <el-input v-model="detailData.remark" readonly placeholder="请输入备注"></el-input>
             </div>
           </el-col>
           <el-col :span="24" class="item file" style="width: 100%; height: auto">
@@ -153,21 +153,37 @@
               {{ scope.row.payAmount | numToFixed }}
             </template>
           </el-table-column> -->
-          <el-table-column
-            align="left"
-            label="表头备注"
-            prop="headerRemark"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <template v-if="edit">
+                <el-input
+                  size="mini"
+                  class="input"
+                  v-model="scope.row.headerRemark"
+                  placeholder="请输入表头备注"
+                ></el-input>
+              </template>
+              <template v-else>
+                {{ scope.row.headerRemark }}
+              </template>
+            </template>
+          </el-table-column>
           <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
-          <el-table-column
-            align="left"
-            label="表体备注"
-            prop="invoiceRemark"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <template v-if="edit">
+                <el-input
+                  size="mini"
+                  class="input"
+                  v-model="scope.row.invoiceRemark"
+                  placeholder="请输表体备注"
+                ></el-input>
+              </template>
+              <template v-else>
+                {{ scope.row.invoiceRemark }}
+              </template>
+            </template>
+          </el-table-column>
 
           <el-table-column
             align="left"

src/views/supply/sales/components/sales_examine.vue

@@ -34,7 +34,7 @@
         <el-col :span="16" class="item">
           <div class="label">备注</div>
           <div class="value">
-            <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
+            <el-input v-model="detailData.remark" readonly placeholder="请输入备注"></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item file" style="width: 100%; height: auto">