From 7f1e58df48d1ca3f04b5f77c90ba17eb1078aeb4 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:38:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=BF=9B=E5=B1=95=E7=9A=84=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/eventOld/cpts/event-info.vue        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index ca929bc52..334a07add 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -113,34 +113,34 @@
                                         </div>
                                         <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
+                                            <template v-if="i.attachmentType === 'image'">
                                                 <div class="detail">
                                                     <div class="detail-field">图片：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <img :src="i.url" :key="i.url"
+                                                        <img :src="i.attachmentUrl" :key="i.attachmentUrl"
                                                             style="width: 50px; height: 50px; padding-right: 10px"
-                                                            @click="watchImg(i.url)" />
+                                                            @click="watchImg(i.attachmentUrl)" />
                                                     </div>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'voice'">
+                                            <template v-if="i.attachmentType === 'voice'">
                                                 <div class="detail">
                                                     <div class="detail-field">语音：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <audio controls>
-                                                            <source :src="i.url" type="" :key="i.url" />
+                                                            <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
                                                         </audio>
                                                     </div>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'doc'">
+                                            <template v-if="i.attachmentType === 'doc'">
                                                 <div class="detail">
                                                     <div class="detail-field">附件：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <a :href="i.url">{{ i.name }}</a>
+                                                        <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
                                                     </div>
                                                 </div>
                                             </template>

From 1fd81362b937a585b751db51c5b2543846ef626c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 15 Aug 2024 16:21:07 +0800
Subject: [PATCH 2/7] 1

---
 src/views/components/resiSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 73076d3d3..55e53e191 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -1075,7 +1075,6 @@ export default {
         val,
         "agencyId"
       );
-      console.log(this.sarr,'seee');
       this.form.level = this.sarr[this.sarr.length - 1].level;
       this.form.agencyId = this.sarr[this.sarr.length - 1].agencyId;
       this.optionsV = [];

From 3280a76b7dbd0f22395452204eef8ad781db3023 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:27:21 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=82=B9=E5=87=BB=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 334a07add..4bf102872 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -677,6 +677,10 @@ export default {
                 "yyyy-MM-dd hh:mm"
             );
         },
+
+        watchImg (src) {
+            window.open(src);
+        },
     },
 };
 </script>

