From 846120aae907fa0326f26cae55fd37ef93cd1a88 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Fri, 10 May 2024 15:53:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E6=9C=8D=E5=8A=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuzhaoren/index.vue    | 20 ++++++++--------
 .../gangweizhaoren/addForm.vue                |  8 +++----
 .../modules/communityService/gxxq/addForm.vue | 24 +++++++++----------
 .../jinengzhaoren/addForm.vue                 |  8 +++----
 .../communityService/measure/index.vue        |  6 +++--
 .../wennuanzhaoren/addForm.vue                |  8 +++----
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index ce395260c..1f3bfad14 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -125,14 +125,14 @@
                        @click="resetSearch">重置</el-button>
           </el-col>
         </el-row>
-           
+
         </el-form>
       </div>
 
       <div class="m-table">
         <div class="div_btn">
           <div class="div_btn_left">
-            <el-button 
+            <el-button
                      size="small"
                      @click="handleAdd"
                      type="primary"
@@ -164,7 +164,7 @@
                     fixed="left"
                     align="center"
                     width="50"/>
-                    
+
           <el-table-column label="序号"
                            fixed="left"
                            type="index"
@@ -196,7 +196,7 @@
                            :show-overflow-tooltip="true"
                            label="服务时间">
             <template slot-scope="scope">
-              
+
               <span>{{scope.row.serviceTimeStart}}至{{scope.row.serviceTimeEnd}}</span>
             </template>
           </el-table-column>
@@ -213,7 +213,7 @@
                            label="服务状态"
                            :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
+              <span>{{scope.row.serviceStatus==='in_service'?'进行中':(scope.row.serviceStatus==='completed' ? '已完成' : '已取消')}}</span>
             </template>
           </el-table-column>
 
@@ -238,7 +238,7 @@
                          type="text"
                          size="small"
                         >查看</el-button>
-              <el-button 
+              <el-button
                          @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
@@ -254,10 +254,10 @@
                          type="text"
                          size="small"
                          >人员名单</el-button> -->
-                         
+
             <!-- 暂时不限制删除按钮，任何状态都允许删除，产品要求的 -->
             <!-- v-if="scope.row.serviceStatus==='in_service'" -->
-              <el-button 
+              <el-button
                          @click="handleDel(scope.row)"
                          type="text"
                          size="small"
@@ -268,7 +268,7 @@
         </el-table>
 
         <div>
-          
+
           <el-pagination @size-change="handleSizeChange"
                          @current-change="handleCurrentChange"
                          :current-page.sync="pageNo"
@@ -350,7 +350,7 @@ import personList from "./personList";
 // 其他组件其他页面有调用
 export default {
   components: { addForm, detailForm, feedBackForm,  personList },
-  
+
 
   data () {
     let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue
index c527d1710..294f5ed62 100644
--- a/src/views/modules/communityService/gangweizhaoren/addForm.vue
+++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue
@@ -160,7 +160,7 @@
         </el-dialog>
     </div>
 </template>
-  
+
 <script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
@@ -242,7 +242,7 @@ export default {
                 checkStrictly: true,
                 emitPath: false,
             },
-            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }],
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }],
             keyWords: "",
             formData: {
                 categoryCode: [],
@@ -874,7 +874,7 @@ export default {
     },
 };
 </script>
-  
+
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
@@ -893,4 +893,4 @@ export default {
     }
 }
 </style>
-  
+
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index 31ead9c47..99c1fdca6 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -82,7 +82,7 @@
           </el-switch>
         </el-form-item>
       </el-form>
-        
+
       <el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1" class="div_form">
         <el-form-item
           v-if="formData.assignFlag"
@@ -117,8 +117,8 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
-              :value="item.label"
+              :label="item.label"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -161,7 +161,7 @@
           label-width="150px"
           prop="serviceTimeEnd"
         >
-            
+
         <!-- :picker-options="startPickerOptions" -->
           <el-date-picker
             v-model.trim="newFormData.serviceTimeStart"
@@ -221,7 +221,7 @@
     </el-dialog>
   </div>
 </template>
-  
+
     <script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
@@ -425,7 +425,7 @@ export default {
         } else {
           this.formData.categoryCode = [data.parentCategoryCode];
         }
-       
+
         if (data.assignInfo) {
           this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart;
           this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
@@ -467,7 +467,7 @@ export default {
       }
     },
     // 服务类型下拉框选中事件
