【修改】bug

src/utils/panel.js

@@ -76,7 +76,7 @@ export default {
             top: 50,
             height: 13,
             lineHeight: 13,
-            width: 250,
+            width: 656,
             fontSize: 12.5,
             title: "经销商",
             fontFamily: "黑体,宋体,微软雅黑",
@@ -90,8 +90,8 @@ export default {
         ,
         {
           options: {
-            left: 300,
-            top: 50,
+            left: 25,
+            top: 65,
             height: 13,
             lineHeight: 13,
             width: 150,
@@ -106,8 +106,8 @@ export default {
         },
         {
           options: {
-            left: 450,
-            top: 50,
+            left: 300,
+            top: 65,
             height: 13,
             lineHeight: 13,
             width: 200,
@@ -124,7 +124,7 @@ export default {
         {
           options: {
             left: 585,
-            top: 50,
+            top: 65,
             height: 13,
             lineHeight: 13,
             width: 300,
@@ -141,7 +141,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 65,
+            top: 80,
             height: 13,
             lineHeight: 13,
             width: 328,
@@ -157,7 +157,7 @@ export default {
         {
           options: {
             left: 300,
-            top: 65,
+            top: 80,
             height: 13,
             lineHeight: 13,
             width: 410,
@@ -173,7 +173,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 80,
+            top: 95,
             height: 13,
             lineHeight: 13,
             width: 633,
@@ -190,14 +190,15 @@ export default {
         {
           options: {
             left: 23,
-            top: 95,
+            top: 110,
             height: 410,
-            width: 633,
+            width: 656,
             fontSize: 12.5,
             field: "table",
             fontFamily: "黑体,宋体,微软雅黑",
             lineHeight: 16,
-            tableFooterRepeat: "",
+            tableFooter:true,
+            tableFooterRepeat:'last',
             columns: [
               [
                 {
@@ -233,6 +234,7 @@ export default {
                   field: "specification",
                   width: 140,
                   align: "left",
+                  overflow:"hidden",
                   colspan: 1,
                   rowspan: 1,
                   fontSize: 12.5,
@@ -266,6 +268,7 @@ export default {
                   rowspan: 1,
                   fontSize: 12.5,
                 },
+
               ],
             ],
           },
@@ -273,11 +276,11 @@ export default {
             title: "表格",
             type: "table",
             editable: true,
-            columnDisplayEditable: true, //列显示是否能编辑
-            columnDisplayIndexEditable: true, //列顺序显示是否能编辑
-            columnTitleEditable: true, //列标题是否能编辑
+            columnDisplayEditable: true,//列显示是否能编辑
+            columnDisplayIndexEditable: true,//列顺序显示是否能编辑
+            columnTitleEditable: true,//列标题是否能编辑
             columnResizable: true, //列宽是否能调整
-            columnAlignEditable: true, //列对齐是否调整
+            columnAlignEditable: true,//列对齐是否调整
             isEnableEditField: true, //编辑字段
             isEnableContextMenu: true, //开启右键菜单 默认true
             isEnableInsertRow: true, //插入行
@@ -287,7 +290,7 @@ export default {
             isEnableMergeCell: true, //合并单元格
           },
         },
-        ,
+
         {
           options: {
             left: 25,
@@ -407,23 +410,23 @@ export default {
           },
           printElementType: { title: "", type: "text" },
         },
-        // {
-        //   options: {
-        //     left: 650,
-        //     top: 410,
-        //     height: 13,
-        //     lineHeight: 13,
-        //     width: 218,
-        //     fontSize: 16,
-        //     title: "",
-        //     fontFamily: "黑体,宋体,微软雅黑",
-        //     field: "pageNumber",
-        //     testData: "",
-        //     color: "#000",
-        //     textAlign: "left",
-        //   },
-        //   printElementType: { title: "", type: "text" },
-        // },
+        {
+          options: {
+            left: 650,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 16,
+            title: "",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "pageNumber",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
       ],
       paperNumberDisabled: true,
     },

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

@@ -329,7 +329,7 @@
             </el-table-column>
             <!-- <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip

src/views/deposit_commerce/refund_list.vue

@@ -350,7 +350,7 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
-            <!-- <el-table-column align="right" label="合同价格" prop="contractPrice" min-width="160" show-overflow-tooltip >
+            <!-- <el-table-column align="right" label="合同单价" prop="contractPrice" min-width="160" show-overflow-tooltip >
                 <template slot-scope="scope">
                   {{ scope.row.contractPrice | numToFixed}}
                 </template>

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -220,7 +220,7 @@
             </el-table-column>
             <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip
@@ -508,8 +508,9 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
-        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
+        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice",
+          "contractAmount",]
       })
       res.data.items = arr
       this.details = res.data

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

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
               <div class="label">项目类别</div>
-              <div class="value">{{ details.refProjectName }}</div>
+              <div class="value">{{ details.refProjectCategory }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
               <div class="label">工程编号</div>
@@ -291,7 +291,7 @@
             </el-table-column>
             <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip
@@ -974,11 +974,9 @@ export default {
               arr.push(item)
             }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty",
-          "contractQty"]
-            item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',
-          "contractPrice",
-          "contractAmount"]
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice",
+          "contractAmount",]
           })
           res.data.items = arr
           this.details = res.data

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

@@ -25,7 +25,7 @@
         </el-col> -->
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">项目类别</div>
-          <div class="value">{{ detailList.refProjectName }}</div>
+          <div class="value">{{ detailList.refProjectCategory }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">行业类别</div>
@@ -549,7 +549,7 @@
             </el-table-column>
             <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip
@@ -1178,17 +1178,9 @@ export default {
           arr.push(item);
         }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["orderHasSendQty", "dataQty", "qty", "hasSendQty",
-          "contractQty"];
-        item.sums2 = [
-          "totalAmount",
-          "diffAmount",
-          "price",
-          "depositAmount",
-          "contractPrice",
-          "contractAmount",
-
-        ];
+        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice",
+          "contractAmount",]
       });
       res.data.items = arr;
       this.detailList = res.data;

src/views/deposit_home/deposit_list.vue

@@ -487,12 +487,12 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractQty | numToFixed }}
+                {{ scope.row.contractQty || 0}}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip

src/views/deposit_home/refund_list.vue

@@ -650,12 +650,12 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractQty | numToFixed }}
+                {{ scope.row.contractQty || 0}}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
-              label="合同价格"
+              label="合同单价"
               prop="contractPrice"
               min-width="160"
               show-overflow-tooltip

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

@@ -70,6 +70,7 @@ export default {
       this.width = width;
       this.hiprintTemplate = hiprintTemplate;
       this.printData = printData;
+
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         $("#preview_content").html(hiprintTemplate.getHtml(printData));
@@ -89,6 +90,7 @@ export default {
               this.$parent.getList();
               console.error("更新发货汇总列表");
             }, 1000);
+
           },
         }
       );
@@ -111,8 +113,18 @@ export default {
 
 ::v-deep tr {
   height: 40px !important;
+
+}
+::v-deep td {
+  height: 40px !important;
+  overflow: hidden;
+  /* display: -webkit-box; */
+ -webkit-line-clamp: 2;
+ /* 数值代表显示几行 */
+ -webkit-box-orient: vertical;
 }
 
+
 ::v-deep .hiprint-printPaper {
   margin: 0 auto;
 }

src/views/supply/pickup/components/pickup_form.vue

@@ -441,11 +441,14 @@ export default {
     },
 
     handleSelect(selection, row) {
-      // this.$refs.table.toggleRowSelection(row);
-      // this.deliverList.forEach((item) => {
-      //     this.$refs.table.toggleRowSelection(item);
-      // });
+      this.$refs.table.toggleRowSelection(row);
+      this.deliverList.forEach((item) => {
+        if (item.invoiceId === row.invoiceId) {
+          this.$refs.table.toggleRowSelection(item);
+        }
+      });
       this.tableSelection = this.$refs.table.selection;
+      // this.tableSelection = this.$refs.table.selection;
     },
 
     handleSelectAll(selection) {