【修改】 bug

src/views/supply/deliver/components/design/panel.js

@@ -92,10 +92,10 @@ export default {
     },
     {
       "options": {
-        "left": 15,
+        "left": 18,
         "top": 115,
         "height": 381,
-        "width": 654,
+        "width": 650,
         "fontSize": 13,
         "field": "table",
         "fontFamily": '黑体',
@@ -291,6 +291,21 @@ export default {
     },
     {
       "options": {
+        "left": 463,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "仓库",
+        "fontFamily": '黑体',
+        "field": "correspondNames",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
         "left": 650,
         "top": 381,
         "height": 13,

src/views/supply/deliver/components/design/print-data.js

@@ -65,7 +65,8 @@ function getDetail(ids,nickName) {
             nowDate: nowDate(),
             takerName:item.type === 2 ? `退货人：${item.takerName || ''}` : `提货人：${item.takerName || ''}` ,
             customerName: item.customerName || '',
-            correspondName: '',
+            correspondName: item.correspondName,
+            correspondNames:'',
             pickCar:item.pickCar || '',
             createBy: JSON.parse(
               localStorage.getItem("supply_user")

src/views/supply/pickup/components/design/panel.js

@@ -92,10 +92,10 @@ export default {
     },
     {
       "options": {
-        "left": 15,
+        "left": 18,
         "top": 115,
         "height": 381,
-        "width": 654,
+        "width": 650,
         "fontSize": 13,
         "field": "table",
         "fontFamily": '黑体',

src/views/supply/policy/policy_list.vue

@@ -714,7 +714,12 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
+        status: true,
         examineBy: this.screenForm.shMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
+        isDirectTransfer: this.screenForm.isDirectTransfer,
+        specification:this.screenForm.specification,
         k3CategoryNumber: this.screenForm.categoryNumber,
         type: 2 // 1:普通零售单，2:政策零售单
       }