发货确认单修改

src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -263,14 +263,42 @@
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            width: 150,
+            prop: 'purchaseCount',
+            label: '数量',
+            align: 'center'
+          },
+          {
+            width: 150,
+            prop: 'purchaseUnit',
+            label: '单位',
+            align: 'center'
+          },
+ 
+          {
+            minWidth: 180,
+            prop: 'packingSpecification',
+            align: 'center',
+            label: '包装规格',
+            showOverflowTooltip: true
+          },
           {
             minWidth: 80,
             prop: 'totalCount',
-            label: '数量',
+            label: '计量数量',
             slot: 'totalCount',
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            minWidth: 80,
+            prop: 'measuringUnit',
+            label: '计量单位',
+            slot: 'measuringUnit',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             minWidth: 120,
             prop: 'goodsLevel',
@@ -288,14 +316,7 @@
             slot: 'availableCountBase',
             align: 'center'
           },
-          {
-            minWidth: 80,
-            prop: 'measuringUnit',
-            label: '单位',
-            slot: 'measuringUnit',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
+     
           {
             minWidth: 130,
             prop: 'modelType',
@@ -401,14 +422,7 @@
           //   label: '批准文号',
           //   showOverflowTooltip: true
           // },
-          
-          {
-            minWidth: 120,
-            prop: 'packingSpecification',
-            align: 'center',
-            label: '包装规格',
-            showOverflowTooltip: true
-          },
+ 
           // {
           //   width: 130,
           //   prop: 'brand',

src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -16,6 +16,7 @@
           :page-size="20"
           @columns-change="handleColumnChange"
           :cache-key="cacheKeyUrl"
+          @sort-change="sortChange"
         >
           <!-- 表头工具栏 -->
           <template v-slot:toolbar>
@@ -319,7 +320,12 @@
         const dataId = this.selection.map((v) => v.id);
         this.remove(dataId);
       },
+      sortChange(column, prop, order){
+        console.log(column)
+        console.log(prop)
+        console.log(order)
 
+      },
       //查看详情
       openDetail(row) {
         this.$refs.contactDetailDialogRef.open(row);

src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -138,14 +138,22 @@
             </el-select>
           </template>
           <template v-slot:notaxSinglePrice="scope">
-     
-              <el-input
-                v-model="scope.row.notaxSinglePrice"
-                placeholder="请输入"
-                type="number"
-              >
-                <template slot="append">元</template>
-              </el-input>
+            <el-input
+              v-model="scope.row.notaxSinglePrice"
+              placeholder="请输入"
+              type="number"
+           
+            >
+              <template slot="append">元</template>
+            </el-input>
+          </template>
+          <template v-slot:totalCount="scope">
+            <el-input
+              v-model="scope.row.totalCount"
+              @input="totalCountChange(scope.row,scope.$index)"
+              type="number"
+              placeholder="请输入"
+            ></el-input>
           </template>
         </ele-pro-table>
       </el-tab-pane>
@@ -221,9 +229,7 @@
   import dictMixins from '@/mixins/dictMixins';
   import outboundDetailsDialog from '@/views/saleManage/saleOrder/returnGoods/components/outboundDetailsDialog.vue';
   import taskInfoTable from '../../invoice/components/taskInfoTable.vue';
-  import {
-    getSendSaleOrderrecordDetailSplit
-  } from '@/api/saleManage/saleordersendrecord';
+  import { getSendSaleOrderrecordDetailSplit } from '@/api/saleManage/saleordersendrecord';
   import inventoryTable from '../../invoice/components/inventoryTable.vue';
   import stowageTable from '../../invoice/components/stowageTable.vue';
   import sendListDialog from './sendListDialog.vue';
@@ -240,7 +246,7 @@
   import { levelList } from '@/enum/dict.js';
 
   export default {
-    mixins: [dictMixins, getDynamicsColumns,tabMixins],
+    mixins: [dictMixins, getDynamicsColumns, tabMixins],
     components: {
       processSubmitDialog,
       // fileMain,
@@ -303,7 +309,7 @@
         productList: [],
         trayList: [],
         trayListData: [],
-        cacheKeyUrl:'eos-saleManage-invoiceConfirm-inventoryTable',
+        cacheKeyUrl: 'eos-saleManage-invoiceConfirm-inventoryTable',
         acceptUnpackoptions,
         visible: false,
         entrustedReceiveDialogFlag: false,
@@ -313,8 +319,8 @@
         activeName: 'first',
         formDef,
         options: [
-          { value: 0, label: '已发货' },
-          { value: 1, label: '未发货' }
+          { value: 0, label: '无异常' },
+          { value: 1, label: '有异常' }
         ],
         options1: [
           { value: 0, label: '未回收' },
@@ -401,10 +407,18 @@
             label: '包装单位',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 100,
+            prop: 'saleCount',
+            label: '发货数量',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             minWidth: 100,
             prop: 'totalCount',
-            label: '计量数量',
+            label: '确认数量',
+            slot: 'totalCount',
             showOverflowTooltip: true,
             align: 'center'
           },
@@ -456,7 +470,7 @@
             prop: 'taxRate',
             label: '税率',
             formatter: (row, column) => {
-              return row.taxRate?row.taxRate+'%':''
+              return row.taxRate ? row.taxRate + '%' : '';
             },
             align: 'center'
           },
@@ -502,7 +516,8 @@
             prop: 'goodsLevel',
             label: '物品级别',
             formatter: (_row, _column, cellValue) => {
-              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
             },
             align: 'center'
           },
@@ -651,7 +666,6 @@
     created() {
       this.requestDict('产地');
       this.requestDict('商品价格类型');
-
     },
     computed: {},
 
@@ -703,8 +717,11 @@
         });
       },
       saveDate(data) {
-        data.forEach((item) => {
-          item['totalCount'] = item.measureQuantity;
+        data.forEach((item, index) => {
+          // item['totalCount'] = item.measureQuantity;
+          // item['saleCount'] = item.measureQuantity;
+          this.$set(data[index], 'totalCount', item.measureQuantity);
+          this.$set(data[index], 'saleCount', item.measureQuantity);
           // item['qmsResult'] = item.result;
           // item['qmsStatus'] = item.status;
           item['sendProductId'] = item.categoryId;
@@ -722,15 +739,7 @@
               item['clientCode'] = item.clientCode || val.customerMark;
               item['pricingWay'] = val.pricingWay || 1;
 
-              if (item.pricingWay == 1) {
-                item.totalPrice = item.singlePrice * item.measureQuantity;
-              }
-              if (item.pricingWay == 2) {
-                item.totalPrice =
-                  item.singlePrice *
-                  item.measureQuantity *
-                  item.sendTotalWeight;
-              }
+              item.totalPrice = item.singlePrice * item.measureQuantity;
             }
           });
         });
