bug

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -229,6 +229,8 @@
           this.$nextTick(() => {
             this.$refs.inventoryTable &&
               this.$refs.inventoryTable.putTableValue(data.detailList);
+              this.setIsInquiry()
+
           });
           if (type == 'init') {
             this.getplanData(data.planId, type);

src/views/bpm/handleTask/components/inquiryManage/detailDialog.vue

@@ -116,7 +116,7 @@
         detailData: {},
         inventoryList: [],
         columns: [
-          {
+        {
             width: 45,
             type: 'index',
             columnKey: 'index',
@@ -124,54 +124,90 @@
             fixed: 'left'
           },
           {
-            width: 150,
+            minWidth: 100,
+            label: '状态',
+            fixed: 'left',
+            formatter: (row, column) => {
+              return row.isInquiry == 1
+                ? '部分核价'
+                : row.isInquiry == 2
+                ? '全部核价完成'
+                : '未核价';
+            },
+            align: 'center'
+          },
+          {
+            minWidth: 100,
             prop: 'productCategoryName',
             label: '分类',
-            slot: 'productCategoryName'
+            slot: 'productCategoryName',
+            align: 'center',
+            showOverflowTooltip: true,
           },
           {
-            width: 140,
+            minWidth: 120,
             prop: 'productCode',
             label: '编码',
-            slot: 'productCode'
+            slot: 'productCode',
+            showOverflowTooltip: true,
+            align: 'center',
           },
           {
-            width: 240,
+            minWidth: 120,
             prop: 'productName',
             label: '名称',
-            slot: 'productName'
+            slot: 'productName',
+            showOverflowTooltip: true,
+            align: 'center',
           },
 
           {
-            width: 150,
+            minWidth: 80,
             prop: 'productBrand',
             label: '牌号',
-            slot: 'productBrand'
+            slot: 'productBrand',
+            showOverflowTooltip: true,
+            align: 'center',
           },
           {
-            width: 80,
+            minWidth: 80,
             prop: 'totalCount',
             label: '数量',
-            slot: 'totalCount'
+            slot: 'totalCount',
+            showOverflowTooltip: true,
+            align: 'center',
+          },
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '重量',
+            slot: 'totalWeight',
+            align: 'center'
           },
           {
-            width: 100,
+            minWidth: 80,
             prop: 'measuringUnit',
             label: '单位',
-            slot: 'measuringUnit'
+            slot: 'measuringUnit',
+            showOverflowTooltip: true,
+            align: 'center',
           },
           {
-            width: 130,
+            minWidth: 120,
             prop: 'modelType',
             label: '型号',
-            slot: 'modelType'
+            slot: 'modelType',
+            showOverflowTooltip: true,
+            align: 'center',
           },
 
           {
-            width: 120,
+            minWidth: 120,
             prop: 'specification',
             label: '规格',
-            slot: 'specification'
+            slot: 'specification',
+            showOverflowTooltip: true,
+            align: 'center',
           },
           // {
           //   width: 130,
@@ -180,22 +216,27 @@
           //   slot: 'modelType'
           // },
           {
-            width: 170,
+            minWidth: 170,
             prop: 'expectReceiveDate',
             label: '到货日期',
-            slot: 'expectReceiveDate'
+            slot: 'expectReceiveDate',
+            showOverflowTooltip: true,
+            align: 'center',
           },
           {
-            width: 140,
+            minWidth: 140,
             prop: 'files',
             label: '附件',
-            slot: 'files'
+            slot: 'files',
+            align: 'center',
           },
           {
-            width: 220,
+            minWidth: 220,
             prop: 'remark',
             label: '备注',
-            slot: 'remark'
+            slot: 'remark',
+            showOverflowTooltip: true,
+            align: 'center',
           }
         ]
       };

