Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:sea:edit']">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item  command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -147,7 +147,7 @@
       <!-- 修改柜信息 -->
       <template v-if="dialogConfig.type === 'modifyCabinet' && dialogConfig.dialogVisible">
         <el-form ref="modifyForm" :rules="rules" :model="modifyCabinetObj" label-width="80px">
-          <el-form-item :label="$t('起运仓库')" prop="startWarehouseId">
+          <el-form-item v-if="false" :label="$t('起运仓库')" prop="startWarehouseId">
             <el-select v-model="modifyCabinetObj.startWarehouseId" :placeholder="$t('请选择仓库')" filterable>
               <el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="$l(warehouse, 'title')" :value="warehouse.id"></el-option>
             </el-select>

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -23,11 +23,11 @@
         <ladingSelect v-model="subMaterialObj.shipperId" :placeholder="$t('请选择托运人')" :allUsers="this.$attrs.allLading" />
       </el-form-item>
       <el-form-item :label="$t('收货人')">
-        <el-input v-model="subMaterialObj.consigneeName"></el-input>
+        <el-input v-model="subMaterialObj.consigneeName" readonly></el-input>
         <!-- <userSelect v-model="subMaterialObj.consigneeId" :placeholder="$t('请选择收货人')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item :label="$t('通知方')">
-        <el-input v-model="subMaterialObj.notifyingName"></el-input>
+        <el-input v-model="subMaterialObj.notifyingName" readonly></el-input>
         <!-- <userSelect v-model="subMaterialObj.notifyingId" :placeholder="$t('请选择通知方')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item label="Mark & No.">
