Merge branch 'master-fix' into pre-release

# Conflicts:
#	src/views/ecw/memberManagement/operatingLevel/index.vue
#	src/views/ecw/order/cargoControlDetailList.vue
#	src/views/ecw/order/index.vue
#	src/views/ecw/order/weightDeal.vue
#	src/views/member/user/memberDetails.vue
#	src/views/system/sms/smsNode.vue

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

@@ -8,7 +8,7 @@
         <dict-selector clearable :disabled="true" :type="DICT_TYPE.ENABLE_STATUS" v-model="queryParams.status" formatter="number"> </dict-selector>
       </el-form-item>
       <el-form-item :label="$t('名称')" prop="name">
-        <el-input v-model="queryParams.name" style="width: 50%;" clearable @blur="trimParams('name')"></el-input>
+        <el-input v-model="queryParams.name" style="width: 50%;" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('等级')" prop="level">
         <dict-selector clearable :disabled="showViewTime" :type="DICT_TYPE.MEMBERSHIP_LEVELS" v-model="queryParams.level"> </dict-selector>
@@ -52,7 +52,7 @@
         <image-upload v-model="queryParams.icon" :fileType="['png', 'jpg', 'jpeg']" :limit="1" />
       </el-form-item>
       <el-form-item :label="$t('等级说明')" style="width: 30%;" prop="description">
-        <el-input type="textarea" autosize :autosize="{ minRows: 2, maxRows: 4}" v-model="queryParams.description" @blur="trimParams('description')"></el-input>
+        <el-input type="textarea" autosize :autosize="{ minRows: 2, maxRows: 4}" v-model="queryParams.description" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
         <span style="color: red;">注：用于客户积分日志显示，请规范填写</span>
       </el-form-item>
       <el-form-item :label="$t('匹配顺序')" style="width: 30%;" prop="sort">
@@ -212,8 +212,7 @@ export default {
         ],
         validityPeriod: [
           {
-            required: true,
-            validator: this.validatePositiveInteger,
+            validator: this.validatePositiveIntegerorNull,
             trigger: "blur"
           }
         ],
