bug修复

src/views/ecw/financial/creatCollection.vue

@@ -84,7 +84,6 @@
               label-width="0"
               style="margin-bottom: 0"
               prop="remark"
-              :rules="{ required: true, trigger: ['blur', 'change'], message: '备注不能为空' }"
             >
               <el-input v-model="form.remark" placeholder="备注"></el-input>
             </el-form-item>
@@ -136,7 +135,7 @@
           </el-table-column>
           <el-table-column label="优惠金额" align="center">
             <template slot-scope="scope">
-              {{ scope.row.discountTotal ? `${scope.row.discountTotal}(${scope.row.discountRemark})` : 0 }}
+              {{ scope.row.discountTotal ? `${scope.row.discountTotal}`:0}}{{scope.row.discountRemark?('('+scope.row.discountRemark+')'): '' }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
@@ -608,10 +607,10 @@
           {{ selectListRow.totalAmount - (discountForm.discountTotal || 0) }}
           <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
         </el-form-item>
-        <el-form-item label="操作人">
+        <el-form-item v-if="opnotice" label="操作人">
           {{ discountForm.author }}
         </el-form-item>
-        <el-form-item label="操作时间">
+        <el-form-item v-if="opnotice" label="操作时间">
           {{ discountForm.time }}
         </el-form-item>
       </el-form>
@@ -657,6 +656,7 @@ export default {
       list: [],
       // fileList: [],
       orderData: [],
+      opnotice:false,
       dialogTableKey: 0,
       total: 0,
       headers: {
@@ -1022,12 +1022,23 @@ export default {
           this.$set(this.discountForm, 'discountTotal', res.data.discountTotal)
           this.$set(this.discountForm, 'discountRemark', res.data.discountRemark)
           this.$set(this.discountForm, 'author', res.data.creatorName)
+          this.opnotice = true
+        }else{
+          this.opnotice = false
         }
       })
     },
     saveDiscount() {
       console.log(this.discountForm)
       // this.selectListRow.id
+      if (this.discountForm.discountTotal === 0||!this.discountForm.discountTotal) {
+        this.$modal.msgError("优惠金额不能为空");
+        return
+      }
+      if (this.discountForm.discountRemark === 0||!this.discountForm.discountRemark) {
+        this.$modal.msgError("优惠原因不能为空");
+        return
+      }
       const params = {
         id: this.selectListRow.id,
         discountTotal: this.discountForm.discountTotal,
@@ -1075,7 +1086,8 @@ export default {
       this.open = false;
     },
     submitForm(addType) {
-      const params = {...this.form, addType}
+      const params = {...this.form}
+      params.addType = addType
       params.receiptAccountList.length = params.receiptAccountList.length - 1
       params.receiptAccountList.map(v => {
         delete v.discountTotal

src/views/ecw/financial/creatPayment.vue

@@ -107,7 +107,7 @@
                 <el-option
                   v-for="item in bankData"
                   :key="item.id"
-                  :label="item.baAccountName + '(' + item.baAccountNum + ')'"
+                  :label="item.bankName + '(' + item.bankNameAccount+ ')'"
                   :value="item.id"
                 />
               </el-select>
@@ -414,7 +414,6 @@ import { DICT_TYPE } from "@/utils/dict";
 import { getToken } from "@/utils/auth";
 import { getChannelList } from "@/api/ecw/channel";
 import CustomerSelector from "@/components/CustomerSelector";
-import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getTradeCityList } from "@/api/ecw/region";
 import { getSupplierPage } from "@/api/ecw/supplier";
@@ -482,9 +481,9 @@ export default {
     listSimpleUsers().then((res) => (that.creatorData = res.data));
     getChannelList().then((res) => (that.channelList = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));
-    getBankAccountPage(that.params).then(
-      (res) => (that.bankData = res.data.list)
-    );
+    // getBankAccountPage(that.params).then(
+    //   (res) => (that.bankData = res.data.list)
+    // );
     getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
       const { data } = res;
       this.allSupplier = data.list;
@@ -595,7 +594,9 @@ export default {
     },
     selectChange(val) {
       const t = this.allSupplier.find(v => v.id == val)
+      
       t && (this.form.supplierName = t.companyZh)
+      t && (this.bankData = t.bankList)
     },
     handleQuery() {},
     handleSelectionChange(val) {
@@ -635,7 +636,7 @@ export default {
       var chineseStr = '';
       //分离金额后用的数组，预定义
       var parts;
-      // 传入的参数为空情况 
+      // 传入的参数为空情况
       if(money === '') {
         return '';
       }
@@ -643,7 +644,7 @@ export default {
       if(money >= maxNum){
         return ''
       }
-      // 传入的参数为0情况 
+      // 传入的参数为0情况
       if (money === 0) {
         chineseStr = cnNums[0] + cnIntLast + cnInteger;
         return chineseStr
@@ -678,7 +679,7 @@ export default {
             chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
           }
           if(m == 0 && zeroCount < 4){
-            chineseStr += cnIntUnits[q]; 
+            chineseStr += cnIntUnits[q];
           }
         }
         // 最后+ 元

src/views/ecw/order/weightDeal.vue

@@ -85,12 +85,12 @@
          </el-table-column>
         <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span>
+            <span>{{scope.row.wVolume||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('泡货方数')" align="center" v-else >
           <template slot-scope="scope">
-            <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span>
+            <span>{{scope.row.vWeight||0}}CBM</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />