Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/financial/creatPayment.vue

@@ -214,9 +214,11 @@
               label=""
               label-width="0"
               style="margin-bottom: 0"
-              required
               :error="$t('账单号不能为空')"
               prop="accountNumber"
+              :rules="[
+                { required: true, message: '账单号不能为空', trigger: 'blur' },
+              ]"
             >
               <el-input
                 v-model="form.accountNumber"
@@ -463,6 +465,7 @@ export default {
         this.handleSelectionChange([res.data])
         this.list = this.multipleSelection
         this.$set(this.form, 'supplierId', res.data.supplierId)
+        this.selectChange(this.form.supplierId)
       })
     }
     if (that.$route.query.id && that.$route.query.id !== '0') {
@@ -474,6 +477,7 @@ export default {
           applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}'),
           invoiceStatus: String(res.data.invoiceStatus),
         }
+
         this.$set(this.form,'supplierBankAccount',res.data.supplierBankAccount)
         console.log(this.form)
       })

src/views/ecw/financial/payable.vue

@@ -181,13 +181,13 @@
 
         <el-form-item :label="$t('操作步骤')">
           <el-select v-model="costObj.stepsId" :placeholder="$t('请选择操作步骤')">
-            <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="type.label" :value="type.value"></el-option>
+            <el-option v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item :label="$t('费用类型')">
           <el-select v-model="costObj.feeType" :placeholder="$t('请选择费用类型')">
-            <el-option v-for="type in this.getDictDatas(DICT_TYPE.FEE_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
+            <el-option v-for="item in this.getDictDatas(DICT_TYPE.FEE_TYPE)" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
@@ -203,7 +203,7 @@
           </el-form-item>
           <el-form-item label="" label-width="0px">
             <el-select v-model="costObj.currencyId" :placeholder="$t('请选择单位')">
-              <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="type.value" :label="type.label" :value="type.value"></el-option>
+              <el-option v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
         </el-row>

src/views/ecw/financial/receiptDetail.vue

@@ -21,13 +21,13 @@
         <el-table-column :label="$t('唛头')" align="center" prop="marks" />
         <el-table-column :label="$t('品名')" align="center" prop="title">
           <template slot-scope="scope">
-            {{ scope.row.titleZh + "(" + scope.row.titleEn + ")" }}
+            <span v-if="scope.row.feeType!=5">{{ scope.row.titleZh + "(" + scope.row.titleEn + ")" }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('箱数')" align="center" prop="num" />
         <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
           <template slot-scope="scope">
-              {{ scope.row.volume + "/" + scope.row.weight }}
+             <span v-if="scope.row.feeType!=5"> {{ scope.row.volume + "/" + scope.row.weight }}</span>
             </template>
           </el-table-column>
         <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
@@ -513,10 +513,14 @@ export default {
     },
     WriteOffProportion(){
         let total = 0
+        let amountTotal = 0
         this.detailed.forEach(item => {
+          if(item.status){
+            amountTotal = NP.plus(amountTotal, item.writeOffAmount)
+          }
            total = NP.plus(total, item.writeOffAmount)
         })
-      let portion = NP.divide(total,this.form.receiptAccountList.find(item=>item.type=='total').writeOffAmount)
+      let portion = NP.divide(amountTotal,total)
       return (portion*100).toFixed(2)
     }
   },

src/views/ecw/financial/receivable.vue

 <template>
   <div class="app-container">
-    <div slot="header" class="card-title">{{ $t('待收款') }}</div>
+
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8" style="margin-right: 60px">
+      <div class="card-title">{{ $t('待收款') }}</div>
       <el-button
         style="float: right; margin-left: 10px"
         type="primary"