From d8120ad19c17234611033cab43ef1e08a6e147c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 16 Aug 2024 17:46:18 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=20'=20=20'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/columns/constants/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index 568381f21..e5b32b7f5 100644
--- a/src/js/columns/constants/index.js
+++ b/src/js/columns/constants/index.js
@@ -165,21 +165,21 @@ export const satisfactionType = [
 export const noSatisfactionType = [
   {
     label: '未回复',
-    value: 0
+    value: '0'
   }, {
     label: '服务态度差',
-    value: 1
+    value: '1'
   },
   {
     label: '推诿扯皮',
-    value: 2
+    value: '2'
   },
   {
     label: '处理不及时',
-    value: 3
+    value: '3'
   },
   {
     label: '其他',
-    value: 4
+    value: '4'
   }
 ]
\ No newline at end of file

From 78b2b73990c7eee4a7f94401641854de500ddea7 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:22:47 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=BF=9B=E5=B1=95=E7=9A=84=E5=9B=BE=E7=89=87=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/eventOld/cpts/event-info.vue   | 183 +++++++++---------
 1 file changed, 93 insertions(+), 90 deletions(-)

diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 4bf102872..20416778b 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -111,40 +111,41 @@
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
-                                        <template v-if="item.internalFile && item.internalFile.length > 0"
-                                            v-for="i in item.internalFile">
-                                            <template v-if="i.attachmentType === 'image'">
-                                                <div class="detail">
-                                                    <div class="detail-field">图片：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <img :src="i.attachmentUrl" :key="i.attachmentUrl"
-                                                            style="width: 50px; height: 50px; padding-right: 10px"
-                                                            @click="watchImg(i.attachmentUrl)" />
-                                                    </div>
-                                                </div>
-                                            </template>
-                                            <template v-if="i.attachmentType === 'voice'">
-                                                <div class="detail">
-                                                    <div class="detail-field">语音：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <audio controls>
-                                                            <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
-                                                        </audio>
-                                                    </div>
-                                                </div>
-                                            </template>
-                                            <template v-if="i.attachmentType === 'doc'">
-                                                <div class="detail">
-                                                    <div class="detail-field">附件：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
-                                                    </div>
-                                                </div>
+                                        <div class="detail">
+                                            <div class="detail-field">附件/图片：</div>
+                                            <template v-if="item.internalFile && item.internalFile.length > 0"
+                                                v-for="i in item.internalFile">
+                                                <template v-if="i.attachmentType === 'image'">
+        
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <img :src="i.attachmentUrl" :key="i.attachmentUrl"
+                                                                style="width: 50px; height: 50px; padding-right: 10px"
+                                                                @click="watchImg(i.attachmentUrl)" />
+                                                        </div>
+                                                    
+                                                </template>
+                                                <template v-if="i.attachmentType === 'voice'">
+                                                    
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <audio controls>
+                                                                <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
+                                                            </audio>
+                                                        </div>
+                                                    
+                                                </template>
+                                                <template v-if="i.attachmentType === 'doc'">
+                                                    
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
+                                                        </div>
+                                                    
+                                                </template>
                                             </template>
-                                        </template>
+                                        </div>
+                                        
                                     </template>
                                     <template v-else>
                                         <div class="detail">
@@ -159,33 +160,34 @@
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
-                                        <template v-if="item.internalFile && item.internalFile.length > 0"
+                                        <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                            <span class="u-info-title-2">附件/图片：</span>
+                                            <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
-                                                <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                    <span class="u-info-title-2">图片：</span>
-                                                    <img :src="i.url" :key="i.url"
-                                                        style="width: 150px; height: 150px; padding-right: 10px"
-                                                        @click="watchImg(i.url)" />
-                                                </div>
-                                            </template>
-                                            <template v-if="i.type === 'voice'">
-                                                <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                    <span class="u-info-title-2">语音：</span>
-                                                    <audio controls>
-                                                        <source :src="i.url" type="" :key="i.url" />
-                                                    </audio>
-                                                </div>
-                                            </template>
-                                            <template v-if="i.type === 'doc'">
-                                                <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                    <span class="u-info-title-2">语音：</span>
-                                                    <audio controls>
-                                                        <source :src="i.url" type="" :key="i.url" />
-                                                    </audio>
-                                                </div>
+                                                <template v-if="i.type === 'image'">
+                                                    
+                                                        <img :src="i.url" :key="i.url"
+                                                            style="width: 150px; height: 150px; padding-right: 10px"
+                                                            @click="watchImg(i.url)" />
+                                                    
+                                                </template>
+                                                <template v-if="i.type === 'voice'">
+                                                    
+                                                        <audio controls>
+                                                            <source :src="i.url" type="" :key="i.url" />
+                                                        </audio>
+                                                    
+                                                </template>
+                                                <template v-if="i.type === 'doc'">
+                                                    
+                                                        <audio controls>
+                                                            <source :src="i.url" type="" :key="i.url" />
+                                                        </audio>
+                                                    
+                                                </template>
                                             </template>
-                                        </template>
+                                        </div>
+                                        
                                     </template>
                                 </div>
                                 <div v-else-if="item.type === 'demand'">
@@ -206,40 +208,41 @@
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
-                                        <template v-if="item.internalFile && item.internalFile.length > 0"
+                                        <div class="detail">
+                                            <div class="detail-field">附件/图片：</div>
+                                            <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
-                                                <div class="detail">
-                                                    <div class="detail-field">图片：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <img :src="i.url" :key="i.url"
-                                                            style="width: 50px; height: 50px; padding-right: 10px"
-                                                            @click="watchImg(i.url)" />
-                                                    </div>
-                                                </div>
+                                                <template v-if="i.type === 'image'">
+                                                    
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <img :src="i.url" :key="i.url"
+                                                                style="width: 50px; height: 50px; padding-right: 10px"
+                                                                @click="watchImg(i.url)" />
+                                                        </div>
+                                                    
+                                                </template>
+                                                <template v-if="i.type === 'voice'">
+                                                    
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <audio controls>
+                                                                <source :src="i.url" type="" :key="i.url" />
+                                                            </audio>
+                                                        </div>
+                                                    
+                                                </template>
+                                                <template v-if="i.type === 'doc'">
+                                                    
+                                                        <div
+                                                            :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                            <a :href="i.url">{{ i.name }}</a>
+                                                        </div>
+                                                    
+                                                </template>
                                             </template>
-                                            <template v-if="i.type === 'voice'">
-                                                <div class="detail">
-                                                    <div class="detail-field">语音：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <audio controls>
-                                                            <source :src="i.url" type="" :key="i.url" />
-                                                        </audio>
-                                                    </div>
-                                                </div>
-                                            </template>
-                                            <template v-if="i.type === 'doc'">
-                                                <div class="detail">
-                                                    <div class="detail-field">附件：</div>
-                                                    <div
-                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <a :href="i.url">{{ i.name }}</a>
-                                                    </div>
-                                                </div>
-                                            </template>
-                                        </template>
+                                        </div>
+                                        
                                     </template>
                                     <div v-if="item.processName === '需求完成'">
                                         <div class="detail">

From 65419d49388a55a55c2f5605664169d57a98f915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 19 Aug 2024 13:24:14 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/timeOut/index.vue      | 71 +++++++++++--------
 1 file changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/shequzhili/timeOut/index.vue b/src/views/modules/shequzhili/timeOut/index.vue
index 2f3117d63..280a91ced 100644
--- a/src/views/modules/shequzhili/timeOut/index.vue
+++ b/src/views/modules/shequzhili/timeOut/index.vue
@@ -104,7 +104,7 @@
                     <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
-          </el-table-column> -->
+</el-table-column> -->
                     <el-table-column prop="eventContent" label="事件描述" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column prop="contactTime" label="联系来电人时限" align="center" :show-overflow-tooltip="true">
@@ -162,7 +162,7 @@
                 </div>
             </div>
         </div>
-        <div v-if="pageType == 'dispose' || pageType == 'info' || pageType == 'assign' || pageType=='check'">
+        <div v-if="pageType == 'dispose' || pageType == 'info' || pageType == 'assign' || pageType == 'check'">
             <event-info ref="eleEditForm" :pageType="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
                 @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
         </div>
@@ -173,7 +173,7 @@
                 :eventDetailData="eventDetailData"></Urging>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="sendTimeLimitMSM">确 定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -223,7 +223,7 @@ export default {
 
             agencyId: "",
             ProcessingList: [
-            {
+                {
                     value: "1",
                     label: "未联系当事人",
                 },
@@ -234,7 +234,7 @@ export default {
                 {
                     value: "3",
                     label: "办理中",
-                }, 
+                },
                 {
                     value: "4",
                     label: "已办结待审核",
@@ -248,7 +248,7 @@ export default {
             level: '',
             optionsG: [],
             sarr: [],
-            dialogVisible:false,
+            dialogVisible: false,
 
             tableData: [
             ],
@@ -276,7 +276,7 @@ export default {
             formData: {
                 agencyId: "",
                 sourceType: "",
-                departId:'',
+                departId: '',
                 eventContent: "",
                 name: "",
                 mobile: "",
@@ -288,9 +288,9 @@ export default {
                 firstIdList: [],
                 secondIdList: [],
                 workOrderNum: "",
-                limitStatus:"",
-                operationType:"",
-                action:0
+                limitStatus: "",
+                operationType: "",
+                action: 0
             },
             cateOptions: [],
             eventTypeCheck: [],
@@ -310,10 +310,10 @@ export default {
             selVoiceUrl: "",
             multipleSelection: [],
             importLoading: false,
-          importType: "1"
+            importType: "1"
         };
     },
-    components:{Urging,eventInfo},
+    components: { Urging, eventInfo },
     computed: {
         maxTableHeight() {
             const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
@@ -419,7 +419,7 @@ export default {
             this.$router.push({ name: 'jumin-huaxiang' });
             this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
                 if (item.name === "jumin-huaxiang") {
-                return {...item, title: name };
+                    return { ...item, title: name };
                 }
                 return item;
             });
@@ -461,7 +461,7 @@ export default {
         async handleAdd() {
             this.pageType = "add";
         },
-        async getDetail(row){
+        async getDetail(row) {
             this.eventId = row.icEventId;
             const url = "/governance/icEvent/detail";
             const { data, code, msg } = await requestPost(url, {
@@ -474,13 +474,13 @@ export default {
             }
         },
         async handleWatch(row) {
-           await this.getDetail(row)
-           this.pageType = "info";
+            await this.getDetail(row)
+            this.pageType = "info";
         },
 
-          async handleDispose(row) {
-           await this.getDetail(row)
-           this.dialogVisible=true;
+        async handleDispose(row) {
+            await this.getDetail(row)
+            this.dialogVisible = true;
         },
         //下载模版
         async handleExportModule() {
@@ -557,7 +557,7 @@ export default {
             formData.append('code', ''); //添加文件对象
             let url = '/governance/icEvent/importEvent'
             if (this.importType == 2) {
-              url = '/governance/icEvent/importAwo'
+                url = '/governance/icEvent/importAwo'
             }
             console.log(url)
             await this.$http
@@ -647,11 +647,11 @@ export default {
             if (this.eventTypeCheck) {
                 this.formData.secondIdList = this.eventTypeCheck
             }
-           
+
             const { pageSize, pageNo, formData } = this;
             // 创建新的 formData 对象，保留原始值
             let newFormData = { ...formData };
-            if(!this.formData.limitStatus){
+            if (!this.formData.limitStatus) {
                 newFormData.limitStatus = '3'
             }
             // 处理 agencyId
@@ -732,8 +732,6 @@ export default {
                     return this.$message.error('网络错误')
                 })
         },
-
-
         getLastItem(list, vals, key) {
             let LIST = list || [];
             for (let item of LIST) {
@@ -760,7 +758,7 @@ export default {
                 endTime: "",
                 limitStartTime: "",
                 limitEndTime: "",
-                operationType:'',
+                operationType: '',
                 status: "",
                 firstIdList: [],
                 secondIdList: [],
@@ -784,9 +782,9 @@ export default {
                 });
             }
         },
-      showAwoList(row) {
-          this.$refs.awoList.open(row)
-      },
+        showAwoList(row) {
+            this.$refs.awoList.open(row)
+        },
         handleChangeAgency(val) {
             this.sarr = []
             const map = new Map();
@@ -798,6 +796,23 @@ export default {
             this.level = this.sarr[this.sarr.length - 1].level
             this.formData.departId = this.sarr[this.sarr.length - 1].agencyId
         },
+        async sendTimeLimitMSM() {
+            const params = {
+                eventId: this.eventDetailData.icEventId,
+                agencyName: this.eventDetailData.agencyName,
+                deptId: this.eventDetailData.deptId,
+                timeLimit: !this.eventDetailData.limitStatus.startsWith("部") ?
+                    this.eventDetailData.contactTime : this.eventDetailData.limitTime,
+                workOrderNum: this.eventDetailData.workOrderNum
+            }
+            this.dialogVisible = false
+            const { data, code, msg } = await requestPost('/governance/icEvent/sendTimeLimitSMS', params);
+            if (code === 0) {
+                this.$message.success("发送成功！");
+            } else {
+                this.$message.error("操作失败！");
+            }
+        }
     },
 };
 </script>

From fc456a54df705db26f7d13b3c52586307d5ace21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 19 Aug 2024 14:49:34 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=B9=8B=20=E7=89=B9=E6=9C=8D=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 55e53e191..533c56934 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -397,6 +397,16 @@ export default {
         },{
           label:'特扶人员',
           value:'SPECIAL_SUPPORT_FLAG',
+          children:[
+           {
+              label: "子女伤残",
+              value: "CHILDREN_DISABILITY_FLAG",
+           },
+           {
+              label: "子女死亡",
+              value: "CHILDREN_DEATH",
+           },
+          ],
         },{
           label: "留守儿童",
           value: "LBC_FLAG",
@@ -899,6 +909,7 @@ export default {
     },
     categoryAll: {
       handler(val, val2) {
+        console.log(val,val2,"dslkkldjsf");
           this.handleCategoryChange(val, val2)
       },
       deep: true
@@ -952,6 +963,7 @@ export default {
   },
   methods: {
     handleCategoryChange(newVal, oldVal) {
+      console.log(newVal, oldVal,"slkdfjlfj");
       let formCopy = JSON.parse(JSON.stringify(this.form));
 
       // 找出被取消选中的值
@@ -978,7 +990,7 @@ export default {
       newVal.forEach(val => {
         if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') {
           formCopy.partyFlag = val === 'partyFlag0' ? 0 : val === 'partyFlag1' ? 1 : 2;
-        } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG' ,'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) {
+        } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'CHILDREN_DISABILITY_FLAG','CHILDREN_DEATH','LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG' ,'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) {
           if (!formCopy.attentionCrowds.includes(val)) {
             formCopy.attentionCrowds.push(val);
           }