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

src/api/dgtmedicine/member/index.ts

@@ -16,6 +16,21 @@ export const listMember = (query?: MemberQuery): AxiosPromise<MemberVO[]> => {
   });
 };
 
+
+/**
+ * 查询审核会员信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMemberApproval = (query?: MemberQuery): AxiosPromise<MemberVO[]> => {
+  return request({
+    url: '/dgtmedicine/member/listMemberApproval',
+    method: 'get',
+    params: query
+  });
+};
+
 /**
  * 查询会员信息详细
  * @param id
@@ -118,3 +133,5 @@ export const editValidityDate = (data: any): AxiosPromise<any> => {
     data: data
   });
 };
+
+

src/views/dgtmedicine/check/index.vue

@@ -69,7 +69,7 @@
 </template>
 
 <script setup name="Member" lang="ts">
-import { listMember, delMember, queryMemberApprovalCount } from '@/api/dgtmedicine/member/index';
+import { listMember, delMember, queryMemberApprovalCount,listMemberApproval } from '@/api/dgtmedicine/member/index';
 import { MemberVO, MemberLevelCountVO } from '@/api/dgtmedicine/member/types';
 import { colNoData } from '@/utils/noData';
 import { DateRange, searchTabs } from '@/views/models/index';
@@ -97,7 +97,7 @@ const { queryParams } = toRefs(data);
 /** 查询会员信息列表 */
 const getList = async () => {
     loading.value = true;
-    const res = await listMember(queryParams.value);
+    const res = await listMemberApproval(queryParams.value);
     memberList.value = res.rows;
     total.value = res.total;
     loading.value = false;

src/views/dgtmedicine/news/medicinenews/index.vue

@@ -64,15 +64,19 @@
             </div>
         </div>
     </div>
-    <el-dialog title="选择品种" v-model="showVarietyDialog" width="600px">
+    <el-dialog title="添加关联品种" v-model="showVarietyDialog" width="500px">
         <div>
-            <el-select v-model="form.variety" filterable multiple clearable placeholder="请选择品种">
-                <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            </el-select>
+            <el-form :model="form" label-width="80px">
+                <el-form-item label="关联品种">
+                    <el-select v-model="form.variety" filterable multiple clearable placeholder="请选择...">
+                        <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
         </div>
-        <div class="dialog-footer">
+        <div class="dialog-footer" style="text-align: right; margin-top: 20px;">
             <el-button @click="showVarietyDialog = false">取消</el-button>
-            <el-button type="primary" @click="edit">确定</el-button>
+            <el-button type="primary" @click="edit">确认添加</el-button>
         </div>
     </el-dialog>
 </template>