From c6d325113d6ddc2d7b317bc3d20d3f073246f092 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 16 May 2023 21:09:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/event/cpts/add.vue     | 96 ++++++++++---------
 .../shequzhili/event/cpts/categoryArray.vue   | 62 ++++++++++++
 .../event/cpts/process-form-replay.vue        |  4 +-
 .../shequzhili/event/cpts/process-form.vue    |  4 +-
 .../modules/shequzhili/event/eventList.vue    |  4 +-
 5 files changed, 120 insertions(+), 50 deletions(-)
 create mode 100644 src/views/modules/shequzhili/event/cpts/categoryArray.vue

diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 6062946..0663570 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -82,7 +82,21 @@
 							v-model="formData.idCard"
 						></el-input>
 					</el-form-item>
-
+					<el-form-item
+						label="事件分类"
+						label-width="150px"
+						:class="{ 'form-item': source === 'visiual' }"
+						prop="categoryList">
+						<div :class="{ 'visiual-form': source === 'visiual'}">
+						<categoryArray
+							v-model="formData.categoryList"
+							:casOptions="casOptions"
+							:props="optionProps"
+							:optionProps="optionProps"
+							@handleChangeCate="handleChangeCate"
+						></categoryArray>
+						</div>
+					</el-form-item>
 					<el-form-item
 						label="反应渠道"
 						label-width="150px"
@@ -298,6 +312,7 @@ import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
 import daiMap from "@/utils/dai-map";
 import { isCard } from "@/utils/validate";
+import categoryArray from "./categoryArray.vue"
 
 let loading; // 加载动画
 var map;
@@ -317,13 +332,10 @@ function iniFmData() {
 		happenTime: "", //发生时间
 		eventContent: "", //	事件内容
 		imageList: [], //	图片集合
-		// categoryList: [],//	二类分类Id
+		categoryList: [],//	事件分类
 		address: "", //事件地址
 		latitude: "", //	经度
 		longitude: "", //维度
-		// operationType: '',//	处理方式
-		// content: '',//回复内容
-		// status: '',//	处理中：processing；已办结：closed_case
 	};
 }
 
