16号合并前

src/views/operationManage/goodsManage/goodsDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-24 14:39:54
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-04-11 17:20:38
+ * @LastEditTime: 2024-04-16 10:26:52
  * @FilePath: \admin-manage\src\views\operationManage\goodsManage\goodsDetail.vue
  * @Description: 
  * 
@@ -795,6 +795,16 @@ export default Vue.extend({
     },
   },
   created() {
+    this.options = []
+    let goodsTypeObj = JSON.parse(sessionStorage.getItem('goodsTypeObj'))
+    for (const key in goodsTypeObj) {
+      if (Object.hasOwnProperty.call(goodsTypeObj, key)) {
+        this.options.push({
+          label:goodsTypeObj[key],
+          value:key
+        })
+      }
+    }
     this.getRuleList()
     this.getData();
     this.mode = this.$route.query.mode || "add";

src/views/operationManage/goodsManage/index.vue

@@ -39,7 +39,7 @@
         show-overflow-tooltip
       > 
        <template slot-scope="scope">
-        {{scope.row.goodsType |filterType}}
+        {{goodsTypeObj[scope.row.goodsType] || '-' }}
        </template>
       </el-table-column>
       <el-table-column
@@ -123,6 +123,7 @@ export default {
       ],
       tableData: [],
       loading: false,
+      goodsTypeObj:JSON.parse(sessionStorage.getItem('goodsTypeObj')),
       query: {
         applyState:'',
         status: '3',

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-04-15 16:07:14
+ * @LastEditTime: 2024-04-16 11:00:27
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd.vue
  * @Description: 
  * 
@@ -139,7 +139,7 @@
         v-model="setQuery.serviceCate"
         :options="typeOptions"
         :props="{
-          multiple: true ,
+          multiple: true,
           value:'id',
           label:'cateName',
           children:'child'
@@ -411,7 +411,15 @@ export default {
       this.loading = true;
       let obj = JSON.parse(JSON.stringify(this.setQuery))
       obj.serviceCode = obj.serviceCode.toString()
-      obj.serviceCate = obj.serviceCate.toString()
+      let str = ''
+      obj.serviceCate.map((item,index)=>{
+        if(index != (obj.serviceCate.length -1 )){
+          str += item.toString()+'/'
+        }else{
+           str += item.toString()
+        }
+      })
+      obj.serviceCate = str
       obj.shopMenuId = obj.shopMenuId.toString()
       add(obj).then((res) => {
         this.loading = false;
@@ -430,7 +438,15 @@ export default {
       this.loading = true;
       let obj = JSON.parse(JSON.stringify(this.setQuery))
       obj.serviceCode = obj.serviceCode.toString()
-      obj.serviceCate = obj.serviceCate.toString()
+      let str = ''
+      obj.serviceCate.map((item,index)=>{
+        if(index != (obj.serviceCate.length -1 )){
+          str += item.toString()+'/'
+        }else{
+           str += item.toString()
+        }
+      })
+      obj.serviceCate = str
       obj.shopMenuId = obj.shopMenuId.toString()
 
       update(obj).then((res) => {
@@ -457,7 +473,7 @@ export default {
         if (res.state == "Success") {
           this.setQuery = res.content;
           this.setQuery.serviceCode = this.setQuery.serviceCode.split(',')
-          this.setQuery.serviceCate = this.setQuery.serviceCate.split(',').map(item=> Number(item))
+          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))
         }
       });
@@ -560,7 +576,20 @@ export default {
     getData(){
       getData().then(res=>{
         if(res.state == 'Success'){
-          this.typeOptions = res.content
+          // this.typeOptions = res.content
+           this.typeOptions = res.content.map(e=>{
+            try{
+              e.child.map(
+              r=>{
+                delete r.child
+                return r
+              }
+            )
+            }catch(e){
+              console.log(e);
+            }
+            return e
+          });
         }
       })
     },
@@ -584,6 +613,8 @@ export default {
     }
   },
   created() {
+   
+
     // this.finishComplexList()
     this.getData()
     this.getRuleList()

src/views/operationManage/shopManage/shopAdd1.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-09-18 10:57:47
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-04-07 15:03:37
+ * @LastEditTime: 2024-04-15 19:41:31
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd1.vue
  * @Description: 
  * 
@@ -88,6 +88,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否连锁：" prop="isChain">
+          <el-radio-group v-model="setQuery.isChain">
+          <el-radio label="0">是</el-radio>
+          <el-radio label="1">否</el-radio>
+        </el-radio-group>
+        </el-form-item>
         <!-- <el-form-item label="业务选择：" prop="shopName">
           <div class="tabs">
             <div
@@ -518,6 +524,7 @@ export default {
       date: [],
       accesseId:'',
       setQuery: {
+        isChain:'0',
         accesser_user_id: "",
         bank_acct_name: "",
         bank_acct_no: "",
@@ -667,6 +674,9 @@ export default {
         agreement: [
           { required: true, message: "请上传租聘协议", trigger: "change" },
         ],
+        isChain: [
+          { required: true, message: "请选择是否连锁", trigger: "change" },
+        ],
       },
       typeOptions: [
         {
@@ -1085,6 +1095,7 @@ export default {
         accesseId:this.$route.query.accesseId||this.accesseId,
         developingPersonID: "",
         fax: "",
+        isChain: this.setQuery.isChain,
         mchntType: this.setQuery.mchntType,
         epId: this.$route.query.id,
         externalName: this.setQuery.shop_name,

src/views/operationManage/shopManage/shopAdd2.vue

@@ -85,6 +85,12 @@
             >
             </el-option>
           </el-select>
+        </el-form-item>
+         <el-form-item label="是否连锁：" prop="isChain">
+          <el-radio-group v-model="setQuery.isChain">
+          <el-radio label="0">是</el-radio>
+          <el-radio label="1">否</el-radio>
+        </el-radio-group>
         </el-form-item>
         <el-form-item label="营业执照号码：" prop="shop_lic">
           <el-input
@@ -637,6 +643,7 @@ export default {
       date1: [],
       accesseId:'',
       setQuery: {
+        isChain:'0',
         accesser_user_id: "",
         bank_acct_name: "",
         bank_acct_no: "",
@@ -809,6 +816,9 @@ export default {
         shareholderName: [
           { required: true, message: "请输入股东姓名", trigger: "blur" },
         ],
+        isChain: [
+          { required: true, message: "请选择是否连锁", trigger: "change" },
+        ],
         
       },
       typeOptions: [
@@ -1370,6 +1380,7 @@ export default {
         accesseId:this.$route.query.accesseId||this.accesseId,
         developingPersonID: "",
         fax: "",
+        isChain: this.setQuery.isChain,
         mchntType: this.setQuery.mchntType,
         epId: this.$route.query.id,
         externalName: this.setQuery.shop_name,

src/views/operationManage/shopManage/shopAdd3.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-09-18 10:57:47
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-04-12 15:22:27
+ * @LastEditTime: 2024-04-15 17:29:09
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd3.vue
  * @Description: 
  * 
@@ -85,6 +85,12 @@
             >
             </el-option>
           </el-select>
+        </el-form-item>
+         <el-form-item label="是否连锁：" prop="isChain">
+          <el-radio-group v-model="setQuery.isChain">
+          <el-radio label="0">是</el-radio>
+          <el-radio label="1">否</el-radio>
+        </el-radio-group>
         </el-form-item>
         <el-form-item label="营业执照号码：" prop="shop_lic">
           <el-input
@@ -614,6 +620,7 @@ export default {
       date1: [],
       accesseId:'',
       setQuery: {
+        isChain:'0',
         accesser_user_id: "",
         bank_acct_name: "",
         bank_acct_no: "",
@@ -789,6 +796,9 @@ export default {
          shareholderCertExpire: [
           { required: true, message: "请输选择身份证有效期", trigger: "change" },
         ],
+        isChain: [
+          { required: true, message: "请选择是否连锁", trigger: "change" },
+        ],
         // 'bnfList.0.bnfHomeAddr': [
         //   { required: true, message: "请输入家庭地址", trigger: "blur" },
         // ],
@@ -1380,6 +1390,7 @@ export default {
         accesseId:this.$route.query.accesseId||this.accesseId,
         developingPersonID: "",
         fax: "",
+        isChain: this.setQuery.isChain,
         mchntType: this.setQuery.mchntType,
         epId: this.$route.query.id,
         externalName: this.setQuery.shop_name,

src/views/operationManage/shopManage/shopAdd4.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-09-18 10:57:47
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-04-12 15:30:04
+ * @LastEditTime: 2024-04-15 19:41:59
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd4.vue
  * @Description: 
  * 
@@ -86,6 +86,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否连锁：" prop="isChain">
+          <el-radio-group v-model="setQuery.isChain">
+          <el-radio label="0">是</el-radio>
+          <el-radio label="1">否</el-radio>
+        </el-radio-group>
+        </el-form-item>
         <el-form-item label="营业执照号码：" prop="shop_lic">
           <el-input
             v-model="setQuery.shop_lic"
@@ -611,6 +617,7 @@ export default {
       date1: [],
       accesseId:'',
       setQuery: {
+        isChain:'0',
         accesser_user_id: "",
         bank_acct_name: "",
         bank_acct_no: "",
@@ -783,6 +790,9 @@ export default {
         shareholderName: [
           { required: true, message: "请输入股东姓名", trigger: "blur" },
         ],
+        isChain: [
+          { required: true, message: "请选择是否连锁", trigger: "change" },
+        ],
         // 'bnfList.0.bnfHomeAddr': [
         //   { required: true, message: "请输入家庭地址", trigger: "blur" },
         // ],
@@ -1340,6 +1350,7 @@ export default {
         accesseId:this.$route.query.accesseId||this.accesseId,
         developingPersonID: "",
         fax: "",
+        isChain: this.setQuery.isChain,
         mchntType: this.setQuery.mchntType,
         epId: this.$route.query.id,
         externalName: this.setQuery.shop_name,