@@ -333,5 +334,6 @@ export default {
 .card-title {
   font-size: 18px;
   font-weight: bold;
+  display: inline-block;
 }
 </style>

src/views/ecw/financial/voucher.vue

@@ -60,7 +60,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-form-item :label="$t('自编号')">
+<!--          <el-form-item :label="$t('自编号')">
             <el-input
               style="max-width: 188px"
               v-model="queryParams.orderNo"
@@ -68,8 +68,8 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
-          <el-form-item :label="$t('订单号')">
+          </el-form-item> -->
+<!--          <el-form-item :label="$t('订单号')">
             <el-input
               style="max-width: 188px"
               v-model="queryParams.orderNo"
@@ -77,10 +77,13 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
+          </el-form-item> -->
+          <el-form-item>
+            <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
           </el-form-item>
         </el-row>
-        <el-row :span="24">
-          <el-form-item :label="$t('商品名称')">
+        <!-- <el-row :span="24"> -->
+ <!--         <el-form-item :label="$t('商品名称')">
             <el-input
               style="max-width: 188px"
               v-model="queryParams.orderNo"
@@ -88,8 +91,8 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
-          <el-form-item :label="$t('费用类型')">
+          </el-form-item> -->
+<!--          <el-form-item :label="$t('费用类型')">
             <dict-selector
               :type="DICT_TYPE.FEE_TYPE"
               v-model="queryParams.feeType"
@@ -100,11 +103,9 @@
               :type="DICT_TYPE.PAYMENT_TYPE"
               v-model="queryParams.paymentType"
             ></dict-selector>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
-          </el-form-item>
-        </el-row>
+          </el-form-item> -->
+
+        <!-- </el-row> -->
       </el-form>
     </el-card>
     <el-table v-loading="loadings" :data="list" border class="card">
@@ -359,8 +360,9 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(11)
       this.queryParams.pageNo = 1;
-      // this.getList();
+      this.getList();
     },
     /** 新增按钮操作 */
     handleAdd(id) {

src/views/ecw/node/index.vue

@@ -422,7 +422,7 @@ export default {
 
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? this.$t("启用") : this.$t("停用");
-      this.$modal.confirm(this.$t('确认要{action}编号为{id}的数据吗?', {action: text, id})).then(function() {
+      this.$modal.confirm(this.$t('确认要{action}编号为{id}的数据吗?', {action: text, id: row.id})).then(function() {
         return updateNode(row);
 
       }).then(() => {

src/views/ecw/order/weightDeal.vue

@@ -58,7 +58,7 @@
               <span>{{scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('品名')" align="center" >
+        <el-table-column :label="$t('品名')">
           <template slot-scope="scope">
             <p>{{scope.row.prodTitleEn||''}}</p>
             <p>{{scope.row.prodTitleZh||''}}</p>
@@ -72,23 +72,22 @@
               <p>{{$t('重量')}}：{{scope.row.weight||0}}KG</p>
             </template>
             </el-table-column>
-            <el-table-column :label="$t('入库货物属性')" align="center" >
+            <el-table-column :label="$t('入库货物属性')">
               <template slot-scope="scope">
-                 <span>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
-                 <p>
-                  <span>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" /></span>
-                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>
-                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</span>
-                  <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
+                 <p>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</p>
+                 <p>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" /></p>
+                  <p>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</p>
+                  <p>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</p>
+                  <p>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG
                 </p>
               </template>
          </el-table-column>
-        <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
+        <el-table-column :label="$t('重货方数')"  v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
             <span>{{scope.row.wvolume||0}}CBM</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('泡货方数')" align="center" v-else >
+        <el-table-column :label="$t('泡货方数')" v-else >
           <template slot-scope="scope">
             <span>{{scope.row.vweight||0}}CBM</span>
           </template>
@@ -204,6 +203,9 @@ export default {
 }
 </script>
 <style scoped>
+  .dialog-footer{
+      margin-top: 10px;
+  }
   .filelist{
     display: flex;
     flex-wrap: wrap;
@@ -222,4 +224,8 @@ export default {
   .card{
     margin-top: 20px;
   }
+  p{
+    text-align: left;
+     margin: 0 !important;
+  }
 </style>