医健宝：完善药师关联店铺,创建组合套餐关联店铺

src/views/his/doctor/type2.vue

@@ -11,9 +11,9 @@
         />
       </el-form-item>
 
-      <el-form-item label="所属医院" prop="hospitalId">
-      <el-select v-model="queryParams.hospitalId" placeholder="请选择所属医院" filterable>
-             <el-option v-for="(option, index) in hospitalList" :key="index" :value="option.dictValue" :label="option.dictLabel"></el-option>
+      <el-form-item label="所属店铺" prop="hospitalId">
+      <el-select v-model="queryParams.storeId" placeholder="请选择所属店铺" filterable>
+             <el-option v-for="(option, index) in storeOptions" :key="index" :value="option.storeId" :label="option.storeName"></el-option>
        </el-select>
       </el-form-item>
 
@@ -126,8 +126,8 @@
          <div v-if="scope.row.nickName!=null"> {{scope.row.nickName}}-{{scope.row.phone}}</div>
        </template>
       </el-table-column>
-      <el-table-column label="所属医院" align="center" prop="hospitalName" width="150px"/>
-
+<!--      <el-table-column label="所属医院" align="center" prop="storeName" width="150px"/>-->
+      <el-table-column label="所属店铺" align="center" width="150px" :formatter="formatStoreName"/>
       <el-table-column label="余额" align="center" prop="balance" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
@@ -229,16 +229,26 @@
                 <el-input v-model="form.doctorName" placeholder="请输入医生姓名" />
               </el-form-item></el-col>
             <el-col :span="12">
-                <el-form-item label="所属医院" prop="hospitalId">
-                  <el-select v-model="form.hospitalId" placeholder="请选择所属医院" clearable size="small" filterable>
-                       <el-option
-                         v-for="dict in hospitalList"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="dict.dictValue"
-                       />
-                     </el-select>
-                </el-form-item>
+<!--                <el-form-item label="所属药铺" prop="hospitalId">-->
+<!--                  <el-select v-model="form.hospitalId" placeholder="请选择所属药铺" clearable size="small" filterable>-->
+<!--                       <el-option-->
+<!--                         v-for="dict in hospitalList"-->
+<!--                         :key="dict.dictValue"-->
+<!--                         :label="dict.dictLabel"-->
+<!--                         :value="dict.dictValue"-->
+<!--                       />-->
+<!--                     </el-select>-->
+<!--                </el-form-item>-->
+              <el-form-item label="所属店铺" prop="storeId">
+                <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
+                  <el-option
+                    v-for="item in storeOptions"
+                    :key="item.storeId"
+                    :label="item.storeName"
+                    :value="item.storeId"
+                  />
+                </el-select>
+              </el-form-item>
             </el-col>
       </el-row>
    <!--   <el-row>
@@ -523,6 +533,7 @@ import{listDepartment} from "@/api/his/disease";
 import{listAllHospital} from "@/api/his/hospital";
 import {getCitys} from "@/api/store/city";
 import pharmacistDetails from '../../components/his/pharmacistDetails.vue';
+import {listStore} from "@/api/hisStore/store";
 export default {
   name: "pharmacist",
   components: { pharmacistDetails },
@@ -685,7 +696,7 @@ export default {
               "dictLabel": "驳回",
               "dictValue": -1
       }],
-
+      storeOptions:[],
 
     };
   },
@@ -714,7 +725,9 @@ export default {
     this.getDicts("sys_product_type").then(response => {
       this.auditTypeOptions = response.data;
     });
-
+    listStore().then(response => {
+      this.storeOptions = response.rows;
+    });
 
     this.getdeplist();
     this.getHospitaldeplist();
@@ -1097,6 +1110,10 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    formatStoreName(row) {
+      const store = this.storeOptions.find(option => option.storeId === row.storeId);
+      return store ? store.storeName : '';
     }
   }
 };

src/views/hisStore/storeProductPackage/index.vue

@@ -30,13 +30,13 @@
               />
         </el-select>
       </el-form-item>
