From 4ddcd26fb4dd320cdfedfda6e78112c3a8f62617 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 28 Sep 2024 12:22:30 +0800
Subject: [PATCH] dj

---
 src/assets/images/doc.png                     | Bin 0 -> 2349 bytes
 .../patientRegister/PatientRegisterEdit.vue   |   3 +
 .../third/ThirdMedicalCenterBookDateList.vue  |   2 +-
 .../third/ThirdMedicalCenterEdit.vue          |   2 +-
 src/components/third/thirdMedicalCenter.vue   |   2 +-
 src/views/fee-settings/ResultSetting.vue      | 114 ++++++++++++++++--
 6 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/images/doc.png

diff --git a/src/assets/images/doc.png b/src/assets/images/doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..23019ba4b0831d68f366425f4bd06efe3ff1e4a4
GIT binary patch
literal 2349
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

literal 0
HcmV?d00001

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 984b8a0..e8bb7a9 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -814,6 +814,9 @@ export default {
         jobType: '', //工种
         poisonIds: [], // 接害因素IDs（主表不保存此项数据）
         isPatientOccupationalDisease: 'Y', // 是否职业病检查（主表不保存此项数据）
+        appointPatientRegisterId:"",
+        thirdBookingId: "",
+
       }, //单位 记录 目前新增与更新是一致
 
 
diff --git a/src/components/third/ThirdMedicalCenterBookDateList.vue b/src/components/third/ThirdMedicalCenterBookDateList.vue
index 43b7eb6..35aafd0 100644
--- a/src/components/third/ThirdMedicalCenterBookDateList.vue
+++ b/src/components/third/ThirdMedicalCenterBookDateList.vue
@@ -27,7 +27,7 @@
     </div>
 
     <!-- 新增或者编辑弹框 -->
-    <el-dialog title="设置可预约日期" :close-on-click-modal="false" :visible.sync="setting" width="240px"
+    <el-dialog title="设置可预约日期" :close-on-click-modal="false" :visible.sync="setting" width="280px"
       @close="close_setting">
       <div>
         <el-table :data="form.bookingDates" border height="480px" size="small" highlight-current-row