@@ -180,8 +180,8 @@ export default {
     },
     download() {
       getBoxLadingBillPdf({shipmentId: this.shipmentObj.id}).then(res=>{
-        let blob = new Blob([res], {type: "application/pdf"})
-        FileSaver.saveAs(blob, this.$t('提单确认件')); 
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"})
+        FileSaver.saveAs(blob, this.$t('提单确认件.xlsx')); 
       })
     }
   },

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -164,7 +164,7 @@ export default {
             list.push({
               ...oItem,
               warehouseInInfo,
-              multiSpecification: item.multiSpecification,
+              // multiSpecification: item.multiSpecification,
               positionNo: oItem.positionNo,
               tallyStatus: item.tallyStatus,
               tallyTime: item.tallyTime,

src/views/ecw/financial/components/CollectionBankDetail.vue

@@ -152,6 +152,7 @@ export default {
       currencyList:[],
       list:[],
       detailed: [],
+      detatilData:[],
       showCurrencyId:0,
       surplusData:[],
       openAddDialog:false,
@@ -159,7 +160,8 @@ export default {
       addForm:{},
       receiptId:0,
       receiptItemId:0,
-      reason:''
+      reason:'',
+      receiptAccountList:[]
     }
   },
   watch:{
@@ -197,18 +199,19 @@ export default {
    },
    getList() {
      getReceivableItem({ id: this.receiptId }).then(res => {
-       res.data = res.data.map(v => ({
+       this.detatilData = res.data.map(v => ({
          ...v,
          amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
          accountNo: +v.accountNo,
          rate:parseFloat(v.rate).toFixed(6),
          attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
        }))
-       this.addForm = res.data.find(v=>v.id==this.receiptItemId)
+       this.addForm = this.detatilData.find(v=>v.id==this.receiptItemId)
        this.detailed = []
        this.detailed.push(this.addForm)
        this.getCollectionData()
      })
+     
    },
    getReceiptInfo(){
        getReceiptInfoByIds({ id: this.receiptId }).then(res => {
@@ -274,7 +277,7 @@ export default {
     handleAddReceiptItem() {
       // 已收
       let recepted = []
-      this.detailed.forEach(item => {
+      this.detatilData.forEach(item => {
           if(!recepted[item.currencyId]){
             recepted[item.currencyId] = item.amount
           }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)

src/views/ecw/financial/receiptDetail.vue

@@ -825,6 +825,43 @@ export default {
       if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
       return ''
     },
+    getsurplusData() {
+          // 已收
+          this.surplusData = []
+          let recepted = []
+          this.detailed.forEach(item => {
+              if(!recepted[item.currencyId]){
+                recepted[item.currencyId] = item.amount
+              }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
+          })
+          // 应收
+          let collom = []
+         // 从期望收费金额中提取应收币种和金额
+         this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
+           collom[item.currencyId] = item.amount
+         })
+            recepted.forEach((amount,currency)=>{
+              if(amount){
+                if(collom[currency]){
+                  if((collom[currency]-amount)!=0) this.surplusData[currency] = +parseFloat((collom[currency]-amount).toPrecision(12))
+                }else{
+                  this.surplusData[currency] = -amount
+                }
+              }
+
+            })
+            collom.forEach((amount,currency)=>{
+              if(amount){
+                if(!this.surplusData[currency]){
+                  if(recepted[currency]){
+                   if((amount-recepted[currency])!=0)  this.surplusData[currency] = +parseFloat((amount-recepted[currency]).toPrecision(12))
+                  }else{
+                  this.surplusData[currency] = amount
+                }
+                }
+              }
+            })
+        },
     calculation() {
       // this.currencyList.forEach((item,index)=>{
       //   var verificationList = this.detailed.filter(v => v.status === 1)
@@ -1082,6 +1119,7 @@ export default {
       return this.$router.push("creatCollection?id=" + this.id);
     },
     detailClick(row) {
+      this.getsurplusData()
       this.openAddDialog = true
       this.dialogTitle = this.$t('银行实收明细详情')
       this.isView = true
@@ -1183,59 +1221,7 @@ export default {
       this.openAddDialog = false
     },
     handleAddReceiptItem() {
-      this.surplusData = []
-
-      // 已收
-      let recepted = []
-      this.detailed.forEach(item => {
-
-          if(!recepted[item.currencyId]){
-            recepted[item.currencyId] = item.amount
-          }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
-      })
-      console.log('rece',recepted)
-
-      // 应收
-      let collom = []
-      /* this.form.receiptAccountList.forEach(item => {
-          if(item.type!='total'){
-            if(!collom[item.currencyId]){
-              collom[item.currencyId] = item.receivableAmount-item.discountTotal
-            }else collom[item.currencyId] = NP.plus(collom[item.currencyId], item.receivableAmount)
-          }
-      }) */
-      // 从期望收费金额中提取应收币种和金额
-      this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
-        collom[item.currencyId] = item.amount
-      })
-      console.log(this.form.receiptAccountList)
-          console.log('collom',collom)
-      // if(recepted.length>collom.length){
-        recepted.forEach((amount,currency)=>{
-          if(amount){
-            if(collom[currency]){
-              if((collom[currency]-amount)!=0) this.surplusData[currency] = +parseFloat((collom[currency]-amount).toPrecision(12))
-            }else{
-              this.surplusData[currency] = -amount
-            }
-          }
-
-        })
-      // }else{
-        collom.forEach((amount,currency)=>{
-          if(amount){
-            if(!this.surplusData[currency]){
-              if(recepted[currency]){
-               if((amount-recepted[currency])!=0)  this.surplusData[currency] = +parseFloat((amount-recepted[currency]).toPrecision(12))
-              }else{
-              this.surplusData[currency] = amount
-            }
-
-            }
-          }
-        })
-      // }
-      console.log(this.surplusData)
+      this.getsurplusData()
       this.addForm = {}
       this.openAddDialog = true
       this.isView = false

src/views/ecw/financial/voucher.vue

@@ -316,6 +316,7 @@ export default {
       dateType: [],
       loading: "",
       params: {
+
       },
       // 查询参数
       queryParams: {
@@ -361,6 +362,13 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      this.params = {}
+      for(var key in this.queryParams){
+          if(this.queryParams[key]){
+            this.params[key] = this.queryParams[key]
+          }
+         }
+      console.log(this.params)
       // 处理查询参数
       let params = { ...this.params };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
@@ -500,7 +508,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.params = {}
       if(this.dateFilter&&this.dateFilter.length>0){
         this.queryParams.beginCreateTime = this.dateFilter[0]
         this.queryParams.endCreateTime = this.dateFilter[1]
@@ -509,12 +516,7 @@ export default {
         this.queryParams.endCreateTime = ''
       }
 
-      this.queryParams.pageNo = 1;
-      for(var key in this.queryParams){
-          if(this.queryParams[key]){
-            this.params[key] = this.queryParams[key]
-          }
-         }
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 新增按钮操作 */

src/views/ecw/order/components/warehouseDetails.vue

@@ -192,7 +192,7 @@ export default {
       channelList:[],
       processInstanceID:undefined,
       list:[],
-
+      currencyList:[],
       prodName: ''
     }
   },

src/views/ecw/order/feeApplication.vue

@@ -55,7 +55,8 @@
          </el-table-column>
          <el-table-column :label="$t('操作')">
            <template v-slot:default = 'scope'>
-             <el-button type="text" v-if="scope.row.status !== 0">{{STATUS[scope.row.status]}}</el-button>
+             <el-button type="text" v-if="scope.row.status !== 0&&scope.row.status !== 1">{{STATUS[scope.row.status]}}</el-button>
+             <el-button type="text" v-if="scope.row.status == 1" @click="examineFn">{{$t('审核中')}}</el-button>
              <el-button type="text" v-if="scope.row.status === 2" @click="modify(scope.row)">{{$t('修改')}}</el-button>
            </template>
          </el-table-column>
@@ -185,6 +186,7 @@ export default {
     },
     examineFn(){
      let item =  this.list.find(e => e.status === 1);
+     console.log(item)
       this.$router.push({path:'/bpm/process-instance/detail',query:{id:item.bpmProcessId}})
     },
     cancel(){

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -503,10 +503,10 @@ export default {
   watch: {
     visible(val){
       if (val) {
+        this.init()
         this.getProductBrandPage(this.warehousing.brandName)
         this.getProductBrandPage1()
         this.handleBrandChange(parseInt(this.form.brand))
-        this.init()
       } else {
         this.$emit('close')
       }
@@ -723,6 +723,7 @@ export default {
                 orderId: this.warehousing.orderId,
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
+                isAppend: this.isAdd ? true : undefined,
                 orderWarehouseInItemDoList: this.form.table.map(e => {
                   return {
                     ...e,