@@ -335,45 +347,21 @@ export default {
 			searchValue: "",
 			resultList: [],
 			loading: false,
-
 			btnDisable: false,
 			gridList: [], //所属网格list--场所区域
-
-			qudaoArray: [
-				// {
-				//   value: "1",
-				//   label: "多媒体反应",
-				// },
-				// {
-				//   value: "2",
-				//   label: "社区电话",
-				// },
-				// {
-				//   value: "3",
-				//   label: "12345",
-				// },
-				// {
-				//   value: "4",
-				//   label: "网络员手持终端",
-				// },
-			],
-
+			qudaoArray: [],
 			formData: iniFmData(),
-
 			//地图相关
 			keyWords: "",
 			isFirst: true, //地图是否首次加载，首次加载不给地址赋值
-
 			//图片相关  oss/file/uploadvariedfile
 			dialogImageUrl: "oss/file/uploadvariedfile",
 			uploadUlr:
-				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+			window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
 			//  upload_url: '', // 上传URL
 			upload_name: "", // 图片或视频名称
 			replayImgList: [],
-
 			okflag: false,
-
 			formDataSearch: {
 				gridId: "",
 				name: "",
@@ -383,11 +371,19 @@ export default {
 			selPersonIndex: "",
 			selPerson: {},
 			demandUserList: [],
-
+			casOptions:[],
+			optionProps: {
+				multiple: false,
+				value: "id",
+				label: "name",
+				children: "subCategory",
+			},
 			hideUploadBtn: false,
 		};
 	},
-	components: {},
+	components: {
+		categoryArray
+	},
 	computed: {
 		dataRule() {
 			let checkIdCard = (rule, value, callback) => {
@@ -423,10 +419,13 @@ export default {
 						trigger: "blur",
 					},
 				],
-				// idCard: [
-				//   { required: true, message: "身份证号不能为空", trigger: "blur" },
-				//   { required: true, validator: checkIdCard, trigger: "blur" },
-				// ],
+				categoryList:[
+					{
+						required: true,
+						message: "事件分类不能为空",
+						trigger: "blur",
+					},
+				],
 				sourceType: [
 					{
 						required: true,
@@ -465,7 +464,12 @@ export default {
 			};
 		},
 	},
-	props: {},
+	props: {
+		source: {//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
 	watch: {
 		"formData.name": function (val) {
 			this.$emit("changeName", val);
@@ -503,6 +507,16 @@ export default {
 	},
 
 	methods: {
+		handleChangeCate(obj) {
+			this.selCateObj = obj
+			this.formData.categoryList = [];
+			let flag = JSON.stringify(obj) == '{}'
+			if(flag) 
+				this.formData.categoryList = []
+			else  
+				this.formData.categoryList.push(this.selCateObj);
+
+		},
 		async handleShowPersonList() {
 			if (this.formData.gridId) {
 				await this.handleChangeGrid();
@@ -565,19 +579,13 @@ export default {
 		},
 		async getCategoryList() {
 			const url = "/gov/issue/issueprojectcategorydict/list";
-
 			let params = {};
-
 			const { data, code, msg } = await requestPost(url, params);
-
 			if (code === 0) {
 				let treeDataNew = this.filterTree(data);
-				// this.categrayList = data
-				//组织级联数据
 				++this.iscascaderShow;
 				this.casOptions = [];
 				this.selCategoryArray = [];
-
 				this.casOptions = treeDataNew;
 			} else {
 				this.$message.error(msg);
diff --git a/src/views/modules/shequzhili/event/cpts/categoryArray.vue b/src/views/modules/shequzhili/event/cpts/categoryArray.vue
new file mode 100644
index 0000000..aca9042
--- /dev/null
+++ b/src/views/modules/shequzhili/event/cpts/categoryArray.vue
@@ -0,0 +1,62 @@
+<template>
+    <div>
+          <el-form :model="form" >
+              <el-form-item>
+                  <el-cascader class="cell-width-2"
+                         ref="myCascader"
+                         v-model="form.selCategoryArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         clearable
+                         @change="handleChangeCate"></el-cascader>
+              </el-form-item>
+          </el-form>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    data() {
+      return {
+          form:{
+              selCategoryArray:{}
+          },
+          selCateObj:{},
+          iscascaderShow:0
+      };
+    },
+    props:{
+      casOptions:{
+          type:Array,
+          default:()=>[]
+      },
+      optionProps:{
+          type:Object,
+          default:()=>{}
+      }
+    },
+    created() {},
+    methods: {
+      handleChangeCate(){
+          if(this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]){
+              this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+          }else{
+              this.selCateObj = {}
+          }
+         
+          this.$emit('handleChangeCate',this.selCateObj)
+      }
+    },
+    mounted(){
+      ++this.iscascaderShow;
+    },
+    components: {},
+    computed: {},
+    watch: {},
+  };
+  </script>
+  <style lang="scss" scoped>
+  
+  </style>>
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 0eeceaa..560c075 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -5,7 +5,7 @@
              :inline="false"
              :model="formData"
              :rules="dataRule">
-      <el-form-item label="事件分类"
+      <!-- <el-form-item label="事件分类"
                     label-width="150px"
                     :class="{'form-item':source==='visiual'}"
                     prop="categoryList">
@@ -19,7 +19,7 @@
                        :show-all-levels="false"
                        @change="handleChangeCate"></el-cascader>
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="回复内容"
                     prop="content"
                     label-width="150px"
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index 5ef9b38..52fc71f 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -17,9 +17,9 @@
             <el-radio v-if="!eventId"
                       label="">暂不处理</el-radio>
             <el-radio label="0">回复</el-radio>
-            <el-radio label="1">立项</el-radio>
+            <!-- <el-radio label="1">立项</el-radio>
             <el-radio label="2">转服务</el-radio>
-            <el-radio label="3">转议题</el-radio>
+            <el-radio label="3">转议题</el-radio> -->
 
           </el-radio-group>
         </el-form-item>
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index deb4447..539f37f 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -181,7 +181,7 @@
 						size="small"
 						>导出</el-button
 					>
-
+<!-- 
 					<el-button
 						@click="handleMarkDiffcult"
 						class="diy-button--export"
@@ -194,7 +194,7 @@
 						class="diy-button--delete"
 						size="small"
 						>取消标记痛点难点</el-button
-					>
+					> -->
 				</div>
 
 				<el-table

From c2e9f42794abb687c1c15ad0cf4f336b6cbb2bc4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 16 May 2023 21:49:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=87=A0=E4=B8=AAinput?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/cpts/process-form-replay.vue        | 88 +++++++++++++++++--
 1 file changed, 83 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 560c075..24bcf94 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -20,7 +20,66 @@
                        @change="handleChangeCate"></el-cascader>
         </div>
       </el-form-item> -->
-      <el-form-item label="回复内容"
+      <!-- 已阅收 处理中 已办结 已结案-->
+      
+      <el-form-item label="办理状态"
+                    prop="manageStatus"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+              <el-select v-model="formData.manageStatus" placeholder="请选择办理状态">
+                <el-option
+                  v-for="item in statusOption"
+                  :label="item.label"
+                  :value="item.value"
+                  clearable
+                  :key="item.value">
+                </el-option>
+              </el-select>
+        </div>
+
+      </el-form-item>
+      <el-form-item
+						label="办理时间"
+						prop="manageTime"
+						label-width="150px"
+						style="display: block"
+					>
+						<el-date-picker
+							v-model="formData.manageTime"
+							class="cell-width-1"
+							type="datetime"
+							placeholder="办理时间"
+							value-format="yyyy-MM-dd HH:mm:ss"
+						>
+						</el-date-picker>
+					</el-form-item>
+          <el-form-item label="办理人"
+                    prop="manageResi"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input class="cell-width-area"
+                    placeholder="请输入办理人"
+                    v-model="formData.manageResi"></el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="办理人电话"
+                    prop="manageResiTel"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input class="cell-width-area"
+                    placeholder="请输入办理人"
+                    v-model="formData.manageResiTel"></el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="办理意见"
                     prop="content"
                     label-width="150px"
                     :class="{'form-item':source==='visiual'}"
@@ -66,14 +125,22 @@ export default {
       formData: {
         operationType: '0',//处理方式[0:已回复 1:已转项目  2:已转需求]	
         content: '',
-        status: ''
+        manageStatus: '',
+        manageTime:'',
+        manageResi:'',
+        manageResiTel:''
       },
 
       status: false,
       okflag: false,
 
       eventDetailCopy: {},
-
+      statusOption:[
+        {label:'已阅收',value:0},
+        {label:'处理中',value:1},
+        {label:'已办结',value:2},
+        {label:'已结案',value:3}
+      ],
       casOptions: [],
       iscascaderShow: 0,
       selCategoryArray: [],
@@ -93,9 +160,20 @@ export default {
 
       return {
         content: [
-          { required: true, message: "回复内容不能为空", trigger: "blur" },
+          { required: true, message: "办理意见不能为空", trigger: "blur" },
+        ],
+        manageStatus: [
+          { required: true, message: "办理状态能为空", trigger: "blur" },
+        ],
+        manageTime: [
+          { required: true, message: "办理时间不能为空", trigger: "blur" },
+        ],
+        manageResi: [
+          { required: true, message: "办理人不能为空", trigger: "blur" },
+        ],
+        manageResiTel: [
+          { required: true, message: "办理人电话不能为空", trigger: "blur" },
         ],
-
       };
     },
 

From acc446a09a3878aa66a70cc86d2add12b6b9f914 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 17 May 2023 09:22:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/event/cpts/process-form-replay.vue  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 24bcf94..ccc4b6d 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -20,7 +20,7 @@
                        @change="handleChangeCate"></el-cascader>
         </div>
       </el-form-item> -->
-      <!-- 已阅收 处理中 已办结 已结案-->
+      <!-- 0、上报 1、阅收 3、完结 4、审核 5、事件评价 6、结案归档-->
       
       <el-form-item label="办理状态"
                     prop="manageStatus"
@@ -107,7 +107,6 @@
 
   </div>
 </template>
-
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
@@ -134,12 +133,15 @@ export default {
       status: false,
       okflag: false,
 
+      // <!-- 0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档-->
       eventDetailCopy: {},
       statusOption:[
-        {label:'已阅收',value:0},
-        {label:'处理中',value:1},
-        {label:'已办结',value:2},
-        {label:'已结案',value:3}
+        {label:'上报',value:0},
+        {label:'阅收',value:1},
+        {label:'完结',value:2},
+        {label:'审核',value:3},
+        {label:'事件评价',value:4},
+        {label:'结案归档',value:5}
       ],
       casOptions: [],
       iscascaderShow: 0,