diff --git a/src/components/third/ThirdMedicalCenterEdit.vue b/src/components/third/ThirdMedicalCenterEdit.vue
index 12f81d2..c14fc45 100644
--- a/src/components/third/ThirdMedicalCenterEdit.vue
+++ b/src/components/third/ThirdMedicalCenterEdit.vue
@@ -93,7 +93,7 @@ export default {
     // 获取初始数据
     dictInit() {
       //字典表
-      postapi("/api/app/CustomerOrgGroup/GetBasicList").then((res) => {
+      postapi("/api/app/ThirdMedicalCenter/GetCustomerOrgGroupList").then((res) => {
         if (res.code != -1) {
           this.customerOrgGroups = res.data;
         }
diff --git a/src/components/third/thirdMedicalCenter.vue b/src/components/third/thirdMedicalCenter.vue
index 30aba9b..5993084 100644
--- a/src/components/third/thirdMedicalCenter.vue
+++ b/src/components/third/thirdMedicalCenter.vue
@@ -216,7 +216,7 @@ export default {
     //获取初始数据
     dictInit() {
       //字典表
-      postapi("/api/app/CustomerOrgGroup/GetBasicList").then((res) => {
+      postapi("/api/app/ThirdMedicalCenter/GetCustomerOrgGroupList").then((res) => {
         if (res.code != -1) {
           this.customerOrgGroups = res.data;
         }
diff --git a/src/views/fee-settings/ResultSetting.vue b/src/views/fee-settings/ResultSetting.vue
index 9d6bb4b..2fb3616 100644
--- a/src/views/fee-settings/ResultSetting.vue
+++ b/src/views/fee-settings/ResultSetting.vue
@@ -19,7 +19,7 @@
           :style="`width: 208px;overflow: scroll;height:${tableHeight + 28}px;background-color: #fff; border-radius: 8px;`">
           <div style="margin-top: 10px">
             <el-tree :data="pacsTemplateTree" :props="treeprops" @node-click="treeClick" node-key="id" ref="itemType"
-              highlight-current auto-expand-parent>
+              highlight-current auto-expand-parent @node-contextmenu="nodeContextmenu">
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <div>
                   <span class="treeicons">
@@ -27,8 +27,10 @@
                         class="el-icon-document-remove"
                         v-if="data.parentId == null"
                       ></i> -->
-                    <img style="width: 20px; height: 20px; vertical-align: sub" src="@/assets/images/order.png"
-                      v-if="!data.parentId" />
+                    <img v-if="data.isTemplate == 'Y'" style="width: 20px; height: 20px; vertical-align: sub"
+                      src="@/assets/images/doc.png" />
+                    <img v-else style="width: 20px; height: 20px; vertical-align: sub"
+                      src="@/assets/images/order.png" />
                   </span>
                   <span :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{
                     node.label
@@ -187,6 +189,8 @@
       </div>
     </div>
 
+
+
     <!-- 新增或者编辑弹框 -->
     <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="800px" @close="bindidclose"
       :close-on-click-modal="false">
@@ -216,7 +220,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="描述" prop="description">
-              <el-input type="textarea" v-model="form.description" size="small" :autosize="{ minRows: 8, maxRows: 16 }"></el-input>
+              <el-input type="textarea" v-model="form.description" size="small"
+                :autosize="{ minRows: 8, maxRows: 16 }"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -314,6 +319,7 @@
         <el-button type="primary" @click="btnSubmitCon" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
+
   </div>
 </template>
 <script>
@@ -392,7 +398,7 @@ export default {
       },
 
       tableData: [],
-      tableDataCon:[],
+      tableDataCon: [],
       initDescription: [],
 
 
@@ -428,7 +434,7 @@ export default {
     this.getPacsTemplateTree();
 
     // 刷新列表数据
-    this.retrieveTable();
+    // this.retrieveTable();
   },
 
   updated() {
@@ -447,6 +453,96 @@ export default {
   methods: {
     dddw,
 
+    nodeContextmenu(event, data, node, self) {
+      console.log('event', event)
+      console.log('data', data)
+      console.log('node', node)
+      console.log('self', self)
+
+      let items = [{
+        label: "新增顶级词条类别",
+        onClick: () => {
+          editPacsType({})
+        }
+      }] // 菜单项
+
+      // 选中结果模版
+      if (data.isTemplate == 'Y') {
+        items.push({ label: "----------------" })
+        items.push({
+          label: '新增结果模版',
+          onClick: () => {
+            editPacsTemplate({})
+          }
+        })
+        items.push({
+          label: '编辑结果模版',
+          onClick: () => {
+            editPacsTemplate({})
+          }
+        })
+        items.push({
+          label: '删除结果模版',
+          onClick: () => {
+            delPacsTemplate({})
+          }
+        })
+      } else {
+        // 选中类别
+        items.push({
+          label: '新增同级词条类别',
+          onClick: () => {
+            editPacsType({})
+          }
+        })
+        items.push({
+          label: '新增子级词条类别',
+          onClick: () => {
+            editPacsType({})
+          }
+        })
+        items.push({
+          label: '编辑词条类别',
+          onClick: () => {
+            editPacsType({})
+          }
+        })
+        items.push({
+          label: '删除词条类别',
+          onClick: () => {
+            delPacsType({})
+          }
+        })
+      }
+
+      this.$contextmenu({
+        items,
+        event,
+        //x: event.clientX,
+        //y: event.clientY,
+        customClass: "custom-class",
+        zIndex: 3,
+        minWidth: 80,
+      });
+
+    },
+
+    editPacsType(data) {
+
+    },
+
+    delPacsType(data) {
+
+    },
+    editPacsTemplate(data) {
+
+    },
+
+    delPacsTemplate(data) {
+
+    },
+
+
     //获取pacs结果模板
     getPacsTemplateTree() {
       let resultType = [], resultTemplate = [], treeData = []
@@ -516,7 +612,7 @@ export default {
         }
       );
 
-      
+
 
       this.curRow = this.$options.data().curRow;
       this.leftdata = this.$options.data().leftdata;
@@ -623,7 +719,7 @@ export default {
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },
-     
+
 
     //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013 /api/app/item-type/by-code-all
     retrieveTable() {
@@ -644,7 +740,7 @@ export default {
       });
 
     },
-    
+
     changeTemplate(v) {
       if (v) {
         this.form.bigtextResultTemplateId = v[v.length - 1]