From cbb8d3e539a842958da8bba537b0f169218b2cca Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 8 May 2024 16:09:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?15491=20=E6=9F=A5=E7=9C=8B=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/textLibraryInfo.vue                         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
index 1c4beb9..e87b3b9 100644
--- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
+++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
@@ -95,7 +95,12 @@ export default {
         this.loading = false
         this.form = data.data
         this.form.FILE = []
-        this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '7158f688d0f34054a28a9275139298df')
+        // CATEGORY_LIST为空的时候，下方的判断会报错，所以当CATEGORY_LIST为空时，keyOne为true
+        if (this.form.CATEGORY_LIST.length > 0) {
+          this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '7158f688d0f34054a28a9275139298df')
+        } else {
+          this.remoteControl.keyOne = true
+        }
       }).catch((e) => {
         this.$message.error(e)
         this.loading = false

From 8e990f8b60a8666989ced71386903cbbc5207ae7 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 08:36:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?15164=20=E5=A2=9E=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20=E8=A6=81=E4=B8=8D=E5=A4=AA=E5=A4=9A=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checklist/components/edit.vue             | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue
index 49bda77..7ac546c 100644
--- a/src/views/firefighting/checklist/components/edit.vue
+++ b/src/views/firefighting/checklist/components/edit.vue
@@ -235,6 +235,19 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="负责部门" label-width="80px">
+                <SelectTree
+                  ref="deptTree_Select"
+                  :clearable="false"
+                  :key="waitFor.DEPARTMENT_ID"
+                  :options="treeDataDepart"
+                  :props="defaultProps"
+                  v-model="waitFor.DEPARTMENT_ID"
+                  placeholder="请选择部门"
+                  style="width: 100%;"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="4" label-width="80px">
               <el-form-item>
                 <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="getDevice">
@@ -404,8 +417,10 @@ export default {
         POSTNAME: '',
         USERNAME: '',
         varList: [],
-        idListFcS: []
+        idListFcS: [],
+        DEPARTMENT_ID: ''
       },
+      treeDataDepart: [],
       pointList: [],
       pointCode: '',
       // ------------end
@@ -531,7 +546,8 @@ export default {
           FIRE_DEVICE_TYPE_ID: this.waitFor.FIRE_DEVICE_TYPE_ID,
           FIRE_POINT_ID: this.waitFor.FIRE_POINT_ID,
           FIRE_DEVICE_CODE: this.waitFor.FIRE_DEVICE_CODE,
-          FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID
+          FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID,
+          DEPARTMENT_ID: this.waitFor.DEPARTMENT_ID
         }
       ).then((data) => {
         this.listLoading = false
@@ -587,6 +603,7 @@ export default {
           this.treeData.forEach((item) => {
             item.isDisabled = true
           })
+          this.treeDataDepart = JSON.parse(data.zTreeNodes)
           resolve()
         }).catch((e) => {
         })
@@ -828,6 +845,7 @@ export default {
       this.waitFor.FIRE_DEVICE_ID = ''
       this.waitFor.FIRE_DEVICE_CODE = ''
       this.waitFor.FIRE_POINT_NAME = ''
+      this.waitFor.DEPARTMENT_ID = ''
       this.pointList = []
       this.getList()
       this.getDevice()