会员模块-积分规则-订单V值新增客户方和不区分是否首单规则

src/utils/dict.js

@@ -272,6 +272,7 @@ export const DICT_TYPE = {
   REWARD_REDEEM_STATUS: "reward_redeem_status", //礼品兑换状态
   MEMBER_SCORE_OPERATE_TYPE: "member_user_score_log_operate_type", //会员积分日志操作类型
   SCORE_RULE_TYPE: "score_rule_type", //积分规则指标类型
+  CUSTOMER_SIDE: "customer_side", //积分规则客户方
   YES_OR_NO: "yes_or_no",
   YES_OR_NO_OR_ALL: "yes_or_no_or_all",
   CLIENT_PLATFORM: "client_platform",

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

@@ -69,9 +69,13 @@
       <el-form-item :label="$t('注册链接')" v-if="queryParams.type == '3'">
         <el-input v-model="queryParams.registerUrl" :placeholder="$t('请输入注册链接')" clearable :disabled="true" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
       </el-form-item>
-      <el-form-item v-if="queryParams.type == '1'" :label="$t('首单')">
+      <el-form-item v-if="queryParams.type == '1'" :label="$t('客户方')" prop="extraOrderV.customerSide">
+        <dict-selector v-model="queryParams.extraOrderV.customerSide" :type="DICT_TYPE.CUSTOMER_SIDE" form-type="checkbox" multiple>
+        </dict-selector>
+      </el-form-item>
+      <el-form-item v-if="queryParams.type == '1'" :label="$t('首单')" prop="extraOrderV.firstOrder">
         <el-radio-group v-model="queryParams.extraOrderV.firstOrder">
-          <el-radio v-for="dict in getDictDatas(DICT_TYPE.YES_OR_NO)" :key="dict.value" :label="dict.value">{{ $l(dict, "label") }}</el-radio>
+          <el-radio v-for="dict in getDictDatas(DICT_TYPE.YES_OR_NO_OR_ALL)" :key="dict.value" :label="dict.value">{{ $l(dict, "label") }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" v-if="queryParams.type == '1'" prop="extraOrderV.transportType">
@@ -493,6 +497,8 @@ export default {
         extraOrderV: {
           orderEntry: [{ required: true, message: "请选择订单入口", trigger: "change" }],
           transportType: [{ required: true, message: "请选择运输方式", trigger: "change" }],
+          firstOrder: [{ required: true, message: "请选择是否首单", trigger: "change" }],
+          customerSide: [{ required: true, message: "请选择客户方", trigger: "change" }],
           receiveAddrList: [{ required: true, message: "请选择提货点", trigger: "change" }],
           orderVRule: {
             low: [
@@ -608,6 +614,7 @@ export default {
           //订单V值扩展字段
           channel: [],
           firstOrder: "1",
+          customerSide:null,
           orderEntry: null,
           transportType: "", //运输方式
           receiveAddrList: [],
@@ -701,6 +708,7 @@ export default {
           let params = deepClone(this.queryParams)
           params.showPlatform = this.queryParams.showPlatform?.join()
           params.extraOrderV.orderEntry = this.queryParams.extraOrderV?.orderEntry?.join()
+          params.extraOrderV.customerSide = this.queryParams.extraOrderV?.customerSide?.join()
           params.extraRegister.registerPlatform = this.queryParams.extraRegister.registerPlatform?.join()
           if (this.queryParams.type == 1 && this.queryParams.extraOrderV.receiveAddrList?.[0]?.[0] == "000") {
             // params.extraOrderV.receiveAddrList[0] = [0, 0, 0];
@@ -801,6 +809,7 @@ export default {
           let params = deepClone(this.queryParams)
           params.showPlatform = this.queryParams.showPlatform?.join()
           params.extraOrderV.orderEntry = this.queryParams.extraOrderV?.orderEntry?.join()
+          params.extraOrderV.customerSide = this.queryParams.extraOrderV?.customerSide?.join()
           params.extraRegister.registerPlatform = this.queryParams.extraRegister.registerPlatform?.join()
           params.status = this.queryParams.status || "2"
           if (this.queryParams.type == 1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000") {
@@ -823,6 +832,7 @@ export default {
           let params = deepClone(this.queryParams)
           params.showPlatform = this.queryParams.showPlatform?.join()
           params.extraOrderV.orderEntry = this.queryParams.extraOrderV.orderEntry?.join()
+          params.extraOrderV.customerSide = this.queryParams.extraOrderV.customerSide?.join()
           params.extraRegister.registerPlatform = this.queryParams.extraRegister.registerPlatform?.join()
           params.status = this.queryParams.status || "1"
           if (this.queryParams.type == 1 && this.queryParams.extraOrderV.receiveAddrList[0][0] == "000") {