Merge branch 'release2.2new' of...

Merge branch 'release2.2new' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2new

src/views/ecw/customer/query.vue

@@ -56,7 +56,7 @@
             <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>
-<!--            <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->
+            <el-descriptions-item :label="$t('询盘信息')">{{ customer.inquiry }}</el-descriptions-item>
           </el-descriptions>
         </el-card>
 

src/views/ecw/order/feeApplication.vue

@@ -55,10 +55,10 @@
          </el-table-column>
          <el-table-column :label="$t('操作')">
            <template v-slot:default = 'scope'>
-             <!--<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 !== 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>-->
-             <el-button type="text" :disabled="!!scope.row.status" @click="del(scope.$index)">删除</el-button>
+             <el-button type="text" v-if="scope.row.status === 0" @click="del(scope.$index)">删除</el-button>
            </template>
          </el-table-column>
       </el-table>
@@ -66,7 +66,7 @@
         <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
       </div>
       <div style="text-align: center;margin-top: 20px;">
-        <el-button type="primary" v-if="!processInstanceId" style="margin-right: 30px;" @click="submit">{{$t('提交')}}</el-button>
+        <el-button type="primary" v-if="!processInstanceId" style="margin-right: 30px;" :disabled="!feeList.length" @click="submit">{{$t('提交')}}</el-button>
         <el-button type="primary" v-if="processInstanceId" style="margin-right: 30px;" @click="goProcessDetail">{{$t('审核中')}}</el-button>
         <el-button type="primary" v-if="processInstanceId" style="margin-right: 30px;" @click="cancel">{{$t('取消审核')}}</el-button>
         <el-button @click="$emit('update:dialogVisible',false)">{{$t('返回')}}</el-button>
@@ -117,6 +117,11 @@ export default {
       selectedUsers:[]
     }
   },
+    computed:{
+      feeList(){
+          return this.list.filter(item => item.status === 0)
+      }
+    },
   created() {
     this.getDictDatas(this.DICT_TYPE.AUDIT_STATUS).forEach( e =>{
       this.STATUS[e.value] = e.label
@@ -160,8 +165,15 @@ export default {
           })
     },
     submit(){
+        // 判断费用申请是否有未填项
+        const errList = this.feeList.filter(item => {
+            return !item['feeType'] || !item['applicationFee'] || !item['applicationFeeCurrency'] || !item['payType']
+        })
+        if(errList.length){
+            return this.$message.error('请填写完整费用申请信息')
+        }
       feeApplicationCreateBatch( {
-        orderFeeApplicationCreateReqVOList: this.list.filter(item => !item.status),
+        orderFeeApplicationCreateReqVOList: this.feeList,
         copyUserId:this.selectedUsers,
         orderId: this.orderId
       }).then(r=>{

src/views/ecw/warehouse/index.vue

@@ -320,10 +320,13 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item :label="$t('保费币种')">
-            <el-select v-model="lineform.currencyUnit">
+            <el-select @change="modifyAmountUnit" v-model="lineform.currencyUnit">
               <el-option v-for="(item) in currencyList" :disabled="item.status === 1" :label="$l(item, 'title')" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('最小保价费金额')" >
+            <el-input-number  :controls="false" v-model="lineform.minPrice"  > </el-input-number>
+          </el-form-item>
           <el-form-item :label="$t('是否支持控货')">
             <el-radio-group v-model="lineform.controlStatus">
               <el-radio :label="0">支持</el-radio>
@@ -549,7 +552,7 @@ export default {
       // 表单参数
       form: {checkList:[],},
       ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
-      lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlStatus:'0',currencyUnit:1},
+      lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlStatus:'0',currencyUnit:1,minPrice:0},
       startName:'',
       destName:'',
 
@@ -691,6 +694,17 @@ export default {
     this.getContinentsList();
   },
   methods: {
+    modifyAmountUnit(val){
+
+      if(val === 6){
+        this.lineform.minPrice = 900
+      } else if(val === 3){
+        this.lineform.minPrice = 10
+      }
+      else {
+        this.lineform.minPrice = 2
+      }
+    },
     changeOtherService(val){
       if(val === '2' && !( Array.isArray(this.lineform.otherService) ? this.lineform.otherService :[]).includes('10')){
         this.lineform.otherService.push('10');
@@ -874,7 +888,20 @@ export default {
         this.lineform.lineId = row.lineId;
         this.lineform.transportType = row.transportType;
          this.lineform.currencyUnit =  row.currencyUnit ? row.currencyUnit : 1
-         this.lineform.controlStatus =  row.controlStatus ?  row.controlStatus  : 0
+        this.lineform.controlStatus =  row.controlStatus ?  row.controlStatus  : 0
+       if(row.minPrice){
+         this.lineform.minPrice = row.minPrice;
+       }else {
+          if(this.lineform.currencyUnit === 6){
+            this.lineform.minPrice = 900
+          } else if(this.lineform.currencyUnit === 3 ){
+            this.lineform.minPrice = 10
+          } else {
+            this.lineform.minPrice = 2
+          }
+       }
+
+
          console.log(row,'row')
     },
 
@@ -890,7 +917,8 @@ export default {
         makeBillNode:this.lineform.makeBillNode,
         isClientShow:this.lineform.isClientShow,
         controlStatus:this.lineform.controlStatus,
-        currencyUnit:this.lineform.currencyUnit
+        currencyUnit:this.lineform.currencyUnit,
+        minPrice:this.lineform.minPrice
         }).then(res => {
           this.$modal.msgSuccess(this.$t("操作成功"));
           // for(let index in this.routeList) {