-  
+
     // 如果服务组织有选择第一个的话让它更新
     handleChangeServiceTypeLevel2() {
       if (this.newFormData.serverOrgType) {
@@ -555,7 +555,7 @@ export default {
                     const filterOptions = (filterCodes) => {
                       this.serviceOptions = res.data.filter(item => filterCodes.includes(item.value));
                     };
-                    
+
                     if (code && this.codeFilters[code]) {
                       filterOptions(this.codeFilters[code]);
                     }
@@ -563,7 +563,7 @@ export default {
                 }else{
                   this.serviceOptions = res.data;
                 }
-               
+
               }
             })
             .catch(() => {
@@ -650,7 +650,7 @@ export default {
         this.$message.error(rspMsg);
       }
     },
-   
+
     //子级为空数组的赋值为null解决有空白页的问题
     handleData(data) {
       for (let i = 0; i < data.length; i++) {
@@ -832,7 +832,7 @@ export default {
   computed:{}
 };
 </script>
-  
+
     <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
@@ -861,4 +861,4 @@ export default {
   padding-right: 12px;
 }
 </style>
-  
+
diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue
index 1ef962eb5..81258d632 100644
--- a/src/views/modules/communityService/jinengzhaoren/addForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue
@@ -160,7 +160,7 @@
         </el-dialog>
     </div>
 </template>
-  
+
 <script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
@@ -241,7 +241,7 @@ export default {
                 checkStrictly: true,
                 emitPath: false,
             },
-            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }],
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }],
             keyWords: "",
             formData: {
                 categoryCode: [],
@@ -871,7 +871,7 @@ export default {
     },
 };
 </script>
-  
+
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
@@ -890,4 +890,4 @@ export default {
     }
 }
 </style>
-  
+
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index f7b99f1e7..033a1a517 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -292,7 +292,7 @@
       </el-pagination>
     </div>
     </div>
-  
+
 
     <el-dialog
       title="需求信息"
@@ -698,7 +698,7 @@ export default {
       boxHeight:true,
 
       serviceOptions: [
-       
+
       ],
       serviceOptiondList: [],
       options: [
@@ -1125,6 +1125,8 @@ export default {
       const _form = {
         ...this.form,
       };
+      // 需求上去掉了图片，但是我又不会改代码，先赋值为[]
+      _form.attachments = [];
       await this.$http
         .post("/governance/userdemand/add", _form)
         .then(({ data: res }) => {
diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
index b28b5775f..620beca34 100644
--- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
@@ -160,7 +160,7 @@
         </el-dialog>
     </div>
 </template>
-  
+
 <script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
@@ -242,7 +242,7 @@ export default {
                 checkStrictly: true,
                 emitPath: false,
             },
-            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }], 
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }],
             keyWords: "",
             formData: {
                 categoryCode: [],
@@ -873,7 +873,7 @@ export default {
     },
 };
 </script>
-  
+
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
@@ -892,4 +892,4 @@ export default {
     }
 }
 </style>
-  
+

From 3f6d9064ac45cbd563bb0c156a92bd01389b5f40 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Wed, 29 May 2024 15:56:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82:?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=88=97=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/gxxq/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 69b3f7c5c..b30a26122 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -146,7 +146,7 @@
         />
 
         <el-table-column
-          label="指派服务"
+          label="需求状态"
           prop="assignFlag"
           fixed="left"
           align="center"

From 1673c33cdc974f49824f4b9c79994c1625696b2e Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Mon, 1 Jul 2024 14:54:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E9=97=A8=E7=89=8C?=
 =?UTF-8?q?=E5=8F=B7=E9=99=90=E5=88=B6=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=B1=89=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomForm.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 521111e1e..b29994f24 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -432,6 +432,11 @@ export default {
 
     },
 
+    // 门牌号输入内容过滤
+    // onDoorNameInput(content) {
+    //   this.dataForm.doorName = content.replaceAll(/[\u4e00-\u9fa5]/g, '');
+    // },
+
     resetData () {
       this.houseId = '' //房屋ID
       this.houseType = '1'
@@ -478,7 +483,8 @@ export default {
           { required: true, message: '所属单元不能为空', trigger: 'blur' },
         ],
         doorName: [
-          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+          { required: true, message: '门牌号不能为空', trigger: 'blur' },
+          { pattern: /^[0-9]*$/, message: '门牌号只能输入数字', trigger: 'blur' }
         ],
         coding: [
           { required: true, message: '房屋编码不能为空', trigger: 'blur' }