mod:表格头部操作

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

@@ -38,4 +38,18 @@ export const setLabel = (ids, label) => {
       method: 'post',
     })
 }
+
+/**
+ * 取消标签
+ */
+export const cancelLabel = (ids, label) => {
+  return request({
+    url: `/patient/patientlabel`,
+    data: {
+      labelName: label,
+      patientids: ids,
+    },
+    method: 'delete',
+  })
+}
   

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

@@ -16,6 +16,7 @@
         <el-button v-if="isExport" type="primary" size="default" @click="handleExportClick">
           {{ buttons[1] }}
         </el-button>
+        <slot name="otherHandler"></slot>
       </template>
       <!-- 2.列中的插槽 -->
 

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

@@ -148,9 +148,16 @@
               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]
+                if (item.type === 'datepicker') {
+
+                  if (item.fieldArray) {
+                    form[`${item.fieldArray[0]}`] = item.resFormat ? item.resFormat(form[`${item.field}`][0]) : form[`${item.field}`][0]
+                    form[`${item.fieldArray[1]}`] = item.resFormat ? item.resFormat(form[`${item.field}`][1]) : form[`${item.field}`][1]
+                  } else if (item.otherOptions.type === 'datetime' && item.resFormat) {
+                    form[`${item.field}`] = form[`${item.field}`] ? item.resFormat(form[`${item.field}`]) : ''
+                  }
+
+                
                 }
               }
 

CMS1.0/src/utils/tools.js

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

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

@@ -7,6 +7,10 @@
     />
     <page-content ref="pageContentRef" :contentTableConfig="contentTableConfig" pageName="/patient/patient"
       :isExport="false" @newBtnClick="handleNewData" @editBtnClick="handleEditData">
+      <template #otherHandler>
+        <el-button type="primary" @click="batchLabels(1)">批量添加标签</el-button>
+        <el-button type="danger" @click="batchLabels(0)">批量删除标签</el-button>
+      </template>
       <template #patientId="{ row }">
         <el-button type="primary" link @click="buttonHandle(row.patientId)">{{ row.name }}</el-button>
       </template>
@@ -36,7 +40,7 @@ import { useRouter } from 'vue-router';
 import PageSearch from '@/components/page-search'
 import PageContent from '@/components/page-content'
 import PageModal from '@/components/page-modal'
-import { setLabel } from '@/api/patient/patient';
+import { setLabel, cancelLabel } from '@/api/patient/patient';
 
 import { searchFormConfig } from './config/search.config'
 import { contentTableConfig } from './config/content.config'
@@ -117,11 +121,23 @@ export default defineComponent({
     })
 
 
-    const batchLabels = async () => {
+    const batchLabels = async (type) => {
+
+      const selectRows = pageContentRef.value.getSelectionRows()
+      if (selectRows.length <= 0) {
+        ElMessage({
+          message: '请选择要操作的数据',
+          type: 'warning',
+        })
+
+        return
+      }
 
+      const boxTitle = type ? '批量添加标签' : '批量取消标签'
+      const boxTip = type ? '请输入新的标签' : '请输入粘贴要取消的标签'
 
 
-      ElMessageBox.prompt('请输入新的标签', '批量打标签', {
+      ElMessageBox.prompt(boxTip, boxTitle, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputPattern: /^[\w\u4E00-\u9FA5]{0,10}$/,
@@ -129,13 +145,16 @@ export default defineComponent({
       })
         .then(async ({ value }) => {
           // 获取选择的编号
-          const selectRows = pageContentRef.value.getSelectionRows()
 
           if (selectRows.length > 0) {
             const ids = selectRows.map((o) => o.patientId);
 
-            console.log(ids, 'ids');
-            const result = await setLabel(ids.join(','), value);
+            let result;
+            if (type === 1) {
+              result = await setLabel(ids, value);
+            } else {
+              result = await cancelLabel(ids, value);
+            }
 
             if (result.state === 'success') {
               ElMessage({

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

@@ -1,3 +1,4 @@
+import moment from 'moment';
 export const modalConfig = {
   formItems: [
     {
@@ -7,18 +8,47 @@ export const modalConfig = {
       label: '拉黑原因',
       placeholder: '请输入拉黑原因'
     },
+    // {
+    //   field: 'timeRange',
+    //   type: 'datepicker',
+    //   label: '有效期',
+    //   required: false,
+    //   placeholder: '请选择有效期',
+    //   otherOptions: {
+    //     'range-separator': '至',
+    //     type: 'datetimerange',
+    //     'unlink-panels': true,
+    //     'value-format': 'YYYY-MM-DD HH:mm:ss',
+    //   },
+    //   fieldArray: ['starttime', 'endtime'],
+    //   resFormat: (time) => {
+    //     return moment(time).format('YYYY-MM-DD HH:mm:ss');
+    //   }
+    // },
     {
-      field: 'timeRange',
+      field: 'starttime',
       type: 'datepicker',
-      label: '有效期',
+      label: '开始时间',
       required: false,
       placeholder: '请选择有效期',
       otherOptions: {
-        'range-separator': '至',
-        type: 'datetimerange',
-        'value-format': 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetime',
+        'value-format': 'yyyy-MM-dd HH:mm:ss',
+      },
+      resFormat: (time) => {
+        return moment(time).format('YYYY-MM-DD HH:mm:ss');
+      }
+    },
+    {
+      field: 'endtime',
+      type: 'datepicker',
+      label: '开始时间',
+      required: false,
+      placeholder: '请选择有效期',
+      otherOptions: {
+        type: 'datetime',
+        'value-format': 'yyyy-MM-dd HH:mm:ss',
       },
-      fieldArray: ['starttime', 'endtime'],
       resFormat: (time) => {
         return moment(time).format('YYYY-MM-DD HH:mm:ss');
       }