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

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -44,7 +44,7 @@
         <el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
       </el-form-item>
       <el-form-item :label="$t('货物描述')">
-        <el-input v-model="subMaterialObj.goodsDesc" :placeholder="$t('请输入货物描述')"></el-input>
+        <el-input v-model="subMaterialObj.goodsDesc" type="textarea" autosize :placeholder="$t('请输入货物描述')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('柜号') + '/' + $t('封条')">
         <el-input v-model="subMaterialObj.containerSealNo" :placeholder="$t('请输入柜号') + '/' + $t('封条')"></el-input>
@@ -131,7 +131,7 @@ export default {
       packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
     };
     if(!this.shipmentObj.ladingBillInfo){
-      console.log(this.shipmentObj,'111')
+      
       this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
@@ -142,9 +142,8 @@ export default {
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)
       this.$set(this.subMaterialObj,'containerSealNo',(this.shipmentObj.trailerInfo?.tlContainerNo||'')+'/'+(this.shipmentObj.trailerInfo?.tlStripSeal||'/'))
       this.subMaterialObj.containerSealNo = this.subMaterialObj.containerSealNo.replace('//','')
-    }
-    
       this.getSup(this.subMaterialObj.agentId)
+    }
   },
   methods: {
     getSup(id) {
@@ -154,7 +153,8 @@ export default {
           this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
           this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
           this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
-          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||''+response.data.externalBackVO?.ctnNo||'')
+          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO.goodName+'\nFROM M NO:'+response.data.externalBackVO.fromNo+'\nBA NO:'+response.data.externalBackVO?.baNo+'\nCTN NO:'+response.data.externalBackVO.ctnNo)
+          
           if(this.subMaterialObj.goodsDesc == null){
             this.$set(this.subMaterialObj,'goodsDesc','/')
           }

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

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('状态')">
-              <dict-selector :type="DICT_TYPE.ECW_PAYMENT_STATE" v-model="queryParams.state" />
+              <dict-selector clearable :type="DICT_TYPE.ECW_PAYMENT_STATE" v-model="queryParams.state" />
             </el-form-item>
           </el-col>
           <el-col :span="5">
@@ -38,9 +38,10 @@
           <el-col :span="7">
             <el-form-item :label="$t('创建时间')">
                 <el-date-picker
+                  style="width:100%;"
                   v-model="selectDate"
                   type="datetimerange"
-                 value-format="yyyy-MM-DD hh:mm:ss"
+                  value-format="yyyy-MM-dd hh:mm:ss"
                   range-separator="至"
                   :start-placeholder="$t('开始日期')"
                   :end-placeholder="$t('结束日期')">
@@ -50,6 +51,7 @@
           <el-col :span="6">
             <el-form-item :label="$t('发票状态')">
               <el-select
+                clearable
                 v-model="queryParams.invoiceStatus"
                 :placeholder="$t('请选择是否开票')">
                 <el-option :label="$t('未开票')" value="0" />
@@ -171,7 +173,7 @@ export default {
     selectDate(val){
       if(val.length){
          this.queryParams.beginCreateTime = val[0]
-         this.queryParams.endCreateTime = val[0]
+         this.queryParams.endCreateTime = val[1]
       }else {
         this.queryParams.beginCreateTime = ''
         this.queryParams.endCreateTime = ''

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

@@ -79,7 +79,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item>
-            <el-button size="mini" type="primary" @click="getList">{{$t('查找')}}</el-button>
+            <el-button size="mini" type="primary" @click="queryParams.page = 1;getList()">{{$t('查找')}}</el-button>
             <el-button size="mini" v-has-permi="['ecw:commission-payable:add']" type="success" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})" >{{$t('新增请款单')}}</el-button>
           </el-form-item>
         </el-col>

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

@@ -53,7 +53,7 @@
                 <el-option
                   v-for="item in deptData"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.named"
                   :value="item.id"
                   @click.native="selectFn('departmentName', item.name)"
                 />
@@ -575,7 +575,9 @@ export default {
       that.deptData.forEach((value) => {
         var dept = that.deptArr.filter((itt) => itt.id == value.parentId);
         if (dept.length > 0) {
-          value.name = dept[0].name + " | " + value.name;
+          value.named = dept[0].name + " | " + value.name;
+        }else {
+          value.named =  value.name;
         }
       });
     });

src/views/ecw/financial/creatPayment.vue

@@ -48,9 +48,10 @@
                 :placeholder="$t('请选择部门')"
               >
                 <el-option
+                  @click.native="selslectVal('departmentName', item.name)"
                   v-for="item in deptData"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.named"
                   :value="item.id"
                 />
               </el-select>
@@ -71,6 +72,7 @@
                   :key="item.id"
                   :label="item.nickname"
                   :value="item.nickname"
+                  @click.native="selslectVal('salesmanId',item.id)"
                 />
               </el-select>
             </el-form-item>
@@ -547,7 +549,9 @@ export default {
       that.deptData.forEach((value) => {
         var dept = that.deptArr.filter((itt) => itt.id == value.parentId);
         if (dept.length > 0) {
-          value.name = dept[0].name + " | " + value.name;
+          value.named = dept[0].name + " | " + value.name;
+        }else {
+          value.named =  value.name;
         }
       });
     });
@@ -568,6 +572,9 @@ export default {
     },
   },
   methods: {
+    selslectVal(key,value){
+      this.form[key] = value;
+    },
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
 	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn

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

@@ -67,6 +67,7 @@ export default {
   methods:{
     submit(){
       this.specialNeedsList.forEach(i => {
+
         i.todoDetail = this.todoDetail
       })
       let p = this.specialNeedsList.filter(i => this.advanceType.indexOf(i.advanceType) > -1)
@@ -119,6 +120,9 @@ export default {
         //特需回显
         getSpecialListByOrderId(this.orderId).then(r => {
           this.echoList = r.data;
+          if(r.data.length){
+            this.todoDetail = r.data[0].todoDetail
+          }
           r.data.forEach(i => {
             this.advanceType.push(i.advanceType)
            let index = this.specialNeedsList.findIndex(item => i.advanceType == item.advanceType)