mod:黑名单

CMS1.0/src/api/patient/patient.js

@@ -30,7 +30,11 @@ export const getPatientLogs = (params) => {
  */
 export const setLabel = (ids, label) => {
     return request({
-      url: `/patient/patientlabel/batchadd/${ids}/${label}`,
+      url: `/patient/patientlabel/batchadd`,
+      data: {
+        labelName: label,
+        patientids: ids,
+      },
       method: 'post',
     })
 }

CMS1.0/src/components/page-content/src/page-content.vue

@@ -181,6 +181,7 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
+
         </div>
       </template>
       <template #handlerImportExport="scope">

CMS1.0/src/components/page-modal/src/page-modal.vue

@@ -115,6 +115,11 @@
                 return Number(o);
               });
             }
+
+            // 时间选择器为数组，把数据转换为数组
+            if (item.type === 'datepicker' && item.fieldArray) {
+              formData.value[`${item.field}`] = [newValue[`${item.fieldArray[0]}`], newValue[`${item.fieldArray[1]}`]];
+            }
           }
         },
       );
@@ -138,6 +143,17 @@
               if (!mainField)
                 mainField = props.pageName.split('/')[props.pageName.split('/').length - 1] + 'Id';
 
+              
+              // 时间日期转换
+              for (const item of props.modalConfig.formItems) {
+
+                // 时间选择器为数组，把数据转换为数组
+                if (item.type === 'datepicker' && item.fieldArray) {
+                  form[`${item.fieldArray[0]}`] = form[`${item.field}`][0]
+                  form[`${item.fieldArray[1]}`] = form[`${item.field}`][1]
+                }
+              }
+
               let query = {
                 pageName: props.pageName,
                 editData: form,
@@ -152,6 +168,8 @@
                 query.pageSize = pageInfo.value.pageSize;
               }
 
