配置新增协议

src/views/hisStore/store/audit.vue

@@ -73,7 +73,9 @@
     </el-tabs>
     <el-table v-loading="loading" border :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="店铺id" align="center" prop="storeId" width="120px"/>
+<!--      <el-table-column label="店铺id" align="center" prop="storeId" width="120px"/>-->
+      <el-table-column label="商家Id" align="center" prop="merchantId"  width="150px"/>
+      <el-table-column label="店铺Id" align="center" prop="storeSeq"  width="150px"/>
       <el-table-column label="店铺名称" align="center" prop="storeName" width="120px"/>
       <el-table-column label="店铺LOGO" align="center" prop="logoUrl" width="100px">
         <template slot-scope="scope">

src/views/hisStore/store/index.vue

@@ -113,6 +113,8 @@
     <el-table v-loading="loading" border :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="店铺id" align="center" prop="storeId" width="120px"/>-->
+      <el-table-column label="商家Id" align="center" prop="merchantId"  width="150px"/>
+      <el-table-column label="店铺Id" align="center" prop="storeSeq"  width="150px"/>
       <el-table-column label="店铺名称" align="center" prop="storeName" width="120px"/>
       <el-table-column label="机构全称" align="center" prop="fullName" width="120px"/>
       <el-table-column label="店铺LOGO" align="center" prop="logoUrl" width="100px">
@@ -166,8 +168,6 @@
       <el-table-column label="累计金额" align="center" prop="totalMoney" />
       <el-table-column label="登录帐号" align="center" prop="account" width="150px" />
       <el-table-column label="创建时间" align="center" prop="createTime"  width="150px"/>
-      <el-table-column label="商家Id" align="center" prop="merchantId"  width="150px"/>
-      <el-table-column label="店铺Id" align="center" prop="storeSeq"  width="150px"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
         <template slot-scope="scope">
           <el-button
@@ -822,15 +822,15 @@ export default {
         drugCode:[
           { required: true, message: "药品经营许可证编号不能为空", trigger: "blur" }
         ],
-        medicalLicense:[
-          { required: true, message: "医疗机构执业许可证不能为空", trigger: "blur" }
-        ],
-        medicalCode:[
-          { required: true, message: "医疗机构执业许可证编号不能为空", trigger: "blur" }
-        ],
-        medicalLicenseExpiry:[
-          { required: true, message: "医疗机构执业许可证有效期不能为空", trigger: "blur" }
-        ],
+        // medicalLicense:[
+        //   { required: true, message: "医疗机构执业许可证不能为空", trigger: "blur" }
+        // ],
+        // medicalCode:[
+        //   { required: true, message: "医疗机构执业许可证编号不能为空", trigger: "blur" }
+        // ],
+        // medicalLicenseExpiry:[
+        //   { required: true, message: "医疗机构执业许可证有效期不能为空", trigger: "blur" }
+        // ],
         medicalDevice2:[
           { required: true, message: "2类医疗器械备案证不能为空", trigger: "blur" }
         ],

src/views/hisStore/store/recommend.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="店铺ID" prop="storeId">
         <el-input
-          v-model="queryParams.storeId"
+          v-model="queryParams.storeSeq"
           placeholder="请输入店铺ID"
           clearable
           size="small"
@@ -87,9 +87,9 @@
 
     <el-table v-loading="loading" border :data="recommendScrmList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="店铺ID" align="center" prop="storeId" />
-      <el-table-column label="推荐店铺ID" align="center" prop="storeId" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="店铺ID" align="center" prop="storeSeq" />
+      <el-table-column label="推荐店铺ID" align="center" prop="storeSeq" />
       <el-table-column label="推荐店铺名称" align="center" prop="storeName" />
       <el-table-column label="排序" align="center" prop="sortOrder" />
 <!--      <el-table-column label="开始时间" align="center" prop="beginTime" width="180">
@@ -241,7 +241,8 @@ export default {
         pageSize: 10,
         storeId: null,
         storeName: null,
-        status: null
+        status: null,
+        storeSeq:null
       },
       // 表单参数
       form: {},
@@ -288,7 +289,7 @@ export default {
       if (query !== '') {
        var isNum =  this.isPureNumber(query);
        console.log(isNum);
-      
+
         this.storeLoading = true;
         let queryObj = { storeName: query };
        if(isNum){
@@ -316,21 +317,21 @@ export default {
 
       // 处理空值情况
       if (value === null || value === undefined) return false;
-      
+
       // 转换为字符串并去除首尾空格
       const str = String(value).trim();
-      
+
       // 处理空字符串
       if (str === '') return allowEmpty;
 
       // 构建正则表达式
       let regex = '^';
-      
+
       // 可选的负号
       if (allowNegative) {
         regex += '[-+]?';
       }
-      
+
       // 数字部分
       if (allowDecimal) {
         // 允许整数或小数（包括 .123 或 123. 形式）
@@ -339,7 +340,7 @@ export default {
         // 只允许整数
         regex += '\\d+';
       }
-      
+
       regex += '$';
 
       return new RegExp(regex).test(str);

src/views/system/config/config.vue

@@ -172,6 +172,12 @@
           <el-form-item label="医生多机构备案协议" prop="doctorFiling">
             <editor v-model="form3.doctorFiling" :min-height="292"/>
           </el-form-item>
+          <el-form-item label="药师注册协议" prop="pharmacistRegister">
+            <editor v-model="form3.pharmacistRegister" :min-height="292"/>
+          </el-form-item>
+          <el-form-item label="药师多机构备案协议" prop="pharmacistFiling">
+            <editor v-model="form3.pharmacistFiling" :min-height="292"/>
+          </el-form-item>
           <el-form-item label="用户协议" prop="userRegister">
             <editor v-model="form3.userRegister" :min-height="292"/>
           </el-form-item>
@@ -190,6 +196,12 @@
           <el-form-item label="用户注销协议" prop="vipAutomaticService">
             <editor v-model="form3.userRemoveService" :min-height="292"/>
           </el-form-item>
+          <el-form-item label="商家规则" prop="storeRules">
+            <editor v-model="form3.storeRules" :min-height="292"/>
+          </el-form-item>
+          <el-form-item label="入驻协议" prop="residencyAgreement">
+            <editor v-model="form3.residencyAgreement" :min-height="292"/>
+          </el-form-item>
 
           <div class="footer">
             <el-button type="primary" @click="submitForm3">提 交</el-button>
@@ -2489,6 +2501,12 @@ export default {
         doctorFiling: [
           { required: true, message: '请输入医生多机构备案协议', trigger: 'blur' }
         ],
+        pharmacistRegister: [
+          { required: true, message: '请输入药师注册协议', trigger: 'blur' }
+        ],
+        pharmacistFiling: [
+          { required: true, message: '请输入药师多机构备案协议', trigger: 'blur' }
+        ],
         userRegister: [
           { required: true, message: '请输入用户协议', trigger: 'blur' }
         ],
@@ -2500,7 +2518,13 @@ export default {
         ],
         vipService: [
           { required: true, message: '请输入会员服务协议', trigger: 'blur' }
-        ]
+        ],
+        storeRules: [
+          { required: true, message: '请输入商家规则', trigger: 'blur' }
+        ],
+        residencyAgreement: [
+          { required: true, message: '请输入入驻协议', trigger: 'blur' }
+        ],
       },
       rulesDelay: [
         {