src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -325,7 +325,11 @@ export default {
             label: '状态',
             fixed: 'left',
             formatter: (row, column) => {
-              return row.isInquiry==1?'已核价':'未核价'
+              return row.isInquiry == 1
+                ? '部分核价'
+                : row.isInquiry == 2
+                ? '全部核价完成'
+                : '未核价';
             },
             align: 'center'
           },
@@ -518,20 +522,35 @@ export default {
       });
       return comitDatasource;
     },
-    setIsInquiry(list){
-        let codeS=[]
-        list.forEach(item=>{
-          item.resultList.forEach(val=>{
-            codeS.push(val.productCode)
-          })
-          
-        }) 
-        this.form.datasource.forEach((item,index)=>{
-          this.$set(this.form.datasource[index],'isInquiry',codeS.includes(item.productCode)?1:0)
-        })
+    setIsInquiry(list) {
+        this.form.datasource.forEach((productItem, index) => {
+          //产品清单
+          let isInquiry = 0,
+            totalCountS = [];
+          list.forEach((item) => {
+            //供应商列表
+            item.resultList.forEach((val) => {
+              //供应商产品
+              if (val.productCode == productItem.productCode) {
+                totalCountS.push(
+                  Number(val.totalCount||0) + Number(productItem.doneTotalCount||0)
+                );
+              }
+            });
+          });
+          if (totalCountS.length > 0) {
         
-        console.log(codeS,'codeS')
-
+            this.$set(
+              this.form.datasource[index],
+              'isInquiry',
+            
+              Math.max(...totalCountS) >= productItem.totalCount ? 2 : 1
+            );
+          } else {
+            this.$set(this.form.datasource[index], 'isInquiry', 0);
+          }
+          console.log(totalCountS, 'codeS');
+        });
       },
     //修改回显
     async putTableValue(data) {

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/detailDialog.vue

@@ -295,7 +295,7 @@
           }
         ],
         competAnalysisListcolumns: [
-          {
+        {
             width: 45,
             type: 'index',
             columnKey: 'index',
@@ -303,195 +303,140 @@
             fixed: 'left'
           },
           {
-            width: 200,
-            prop: 'productName',
-            label: '名称',
-            slot: 'productName',
-            align: 'center'
-          },
-          {
-            width: 120,
+            minWidth: 160,
             prop: 'productCode',
             label: '编码',
-            slot: 'productCode',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 200,
-            prop: 'productCategoryName',
-            label: '类型',
-            slot: 'productCategoryName',
+            minWidth: 120,
+            prop: 'productName',
+            label: '名称',
+            showOverflowTooltip: true,
             align: 'center'
           },
+
           {
-            width: 160,
-            prop: 'productBrand',
-            label: '牌号',
-            slot: 'productBrand',
+            minWidth: 160,
+            prop: 'batchNo',
+            label: '批次号',
+            showOverflowTooltip: true,
+            slot: 'batchNo',
             align: 'center'
           },
           {
-            width: 120,
-            prop: 'modelType',
-            label: '型号',
-            slot: 'modelType',
+            minWidth: 160,
+            prop: 'barcodes',
+            label: '发货条码',
+            showOverflowTooltip: true,
+            slot: 'barcodes',
             align: 'center'
           },
           {
-            width: 120,
-            prop: 'specification',
-            label: '规格',
-            slot: 'specification',
+            minWidth: 120,
+            prop: 'materielDesignation',
+            label: '物料代号',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 200,
-            prop: 'customerMark',
+            minWidth: 120,
+            prop: 'clientCode',
             label: '客户代号',
-            slot: 'customerMark',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 200,
-            prop: 'warehouseName',
-            label: '仓库名称',
-            slot: 'warehouseName',
+            minWidth: 120,
+            prop: 'engrave',
+            label: '刻码',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 100,
-            prop: 'stockLedger',
-            label: '发货明细',
-            slot: 'stockLedger',
-            align: 'center'
+            minWidth: 160,
+            prop: 'packageNo',
+            align: 'center',
+            label: '包装编码',
+            showOverflowTooltip: true
           },
           {
-            width: 120,
-            prop: 'totalCount',
-            label: '数量',
-            slot: 'totalCount',
-            align: 'center'
+            minWidth: 100,
+            prop: 'packingQuantity',
+            align: 'center',
+            label: '包装数量',
+            showOverflowTooltip: true
           },
           {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
+            minWidth: 120,
+            prop: 'packingUnit',
+            align: 'center',
+            label: '包装单位',
+            showOverflowTooltip: true
           },
           {
-            width: 120,
-            prop: 'singleWeight',
-            label: '单重',
-            slot: 'singleWeight',
+            minWidth: 100,
+            prop: 'totalCount',
+            label: '计量数量',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 100,
-            prop: 'receiveTotalWeight',
-            label: '收货总重',
-            slot: 'receiveTotalWeight',
+            minWidth: 150,
+            prop: 'measuringUnit',
+            label: '计量单位',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 200,
-            prop: 'sendTotalWeight',
-            label: '发货总重',
-            slot: 'sendTotalWeight',
+            width: 160,
+            prop: 'pricingWay',
+            label: '计价方式',
+            slot: 'pricingWay',
             align: 'center',
-            headerSlot: 'headerTotalCount'
-          },
-
-          {
-            width: 100,
-            prop: 'increaseTotalWeight',
-            label: '增重重量',
-            slot: 'increaseTotalWeight',
-            align: 'center'
+            formatter: (row, column) => {
+              return row.pricingWay == 1 ? '数量' : '重量';
+            }
           },
           {
             width: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
-            align: 'center'
-          },
-          {
-            width: 160,
             prop: 'singlePrice',
             label: '单价',
             slot: 'singlePrice',
             align: 'center'
           },
+
           {
-            width: 120,
+            width: 100,
             prop: 'totalPrice',
-            label: '销售总金额',
-            slot: 'totalPrice',
-            formatter: (_row, _column, cellValue) => {
-              return _row.totalPrice? _row.totalPrice+ '元' : '';
-            },
+            label: '合计',
             align: 'center'
           },
 
           {
-            width: 120,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays',
-            align: 'center'
-          },
-          {
-            width: 200,
-            prop: 'guaranteePeriod',
-            label: '质保期',
-            slot: 'guaranteePeriod',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + (_row.guaranteePeriodUnitName|| '')
-              );
-            },
-            align: 'center'
-          },
-          // {
-          //   width: 120,
-          //   prop: 'guaranteePeriodUnitCode',
-          //   label: '',
-          //   slot: 'guaranteePeriodUnitCode'
-          // },
-          {
-            width: 120,
-            prop: 'technicalAnswerName',
-            label: '技术答疑人',
-            slot: 'technicalAnswerName',
-            align: 'center'
-          },
-          {
-            width: 220,
-            prop: 'technicalParams',
-            label: '技术参数',
-            slot: 'technicalParams',
+            minWidth: 80,
+            prop: 'receiveTotalWeight',
+            label: '重量',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            width: 240,
-            prop: 'technicalDrawings',
-            label: '技术图纸',
-            slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+            minWidth: 100,
+            prop: 'weightUnit',
+            label: '重量单位',
+            showOverflowTooltip: true,
             align: 'center'
           },
+
           {
             width: 220,
             prop: 'remark',
             label: '备注',
             slot: 'remark',
             align: 'center'
-          }
+          },
+         
         ]
       };
     },

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -531,12 +531,7 @@
             slot: 'singlePrice',
             align: 'center'
           },
-          {
-            width: 100,
-            prop: 'taxRate',
-            label: '税率',
-            align: 'center'
-          },
+       
           {
             width: 100,
             prop: 'totalPrice',

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTable.vue

@@ -342,12 +342,7 @@
             slot: 'singlePrice',
             align: 'center'
           },
-          {
-            width: 100,
-            prop: 'taxRate',
-            label: '税率',
-            align: 'center'
-          },
+        
           {
             width: 100,
             prop: 'totalPrice',