拆单应收款bug修复

src/api/ecw/orderHandle.js

@@ -127,4 +127,13 @@ export function getMergeListByMergeId(params){
     method: 'get',
     params
   })
-}
\ No newline at end of file
+}
+
+// 计价单位的数量参数是否必传
+export function quantitycheck(query) {
+  return request({
+    url: '/order/split-item/quantity/check',
+    method: 'get',
+    params: query
+  })
+}

src/components/CustomerSelector/index.vue

@@ -59,7 +59,7 @@ export default {
             params.searchKey = keyword
             this.loading = true
             getCustomerSelect(params)
-                .then(res => this.list = res.data)
+                .then(res => this.list = res.data.list)
                 .finally(() => this.loading = false)
         }
     }

src/views/ecw/financial/creatCollection.vue

@@ -112,7 +112,11 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="num" />
-          <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
+            <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
+              <template slot-scope="scope">
+                 {{ scope.row.volume}}/{{ scope.row.weight}}
+                </template>
+              </el-table-column>
           <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
             <template slot-scope="scope">
               <dict-tag
@@ -510,7 +514,11 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="num" />
-          <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
+          <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
+            <template slot-scope="scope">
+               {{ scope.row.volume}}/{{ scope.row.weight}}
+              </template>
+            </el-table-column>
           <el-table-column :label="$t('发货人')" align="center" prop="consignorName" />
           <el-table-column :label="$t('收货人')" align="center" prop="consigneeName" />
           <el-table-column :label="$t('订单状态')" align="center" prop="status">
@@ -571,7 +579,11 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="num" />
-          <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
+          <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
+            <template slot-scope="scope">
+               {{ scope.row.volume}}/{{ scope.row.weight}}
+              </template>
+            </el-table-column>
           <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
             <template slot-scope="scope">
               <dict-tag

src/views/ecw/order/splitApply.vue

@@ -214,26 +214,29 @@
           </div>
         </el-dialog>
         <!-- 对话框(添加 / 修改) -->
-           <el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
-             <el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="80px">
+           <el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="500px" append-to-body>
+             <el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="120px">
                <el-row>
                 <el-form-item :label="$t('中文品名')+':'" v-if="splitData.length>0">
-                   <el-select v-model="shopForm.prodTitleZh" :placeholder="$t('请选择中文品名')"  @change="changeProdTitleZh" clearable>
-                    <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
+                   <el-select v-model="shopForm.pordid" :placeholder="$t('请选择中文品名')"  @change="changeProdTitleZh" clearable>
+                    <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleZh" :value="item.id" :key="item.prodTitleZh" ></el-option>
                    </el-select>
                  </el-form-item>
                </el-row>
                <el-row>
                 <el-form-item :label="$t('英文品名')+':'" v-if="splitData.length>0">
-                     <el-select v-model="shopForm.prodTitleEn" :placeholder="$t('请选择英文品名')"  @change="changeProdTitleEn" clearable>
-                      <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
+                     <el-select v-model="shopForm.pordid" :placeholder="$t('请选择英文品名')"  @change="changeProdTitleZh" clearable>
+                      <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleEn" :value="item.id" :key="item.prodTitleEn" ></el-option>
                      </el-select>
                  </el-form-item>
                  <el-form-item :label="$t('剩余箱数')+':'">
                     {{shopForm.sum||0}}
                  </el-form-item>
                  <el-form-item :label="$t('放入箱数')+':'">
-                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
+                    <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
+                 </el-form-item>
+                 <el-form-item v-if="quantityshow" :label="$t('放入数量')+'('+$t('个')+')'+':'">
+                    <el-input-number v-model="shopForm.quantity" controls-position="right"  :min="1" :max="quantitySum"></el-input-number>
                  </el-form-item>
                  <el-form-item :label="$t('备注信息')+':'">
                     <el-input v-model="shopForm.remarks"></el-input>
@@ -265,7 +268,7 @@
 
 <script>
 import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
-import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSplitItem,deleteSplit} from "@/api/ecw/orderHandle"
+import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSplitItem,deleteSplit,quantitycheck} from "@/api/ecw/orderHandle"
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import {getChannelList} from '@/api/ecw/channel'
 import WorkFlow from '@/components/WorkFlow'
@@ -297,7 +300,7 @@ export default {
       importCityList:[],
       selectedUsers:[],
       shopOpen:false,
-
+      quantityshow:false,
       shopForm:{},
       // 表单校验
       rules: {
@@ -318,7 +321,8 @@ export default {
         page:1,
         rows:20
       },
-      splitItemIndex:0
+      splitItemIndex:0,
+      quantitySum:0
     };
   },
   created() {
@@ -457,6 +461,7 @@ export default {
     addShop(index){
       this.splitItemIndex = index
       this.shopOpen = true
+
     },
     addSplit(){
       this.form.transportId = this.orderData.transportId
@@ -466,22 +471,38 @@ export default {
         if(this.orderData.logisticsInfoDto&&this.orderData.logisticsInfoDto.channelId){
           this.form.channelId = this.orderData.logisticsInfoDto.channelId
           }
-
       }
-
       this.open = true
     },
-    changeProdTitleZh(){
+    changeProdTitleZh(val){
         var list = []
-        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleZh == this.shopForm.prodTitleZh)
+        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.id == val)
         this.shopForm.sum = list[0].num
+        this.quantitySum = list[0].quantity
         this.shopForm.orderItemId = list[0].orderItemId
         this.shopForm.prodTitleEn = list[0].prodTitleEn
+        this.shopForm.prodTitleZh = list[0].prodTitleZh
+        var params = {
+          'seaFreightVolume':list[0].seaFreightVolume,
+          'clearanceFreightVolume':list[0].clearanceFreightVolume
+        }
+        console.log(params)
+        this.numcheck(params)
+    },
+    numcheck(params){
+      quantitycheck(params).then(res=>{
+        this.quantityshow = res.data
+      })
+    },
+    numChange(){
+      var sum =  parseInt(this.quantitySum/this.shopForm.num)
+      this.$set(this.shopForm,'quantity',sum)
     },
     changeProdTitleEn(){
         var list = []
         list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
         this.shopForm.sum = list[0].num
+        this.quantitySum = list[0].quantity
         this.shopForm.prodTitleZh = list[0].prodTitleZh
     },
     haddleAdd(){