【修改】 bug

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

@@ -95,7 +95,7 @@ export default {
         "left": 15,
         "top": 115,
         "height": 381,
-        "width": 656,
+        "width": 654,
         "fontSize": 13,
         "field": "table",
         "fontFamily": '黑体',
@@ -291,20 +291,19 @@ export default {
     },
     {
       "options": {
-        "left": 463,
+        "left": 650,
         "top": 381,
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "仓库",
+        "title": "",
         "fontFamily": '黑体',
-        "field": "correspondName",
+        "field": "pageNumber",
         "testData": "",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
     }],
-   
-   
+    "paperNumberDisabled": true
   }]
 }

src/views/supply/deliver/components/design/preview.vue

@@ -119,11 +119,10 @@ export default {
   margin: 0 auto;
 }
 
-::v-deep tr td {
+/* ::v-deep tr td {
   border: 0 !important;
-  /* width: 911px !important;
-    height: 529px !important; */
-}
+
+} */
 
 ::v-deep .hiprint-paperNumber {
   display: none;

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

@@ -52,6 +52,7 @@ function getDetail(ids,nickName) {
             });
           }
           detailArr.push({
+            pageNumber:index+1,
             type: item.type,
             tiTui:item.type === 2 ? `退货人` : `提货人`,
             takerPhone:item.takerPhone || '',

src/views/supply/deliver/sum_list.vue

@@ -128,6 +128,8 @@
                 {{  scope.row.orderType | orderTypeFilter  }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="订单日期" prop="theTime" min-width="160" show-overflow-tooltip>

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

@@ -168,7 +168,9 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400" 
+      show-summary
+            :summary-method="$getSummaries">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
@@ -190,7 +192,7 @@
             <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
+        <el-table-column align="center" label="订单金额" min-width="100" prop="totalAmount" show-overflow-tooltip>
           <template slot-scope="scope">
             {{(scope.row.price || 0) * (scope.row.qty || 0)}}
           </template>
@@ -431,6 +433,10 @@ export default {
     getDetail() {
       getEnginDetail({id: this.listItem.enginInfoId}).then(res => {
         this.detailData = res.data;
+        res.data.items.forEach(item => {
+          item.sums1 = ['qty', 'hasOrderQty', 'hasDeliverQty'];
+            item.sums2 = ['totalAmount', 'price'];
+        })
         this.goodsList = res.data.items;
       })
     },

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

@@ -95,7 +95,7 @@ export default {
         "left": 15,
         "top": 115,
         "height": 381,
-        "width": 656,
+        "width": 654,
         "fontSize": 13,
         "field": "table",
         "fontFamily": '黑体',
@@ -303,8 +303,22 @@ export default {
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 650,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "",
+        "fontFamily": '黑体',
+        "field": "pageNumber",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }],
-   
-  
+    "paperNumberDisabled": true
   }]
 }

src/views/supply/pickup/components/design/preview.vue

@@ -119,11 +119,10 @@ export default {
   margin: 0 auto;
 }
 
-::v-deep tr td {
+/* ::v-deep tr td {
   border: 0 !important;
-  /* width: 911px !important;
-    height: 529px !important; */
-}
+
+} */
 
 ::v-deep .hiprint-paperNumber {
   display: none;

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

@@ -52,6 +52,7 @@ function getDetails(ids, nickName) {
           });
         }
         detailArr.push({
+          pageNumber:index+1,
           type: item.type,
           tiTui: item.type === 2 ? `退货人` : `提货人`,
           takerPhone: item.takerPhone || '',