From fedeb5554de157b5e9f5fb7e80c6b5164508299d Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 22 Feb 2023 11:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/commonDemand/addForm.vue | 194 +++++++++---------
 .../communityService/commonDemand/index.vue   |  50 ++---
 2 files changed, 128 insertions(+), 116 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 85f7ecdfe..2ef6e9b37 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -74,7 +74,7 @@
           </el-form-item>
 
           <el-form-item
-            label="服务名称"
+            label="服务事项"
             prop="serviceName"
             label-width="150px"
             :class="{ 'form-item': source === 'visiual' }"
@@ -82,71 +82,82 @@
           >
             <el-input
               class="item_width_1"
-              placeholder="请输入服务名称"
+              placeholder="请输入服务事项"
               v-model="formData.serviceName"
             >
             </el-input>
           </el-form-item>
 
           <el-form-item
-            label="服务组织"
-            prop="serviceOrgId"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
+              label="服务内容"
+              prop="remark"
+              label-width="150px"
+              :class="{ 'form-item': source === 'visiual' }"
+              style="display: block"
           >
-            <el-select
-              v-model="formData.serviceOrgType"
-              class="input-width-small"
-              placeholder="请选择"
-              clearable
-              @change="handleServiceChange('add', $event)"
-            >
-              <el-option
-                v-for="item in serviceOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            -
-            <el-select
-              v-model="formData.serviceOrgId"
-              class="input-width-middle"
-              filterable
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in serviceOptiondList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
+            <el-input
+                class="item_width_1"
+                type="textarea"
+                maxlength="1000"
+                show-word-limit
+                :rows="3"
+                placeholder="请输入备注，不超过1000字"
+                v-model="formData.remark"
+            ></el-input>
           </el-form-item>
 
           <el-form-item
-            label="服务范围"
-            prop="objList"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
+              label="服务范围"
+              prop="objList"
+              label-width="150px"
+              :class="{ 'form-item': source === 'visiual' }"
+              style="display: block"
           >
             <el-cascader
-              class="item_width_1"
-              ref="myCascader"
-              v-model="scopeIdArray"
-              :key="iscascaderShow"
-              :options="casOptions"
-              :props="optionProps"
-              :show-all-levels="false"
-              @change="handleChangeScope"
+                class="item_width_1"
+                ref="myCascader"
+                v-model="scopeIdArray"
+                :key="iscascaderShow"
+                :options="casOptions"
+                :props="optionProps"
+                :show-all-levels="false"
+                @change="handleChangeScope"
             ></el-cascader>
           </el-form-item>
 
+
+          <el-form-item
+              label="服务时间"
+              label-width="150px"
+              :class="{ 'form-item': source === 'visiual' }"
+              prop="serviceTimeStart"
+          >
+            <el-date-picker
+                v-model="formData.serviceTimeStart"
+                :picker-options="startPickerOptions"
+                class="item_width_2"
+                style="width: 220px"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd"
+                placeholder="开始时间"
+            >
+            </el-date-picker>
+            <span class="data-tag">至</span>
+            <el-date-picker
+                v-model="formData.serviceTimeEnd"
+                :picker-options="endPickerOptions"
+                class="item_width_2 data-tag"
+                style="width: 220px"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd"
+                placeholder="结束时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+
           <el-form-item
             label="政策依据"
             prop="policyId"
@@ -207,54 +218,49 @@
             </el-input>
           </el-form-item>
 
+
+
           <el-form-item
-            label="服务时间"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="serviceTimeStart"
+              label="服务方"
+              prop="serviceOrgId"
+              label-width="150px"
+              :class="{ 'form-item': source === 'visiual' }"
+              style="display: block"
           >
-            <el-date-picker
-              v-model="formData.serviceTimeStart"
-              :picker-options="startPickerOptions"
-              class="item_width_2"
-              style="width: 220px"
-              type="date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              value="yyyy-MM-dd"
-              placeholder="开始时间"
+            <el-select
+                v-model="formData.serviceOrgType"
+                class="input-width-small"
+                placeholder="请选择"
+                clearable
+                @change="handleServiceChange('add', $event)"
             >
-            </el-date-picker>
-            <span class="data-tag">至</span>
-            <el-date-picker
-              v-model="formData.serviceTimeEnd"
-              :picker-options="endPickerOptions"
-              class="item_width_2 data-tag"
-              style="width: 220px"
-              type="date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              value="yyyy-MM-dd"
-              placeholder="结束时间"
+              <el-option
+                  v-for="item in serviceOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            -
+            <el-select
+                v-model="formData.serviceOrgId"
+                class="input-width-middle"
+                filterable
+                placeholder="请选择"
+                clearable
             >
-            </el-date-picker>
+              <el-option
+                  v-for="item in serviceOptiondList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
 
-          <el-form-item
-            label="备注"
-            prop="remark"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入备注，不超过1000字"
-              v-model="formData.remark"
-            ></el-input>
-          </el-form-item>
+
           <el-form-item
             label="直接反馈"
             prop="remark"
@@ -1189,6 +1195,8 @@
 
       resetData() {
         this.formData = {
+          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
           objList: [], //
           principalName: "", //经办人(责任人)姓名
           principalContact: "", //经办人联系方式
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 33a2c9475..d8f8f764f 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -43,8 +43,31 @@
                 </div>
               </el-form-item>
 
+              <el-form-item label="服务时间"
+                            prop="serviceTimeStart">
+                <el-date-picker v-model="formData.serviceTimeStart"
+                                :picker-options="startPickerOptions"
+                                class="item_width_2"
+                                size="small"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                value="yyyy-MM-dd"
+                                placeholder="开始时间">
+                </el-date-picker>
+                <span class="data-tag">至</span>
+                <el-date-picker v-model="formData.serviceTimeEnd"
+                                :picker-options="endPickerOptions"
+                                class="item_width_2 data-tag"
+                                size="small"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                value="yyyy-MM-dd"
+                                placeholder="结束时间">
+                </el-date-picker>
+              </el-form-item>
+
 
-              <el-form-item label="服务名称"
+              <el-form-item label="服务事项"
                             prop="serviceName">
                 <el-input v-model="formData.serviceName"
                           class="item_width_1"
@@ -81,28 +104,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="服务时间"
-                            prop="serviceTimeStart">
-                <el-date-picker v-model="formData.serviceTimeStart"
-                                :picker-options="startPickerOptions"
-                                class="item_width_2"
-                                size="small"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                value="yyyy-MM-dd"
-                                placeholder="开始时间">
-                </el-date-picker>
-                <span class="data-tag">至</span>
-                <el-date-picker v-model="formData.serviceTimeEnd"
-                                :picker-options="endPickerOptions"
-                                class="item_width_2 data-tag"
-                                size="small"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                value="yyyy-MM-dd"
-                                placeholder="结束时间">
-                </el-date-picker>
-              </el-form-item>
+
 
               <el-form-item label="服务状态"
                             prop="serviceStatus">
@@ -759,6 +761,8 @@
 
       resetSearch () {
         this.formData = {
+          serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+          serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
           serviceName: '',//项目名称
           serviceOrgType: '',//服务组织类型
           serviceOrgId: '',//服务组织Id