@@ -278,9 +277,6 @@ export default {
     }
   },
   methods: {
-    trimParams(val) {
-      this.queryParams[val] = this.queryParams[val].trim();
-    },
     validatePositiveInteger(rule, value, callback) {
       if (!value) {
         return callback(new Error(this.$t("请输入整数")));
@@ -342,8 +338,6 @@ export default {
       this.$refs["queryForm"].validate((valid) => {
         if (valid) {
           let params = deepClone(this.queryParams)
-          params.status = null
-          params.enableDate = null
           addNewMemberLevel(params).then((res) => {
             this.$message.success(this.$t("保存成功"))
             this.$router.go(-1)

src/views/ecw/order/cargoControlDetailList.vue

@@ -340,7 +340,6 @@ export default {
       this.noParam2.value = ""
       this.dateFilter = []
       this.checkTime = []
-      this.dateCreateTime = []
       this.getList()
     },
     review(id) {

src/views/ecw/order/weightDeal.vue

@@ -165,7 +165,8 @@
             <!---
               240808 按要求隐藏 https://czxy.cpolar.cn/task-view-199.html
               -->
-            <el-button  type="primary" v-hasPermi="['ecw:weight_deal:all_process']" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>
+            <!--<el-button  type="primary" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>-->
+
             <el-button plain type="primary" v-hasPermi="['ecw:weight_deal:process']" @click="submit('process')">{{$t('设为全泡')}}</el-button>
             <el-button  plain type="primary" v-hasPermi="['ecw:weight_deal:half_throw']" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
           </div>

src/views/member/user/memberDetails.vue

@@ -75,7 +75,7 @@
         </el-descriptions-item
       > -->
       <el-descriptions-item :label="$t('会员等级')">
-        <el-image v-if="this.levelDetails.configId&&details.userScoreLevelInfo!=null&&details.userScoreLevelInfo.levelIcon!=''" :src="details.userScoreLevelInfo!=null?details.userScoreLevelInfo.levelIcon:null" style="width: 20px; height: 20px">{{ $t("无") }}</el-image>
+        <el-image v-if="this.levelDetails.configId" :src="details.userScoreLevelInfo!=null?details.userScoreLevelInfo.levelIcon:null" style="width: 20px; height: 20px">{{ $t("无") }}</el-image>
         {{ details.userScoreLevelInfo.level!=null?(isChinese ? handleMemberShipLevels(details.userScoreLevelInfo.level).label : handleMemberShipLevels(details.userScoreLevelInfo.level).labelEn):null }}
         <el-button v-has-permi="['member:detail']" type="primary" class="copy-btn" @click="openLevelDetail()">
           {{ $t("详情") }}
@@ -461,16 +461,16 @@
         </el-tabs>
       </div>
     </el-dialog>
-    <el-dialog :title="levelDetailsTitle" :visible.sync="levelDetailsShow" width="50%">
-        <el-form :rules="rulesDetails" :model="levelDetails" label-position="left" ref="formDetails" label-width="100px">
+    <el-dialog :title="levelDetailsTitle" :visible.sync="levelDetailsShow" width="50%" :rules="rulesEnterprise" :model="levelDetails" label-position="left" ref="formEnter" label-width="100px">
+        <el-form>
           <el-form-item :label="$t('编号:')">
-            <el-input v-model="levelDetails.memberCode" style="width: 50%" disabled></el-input>
+            <el-input v-model="levelDetails.ruleNumber" style="width: 50%" disabled></el-input>
           </el-form-item>
-          <el-form-item :label="$t('等级:')" prop="level">
+          <el-form-item :label="$t('等级:')">
             <dict-selector v-model="levelDetails.level"  :disabled="levelDetailsCanEdit" clearable :type="DICT_TYPE.MEMBERSHIP_LEVELS" />
           </el-form-item>
-          <el-form-item :label="$t('等级有效期:')" prop="validityPeriod">
-            <el-date-picker type="date" :placeholder="$t('请选择日期')" :disabled="levelDetailsCanEdit" v-model="levelDetails.validityPeriod" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          <el-form-item :label="$t('等级有效期:')">
+            <el-date-picker type="datetime" :placeholder="$t('请选择日期')" :disabled="levelDetailsCanEdit" v-model="levelDetails.validityPeriod" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
           </el-form-item>
           <el-form-item :label="$t('等级特殊设置')">
             <el-switch
@@ -481,7 +481,7 @@
             </el-switch>
             <el-button style="margin-left: 10px;" type="info">{{ $t("不降级") }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('更新原因')" prop="remarks">
+          <el-form-item :label="$t('更新原因')">
             <el-input :disabled="levelDetailsCanEdit" v-model="levelDetails.remarks" style="width: 50%"  type="textarea" autosize :autosize="{ minRows: 2, maxRows: 4}"></el-input>
           </el-form-item>
           <el-form-item :label="$t('最后更新人')">
@@ -529,7 +529,7 @@ export default {
       memberOperateLevelList: [],
       levelDetails: {
         configId: "",
-        memberCode: "",
+        ruleNumber: "",
         memberId: "",
         level: "",
         validityPeriod: "",
@@ -653,29 +653,6 @@ export default {
           }
         ]
       },
-      rulesDetails: {
-        level: [
-          {
-            required: true,
-            message: this.$t("等级不能为空"),
-            trigger: "blur"
-          }
-        ],
-        validityPeriod: [
-          {
-            required: true,
-            message: this.$t("等级有效期不能为空"),
-            trigger: "blur"
-          }
-        ],
-        remarks: [
-          {
-            required: true,
-            message: this.$t("更新原因不能为空"),
-            trigger: "blur"
-          }
-        ],
-      },
       getDictDatas,
       DICT_TYPE,
       details: {
@@ -1013,25 +990,14 @@ export default {
       this.levelDetailsShow=false;
     },
     submitDetails(){
+      this.levelDetailsShow=false;
       let params = { ...this.levelDetails }
-      if (params.memberId==''){
-        params.memberId = this.$route.params.id
-      }
-      this.$refs["formDetails"].validate((valid) => {
-        if (valid){
-          updateMemberLevelDetails(params).then((res) => {
-            if (res.code == 0){
-              this.loading = false;
-              this.handleQueryOperateLevelLog();
-              this.handleQueryDetailsLog();
-              this.$message.success(this.$t("更新成功"));
-              this.levelDetailsShow=false;
-              this.getDetails()
-            }
-          })
-        }
+      updateMemberLevelDetails(params).then((res) => {
+        this.loading = false;
+        this.handleQueryOperateLevelLog();
+        this.handleQueryDetailsLog();
+        this.$message.success(this.$t("更新成功"));
       })
-
     },
     handleClick(val) {
       if (val.name == 1) {

src/views/system/sms/smsNode.vue

@@ -19,7 +19,7 @@
       <el-form-item label="国家" prop="countryId">
         <el-select filterable clearable v-model="queryParams.countryId" :placeholder="$t('请选择国家')">
           <el-option key="0" label="全部" :value="parseInt(0)" />
-          <el-option key="-1" label="其他" :value="parseInt(-1)" />
+          <el-option key="1" label="其他" :value="parseInt(1)" />
           <el-option v-for="dict in countryList"
                       :key="dict.id" :label="$l(dict, 'name')" :value="parseInt(dict.id)" />
         </el-select>
@@ -91,7 +91,7 @@
       </el-table-column>
       <el-table-column label="国家" align="center" prop="countryId">
         <template slot-scope="scope">
-          {{ scope.row.countryId!=null?countryMap.get(scope.row.countryId)!=null?countryMap.get(scope.row.countryId).nameZh:'':'' }}
+          {{ scope.row.countryId | guojia(countryMap) }}
         </template>
       </el-table-column>