处理格式化冲突

src/views/ecw/customer/index.vue

@@ -713,7 +713,7 @@
       <el-table-column :label="$t('入仓确认')" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.arrivalConfirm == 1">{{ $t('是') }}</el-tag>
-          <el-tag type="info">{{ $t('否') }}</el-tag>
+          <el-tag type="info" v-else>{{ $t('否') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货无收货人')" align="center">

src/views/ecw/customerConfirm/index.vue

@@ -524,7 +524,7 @@
       <el-table-column :label="$t('入仓确认')" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.arrivalConfirm == 1">{{ $t('是') }}</el-tag>
-          <el-tag type="info">{{ $t('否') }}</el-tag>
+          <el-tag type="info" v-else>{{ $t('否') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货无收货人')" align="center">

src/views/ecw/customerToBeAssigned/index.vue

@@ -521,7 +521,7 @@
       <el-table-column :label="$t('入仓确认')" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.arrivalConfirm == 1">{{ $t('是') }}</el-tag>
-          <el-tag type="info">{{ $t('否') }}</el-tag>
+          <el-tag type="info" v-else>{{ $t('否') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货无收货人')" align="center">

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -51,12 +51,12 @@
       <el-row :gutter="10">
         <el-col :span="12">
           <el-form-item :label="$t('中文封面图')" prop="coverImageZh">
-            <image-upload v-model="queryParams.coverImageZh" />
+            <image-upload v-model="queryParams.coverImageZh" :isShowEditButton="!showViewTime"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('英文封面图')" prop="coverImageEn">
-            <image-upload v-model="queryParams.coverImageEn" />
+            <image-upload v-model="queryParams.coverImageEn" :isShowEditButton="!showViewTime"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -99,11 +99,12 @@
       </el-form-item>
 
       <!-- 链接 -->
-      <el-form-item :label="$t('活动链接')" v-if="queryParams.type == '4'">
+      <el-form-item :label="$t('活动链接')" v-if="queryParams.type == '4'" >
         <el-input
           v-model="queryParams.extraShare.activityUrl"
           :placeholder="$t('请输入活动链接')"
           clearable
+          :disabled="true"
           onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
@@ -472,6 +473,7 @@
       </el-col>
       <el-col :span="3">
         <el-button
+        v-if="$route.query.pageStatus != 'view'"
           type="primary"
           style="width: 100%"
           @click="handleResetIntegralRule"
@@ -996,9 +998,11 @@ export default {
     } else {
       this.handleGetRegionTreeList();
     }
+    this.queryParams.extraShare.activityUrl = '/pages/activityShare/index'
   },
   activated() {},
   methods: {
+    //process.env.NODE_ENV
     //预览活动详情
     viewActivityDesc(val) {
       this.viewActivityDialog = true;
@@ -1139,7 +1143,7 @@ export default {
             this.queryParams.extraRegister.registerPlatform?.join();
           params.status = this.queryParams.status || "2";
           if (
-            (this.queryParams.type =
+            (this.queryParams.type ==
               1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000")
           ) {
             params.extraOrderV.receiveAddrList = [[0, 0, 0]];
@@ -1166,7 +1170,7 @@ export default {
             this.queryParams.extraRegister.registerPlatform?.join();
           params.status = this.queryParams.status || "1";
           if (
-            (this.queryParams.type =
+            (this.queryParams.type ==
               1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000")
           ) {
             params.extraOrderV.receiveAddrList = [[0, 0, 0]];

src/views/ecw/memberManagement/sharingDetails/index.vue

+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item :label="$t('操作人')" prop="memberName">
+        <el-input
+          v-model="queryParams.memberName"
+          :placeholder="$t('请输入操作人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('分类')" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          :placeholder="$t('请选择分类')"
+          clearable
+        >
+          <el-option
+            v-for="item in getDictDatas(DICT_TYPE.SCORE_RULE_TYPE)"
+            :label="isChinese ? item.label : item.labelEn"
+            :value="item.value"
+            v-if="item.value == 3 || item.value == 4"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('标题')" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          :placeholder="$t('请输入关键词查找')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('分享ID')" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          :placeholder="$t('请输入分享ID')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('总积分')" prop="type">
+        <el-row :gutter="10" style="width: 300px">
+          <el-col :span="10">
+            <dict-selector
+              v-model="queryParams.relationSymbol"
+              clearable
+              :type="DICT_TYPE.QUANTITATIVE_RELATION_SYMBOL"
+              @change="handleQuery"
+            />
+          </el-col>
+          <el-col :span="14">
+            <el-input
+              v-model.trim="queryParams.totalScore"
+              :placeholder="$t('请输入数字')"
+              clearable
+              onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item :label="$t('操作时间')">
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
+          $t("搜索")
+        }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{
+          $t("重置")
+        }}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column :label="$t('序号')" align="center" prop="id" />
+      <el-table-column :label="$t('操作人')" align="center" prop="memberName" />
+      <el-table-column
+        :label="$t('分类')"
+        align="center"
+        :prop="isChinese ? 'typeZh' : 'typeEn'"
+      />
+      <el-table-column :label="$t('分享ID')" align="center" prop="code" />
+      <el-table-column
+        :label="$t('标题')"
+        align="center"
+        :prop="isChinese ? 'titleZh' : 'titleEn'"
+      />
+      <el-table-column
+        :label="$t('操作时间')"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('点击时间')"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.triggerTime) || "--" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('积分')" align="center" prop="score" />
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { getShareRecordDetails } from "@/api/ecw/memberManagement";
+export default {
+  name: "EcwMembermanagementSharingdetailsIndex",
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典类型列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        page: 1,
+        rows: 10,
+        memberName: "", //操作人
+        type: "", //分类
+        title: "",
+        relationSymbol: "", //查询条件
+        totalScore: "",
+        name: null,
+        status: null,
+        type: null,
+        category: null,
+        remark: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    isChinese() {
+      return this.$i18n.locale === "zh_CN";
+    },
+  },
+  methods: {
+    goShareDetails(row) {
+      if (row.triggerCount != "0") {
+        this.$router.push({
+          path: "/memberManagement/sharingStatisticalDetails",
+          query: {
+            id: row.id,
+          },
+        });
+      }
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
+      // 执行查询
+      getShareRecordDetails(params).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.queryParams.relationSymbol = "";
+      this.queryParams.totalScore = "";
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  },
+};
+</script>

src/views/ecw/memberManagement/sharingStatisticalDetails/index.vue

@@ -42,7 +42,7 @@
           width="180"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) || "--" }}</span>
+            <span>{{ parseTime(scope.row.triggerTime) || "--" }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('积分')" align="center" prop="score" />

src/views/ecw/memberManagement/sharingStatistics/index.vue

@@ -141,7 +141,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) || "--" }}</span>
+          <span>{{ parseTime(scope.row.lastTriggerTime) || "--" }}</span>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/myCustomerService/index.vue

@@ -578,7 +578,7 @@
       <el-table-column :label="$t('入仓确认')" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.arrivalConfirm == 1">{{ $t('是') }}</el-tag>
-          <el-tag type="info">{{ $t('否') }}</el-tag>
+          <el-tag type="info" v-else>{{ $t('否') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货无收货人')" align="center">

src/views/ecw/oceanCustomer/index.vue

@@ -573,7 +573,7 @@
       <el-table-column :label="$t('入仓确认')" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.arrivalConfirm == 1">{{ $t('是') }}</el-tag>
-          <el-tag type="info">{{ $t('否') }}</el-tag>
+          <el-tag type="info" v-else>{{ $t('否') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货无收货人')" align="center">

src/views/ecw/order/cargoControl.vue

@@ -3,7 +3,7 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item :label="$t('编号')" prop="orderNo">
-        <el-input v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="noParam.value = noParam.value.replace(/\s+/g, '')">
+        <el-input v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(noParam, 'value')">
           <template slot="prepend">
             <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" class="w-50" />
           </template>
@@ -64,11 +64,10 @@
         <el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>-->
       <el-form-item :label="$t('发货人')" prop="consignorKey">
-        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consignorKey = queryParams.consignorKey.replace(/\s+/g, '')" />
+        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consignorKey')" />
       </el-form-item>
-
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
-        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consigneeKey = queryParams.consigneeKey.replace(/\s+/g, '')" />
+        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consigneeKey')" />
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsTypes">
@@ -123,7 +122,7 @@
           <el-option :label="$t('否')" :value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
+      <el-form-item :label="$t('特需')" prop="packageTypeArr" v-show="showSearch">
         <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable>
           <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
             <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
@@ -162,11 +161,17 @@
       <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
         <template slot-scope="{ row }">{{ row.releaseNum }}</template>
       </el-table-column>
+      <el-table-column :label="$t('放货率')" align="left" prop="status">
+        <template slot-scope="{ row }"> {{ row.releaseRatio }}% </template>
+      </el-table-column>
       <el-table-column :label="$t('订单状态')" align="left" prop="status">
         <template slot-scope="{ row }">
           {{ row.statusMsg }}
         </template>
       </el-table-column>
+      <el-table-column :label="$t('提货率')" align="left" prop="status">
+        <template slot-scope="{ row }"> {{ row.pickRatio || 0 }}% </template>
+      </el-table-column>
       <el-table-column :label="$t('已卸柜/已到仓时间')" align="left" prop="status">
         <template slot-scope="{ row }">
           {{ row.unloadTime }}
@@ -475,7 +480,11 @@ export default {
     getList() {
       this.loading = true
       // 执行查询
-      getCargoControlOrderPage(this.combinedQueryParams).then((response) => {
+      const query = { ...this.combinedQueryParams }
+      if (query.packageTypeArr && query.packageTypeArr.length) {
+        query.packageType = query.packageTypeArr.join(",")
+      }
+      getCargoControlOrderPage(query).then((response) => {
         this.list = []
         // 直接更细数据，可能因为elTable的部分渲染产生bug，比如权限控制异常
         this.$nextTick(() => {

src/views/ecw/order/detail.vue

@@ -81,10 +81,10 @@
         </el-descriptions-item>
         <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{order.channelName}}</el-descriptions-item>
         <el-descriptions-item :label="$t('服务')" >
-          <el-tag v-if="order.type.indexOf('1') > -1">
+          <el-tag v-if="order.type && order.type.indexOf('1') > -1">
             {{ $t('集运') }}
           </el-tag>
-          <el-tag v-if="order.type.indexOf('2') > -1">
+          <el-tag v-if="order.type && order.type.indexOf('2') > -1">
             {{ $t('海外仓') }}
           </el-tag>
         </el-descriptions-item>

src/views/ecw/order/exception/index.vue

@@ -14,6 +14,7 @@
           :placeholder="$t('请输入订单号')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="replaceSpace(queryParams, 'orderNo')"
         >
           <template slot="prepend">
             <dict-selector
@@ -198,6 +199,7 @@
           :placeholder="$t('发货人')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="replaceSpace(queryParams, 'consignorText')"
         />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeText">
@@ -206,6 +208,7 @@
           :placeholder="$t('收货人')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="replaceSpace(queryParams, 'consigneeText')"
         />
       </el-form-item>
       <el-form-item :label="$t('唛头') + ':'" v-show="showSearch">
@@ -214,6 +217,7 @@
           :placeholder="$t('请输入唛头')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="replaceSpace(queryParams, 'marks')"
         >
           <template slot="prepend">
             <dict-selector
@@ -1166,6 +1170,10 @@ export default {
           this.AddressTown = data;
         })
       }
+    },
+    // 自动去除空格
+    replaceSpace(obj, field){
+      obj[field] = obj[field].replace(/\s+/g, '');
     }
   },
 };

src/views/ecw/order/index.vue

@@ -1758,6 +1758,7 @@ export default {
     // 增值服务文本
     getTypeText(){
       return type => {
+        if(!type) return ""
         const arr = []
         if(type.indexOf('1') > -1){
           arr.push(this.$t('集运'))
@@ -1765,7 +1766,6 @@ export default {
         if(type.indexOf('2') > -1){
           arr.push(this.$t('海外仓'))
         }
-        return arr.join("、")
       }
     }
   },

src/views/ecw/order/penddingList.vue

@@ -335,7 +335,7 @@ export default {
   data() {
     return {
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 导出中
       exporting: false,
       // 选中数组

src/views/ecw/order/stockingList.vue

@@ -526,7 +526,7 @@ export default {
   data() {
     return {
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 导出中状态
       exporting: false,
       // 选中数组

src/views/member/user/memberDetails.vue

@@ -40,7 +40,7 @@
     <!--lanbm 2024-05-15 修改信息显示BUG-->
     <el-descriptions :title="$t('基础信息')" :labelStyle="{'width': '146px'}"  :contentStyle="{'width': '278px'}" :column="4" border>
       <el-descriptions-item :label="$t('会员编号')">{{
-        details.id
+        details.memberCode
       }}</el-descriptions-item>
       <el-descriptions-item :label="$t('会员昵称')">{{
         details.nickname