Merge branch 'master' into develop

src/mixin/print.js

@@ -142,7 +142,7 @@ export default {
           loadingLen = data.length;
           for (let i = data.length; i > 0; i--) {
             const newData = data[i - 1];
-            await this.setPrintData(newData);
+            await this.setPrintData(newData,funcType);
             loadingLen--;
           }
         } catch (error) {
@@ -273,7 +273,7 @@ export default {
      * @param {object} data
      * this.outputData 打印数据
      */
-    setPrintData(data) {
+    setPrintData(data,funcType) {
       let salesOrderId, invoiceId; //出库单号，发货单号 默认数据中的第一个
       salesOrderId = data.invoicePickBeans[0].salesOrderId;
       invoiceId = data.invoicePickBeans[0].invoiceId;
@@ -284,7 +284,8 @@ export default {
         data.invoicePickBeans[0].refEnginRecordNo ||
         "";
       let remark;
-      remark = data.invoicePickBeans[0].remark;
+      remark = funcType==='getDtailPrintDis'?data.invoicePickBeans[0].remark || "" : data.remark||"";
+      console.log(data.invoicePickBeans[0],'oo');
       let tuiHuoRen = data.createBy;
       // 数量合计
       let total = 0;

src/views/deposit_home/components/refund_list-detail.vue

@@ -473,6 +473,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="right"
               label="单价"

src/views/deposit_home/deposit_list.vue

@@ -396,6 +396,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
+            <!-- <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column> -->
             <el-table-column
               align="left"
               label="是否退押"

src/views/deposit_home/refund_list.vue

@@ -572,6 +572,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
+            <!-- <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column> -->
             <el-table-column
               align="left"
               label="是否退押"