Finish Hotfix-zh-167

src/components/Common/print-common.vue

@@ -22,6 +22,7 @@
             <div class="label">仓库：</div>
             <div class="value">{{ item.correspondName }}</div>
           </el-col>
+
         </el-row>
       </div>
 
@@ -36,6 +37,7 @@
             <el-col :span="3">存货名称</el-col>
             <el-col :span="6">规格型号</el-col>
             <el-col :span="2">数量</el-col>
+            <el-col :span="2">订单备注</el-col>
             <el-col :span="2">备注说明</el-col>
           </el-row>
         </div>
@@ -50,6 +52,7 @@
               <el-col :span="3">{{ it.materialName }}</el-col>
               <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
+              <el-col :span="2">{{ it.headerRemark }}</el-col>
                <el-col :span="2">{{ it.pjxh1Text }}</el-col>
             </el-row>
           </div>

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

@@ -157,7 +157,7 @@
             <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column> -->
         <!-- <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">