@@ -774,7 +783,6 @@
               this.$refs.taskInfoTableRef.putTableValue(
                 data.logisticTrakListNoteVOList
               );
-
           });
         }
       },
@@ -831,12 +839,13 @@
         }
         this.isUpdate = type != 'add';
       },
-      totalCountChange(row) {
-        if (row.totalCount > row.sendTotalCount) {
-          row.totalCount = row.sendTotalCount;
-        }
+      totalCountChange(row,index) {
         if (row.totalCount < 0) {
-          row.totalCount = 0;
+          this.$set(this.form.productList[index],'totalCount',0)
+        }
+        if(row.totalCount&&row.singlePrice){
+          console.log(row.totalCount*row.singlePrice)
+          this.$set(this.form.productList[index],'totalPrice',row.totalCount*row.singlePrice)
         }
       },
       getValidate() {
@@ -915,12 +924,10 @@
               businessName: data.contactName,
               businessType: '发货确认单'
             }
-
           };
 
           this.$refs.processSubmitDialogRef.init(params);
         });
-    
       },
       remove(index) {
         this.form.productList.splice(index, 1);

src/views/saleManage/saleOrder/invoiceConfirm/components/detailDialog.vue

@@ -370,10 +370,18 @@
             label: '包装单位',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 100,
+            prop: 'saleCount',
+            label: '发货数量',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             minWidth: 100,
             prop: 'totalCount',
-            label: '计量数量',
+            label: '确认数量',
+            slot:'totalCount',
             showOverflowTooltip: true,
             align: 'center'
           },