+              console.log(query, 'query');
+
               useSystemStore()
                 .editPageDataAction(query)
                 .then(() => {

CMS1.0/src/utils/tools.js

@@ -7,4 +7,14 @@ export const ArrayToMap = (arr, key) => {
     }
 
     return result;
+}
+
+export const getTimeFrame = (starttime, endtime) => {
+    if (!starttime || !endtime) return '永久';
+
+    if (starttime && !endtime) return `${starttime}以后`;
+
+    if (!starttime && endtime) return `截止到${endtime}`;
+
+    if (starttime && endtime) return `${starttime}至${endtime}`;
 }

CMS1.0/src/views/main/patientFile/patientFileList/cpns/logs/log.vue

@@ -1,15 +1,15 @@
 <template>
-  <el-timeline style="max-width: 600px;margin-top: 10px">
-    <el-timeline-item
-      v-for="(item, index) in logs"
-      :key="index"
-      :timestamp="item.createTime"
-    >
-    <!-- <span> {{ item.createUserName }} </span> -->
-        <span style="color: blue;"> {{ item.type }} </span>
-      {{ item.content }}
-    </el-timeline-item>
-  </el-timeline>
+    <div class="center-flex">
+        <el-timeline style="max-width: 90vh;margin-top: 10px">
+            <el-timeline-item v-for="(item, index) in logs" :key="index" :timestamp="item.createTime">
+                <span style="font-weight: bold;margin-right: 10px;"> {{ item.createUserName }} </span>
+                
+                <span style="color: blue;margin-right: 10px;"> {{ item.type }} </span>
+                {{ item.content }}
+            </el-timeline-item>
+        </el-timeline>
+    </div>
+
 </template>
 
 <script setup>
@@ -40,4 +40,14 @@ onMounted(() => {
     getLogs().then(() => {});
 })
     
-</script>
+</script>
+
+<style lang="scss" scoped>
+    /* .center-flex {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 90vh;
+        height: 100vh;
+    }*/
+</style>

CMS1.0/src/views/main/patientFile/patientFileList/patientFileList.vue

@@ -162,19 +162,6 @@ export default defineComponent({
     }
 
 
-    // objectDic();
-
-    // const getStatus = (status) => {
-    //   console.log(patientStatus, 'patientStatus')
-    //   const statusInfo = patientStatus.find((o) => {
-    //     return o.value === status;
-    //   });
-
-    //   console.log(statusInfo, 'statusInfo')
-
-    //   return statusInfo || { color: '', label: '' };
-    // }
-
     // 1.处理逻辑
     const newCallback = () => { }
     const editCallback = () => {

CMS1.0/src/views/main/patientFile/patientblack/config/content.config.js

@@ -2,14 +2,14 @@ export const contentTableConfig = {
   title: '黑名单',
   contentTableHeader: true,
   propList: [
-    { prop: 'postCode', label: '患者姓名' },
-    { prop: 'postName', label: '患者手机号' },
-    { prop: 'postSort', label: '拉黑原因' },
-    { prop: 'createTime', label: '备注说明' },
-    { prop: 'status', label: '有效期',},
-    { prop: 'status', label: '创建时间',},
-    { label: '操作', minWidth: '120', slotName: 'handler' }
+    { prop: 'patientName', label: '患者姓名', slotName: 'patientId', minWidth: '100', customSlot: true, fixed : 'left'  },
+    { prop: 'phoneNumber', label: '患者手机号', minWidth: '100' },
+    { prop: 'reason', label: '拉黑原因', minWidth: '200' },
+    { prop: 'note', label: '备注说明', minWidth: '200' },
+    { prop: 'starttime', label: '有效期', minWidth: '200', slotName: 'timeFrame', customSlot: true,},
+    { prop: 'createTime', label: '创建时间', minWidth: '180',},
+    { label: '操作', minWidth: '120', slotName: 'handler', fixed : 'right' }
   ],
-  showIndexColumn: true,
+  showIndexColumn: false,
   showSelectColumn: false,
 }

CMS1.0/src/views/main/patientFile/patientblack/config/modal.config.js

@@ -1,53 +1,34 @@
 export const modalConfig = {
   formItems: [
     {
-      field: 'postName',
-      type: 'input',
-      label: '患者姓名',
       required: true,
-      placeholder: '请输入患者姓名'
-    },
-    {
-      field: 'postCode',
-      type: 'input',
-      label: '患者手机号',
-      required: true,
-      placeholder: '请输入患者手机号'
-    },
-    {
-      required: true,
-      field: 'postSort',
+      field: 'reason',
       type: 'input',
       label: '拉黑原因',
       placeholder: '请输入拉黑原因'
     },
     {
-      field: 'status',
-      type: 'switch',
+      field: 'timeRange',
+      type: 'datepicker',
       label: '有效期',
-      required: true,
-      placeholder: '请选择有效期'
+      required: false,
+      placeholder: '请选择有效期',
+      otherOptions: {
+        'range-separator': '至',
+        type: 'datetimerange',
+        'value-format': 'YYYY-MM-DD HH:mm:ss',
+      },
+      fieldArray: ['starttime', 'endtime'],
+      resFormat: (time) => {
+        return moment(time).format('YYYY-MM-DD HH:mm:ss');
+      }
     },
     {
-      field: 'remark',
+      field: 'note',
       type: 'textarea',
       label: '备注',
       placeholder: '请输入备注'
     }
-    // {
-    //   field: "departmentId",
-    //   type: "select",
-    //   label: "选择部门",
-    //   placeholder: "请选择部门",
-    //   options: [],
-    // },
-    // {
-    //   field: "roleId",
-    //   type: "select",
-    //   label: "选择角色",
-    //   placeholder: "请选择角色",
-    //   options: [],
-    // },
   ],
   colLayout: { span: 24 },
   itemStyle: {}

CMS1.0/src/views/main/patientFile/patientblack/config/search.config.js

@@ -8,13 +8,13 @@ export const searchFormConfig = {
   },
   formItems: [
     {
-      field: 'postCode',
+      field: 'patientName',
       type: 'input',
       label: '患者姓名',
       placeholder: '请输入患者姓名'
     },
     {
-      field: 'postName',
+      field: 'phoneNumber',
       type: 'input',
       label: '患者手机号',
       placeholder: '请输入患者手机号'

CMS1.0/src/views/main/patientFile/patientblack/patientblack.vue

@@ -8,19 +8,27 @@
     <page-content
       ref="pageContentRef"
       :contentTableConfig="contentTableConfig"
-      pageName="/system/post"
+      pageName="/patient/blacklist"
       :isExport="false"
+      :isCreate="false"
       @newBtnClick="handleNewData"
       @editBtnClick="handleEditData"
     >
       <template #postStatus="{ row }">
         <el-tag :type="row.status === '0' ? 'error' : 'success'">{{ row.status === '0' ? '禁用' : '启用' }}</el-tag>
       </template>
+      <template #timeFrame="{ row }">
+        {{ getTimeFrame(row.starttime, row.endtime) }}
+      </template>
+      <template #patientId="{ row }">
+        <el-button type="primary" link @click="buttonHandle(row.patientId)">{{ row.patientName }}</el-button>
+      </template>
     </page-content>
     <page-modal
       :defaultInfo="defaultInfo"
       ref="pageModalRef"
-      pageName="/system/post"
+      :mainKey="'blackId'"
+      pageName="/patient/blacklist"
       :modalConfig="modalConfigRef"
     ></page-modal>
   </div>
@@ -39,6 +47,8 @@ import { modalConfig } from './config/modal.config'
 
 import { usePageSearch } from '@/hooks/use-page-search'
 import { usePageModal } from '@/hooks/use-page-modal'
+import { getTimeFrame } from '@/utils/tools'
+import { useRouter } from 'vue-router'
 
 export default defineComponent({
   name: 'Patientblack',
@@ -48,6 +58,9 @@ export default defineComponent({
     PageModal
   },
   setup() {
+
+    const router = useRouter();
+
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
 
     // 1.处理逻辑
@@ -64,7 +77,18 @@ export default defineComponent({
     // 3.调用hook获取公共变量和函数
     const [pageModalRef, defaultInfo, handleNewData, handleEditData] =
       usePageModal(newCallback, editCallback)
+
+    function buttonHandle(id) {
+      router.push({
+        path: '/patientFile/patientDetail',
+        query: {
+          id,
+        }
+      });
+    }
     return {
+      buttonHandle,
+      getTimeFrame,
       searchFormConfig,
       contentTableConfig,
       pageContentRef,