Merge tag 'Hotfix-zh-162' into develop

Finish Hotfix-zh-162

src/views/supply/apply/components/engin_detail.vue

@@ -166,7 +166,7 @@
           </el-table-column>
           <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></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></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="serviceName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/engin_examine.vue

@@ -145,11 +145,17 @@
             <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
+       <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+   <template slot-scope="scope">
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+          </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>
+               <template slot-scope="scope">
             <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
-        </el-table-column>
+          </el-table-column>
       </el-table>
     </div>