解决合并冲突

openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue

@@ -28,7 +28,6 @@
           label-width="68px"
         >
           <el-row :gutter="24">
-            <!-- <el-col :span="5"> -->
             <el-form-item label="项目名" prop="searchKey" label-width="55">
               <el-input
                 v-model="queryParams.searchKey"
@@ -38,8 +37,7 @@
                 @keyup.enter="handleQuery"
               />
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
+
             <el-form-item label="状态" prop="statusEnum" label-width="80">
               <el-select v-model="queryParams.statusEnum" clearable>
                 <el-option
@@ -50,8 +48,6 @@
                 />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
             <el-form-item label="医保是否对码" prop="ybMatchFlag" label-width="120">
               <el-select v-model="queryParams.ybMatchFlag" placeholder="" clearable>
                 <el-option
@@ -62,24 +58,7 @@
                 />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="4">
-              <el-form-item label="执行科室" prop="ruleId" label-width="100">
-                <el-select
-                  v-model="queryParams.ruleId"
-                  placeholder=""
-                  clearable
-                >
-                  <el-option
-                    v-for="item in exeOrganizations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :span="4"> -->
+
             <el-form-item label="类型" prop="typeEnum" label-width="100">
               <el-select v-model="queryParams.typeEnum" placeholder="" clearable>
                 <el-option
@@ -116,9 +95,9 @@
             >
           </el-col>
 
-            <el-col :span="1.5">
-              <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
-            </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
+          </el-col>
 
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Search" @click="getList">查询</el-button>
@@ -148,7 +127,7 @@
             key="busNo"
             prop="busNo"
             :show-overflow-tooltip="true"
-            width="150"
+            width="200"
           />
           <el-table-column
             label="项目名称"
@@ -156,22 +135,9 @@
             key="name"
             prop="name"
             :show-overflow-tooltip="true"
-            width="150"
-          />
-          <el-table-column
-            label="拼音"
-            align="center"
-            key="pyStr"
-            prop="pyStr"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="五笔码"
-            align="center"
-            key="wbStr"
-            prop="wbStr"
-            :show-overflow-tooltip="true"
+            width="200"
           />
+
           <el-table-column
             label="目录类别"
             align="center"
@@ -180,94 +146,6 @@
             :show-overflow-tooltip="true"
             width="100"
           />
-          <el-table-column
-            label="业务类型"
-            align="center"
-            key="typeEnum_enumText"
-            prop="typeEnum_enumText"
-            :show-overflow-tooltip="true"
-            width="90"
-          />
-          <el-table-column
-            label="使用单位"
-            align="center"
-            key="permittedUnitCode_dictText"
-            prop="permittedUnitCode_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保标记"
-            align="center"
-            key="ybFlag_enumText"
-            prop="ybFlag_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保编码"
-            align="center"
-            key="ybNo"
-            prop="ybNo"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保对码标记"
-            align="center"
-            key="ybMatchFlag_enumText"
-            prop="ybMatchFlag_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="statusEnum_enumText"
-            prop="statusEnum_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="归属科室"
-            align="center"
-            key="orgId_dictText"
-            prop="orgId_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="所在位置"
-            align="center"
-            key="locationId_dictText"
-            prop="locationId_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="身体部位"
-            align="center"
-            key="bodySiteCode_dictText"
-            prop="bodySiteCode_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="所需标本"
-            align="center"
-            key="specimenCode_dictText"
-            prop="specimenCode_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="财务类别"
-            align="center"
-            key="itemTypeCode_dictText"
-            prop="itemTypeCode_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="医保类别"
-            align="center"
-            key="ybType_dictText"
-            prop="ybType_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
           <el-table-column
             label="售价"
             align="center"
@@ -277,20 +155,34 @@
             width="100"
           />
           <el-table-column
-            label="说明"
+            label="财务类别"
             align="center"
-            key="descriptionText"
-            prop="descriptionText"
+            key="itemTypeCode_dictText"
+            prop="itemTypeCode_dictText"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <el-table-column
+            label="使用单位"
+            align="center"
+            key="permittedUnitCode_dictText"
+            prop="permittedUnitCode_dictText"
             :show-overflow-tooltip="true"
           />
-          <!-- <el-table-column
-            label="执行科室"
+          <el-table-column
+            label="医保编码"
             align="center"
-            key="ruleId"
-            prop="ruleId"
+            key="ybNo"
+            prop="ybNo"
             :show-overflow-tooltip="true"
-            width="90"
-          /> -->
+          />
+          <el-table-column
+            label="状态"
+            align="center"
+            key="statusEnum_enumText"
+            prop="statusEnum_enumText"
+            :show-overflow-tooltip="true"
+          />
           <el-table-column
             label="操作"
             align="center"
@@ -345,16 +237,30 @@
 
     <!-- 诊疗目录导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+      <el-upload
