Merge remote-tracking branch 'origin/dev' into dev

src/components/WorkFlow/index.vue

 <template>
-    <div>
+    <div class="workflow">
         <div class="mb-10">
             <my-process-viewer
                 ref="processViewer"
@@ -82,4 +82,9 @@ export default {
     }
 
 }
-</script>
+</script>
\ No newline at end of file
+<style lang="scss" scoped>
+.workflow ::v-deep .my-process-designer{
+    height: auto;
+}
+</style>
\ No newline at end of file

src/views/ecw/box/ladingBill/previewBill.vue

@@ -58,6 +58,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .contentHtml {
+  word-break: initial;
   > table {
     width: 96% !important;
     margin-left: 2%;

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

@@ -523,10 +523,9 @@ export default {
       const {
         checkExamineStatus,
         checkDealStatus,
-        customsInfo = {},
+        customsInfo,
       } = this.shipmentObj;
-      const { dcCheckStatus } = customsInfo;
-      // 部分退场状态并且审核通过，退场不可选择
+      const { dcCheckStatus } = customsInfo ?? {};       // 部分退场状态并且审核通过，退场不可选择
       if (
         checkExamineStatus === 2 &&
         dcCheckStatus === 2 &&
@@ -565,11 +564,11 @@ export default {
         this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
         this.$set(this.cusDeclarationObj, "dcPassTime", "");
       } else {
-        const { customsInfo = {} } = this.shipmentObj;
+        const { customsInfo } = this.shipmentObj;
         this.$set(
           this.cusDeclarationObj,
           "dcCheckStatus",
-          (customsInfo.dcCheckStatus && String(customsInfo.dcCheckStatus)) ||
+          (customsInfo?.dcCheckStatus && String(customsInfo?.dcCheckStatus)) ||
             "3"
         );
       }
@@ -596,8 +595,8 @@ export default {
     },
     // 查验状态
     "cusDeclarationObj.dcCheckStatus"(val) {
-      const { customsInfo = {} } = this.shipmentObj;
-      if (val != customsInfo.dcCheckStatus) {
+      const { customsInfo } = this.shipmentObj;
+      if (val != customsInfo?.dcCheckStatus) {
         this.$set(this.cusDeclarationObj, "dcPassTime", "");
       }
     },
@@ -608,9 +607,9 @@ export default {
       const {
         checkExamineStatus,
         checkDealStatus,
-        customsInfo = {},
+        customsInfo,
       } = this.shipmentObj;
-      const { dcCheckStatus } = customsInfo;
+      const { dcCheckStatus } = customsInfo ?? {};
       if (checkExamineStatus === 1) {
         return dcCheckStatus === 1
           ? this.$t("退场审核中")
@@ -629,9 +628,9 @@ export default {
         const {
           checkExamineStatus,
           checkDealStatus,
-          customsInfo = {},
+          customsInfo,
         } = this.shipmentObj;
-        const { dcCheckStatus } = customsInfo;
+        const { dcCheckStatus } = customsInfo ?? {};
 
         // 状态
         if (type === "status") {

src/views/ecw/coupon/index.vue

@@ -14,10 +14,15 @@
         <!-- <el-select v-model="queryParams.type" placeholder="请选择类型 1:优惠卷 2:金额-满减 3:方数-满减 4 折扣 5优惠 6 特价 7区间价" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select> -->
-        <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" />
+        <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" clearable />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
+      <el-form-item label="状态" prop="status" clearable>
+        <!-- <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/> -->
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option label="草稿" value="0" />
+          <el-option label="已发布" value="1" />
+          <el-option label="已过期" value="2" />
+        </el-select>
       </el-form-item>
       <el-form-item label="关键字" prop="conditionCurrencyId">
         <el-input v-model="queryParams.searchKey" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery"/>
@@ -136,11 +141,11 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="titleZh" />
-      <el-table-column label="描述" align="center" prop="type">
+      <!-- <el-table-column label="描述" align="center" prop="type">
         <template slot-scope="{row}">
           {{$l(row, 'content')}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.creatorName }}</div>
@@ -163,12 +168,12 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column label="状态" align="center" prop="createTime" width="180">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"
@@ -261,6 +266,10 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
+      if(params.status == 2){
+        params.overdueStatus=0
+        params.status = null
+      }
       this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
       this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');