Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6

src/views/ecw/financial/commission-requestFunds.vue

@@ -99,11 +99,11 @@
           </el-descriptions-item>
           <el-descriptions-item :label="$t('客户的账户名称')" >
             <el-form-item v-if="(form.customerId && bankAccountList.length) || !form.customerId" label-width="0"   prop="customerBankAccountName">
-              <el-select  v-model="form.customerBankAccount" >
-                <el-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.bankAccount" :label="item.bankAccount + (item.bankName)" ></el-option>
+              <el-select  v-model="form.customerBankAccountName" >
+                <el-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.accountName" :label="item.accountName" ></el-option>
               </el-select>
             </el-form-item>
-            <span v-else >{{$t('客户档案没有银行账户。')}}</span>
+            <span v-else >{{$t('客户档案未设置银行账户。')}}</span>
           </el-descriptions-item>
           <el-descriptions-item :label="$t('账户名称')" >
             <el-form-item label-width="0" :rules="{message:$t('账户名称不能为空'),required:true,}"  prop="customerBankAccountName">
@@ -540,7 +540,7 @@ export default {
           applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d} {h}:{i}:{s}'),
           invoiceStatus: String(res.data.invoiceStatus),
         }
-        this.$set(this.form, 'customerBankAccount', res.data.customerBankAccount)
+        this.$set(this.form, 'customerBankAccountName', accountName)
         this.list = [...res.data.payableBackVOList]
         this.defaultList = [...res.data.payableBackVOList]
       });
@@ -879,7 +879,7 @@ export default {
          this.form.customerBankAccount = ''; //	客户银行账号
          this.form.customerBankAccountName = ''; //客户银行账户名
          this.form.customerBankAddress = ''; //	银行地址
-         this.form.customerBankAddress = ''; //	银行代码
+         this.form.customerBankCode = ''; //	银行代码
       }
 
     }

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

@@ -2,7 +2,7 @@
     <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" v-loading="loading">
         <el-timeline v-if="list.length">
             <el-timeline-item v-for="item in list" :timestamp="item.pickTime|parseTime" placement="top" :key="item.id">
-                <div> {{item.deleted ? $t('已撤销') : $t('已提货')}} <el-button v-if="!item.deleted" size="mini" @click="deletePickup(item.id)" class="ml-10">{{$t('撤销')}}</el-button></div>
+                <div> {{item.deleted ? $t('已撤销') : $t('已提货')}} <el-button v-if="!item.deleted" :disabled="loading" size="mini" @click="deletePickup(item.id)" class="ml-10">{{$t('撤销')}}</el-button></div>
                 <div>{{$t('提货箱数')}}：{{item.pickNum}}箱</div>
                 <div>{{$t('操作人')}}：{{item.creator}}</div>
                 <div v-if="item.deleted">{{$t('撤销人')}}：{{item.updater}}</div>
@@ -50,6 +50,7 @@ export default {
             }).then(res => {
                 this.$message.success('操作成功')
                 this.$emit('delete', id)
+                this.getList()
             })
         },
         closeDialog(){
@@ -58,4 +59,4 @@ export default {
         }
     }
 }
-</script>
+</script>
\ No newline at end of file

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')
       }