+        ref="uploadRef"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <el-icon class="el-icon--upload"><upload-filled /></el-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
           <div class="el-upload__tip text-center">
             <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-              @click="importTemplate">下载模板</el-link>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate"
+              >下载模板</el-link
+            >
           </div>
         </template>
       </el-upload>
@@ -369,13 +275,14 @@
 </template>
   
 <script setup name="DiagnosisTreatment">
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth';
 import {
   getDiagnosisTreatmentList,
   stopDiseaseTreatment,
   startDiseaseTreatment,
   getDiseaseTreatmentInit,
   getDiagnosisTreatmentOne,
+  validateActivityEdit,
 } from './components/diagnosistreatment';
 import diagnosisTreatmentDialog from './components/diagnosisTreatmentDialog';
 import DiagTreYbDialog from './components/diagTreYbDialog';
@@ -407,18 +314,17 @@ const upload = reactive({
   // 是否显示弹出层
   open: false,
   // 弹出层标题
-  title: "",
+  title: '',
   // 是否禁用上传
   isUploading: false,
   // 是否更新已经存在的数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: { Authorization: 'Bearer ' + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/diagnosis-treatment/import-data"
+  url: import.meta.env.VITE_APP_BASE_API + '/data-dictionary/diagnosis-treatment/import-data',
 });
 
-
 const data = reactive({
   form: {},
   queryParams: {
@@ -445,7 +351,6 @@ const filterNode = (value, data) => {
 /** 诊断目录分类查询下拉树结构 */
 function getDiseaseTreatmentList() {
   getDiseaseTreatmentInit().then((response) => {
-    console.log(response, 'response诊疗目录分类查询下拉树结构');
     diagnosisCategoryOptions.value = response.data.diagnosisCategoryOptions.sort((a, b) => {
       return parseInt(a.value) - parseInt(b.value);
     });
@@ -458,18 +363,15 @@ function getDiseaseTreatmentList() {
 }
 /** 查询诊断目录列表 */
 function getList() {
-  console.log(queryParams.value, 'queryParams***********************');
   loading.value = true;
   getDiagnosisTreatmentList(queryParams.value).then((res) => {
     loading.value = false;
     diagnosisTreatmentList.value = res.data.records;
-    console.log(diagnosisTreatmentList, 'res.data');
     total.value = res.data.total;
   });
 }
 /** 节点单击事件 */
 function handleNodeClick(data) {
-  console.log(data, '节点单击事件');
   queryParams.value.categoryCode = data.value;
   currentCategoryEnum.value = data.value;
   handleQuery();
@@ -477,7 +379,6 @@ function handleNodeClick(data) {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNo = 1;
-  console.log(queryParams, 'queryParams搜索');
   getList();
 }
 
@@ -528,7 +429,11 @@ function handleImport() {
 }
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/data-dictionary/diagnosis-treatment/import-template', {}, `diagnosis_treatment_template_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    '/data-dictionary/diagnosis-treatment/import-template',
+    {},
+    `diagnosis_treatment_template_${new Date().getTime()}.xlsx`
+  );
 }
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
@@ -541,8 +446,8 @@ const handleFileSuccess = (response, file, fileList) => {
   proxy.$refs['uploadRef'].handleRemove(file);
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-    response.msg +
-    '</div>',
+      response.msg +
+      '</div>',
     '导入结果',
     { dangerouslyUseHTMLString: true }
   );
@@ -555,7 +460,6 @@ function submitFileForm() {
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, 'selection');
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
@@ -564,22 +468,28 @@ function handleSelectionChange(selection) {
 
 /** 打开新增弹窗 */
 function openAddDiagnosisTreatment() {
-  // if (currentCategoryEnum.value) {
-  console.log('打开新增弹窗');
   title.value = '新增';
   nextTick(() => {
     proxy.$refs.diagnosisTreatmentRef.show();
   });
-  // } else {
-  //   proxy.$modal.msgError("请先选择目录分类！");
-  // }
 }
+const isEditInfoDisable = ref(0);
 /** 打开编辑弹窗 */
 function openEditDiagnosisTreatment(row) {
+  validateActivityEdit(row.id).then((res) => {
+    // res.data == 1  医生开过该诊疗项目，不可编辑
+    isEditInfoDisable.value = res.data;
+    getDiagnosisTreatmentInfo(row);
+  });
+}
+// 根据诊疗id 查询诊疗信息
+function getDiagnosisTreatmentInfo(row) {
   getDiagnosisTreatmentOne(row.id).then((response) => {
-    console.log(response, 'response88888');
-
-    currentData.value = response.data;
+    currentData.value = {
+      ...response.data,
+      // 禁用编辑
+      isEditInfoDisable: isEditInfoDisable.value,
+    };
     currentData.value.ybFlag == 1
       ? (currentData.value.ybFlag = true)
       : (currentData.value.ybFlag = false);