Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/box/query.vue

@@ -110,7 +110,7 @@
               <div class="status-line"></div>
               <div class="status-number">{{logList.length - index}}</div>
               <div class="status-info">
-                <div>{{$l(item, 'title')}}</div>
+                <div>{{$l(item, 'title')}} <el-button v-if="item.approvalId>0" type="text" @click="handleApproval(item.bpmProcessId)">{{$t('查看审批')}}</el-button></div>
                 <div>
                   <p>{{formatDate(item.createTime)}}</p>
                   <p>{{item.operator}}</p>
@@ -574,6 +574,9 @@ export default {
         );
       }
     },
+    handleApproval(id) {
+      this.$router.push({path: '/bpm/process-instance/detail', query: {id: id}})
+    }
   },
   computed: {
     visitedViews() {
@@ -636,7 +639,7 @@ export default {
       } else {
         return getTotlContent(secStatistics);
       }
-    },
+    }
   },
 };
 </script>

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

@@ -203,7 +203,6 @@ export default {
     };
   },
   created() {
-    this.queryAllData();
     this.getCountry()
   },
   methods: {
@@ -218,6 +217,7 @@ export default {
       if(warehouse){
         this.$set(this.queryParams,'destCountryId', warehouse.guojia)
       }
+      this.queryAllData();
     },
     /* 查询已预装 */
     getSecGoods() {

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

@@ -16,7 +16,7 @@
         </el-descriptions-item>
         <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
       </el-descriptions>
-      
+
       </div>
       <el-descriptions :column="3" border>
         <el-descriptions-item >
@@ -50,6 +50,7 @@
           {{ WriteOffProportion }}%
         </el-descriptions-item>
       </el-descriptions>
+      <div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
     <div class="btn">
       <el-button
         size="mini"

src/views/ecw/financial/creatCollection.vue

@@ -102,7 +102,7 @@
         </el-col>
         <el-table v-loading="loadings" :data="list" border :key="isUpdate">
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-           <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+           <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">
@@ -532,10 +532,10 @@
             />
           </el-form-item>
 
-          <el-form-item :label="$t('自编号')" prop="containerNumber">
+          <el-form-item :label="$t('提单号')" prop="tidanNo">
             <el-input
-              v-model="queryParams.containerNumber"
-              :placeholder="$t('请输入自编号')"
+              v-model="queryParams.tidanNo"
+              :placeholder="$t('请输入提单号')"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -558,7 +558,7 @@
         >
           <el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column>
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-          <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+          <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">

src/views/ecw/financial/receiptDetail.vue

@@ -18,7 +18,7 @@
       <div slot="header" class="card-title">{{ $t('应收明细') }}</div>
       <el-table :data="list" border>
         <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-        <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
+        <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
         <el-table-column :label="$t('唛头')" align="center" prop="marks" />
         <el-table-column :label="$t('品名')" align="center" prop="title">
           <template slot-scope="scope">
@@ -312,7 +312,7 @@
         </el-descriptions-item>
       </el-descriptions>
     </el-card>
-    <div style="margin: 20px 0;font-size:16px" v-if="form.finaceRemark">{{form.finaceRemark}}</div>
+    <div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
     <div slot="footer" style="margin: 20px 0">
       <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button>
       <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6"  type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
@@ -1164,12 +1164,15 @@ export default {
       }, 0)
     },
     editClick(row) {
+      this.getsurplusData()
       this.openAddDialog = true
       this.dialogTitle = this.$t('编辑银行实收明细')
       this.saveBtnText = this.$t('提交')
       this.isView = false
       setTimeout(() => {
         this.addForm = { ...row }
+        var bank = this.bankData.find(v=>v.baAccountNum==this.addForm.accountNo)
+        if(bank) this.addForm.accountId = bank.id
         this.setWriteOffAmount()
       }, 0)
     },

src/views/ecw/financial/selfNoReportDetail.vue

@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的仓')">
-            <el-select v-model="queryParams.dstWarehouseId" :placeholder="$t('请选择')" clearable>
+            <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in importWarehouseList"
                 :key="item.id"
@@ -85,7 +85,7 @@
       <el-table-column :label="$t('运输方式') + '/' + $t('目的地')">
         <template slot-scope="{row}">
             <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
-            /{{row.objectiveName}}
+            /{{row.dstWarehouseName}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('仓库实测')">

src/views/ecw/financial/voucher.vue

@@ -64,6 +64,15 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-form-item :label="$t('编号')">
+            <el-input
+              style="max-width: 188px"
+              v-model="queryParams.receiptNo"
+              :placeholder="$t('请输入订单号和提单号、自编号')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
           </el-form-item>

src/views/ecw/order/index.vue

@@ -113,7 +113,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
       </el-form-item>
     </el-form>