From c01d29032b963b621f5fc74b3bf630a56ff80dc4 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 18 Jan 2024 16:28:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:13708=20=E6=9C=89?=
 =?UTF-8?q?=E9=97=B2=E7=A9=BA=E9=97=B4=E6=A0=87=E7=82=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=E5=90=8E=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/confinedspace.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/map/dialog/confinedspace.vue b/src/views/map/dialog/confinedspace.vue
index b293563..96d2fa8 100644
--- a/src/views/map/dialog/confinedspace.vue
+++ b/src/views/map/dialog/confinedspace.vue
@@ -261,8 +261,8 @@ export default {
         this.measuresList = data.measuresList // 参数map
         this.gasList = data.gasList // 参数map
         this.gas = data.gas || {} // 参数map
-        this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
-        this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
+        this.info.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+        this.info.APPROVE_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
       }).catch((e) => {
         console.log(e)
       })

From 00f4b5ff34701b2c128315aceabc7a486c32a909 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 18 Jan 2024 17:43:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E7=8A=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promise_book_issued/components/add.vue             | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/security_commitment/promise_book_issued/components/add.vue b/src/views/security_commitment/promise_book_issued/components/add.vue
index 97d9dd7..a9e0c71 100644
--- a/src/views/security_commitment/promise_book_issued/components/add.vue
+++ b/src/views/security_commitment/promise_book_issued/components/add.vue
@@ -141,7 +141,10 @@
               }"
             >
               <div style="display:flex;justify-content: space-between;align-items: flex-start;">
-                <el-select v-model="item.USER_ID" multiple style="width: calc(100% - 60px);">
+                <el-select v-if="form.TYPE!='1'" v-model="item.USER_ID" multiple style="width: calc(100% - 60px);">
+                  <el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+                </el-select>
+                <el-select v-if="form.TYPE=='1'" v-model="item.USER_ID" style="width: calc(100% - 60px);">
                   <el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
                 </el-select>
                 <el-button v-if="index !== 0" type="danger" @click="removePeople(index)">删除</el-button>
@@ -193,7 +196,10 @@
               }"
             >
               <div style="display:flex;justify-content: space-between;align-items: flex-start;">
-                <el-select v-model="item.USER_ID" :multiple-limit="1" multiple style="width: 100%;">
+                <el-select v-if="form.TYPE!='1'" v-model="item.USER_ID" :multiple-limit="1" multiple style="width: 100%;">
+                  <el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+                </el-select>
+                <el-select v-if="form.TYPE=='1'" v-model="item.USER_ID" style="width: 100%;">
                   <el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
                 </el-select>
                 <!--                <el-button v-if="index !== 0" type="danger" @click="removeCoverPeople(index)">删除</el-button>-->

From 852d67810c3e158e8aeb85331cde35033279fe0d Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 18 Jan 2024 18:08:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E7=8A=B6=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promise_book_issued/components/list.vue                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/security_commitment/promise_book_issued/components/list.vue b/src/views/security_commitment/promise_book_issued/components/list.vue
index 72630ce..11cc357 100644
--- a/src/views/security_commitment/promise_book_issued/components/list.vue
+++ b/src/views/security_commitment/promise_book_issued/components/list.vue
@@ -86,7 +86,8 @@
       <el-table-column prop="POSTNAME" label="涉及岗位" />
       <el-table-column label="承诺人数/涉及人数">
         <template slot-scope="{row}">
-          {{ row.ISSIGN }}/{{ row.PEOPLENUM_INVOLVED }}
+          <span v-if="row.TYPE!='1'">{{ row.ISSIGN }}/{{ row.PEOPLENUM_INVOLVED }}</span>
+          <span v-if="row.TYPE=='1'">{{ row.ISSIGN }}/2</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" width="80">