Merge branch 'release' into 'jd_dev'

Release分支代码合并到jd_dev分支20241206

See merge request !40

src/views/jiedao/profile/components/Release.vue

@@ -12,44 +12,75 @@
       :model="formData"
       :rules="rules"
       size="small"
-      label-width="100px"
+      label-width="140px"
     >
       <el-row>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('release.orderNo')">
             {{ detail.orderNo }}
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item :label="$t('release.sumNum')">
-            {{ detail.sumNum }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('release.sumVolume')"> {{ detail.sumVolume }}m³ </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('release.sumWeight')"> {{ detail.sumWeight }}kg </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
+          <el-form-item :label="$t('release.sumNum')">
+            {{ detail.sumNum }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('release.sumConNum')">
             {{ detail.sumNum }}
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('release.remainNum')">
             {{ detail.sumNum - detail.releaseNum }}
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('release.unloadTime')">
+            {{ detail.unloadTime || '-'}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('release.lockConsigneeTime')">
+            {{ detail.lockConsigneeTime || '-' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('release.limitUpdateConsignee')">
+            {{ detail.isLimitUpdateConsignee ? $t("release.yes") : $t("release.no") }}
+          </el-form-item>
+        </el-col>
       </el-row>
-      <div class="title">{{ $t('release.releaseNotice') }}</div>
+      <div class="title flex">
+        <div>
+          {{ $t('release.releaseNotice') }}
+        </div>
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() <= (new Date(detail.lockConsigneeTime)).getTime()">
+          {{$t('release.releaseNotesOne')}}
+        </div>
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() > (new Date(detail.lockConsigneeTime)).getTime()">
+          {{$t('release.releaseNotesTwo')}}
+        </div>
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && !detail.unloadTime">
+          {{$t('release.releaseNotesThree')}}
+        </div>
+        <div class="ml-20 red" v-if="!detail.isLimitUpdateConsignee">
+          {{$t('release.releaseNotesFour')}}
+        </div>
+      </div>
       <div class="flex">
         <el-form-item :label="$t('release.consigneeName')" prop="consigneeName">
           <el-input
             v-model="formData.consigneeName"
             :placeholder="$t('release.consigneeNameNotice')"
             clearable
-            :disabled="isSuccess"
+            :disabled="disableUpdateCongsignee || isSuccess"
             class="w-150"
           />
         </el-form-item>
@@ -58,7 +89,7 @@
             v-model="formData.consigneePhone"
             :placeholder="$t('release.consigneePhoneNotice')"
             clearable
-            :disabled="isSuccess"
+            :disabled="disableUpdateCongsignee || isSuccess"
             class="w-250 ml-10"
           >
             <el-select slot="prepend" v-model="formData.consigneeCountryCode" placeholder="" style="width:100px">
@@ -70,7 +101,7 @@
             v-model="formData.consigneeEmail"
             :placeholder="$t('release.consigneeEmailNotice')"
             clearable
-            :disabled="isSuccess"
+            :disabled="disableUpdateCongsignee || isSuccess"
             class="w-150"
           />
         </el-form-item>
@@ -211,6 +242,14 @@ export default {
         t = this.$t('release.releaseSuccess')
       }
       return t
+    },
+    disableUpdateCongsignee(){
+      if(!this.detail?.isLimitUpdateConsignee) return false
+      // 锁定且过期了返回false，其他情况全部是true
+      if(this.detail.isLimitUpdateConsignee && this.detail.lockConsigneeTime && new Date(this.detail.lockConsigneeTime).getTime() < Date.now()){
+        return false
+      }
+      return true
     }
   },
   created() {
@@ -271,6 +310,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.w-80{
+  width: 80px;
+}
+.red{
+  color: red;
+}
 .title {
   font-size: 16px;
   margin: 20px 0;

src/views/jiedao/profile/delivery.vue

@@ -750,7 +750,7 @@
               required
               :error="$t('delivery.marksRules')"
             >
-              <el-input v-model="form.marks" placeholder="" class="w-150" />
+              <el-input v-model="form.marks" placeholder="" class="w-150" @blur="trimMarks" />
             </el-form-item>
           </el-descriptions-item>
           <!--单证报关-->
@@ -1947,6 +1947,7 @@ export default {
     },
     'form.isCargoControl'() {
       // this.isCargoControlDrawee()
+      this.setDefaultDrawee()
       this.getIdCardData()
     },
     'form.channelId'() {
@@ -2013,11 +2014,12 @@ export default {
     hasConsignee(){
       // 无收货人，默认发货人付款,而且必须控货
       if(!this.hasConsignee){
-        this.form.drawee = 1
+        // this.form.drawee = 1
         this.form.isCargoControl = true
         this.$refs.form.clearValidate("consigneeName")
         this.$refs.form.clearValidate("consigneePhone")
         this.$refs.form.clearValidate("consigneeCompany")
+        this.setDefaultDrawee()
       }
     }
   },
@@ -2101,6 +2103,7 @@ export default {
         })
       })
     } else{
+      this.setDefaultDrawee()
       this.addProduct()
       if (this.$route.query.tranfId) {
         setTimeout(() => {
@@ -2132,6 +2135,16 @@ export default {
         this.form.objectiveId = this.importCityList[0].id
       } */
     },
+    setDefaultDrawee(){
+      // 优先级为：发货人默认付款，发货人付款>收货人默认付款，收货人付款>订单控货，收货人付款
+      if(this.userInfo.defaultPay){
+        this.form.drawee = 1
+        return
+      }
+      if(this.form.isCargoControl){
+        this.form.drawee = 2
+      }
+    },
     async getChannelList() {
       const query = {
         cityId: this.form.objectiveId,
@@ -2677,6 +2690,10 @@ export default {
     async handleCancel(){
       await this.$confirm(this.$t("是否需要返回?"))
       this.$router.back()
+    },
+    // 去除唛头首尾空格
+    trimMarks(){
+      this.form.marks = this.form.marks.trim()
     }
   }
 }