Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

src/store/modules/user.js

@@ -10,7 +10,7 @@ const user = {
     roles: [],
     permissions: [],
     isAdmin: false,
-    medicalMallConfig: {isMedicalMall: "0",statics: "0",isAudit:"0",isResource:"0"}
+    medicalMallConfig: {medicalMall: false,statics: false,audit:false,resource:false}
   },
 
   mutations: {
@@ -74,6 +74,7 @@ const user = {
           commit('SET_AVATAR', avatar)
           commit('SET_USER', user)
           commit('SET_ISADMIN', res.isAdmin)
+          console.log(res.medicalMallConfig)
           commit('SET_MEDICALMALL', res.medicalMallConfig)
           resolve(res)
         }).catch(error => {

src/views/his/company/index.vue

@@ -118,9 +118,9 @@
       </el-table-column>
       <el-table-column label="管理员账号" align="center" prop="userName"/>
       <el-table-column label="限制用户数量" align="center" prop="limitUserCount"/>
-      <el-table-column label="限制pad数量" align="center" prop="maxPadNum" :formatter="padNumFormatter" v-if="this.$store.state.user.medicalMallConfig.isResource"/>
-      <el-table-column label="占用pad数量" align="center" prop="usedNum" v-if="this.$store.state.user.medicalMallConfig.isResource"/>
-      <el-table-column label="所属部门" align="center" prop="deptId" v-if="this.$store.state.user.medicalMallConfig.isResource">
+      <el-table-column label="限制pad数量" align="center" prop="maxPadNum" :formatter="padNumFormatter" v-if="this.$store.state.user.medicalMallConfig.resource"/>
+      <el-table-column label="占用pad数量" align="center" prop="usedNum" v-if="this.$store.state.user.medicalMallConfig.resource"/>
+      <el-table-column label="所属部门" align="center" prop="deptId" v-if="this.$store.state.user.medicalMallConfig.resource">
         <template slot-scope="scope">
           <el-tag prop="deptId" v-for="(item, index) in deptOptions" :key="'deptId'+index"
                   v-if="scope.row.deptId===item.deptId"
@@ -212,7 +212,7 @@
           </el-select>
         </el-form-item>
         <!-- 所属部门 -->
-        <el-form-item label="所属部门" prop="deptId" v-if="this.$store.state.user.medicalMallConfig.isResource">
+        <el-form-item label="所属部门" prop="deptId" v-if="this.$store.state.user.medicalMallConfig.resource">
           <el-select
             v-model="form.deptId"
             placeholder="请选择"
@@ -239,7 +239,7 @@
         <el-form-item label="员工数量" prop="limitUserCount">
           <el-input-number v-model="form.limitUserCount" :min="1" :max="10000"></el-input-number>
         </el-form-item>
-        <el-form-item label="pad数量" prop="maxPadNum" v-if="this.$store.state.user.medicalMallConfig.isResource">
+        <el-form-item label="pad数量" prop="maxPadNum" v-if="this.$store.state.user.medicalMallConfig.resource">
           <el-input-number v-model="form.maxPadNum" :min="-1" :max="10000"></el-input-number>
           <span class="pad-tips">
             注：-1表示不做限制

src/views/hisStore/components/storeDetails.vue

@@ -98,7 +98,7 @@
         <el-descriptions-item label="营业执照有效期" >
           <span v-if="item!=null">{{item.businessLicenseExpireStart}} - {{item.businessLicenseExpireEnd}}</span>
         </el-descriptions-item>
-        <div v-if="this.$store.state.user.medicalMallConfig.isMedicalMall">
+        <div v-if="this.$store.state.user.medicalMallConfig.medicalMall">
         <el-descriptions-item label="药品经营许可证" >
           <el-image
             style="width: 100px"
@@ -180,7 +180,7 @@
           <el-button type="primary" @click="handleUpdate(-1)">审核退回</el-button>
         </div>
       </div>
-      <div v-if="item.isAudit!==0 && this.$store.state.user.medicalMallConfig.isMedicalMall" class="dialog">
+      <div v-if="item.isAudit!==0 && this.$store.state.user.medicalMallConfig.medicalMall" class="dialog">
         <el-divider content-position="left">审核记录</el-divider>
         <el-table :data="item.auditLogs" border >
           <el-table-column label="描述" align="center" prop="des" :show-overflow-tooltip="true" />

src/views/hisStore/store/audit.vue

@@ -116,7 +116,7 @@
 
       <el-table-column label="登录帐号" align="center" prop="account" width="150px" />
       <el-table-column label="创建时间" align="center" prop="createTime"  width="150px"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="130px" v-if="this.$store.state.user.medicalMallConfig.isMedicalMall">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="130px" v-if="this.$store.state.user.medicalMallConfig.medicalMall">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/hisStore/store/index.vue

@@ -313,7 +313,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div v-if="this.$store.state.user.medicalMallConfig.isMedicalMall">
+        <div v-if="this.$store.state.user.medicalMallConfig.medicalMall">
           <el-row>
             <el-col :span="12">
               <el-form-item label="药品经营许可证上传" prop="drugLicense">

src/views/hisStore/storeProduct/index.vue

@@ -940,7 +940,7 @@ export default {
   },
   data() {
     return {
-      isMedicalMall: this.$store.state.user.medicalMallConfig.isMedicalMall,
+      isMedicalMall: this.$store.state.user.medicalMallConfig.medicalMall,
       companyId: null,
       storeId: null,
       isAudit: null,

src/views/index.vue

@@ -232,26 +232,27 @@
             <el-radio-button label="上月"></el-radio-button>
           </el-radio-group>
         </div>
-
         <div class="action-group">
-          <!-- 选择部门 -->
-          <el-select v-model="deptId" placeholder="请选择部门" size="small" @change="handleDeptChange" style="width: 150px">
-            <el-option
-              v-for="company in deptOptions"
-              :key="company.deptId"
-              :label="company.deptName"
-              :value="company.deptId"
-            />
-          </el-select>
-          <!-- 选择销售公司 -->
-          <el-select  v-model="companyId" placeholder="请选择销售公司" size="small" clearable @change="handleCompanyChange" style="width: 180px" >
-            <el-option
-              v-for="company in companyOptions"
-              :key="company.companyId"
-              :label="company.companyName"
-              :value="company.companyId"
-            />
-          </el-select>
+          <div v-if="this.$store.state.user.medicalMallConfig.statics">
+            <!-- 选择部门 -->
+            <el-select v-model="deptId" placeholder="请选择部门" size="small" @change="handleDeptChange" style="width: 150px">
+              <el-option
+                v-for="company in deptOptions"
+                :key="company.deptId"
+                :label="company.deptName"
+                :value="company.deptId"
+              />
+            </el-select>
+            <!-- 选择销售公司 -->
+            <el-select  v-model="companyId" placeholder="请选择销售公司" size="small" clearable @change="handleCompanyChange" style="width: 180px" >
+              <el-option
+                v-for="company in companyOptions"
+                :key="company.companyId"
+                :label="company.companyName"
+                :value="company.companyId"
+              />
+            </el-select>
+          </div>
           <el-radio-group v-model="userTypeText" @change="handleUserType">
             <el-radio-button label="会员"></el-radio-button>
             <el-radio-button label="企微"></el-radio-button>