Bläddra i källkod

Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

lisy 5 månader sedan
förälder
incheckning
772afa34f5
4 ändrade filer med 22 tillägg och 4 borttagningar
  1. 2 0
      .env.development
  2. 2 0
      .env.production
  3. 17 4
      src/views/auth/userbind/index.vue
  4. 1 0
      src/views/h5-custom/list/index.vue

+ 2 - 0
.env.development

@@ -40,3 +40,5 @@ VITE_APP_SSE = true
 VITE_APP_PACKAGE_SHARE_URL = 'http://dm.share.yujin.shuziyunyao.com/package'
 # 测试版微信小程序扫码域名
 VITE_APP_SHARE_QR_CODE_URL = 'http://dm.share.yujin.shuziyunyao.com'
+
+VITE_H5_URL = 'https://t.yujin.shuziyunyao.com/'

+ 2 - 0
.env.production

@@ -44,3 +44,5 @@ VITE_APP_APPID = '1890328853823459329'
 # 测试版微信小程序扫码域名
 
 VITE_APP_SHARE_QR_CODE_URL = 'https://www.shuziyunyao.com/dm'
+
+VITE_H5_URL = 'https://t.zycpzs.cn/'

+ 17 - 4
src/views/auth/userbind/index.vue

@@ -11,6 +11,13 @@
                             <el-option v-for="dict in approval_query_type" :value="dict.value" :label="dict.label"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否有管理员" prop="hasAdmin">
+                        <el-select v-model="queryParams.hasAdmin" clearable>
+                            <el-option label="全部" value="" />
+                            <el-option label="是" value="1" />
+                            <el-option label="否" value="0" />
+                        </el-select>
+                    </el-form-item>
                     <el-form-item>
                         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -47,6 +54,11 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column label="是否有管理员" align="center" prop="hasAdmin" width="90">
+                    <template #default="{ row }">
+                        <dict-tag :options="yes_no" :value="row.hasAdmin"></dict-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="统一社会信用代码" align="center" prop="cpyName" width="250">
                     <template #default="scope">
                         <div style="margin-left: 10px;">{{ scope.row.cpyInfo.creditCode }}</div>
@@ -85,9 +97,9 @@ const loading = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const { approval_query_type } = toRefs<any>(proxy?.useDict('approval_query_type'));
+const { approval_query_type, yes_no } = toRefs<any>(proxy?.useDict('approval_query_type', 'yes_no'));
 
-const data = reactive<PageData<any, QueryUserBindInfoBo>>({
+const data = reactive<PageData<any, any>>({
     form: {},
     queryParams: {
         pageNum: 1,
@@ -95,6 +107,7 @@ const data = reactive<PageData<any, QueryUserBindInfoBo>>({
         cpyName: undefined,
         userName: undefined,
         keywords: undefined,
+        hasAdmin: undefined,
         status: '0',
         params: {}
     },
@@ -137,9 +150,9 @@ const handleApproval = async (row: any, res: string) => {
         })
             .then(() => {
                 const params = {
-                    approvalType: '2',
+                    approvalType: +row.hasAdmin ? '0' : '1',
                     targetId: row.id,
-                    res
+                    res: res,
                 };
                 approvalAjax(params);
             })

+ 1 - 0
src/views/h5-custom/list/index.vue

@@ -8,6 +8,7 @@
                             <el-form-item label="模版类别" prop="tplType">
                                 <el-select v-model="queryParams.tplType" style="width: 100%;" placeholder="请选择审核状态" clearable>
                                     <el-option v-for="dict in class_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                                    <el-option label="药食同源" value="11" />
                                 </el-select>
                             </el-form-item>
                         </el-col>