保存时，包装数量问题修改

src/config/index.js

@@ -488,7 +488,7 @@ export default {
   intoTypeBySql: {
     other: '入库类型-其他入库',
     purchase: '入库类型-采购入库',
-    purchaseReturn: '入库类型-采退入库'
+    purchaseReturn: '入库类型-采退出库'
   },
 
   /**

src/view/ivt/ivt-freeze/form.vue

@@ -354,7 +354,7 @@ export default {
           }else{
             row.nonStandardForm = {
               formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-              piece:row['freezeQty'],
+              box:row['freezeQty'],
             }
             row.nonStandardItems = [
               {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/ivt/ivt-transfer/form.vue

@@ -59,6 +59,9 @@
                      control-id="oInvId"
                      :new-row-flag="true" :height="400"
                      :columns="this.type === this.$config.formMode.add ? transferWhItemColumns: transferStdItemColumns"
+                     @changeValue="getTotals"
+                     @on-choose="getTotals"
+                     @changeNonStandard="changeNonStandard"
           ></EditTable>
         </div>
       </DkPanel>
@@ -238,8 +241,8 @@ export default {
           digits: 0,
           sum: true,
           formula: {
-            box: ['transferQty/packBox', 'freezeQty', 'packBox'],
-            piece: ['transferQty%packBox', 'freezeQty', 'packBox'],
+            box: ['transferQty/packBox', 'transferQty', 'packBox'],
+            piece: ['transferQty%packBox', 'transferQty', 'packBox'],
           },
         },
         //包装
@@ -378,6 +381,64 @@ export default {
       }
     },
     /**
+     * @desc   : 数量改变事件
+     * @author : 姜宁
+     * @date   : 2024/8/13 9:22
+     */
+    getTotals(field, row, rowIndex) {
+      let table = this.$refs['goodsTable'].tableData;
+      let sumQuantity = 0;  // 合计数量
+      if (table && table.length > 0) {
+        table.forEach(row => {
+          if (row["transferQty"]) {
+            sumQuantity += parseFloat(row["transferQty"]);
+          }
+          this.decimalPlaces = row['decimalPlaces']
+          if(row['subUnitId']){
+            row.nonStandardForm = {
+              formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
+              box:(row['transferQty']/row['packBox'] >= 1 ? Math.floor(row['transferQty']/row['packBox']):0),
+              piece:row['transferQty']%row['packBox']?row['transferQty']%row['packBox']:0,
+            }
+            row.nonStandardItems = [
+              {code:'formula',label:'计算公式',type:'text',readonly:true},
+              {code:'box',label:row['subUnitName'],type:'number' },
+              {code:'piece',label:row['unitName'],type:'number',digits:this.decimalPlaces}
+            ]
+            row['unitInfo'] = (row['transferQty']/row['packBox'] >= 1 ? Math.floor(row['transferQty']/row['packBox']):0) + row['subUnitName'] + (row['transferQty']%row['packBox']?row['transferQty']%row['packBox']:0).toFixed(this.decimalPlaces) + row['unitName']
+          }else{
+            row.nonStandardForm = {
+              formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
+              box:row['transferQty'],
+            }
+            row.nonStandardItems = [
+              {code:'formula',label:'计算公式',type:'text',readonly:true},
+              {code:'piece',label:row['unitName'],type:'number',digits: this.decimalPlaces}
+            ]
+            row['unitInfo'] = row['transferQty'] + row['unitName']
+          }
+          row['box'] = row['nonStandardForm']['box']
+          row['piece'] = row['nonStandardForm']['piece']
+        })
+        this.formData.sumQuantity = sumQuantity;
+      }
+    },
+    /**
+     * @desc   : 修改包装数
+     * @author : 姜宁
+     * @date   : 2024/8/13 9:28
+     */
+    changeNonStandard({row,rowIndex,field}){
+      let table = this.$refs['goodsTable'].tableData
+      table[rowIndex][field] = (row['nonStandardForm']['box']?row['nonStandardForm']['box']:0)
+        + row['subUnitName']
+        +(row['nonStandardForm']['piece'] == 0 || row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:'')
+        +(row['unitName']?(row['nonStandardForm']['piece']?row['unitName']:''):'')
+      table[rowIndex]['box'] = row['nonStandardForm']['box']?row['nonStandardForm']['box']:0
+      table[rowIndex]['piece'] = row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:0
+      table[rowIndex]['transferQty'] = row['packBox'] * (row['nonStandardForm']['box']?row['nonStandardForm']['box']:0) + (row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:0)
+    },
+    /**
      * @desc   : 赋值盘点实体信息
      * @author : 宋扬
      * @date   : 2024/3/18 10:57

src/view/ivt/ivt-transfer/index.vue

@@ -94,16 +94,10 @@
               <DkTableColumn field="skuModel"/>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"/>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode"/>
               <!-- 品牌-->
-              <DkTableColumn field="shortName"/>
+              <DkTableColumn field="brandName"/>
               <!-- 调整数量-->
               <DkTableColumn field="transferQty" dataType="number"/>
-              <!-- 箱-->
-              <DkTableColumn field="box" dataType="number" :digits="0"/>
-              <!-- 片-->
-              <DkTableColumn field="piece" dataType="number" :digits="0"/>
               <!-- 包装数量-->
               <DkTableColumn field="boxPiece" />
               <!--源批号-->

src/view/ivt/out-handle/form.vue

@@ -388,7 +388,7 @@
         }else{
           row.nonStandardForm = {
             formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-            piece:row['outingQty'],
+            box:row['outingQty'],
           }
           row.nonStandardItems = [
             {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/pur/pur-by-sale/index.vue

@@ -402,7 +402,7 @@ export default {
           }else{
             row.nonStandardForm = {
               formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-              piece:row['itemQty'],
+              box:row['itemQty'],
             }
             row.nonStandardItems = [
               {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/pur/pur-order/form.vue

@@ -409,7 +409,7 @@ export default {
           }else{
             row.nonStandardForm = {
               formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-              piece:row['itemQty'],
+              box:row['itemQty'],
             }
             row.nonStandardItems = [
               {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/pur/pur-return/form.vue

@@ -595,8 +595,8 @@ export default {
       // 账务日期
       this.params.intoDate = new Date().format("yyyy-MM-dd")
       // 新建
+      let tableFilter = this.$refs['detailTable'].getTableDataFilter();
       if (this.type === this.$config.formMode.add) {
-        let tableFilter = this.$refs['detailTable'].getTableDataFilter();
         tableFilter.map(row => {
           let item = row
           // 退货价
@@ -636,6 +636,13 @@ export default {
         // 采购入库明细
         this.params.itemList = tableFilter
       }
+      //行号
+      let itemIndex = 1
+      tableFilter.forEach(it =>{
+        this.$set(it,'itemIndex',itemIndex)
+        itemIndex++
+      })
+      return tableFilter
     },
 
     /**

src/view/sale/order-out/form.vue

@@ -653,7 +653,7 @@ export default {
         }else{
           row.nonStandardForm = {
             formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-            piece:row['outingQty'],
+            box:row['outingQty'],
           }
           row.nonStandardItems = [
             {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/sale/order-out/formOrderOut.vue

@@ -369,7 +369,7 @@ export default {
       }else{
         row.nonStandardForm = {
           formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-          piece:row['outingQty'],
+          box:row['outingQty'],
         }
         row.nonStandardItems = [
           {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/sale/order-return/form.vue

@@ -558,7 +558,7 @@ export default {
       }else{
         row.nonStandardForm = {
           formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-          piece:Math.abs(row['outingQty']),
+          box:Math.abs(row['outingQty']),
         }
         row.nonStandardItems = [
           {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/sale/order-return/formOutReturn.vue

@@ -295,7 +295,7 @@ export default {
       }else{
         row.nonStandardForm = {
           formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-          piece:Math.abs(row['outingQty']),
+          box:Math.abs(row['outingQty']),
         }
         row.nonStandardItems = [
           {code:'formula',label:'计算公式',type:'text',readonly:true},

src/view/sale/order/form.vue

@@ -1199,7 +1199,7 @@ export default {
           }else{
             row.nonStandardForm = {
               formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
-              piece:row['itemQty'],
+              box:row['itemQty'],
             }
             row.nonStandardItems = [
               {code:'formula',label:'计算公式',type:'text',readonly:true},