wenjie 7 kuukautta sitten
vanhempi
commit
4169125d2a

+ 1 - 1
src/views/merchantManage/addUser.vue

@@ -23,7 +23,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="绑定主商户" prop="platformType">
+      <el-form-item label="所属平台" prop="platformType">
           <el-checkbox-group v-model="setQuery.platformType">
             <div class="flex" v-for="(item,index) in masterShopOptions" :key="index" ><el-checkbox :label="item.value">{{item.label}}</el-checkbox> 
             <el-form-item v-if="setQuery.platformType.includes(item.value)" :prop="'platformShareLists.' + index + '.shareId'" :rules="{required: true, message: '请选择分账规则', trigger: 'change'}">

+ 1 - 1
src/views/merchantManage/index.vue

@@ -15,7 +15,7 @@
           size="small"
           clearable
           class="item-width-200 ml10"
-          placeholder="请选择主商户"
+          placeholder="请选择所属平台"
         >
           <el-option
             v-for="item in masterShopOptions"

+ 3 - 3
src/views/operationManage/bannerManage/addBanner.vue

@@ -12,7 +12,7 @@
           class="item-width-300"
         ></el-input>
       </el-form-item>
-      <el-form-item label="主商户" prop="platformType">
+      <el-form-item label="所属平台" prop="platformType">
          <el-select
           v-model="setQuery.platformType"
           size="small"
@@ -114,7 +114,7 @@ export default {
     rules() {
       if(this.setQuery.jumpSet == 1){
         return {
-        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
+        platformType: [{ required: true, message: "请选择所属平台", trigger: "change" }],
         bannerImg: [{ required: true, message: "请上传banner图", trigger: "change" }],
         bannerName: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
         colour: [{ required: true, message: "请输入banner主题色", trigger: "blur" }],
@@ -123,7 +123,7 @@ export default {
       }
       }else{
          return {
-        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
+        platformType: [{ required: true, message: "请选择所属平台", trigger: "change" }],
         bannerImg: [{ required: true, message: "请上传banner图", trigger: "change" }],
         bannerName: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
         colour: [{ required: true, message: "请输入banner主题色", trigger: "blur" }],

+ 1 - 1
src/views/operationManage/bannerManage/index.vue

@@ -30,7 +30,7 @@
           size="small"
           clearable
           class="item-width-200 ml10"
-          placeholder="请选择主商户"
+          placeholder="请选择所属平台"
         >
           <el-option
             v-for="item in masterShopOptions"

+ 1 - 1
src/views/operationManage/goodsManage/index.vue

@@ -24,7 +24,7 @@
           size="small"
           clearable
           class="item-width-200 ml10"
-          placeholder="请选择主商户"
+          placeholder="请选择所属平台"
         >
           <el-option
             v-for="item in masterShopOptions"

+ 2 - 2
src/views/operationManage/goodsManage/labelList.vue

@@ -15,7 +15,7 @@
           size="small"
           clearable
           class="item-width-200 ml10"
-          placeholder="请选择主商户"
+          placeholder="请选择所属平台"
         >
           <el-option
             v-for="item in masterShopOptions"
@@ -182,7 +182,7 @@ export default {
         "labelType": ''
       },
       rules: {
-        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
+        platformType: [{ required: true, message: "请选择所属平台", trigger: "change" }],
         labelName: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
       },
     };

+ 1 - 1
src/views/operationManage/shopManage/index.vue

@@ -15,7 +15,7 @@
           size="small"
           clearable
           class="item-width-200 ml10"
-          placeholder="请选择主商户"
+          placeholder="请选择所属平台"
         >
           <el-option
             v-for="item in masterShopOptions"

+ 24 - 4
src/views/operationManage/shopManage/shopAdd.vue

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2023-05-26 16:37:34
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-31 14:01:11
+ * @LastEditTime: 2024-10-31 17:42:39
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd.vue
  * @Description:
  *
@@ -205,12 +205,12 @@
 
        <el-form-item label="店铺状态:" >
 
-       <el-radio-group :disabled="!setQuery.authAccount" v-model="setQuery.state">
+       <el-radio-group :disabled="isDisabled" v-model="setQuery.state">
         <el-radio :label="1">运营中</el-radio>
         <el-radio :label="2">关闭</el-radio>
       </el-radio-group>
       </el-form-item>
-       <el-form-item label="绑定主商户及分账规则" prop="platformType">
+       <el-form-item label="绑定所属平台及分账规则" prop="platformType">
 
         <el-checkbox-group v-model="setQuery.platformType" prop="platformType">
             <div class="flex" v-for="(item,index) in masterShopOptions" :key="index" ><el-checkbox :label="item.value">{{item.label}}</el-checkbox> 
@@ -440,7 +440,7 @@ export default {
           { required: true, message: "请选择经营商品类型", trigger: "change" },
         ],
         platformType: [
-          { type: 'array', required: true, message: '请至少绑定一个主商户', trigger: 'change' }
+          { type: 'array', required: true, message: '请绑定所属平台', trigger: 'change' }
         ],
         serviceTel: [
           { required: true, message: "请输入店铺电话", trigger: "blur" },
@@ -499,7 +499,27 @@ export default {
         }
     }
   },
+  computed: {
+    isDisabled(val){
+      let flag = true
+
+      this.setQuery.platformType.forEach(item=>{
+        this.setQuery.shopInfos.forEach(i=>{
+          if(i.platformType == item&&i.authAccount){
+            flag = false
+          }
+
+        })
+      })
+      if(flag){
+        this.setQuery.state = 2
+      }
+
+      return flag
+    },
+  },
   methods: {
+    
     // 选择地址
     selectAddress(val){
       let item = this.addressOptions.filter(item=>item.value==val)[0]