-      <el-form-item label="公司" prop="companyId">
-        <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+      <el-form-item label="所属店铺" prop="storeId">
+        <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
           <el-option
-            v-for="item in companyOptions"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
+            v-for="item in storeOptions"
+            :key="item.storeId"
+            :label="item.storeName"
+            :value="item.storeId"
           />
         </el-select>
       </el-form-item>
@@ -108,7 +108,8 @@
               <el-tag prop="cateId" v-for="(item, index) in cateOptions"    v-if="scope.row.cateId==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column label="所属公司" align="center" prop="companyName" />
+<!--      <el-table-column label="所属公司" align="center" prop="companyName" />-->
+      <el-table-column label="所属店铺" align="center" width="150px" :formatter="formatStoreName"/>
       <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip />
       <el-table-column label="描述" align="center" prop="descs" show-overflow-tooltip />
       <el-table-column label="原价" align="center"  >
@@ -175,13 +176,13 @@
                 <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>
               </el-radio-group>
         </el-form-item>
-         <el-form-item label="公司" prop="companyId">
-           <el-select style="width: 220px" filterable v-model="form1.companyId" placeholder="请选择公司名" clearable size="small">
+         <el-form-item label="所属店铺" prop="storeId">
+           <el-select style="width: 240px" v-model="form1.storeId" placeholder="请选择店铺" clearable size="small" >
              <el-option
-               v-for="item in companyOptions"
-               :key="item.companyId"
-               :label="item.companyName"
-               :value="item.companyId"
+               v-for="item in storeOptions"
+               :key="item.storeId"
+               :label="item.storeName"
+               :value="item.storeId"
              />
            </el-select>
          </el-form-item>
@@ -214,13 +215,23 @@
                     />
             </el-select>
         </el-form-item>
-        <el-form-item label="所属公司" prop="companyId">
-          <el-select style="width: 240px" v-model="form.companyId" placeholder="请选择企业" clearable size="small" @change="handleCompanyChange">
+<!--        <el-form-item label="所属公司" prop="companyId">-->
+<!--          <el-select style="width: 240px" v-model="form.companyId" placeholder="请选择企业" clearable size="small" @change="handleCompanyChange">-->
+<!--            <el-option-->
+<!--              v-for="item in companyOptions"-->
+<!--              :key="item.companyId"-->
+<!--              :label="item.companyName"-->
+<!--              :value="item.companyId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="所属店铺" prop="storeId">
+          <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
             <el-option
-              v-for="item in companyOptions"
-              :key="item.companyId"
-              :label="item.companyName"
-              :value="item.companyId"
+              v-for="item in storeOptions"
+              :key="item.storeId"
+              :label="item.storeName"
+              :value="item.storeId"
             />
           </el-select>
         </el-form-item>
@@ -336,6 +347,7 @@ import productAttrValueSelect from "../components/productAttrValueSelect";
 import Material from '@/components/Material'
 import singleImg from '@/components/Material/single'
 import {getCompanyList} from "@/api/company/company";
+import {listStore} from "@/api/hisStore/store";
 export default {
   name: "HisStoreProductPackage",
   components: {
@@ -437,7 +449,8 @@ export default {
           { required: true, message: "限购次数不能为空" }
         ],
 
-      }
+      },
+      storeOptions:[]
     };
   },
   created() {
@@ -455,6 +468,10 @@ export default {
     this.getList();
 
     this.getCompanyList();
+
+    listStore().then(response => {
+      this.storeOptions = response.rows;
+    });
   },
   methods: {
     handleCompanyChange(){
@@ -500,8 +517,8 @@ export default {
       this.$message.success("商品已添加!");
     },
     handleAddProduct(){
-      if(!this.form.companyId) {
-        this.$message.error("请选择套餐所属公司!");
+      if(!this.form.storeId) {
+        this.$message.error("请选择套餐所属商铺!");
         return;
       }
       this.product.open=true;
@@ -729,7 +746,10 @@ export default {
       });
 
     },
-
+    formatStoreName(row) {
+      const store = this.storeOptions.find(option => option.storeId === row.storeId);
+      return store ? store.storeName : '';
+    },
 
   }
 };