数据分离

src/views/operationManage/bannerManage/addBanner.vue

@@ -6,13 +6,6 @@
       :rules="rules"
       label-width="130px"
     >
-    
-        <el-form-item label="名称：" prop="bannerName">
-        <el-input
-          v-model="setQuery.bannerName"
-          class="item-width-300"
-        ></el-input>
-      </el-form-item>
       <el-form-item label="名称：" prop="bannerName">
         <el-input
           v-model="setQuery.bannerName"

src/views/operationManage/goodsManage/index.vue

@@ -112,9 +112,12 @@
           label="所属平台"
           fit
         >
-        <template slot-scope="scope">
-          {{filterMasterName(scope.row.platformType )}}
-        </template>
+       <template slot-scope="scope">
+
+         <div v-for="item in JSON.parse(scope.row.prices)" :key="item.platformType">
+            <div>{{filterMasterName(item.platformType)}}</div>
+          </div>
+          </template>
         </el-table-column>
 
       <template v-if="activeName == '审核未通过商品'">

src/views/operationManage/goodsManage/labelList.vue

@@ -208,6 +208,8 @@ export default {
       this.setQuery ={
         "id": row.id,
         "labelName": row.labelName,
+        platformType: Number(row.platformType),
+
         // "labelType": row.labelType
       }
     },
@@ -217,6 +219,8 @@ export default {
      this.setQuery ={
         "id": 0,
         "labelName": "",
+        platformType:"",
+
         // "labelType": 0
       }
     

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-09-03 13:58:11
+ * @LastEditTime: 2024-10-31 14:01:11
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd.vue
  * @Description:
  *
@@ -16,7 +16,7 @@
       :rules="rules"
       v-loading="pageLoading"
       :disabled="disabled"
-      label-width="130px"
+      label-width="180px"
     >
     <el-tabs v-model="activeName">
     <el-tab-pane label="基本信息" name="1">
@@ -170,7 +170,7 @@
         }"
         @change=""></el-cascader>
       </el-form-item>
-      <el-form-item label="银联分账帐户：">
+      <!-- <el-form-item label="银联分账帐户：">
         <el-select v-model="setQuery.authAccount" size="small" filterable class="item-width-300" placeholder="请搜索选择店铺主体">
           <el-option
             v-for="(item,index) in authOptions"
@@ -194,7 +194,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         <el-form-item label="店铺搜索：">
 
        <el-radio-group v-model="setQuery.searchEnable">
@@ -210,12 +210,46 @@
         <el-radio :label="2">关闭</el-radio>
       </el-radio-group>
       </el-form-item>
-      <el-form-item label="绑定主商户" prop="platformType">
-          <el-checkbox-group v-model="setQuery.platformType">
-            <el-checkbox label="1">慧研学惠生活</el-checkbox>
-            <el-checkbox label="2" >印象贵大</el-checkbox>
+       <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> 
+            <el-form-item label="分账规则：" v-if="setQuery.platformType.includes(item.value)" :prop="'shopInfos.' + index + '.shareId'" :rules="{required: true, message: '请选择分账规则', trigger: 'change'}">
+              <el-select
+              v-model="setQuery.shopInfos[index].shareId"
+              class="item-width-300"
+              placeholder="请选择分账规则"
+            >
+              <el-option
+                v-for="item in ruleOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            </el-form-item>
+             <el-form-item label="银联分账帐户：" v-if="setQuery.platformType.includes(item.value)" >
+            <el-select v-model="setQuery.shopInfos[index].authAccount" size="small" filterable class="item-width-300" placeholder="请搜索选择店铺主体">
+              <el-option
+                v-for="(item,index) in authOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+            </div>
           </el-checkbox-group>
-        </el-form-item>
+       
+      </el-form-item>
+      <!-- <el-form-item label="绑定主商户" prop="platformType">
+        <el-checkbox-group v-model="setQuery.platformType">
+          <el-checkbox label="1">慧研学惠生活</el-checkbox>
+          <el-checkbox label="2" >印象贵大</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item> -->
 
     </el-tab-pane>
 
@@ -335,7 +369,8 @@ export default {
         authAccount:"",
         searchEnable:1,
         state:2,
-        platformType:[]
+        platformType:[],
+        shopInfos:[],//店铺主体分账规则绑定
       },
       authOptions:[],//银联账号
       typeOptions:[],//商品分类
@@ -533,6 +568,15 @@ export default {
           })
           obj.serviceCate = str
           obj.shopMenuId = obj.shopMenuId.toString()
+          let shopInfos = JSON.parse(JSON.stringify(obj.shopInfos))
+          obj.shopInfos = []
+          shopInfos.map(item=>{
+            if(item.shareId&&obj.platformType.includes(Number(item.platformType))){
+              obj.shopInfos.push(item)
+            }
+          })
+              console.log(obj.shopInfos);
+
           obj.platformType = obj.platformType.toString()
           if (this.setQuery.shopId) {
             this.update(obj);
@@ -602,7 +646,17 @@ export default {
           this.setQuery.serviceCode = this.setQuery.serviceCode.split(',')
           this.setQuery.serviceCate = this.setQuery.serviceCate.split('/').map(item=>{return item = item.split(',').map(item=> Number(item))})
           this.setQuery.shopMenuId = this.setQuery.shopMenuId.split(',').map(item=> Number(item))
-          this.setQuery.platformType = this.setQuery.platformType.split(',')
+          this.setQuery.platformType = this.setQuery.platformType.split(',').map(item=> Number(item))
+          if(!this.setQuery.shopInfos){
+            this.setQuery.shopInfos=[]
+            this.masterShopOptions.map(item=>{
+              this.setQuery.shopInfos.push({
+                shareId:'',
+                authAccount:'',
+                platformType:item.value
+              })
+            })
+          }
         }
       });
     },
@@ -769,6 +823,14 @@ export default {
     }
   },
   created() {
+    this.setQuery.shopInfos=[]
+    this.masterShopOptions.map(item=>{
+      this.setQuery.shopInfos.push({
+        shareId:'',
+        authAccount:'',
+        platformType:item.value
+      })
+    })
     // this.finishComplexList()
     this.getData()
     this.getRuleList()
@@ -793,6 +855,9 @@ export default {
 <style lang="scss" scoped>
 .shopAdd {
   padding-bottom: 40px;
+  .flex{
+    display: flex;
+  }
   .position{
     cursor: pointer;
     font-size: 20px;