From 2201a66b45ad562972db28c54fc80adea036a2fc Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Wed, 31 Jul 2024 19:12:58 +0800
Subject: [PATCH] 专项性行动-首页联动

---
 src/views/Login.vue                            |  15 ++++++++++-----
 src/views/baseComapnyInfo/Form.vue             |  13 +++++++++++++
 src/views/baseSpecialAction/Form.vue           |  21 +++++++++++++++------
 src/views/baseSpecialhandle/index.vue          |   1 -
 src/views/baseSystemInfo/HandleInspectForm.vue | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSystemInfo/index.vue             |  11 +++++++++--
 src/views/overView/Overview.vue                |  90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 vue.config.js                                  |  12 ++++++------
 8 files changed, 261 insertions(+), 56 deletions(-)
 create mode 100644 src/views/baseSystemInfo/HandleInspectForm.vue

diff --git a/src/views/Login.vue b/src/views/Login.vue
index a8f2769..83e9359 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -33,9 +33,10 @@
               <!-- 忘记密码？ -->
             </div>
           </div>
-          <div class="login-button" @click="toHome">
+          <el-button class="login-button" @click="toHome" :loading="loading">登录</el-button>
+          <!-- <div class="login-button" @click="toHome">
             {{ loading ? "登录中。。。" : "登录" }}
-          </div>
+          </div> -->
         </el-form>
       </div>
     </div>
@@ -83,9 +84,11 @@ export default {
           this.$store
             .dispatch("Login", this.form)
             .then(() => {
+              console.log(222);
               this.$router.push({ path: "/homePage" });
             })
             .catch(() => {
+              this.loading = false;
               this.$store.commit("SET_LOGIN_LOADING", false);
             });
         }
@@ -173,12 +176,14 @@ export default {
         .login-button {
           width: 100%;
           height: 46px;
-          line-height: 46px;
-          text-align: center;
+          // line-height: 46px;
+          // text-align: center;
           background-image: url("@/assets/images/login-btn.png");
           background-size: 100%;
           background-repeat: no-repeat;
-          cursor: pointer;
+          border-radius: 25px;
+          border: unset;
+          // cursor: pointer;
           color: #5ed0fa;
           font-size: 18px;
         }
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index d2d87f4..5b928b4 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -44,6 +44,13 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
+         		  <el-form-item label="所属区县" prop="areaId">
+         		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
+         		      <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
+         		    </el-radio-group>
+         		  </el-form-item>
+         		</el-col>
+				<el-col :span="24">
 					<el-form-item label="其他信息" prop="otherInfo">
 						<NCC-Quill v-model="dataForm.otherInfo" placeholder="请输入内容...">
 						</NCC-Quill>
@@ -61,14 +68,18 @@
 import request from '@/utils/request'
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
+import infoMixin from "@/mixins/info";
+
 export default {
 	components: {},
 	props: [],
+	mixins: [infoMixin],
 	data() {
 		return {
 			loading: false,
 			visible: false,
 			isDetail: false,
+			areaOptions: [],
 			dataForm: {
 				id: '',
 				id: undefined,
@@ -79,6 +90,7 @@ export default {
 				contactInformation: undefined,
 				qualificationCertificate: [],
 				otherInfo: undefined,
+				areaId: undefined,
 			},
 			rules: {
 				companyName: [
@@ -101,6 +113,7 @@ export default {
 	computed: {},
 	watch: {},
 	created() {
+		this.initAreaTypeList();
 	},
 	mounted() {
 	},
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index f3bce50..303ea65 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -113,9 +113,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"
-        >确 定</el-button
-      >
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :loading="btnLoading">确 定</el-button>
     </span>
     <el-dialog class="zxDialog" title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen @close="handleClose" :modal="false">
       <iframe 
@@ -156,7 +154,7 @@ export default {
         lastModifyUserId: undefined,
         lastModifyTime: undefined,
         deadline: undefined,
-        relationId: undefined
+        relationId: undefined,
       },
       rules: {
         specialActionType: [
@@ -179,6 +177,13 @@ export default {
             message: "请输入截止日期",
             trigger: "change",
           }
+        ],
+        relationId: [
+          {
+            required: true,
+            message: "请选择关联表单",
+            trigger: "change",
+          }
         ]
       },
       areaOptions: [],
@@ -187,6 +192,7 @@ export default {
       viewportHeight: 0,
       nestedPageUrl:"http://8.130.38.56:8043/old/#/onlineDev/webDesign/indexNew",
       dialogVisible: false,
+      btnLoading: false
     };
   },
   computed: {},
@@ -277,6 +283,7 @@ export default {
     dataFormSubmit() {
       this.$refs["elForm"].validate((valid) => {
         if (valid) {
+          this.btnLoading = true;
           if (!this.dataForm.id) {
             let {title, content} = this.dataForm;
             // 新增
@@ -290,10 +297,11 @@ export default {
                 type: "success",
                 duration: 1000,
                 onClose: () => {
+                  this.btnLoading = false;
                   (this.visible = false), this.$emit("refresh", true);
                 },
               });
-            });
+            }).catch(() => this.btnLoading = false);
           } else {
             // 发布任务
             request({
@@ -306,11 +314,12 @@ export default {
                 type: "success",
                 duration: 1000,
                 onClose: () => {
+                  this.btnLoading = false;
                   this.visible = false;
                   this.$emit("refresh", true);
                 },
               });
-            });
+            }).catch(() => this.btnLoading = false);
           }
         }
       });
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index d948ff2..7574def 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -149,7 +149,6 @@ export default {
         params:null
       }).then(res => {
         formData = res.data.formData;
-        console.log(res, formData, modelId, Itemid, isPreview, useFormPermission);
         this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
       });
     
diff --git a/src/views/baseSystemInfo/HandleInspectForm.vue b/src/views/baseSystemInfo/HandleInspectForm.vue
new file mode 100644
index 0000000..9607ea5
--- /dev/null
+++ b/src/views/baseSystemInfo/HandleInspectForm.vue
@@ -0,0 +1,154 @@
+<template>
+    <!-- 归属地变更申请结果处理 -->
+    <el-dialog
+      title="归属地变更申请结果处理"
+      :close-on-click-modal="false"
+      :visible.sync="visible"
+      class="NCC-dialog NCC-dialog_center"
+      lock-scroll
+      width="70%"
+    >
+        <el-form
+          :model="dataForm"
+          :rules="rules"
+          ref="elForm"
+          size="small"
+          label-width="100px"
+          v-loading="loading"
+        >
+          <!-- <el-form-item label="市属" prop="city">
+            <el-input
+              v-model="dataForm.city"
+              placeholder="请输入市属"
+              maxlength="20"
+            ></el-input>
+          </el-form-item> -->
+          <el-form-item label="转入归属地" prop="toChangeIntoId">
+            <el-radio-group
+              v-model="dataForm.toChangeIntoId"
+              placeholder="请选择所属区县"
+              style="line-height: 22px"
+            >
+              <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="内容描述" prop="applnycontent">
+            <el-input
+              type="textarea"
+              v-model="dataForm.applnycontent"
+              placeholder="请输入内容描述"
+              maxlength="300"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="处理意见" prop="processingresults">
+            <el-radio-group v-model="dataForm.processingresults">
+              <el-radio label="同意">同意</el-radio>
+              <el-radio label="不同意">不同意</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="处理意见" prop="opinion">
+            <el-input
+              type="textarea"
+              v-model="dataForm.opinion"
+              placeholder="请输入处理意见"
+              maxlength="300"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="visible = false">取 消</el-button>
+          <el-button type="primary" @click="dataFormSubmit" :loading="btnLoading">确 定</el-button>
+        </span>
+    </el-dialog>
+  </template>
+  <script>
+  import request from "@/utils/request";
+  export default {
+    components: {},
+    props: [],
+    data() {
+      return {
+        loading: false,
+        visible: false,
+        isDetail: false,
+        dataForm: {
+          id: "",
+          applnycontent: '',
+          toChangeIntoId: '',
+          processingresults: '',
+          opinion: '',
+        },
+        rules: {
+            areaId: [
+                { required: true, message: '请选择转入归属地', trigger: 'change' },
+            ],
+            processingresults: [
+                { required: true, message: '请选择处理意见', trigger: 'change' },
+            ],
+        },
+        areaOptions: [],
+        btnLoading: false,
+      };
+    },
+    computed: {},
+    watch: {},
+    created() {
+        this.initAreaTypeList();
+    },
+    mounted() {},
+    methods: {
+      async initAreaTypeList() {
+        let list = this.$store.state.meta.area;
+            !list && (list = await this.$store.dispatch('getTypeListByCode', 'area'));
+            this.areaOptions = list;
+      },
+     
+      goBack() {
+        this.$emit("refresh");
+      },
+      init(id, isDetail) {
+        this.dataForm.id = id || '';
+        this.visible = true;
+        this.isDetail = isDetail || false;
+        this.$nextTick(async () => {
+          this.$refs["elForm"].resetFields();
+          if(!this.dataForm.id) return
+          this.loading = true;
+          request({
+              url: `/Extend/BaseChangeTerritory/${this.dataForm.id}`,
+              method: "GET",
+          }).then((res) => {
+              this.dataForm.toChangeIntoId = res.data.toChangeIntoId;
+              this.dataForm.id = res.data.id;
+              this.dataForm.applnycontent = res.data.applnycontent;
+              this.loading = false;
+          })
+        });
+      },
+      dataFormSubmit() {
+        this.$refs["elForm"].validate(async (valid) => {
+          if (valid) {
+            this.btnLoading = true;
+            request({
+              url: `/Extend/BaseChangeTerritory/DisposeOf`,
+              method: "POST",
+              data: this.dataForm,
+            }).then((res) => {
+                this.btnLoading = false;
+                this.visible = false;
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                });
+                this.$emit("refresh", true);
+            }).catch(() => {
+                this.btnLoading = false;
+            });
+          
+          }
+        });
+      },
+    },
+  };
+  </script>
+  
\ No newline at end of file
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index f5155ed..88f5af6 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -208,7 +208,7 @@
 
           <span slot="footer" class="dialog-footer">
             <el-button @click="areaChangeVisible = false">取 消</el-button>
-            <el-button type="primary" @click="areaSubmit">确 定</el-button>
+            <el-button type="primary" @click="areaSubmit" :loading="btnLoading">确 定</el-button>
           </span>
         </el-dialog>
         <InspectionForm
@@ -274,7 +274,8 @@ export default {
 
       // 上报
       InspectionFormVisible: false,
-      ChangeRecordVisible: false
+      ChangeRecordVisible: false,
+      btnLoading: false,
     };
   },
   created() {
@@ -375,12 +376,18 @@ export default {
     },
     areaSubmit() {
       if (this.activeAreaId == this.areaForm.areaId) return;
+      this.btnLoading = true;
       applnyChageArea({
         id: this.activeSystemId,
         toChangeIntoId: this.areaForm.areaId,
         applnycontent: this.areaForm.applnycontent,
       }).then((res) => {
+        this.btnLoading = false;
         this.areaChangeVisible = false;
+        this.$message({
+          message: res.msg,
+          type: 'success'
+        });
         this.initList();
       });
     },
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 6711e7e..305819f 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -15,40 +15,15 @@
           <div class="item-body">
             <template>
               <el-table :data="taskList" style="width: 100%" stripe v-loading="taskLoading">
-                <el-table-column type="index" width="50"> </el-table-column>
-                <el-table-column
-                  prop="teskName"
-                  label="任务名称"
-                  show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="teskCode"
-                  label="任务编号"
-                  show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="teskStatus"
-                  label="状态"
-                  show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="teskUser"
-                  label="分配者"
-                  show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="teskTime"
-                  label="任务期限"
-                  show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column label="操作">
-                  <template>
-                    <el-button type="primary" size="small">处理</el-button>
+                <el-table-column type="index" width="40"> </el-table-column>
+                <el-table-column prop="taskTitle" label="任务名称" show-overflow-tooltip/>
+                <el-table-column prop="taskType" label="任务类型" show-overflow-tooltip width="100"/>
+                <el-table-column prop="taskState" label="状态" show-overflow-tooltip width="80"/>
+                <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip />
+                <el-table-column prop="deadLine" label="任务期限" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="130"/>
+                <el-table-column label="操作" width="100">
+                  <template slot-scope="scope">
+                    <el-button type="primary" size="small" @click="handleTask(scope.row)">处理</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -145,15 +120,20 @@
       </el-col>
     </el-row>
     <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refreshDataList="msgRefresh"/>
+    <HandleInspectForm v-if="HandleInspectFormVisible" ref="HandleInspectForm" @refresh="(val) => {taskRefresh('HandleInspectFormVisible', val)}"/>
+    <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="(val) => {taskRefresh('formVisible', val)}" />
   </div>
 </template>
 
 <script>
 import request from "@/utils/request";
 import MsgForm from "./msgForm.vue"
+import HandleInspectForm from "@/views/baseSystemInfo/HandleInspectForm.vue"
+import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form'
+
 export default {
   name: "Overview",
-  components: { MsgForm },
+  components: { MsgForm, HandleInspectForm, NCCForm },
   data() {
     return {
       todoTableData: [],
@@ -182,7 +162,8 @@ export default {
       },
       taskList: [],
       taskTotal: 0,
-      TaskFormVisible: false
+      HandleInspectFormVisible: false,
+      formVisible: false
     };
   },
   created() {
@@ -281,6 +262,43 @@ export default {
       };
       this.getAllTaskList();
     },
+    async handleTask(row) {
+      if(row.taskType == '归属地变更') {
+        this.HandleInspectFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs.HandleInspectForm.init(row.taskCorrelationId, true);
+        })
+      } else if(row.taskType == '专项行动') {
+        this.formVisible = true;
+        let data = await this.getBaseSpecialActionInfo('588008032122701061');
+        // let row = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+        var  Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
+        var  modelId = data.formId;//关联的表单id
+        var taskId = data.id; // 当前专项行动id
+        var isPreview = false;//固定死，值不变
+        var useFormPermission = false;//固定死，值不变
+        var formData = [];
+        request({
+          url: '/visualdev/OnlineDev/'+modelId+'/Config',
+          method: "GET",
+          params:null
+        }).then(res => {
+          formData = res.data.formData;
+          this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
+        });
+      }
+    },
+    async getBaseSpecialActionInfo(id) {
+      let {data} = await request({
+        url: `/Extend/BaseSpecialActionInfo/${id}`,
+        method: "GET",
+      })
+      return data;
+    },
+    taskRefresh(key, val) {
+      this[key] = false;
+      val && this.getAllTaskList();
+    }
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index a858414..63a9790 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -17,8 +17,8 @@ module.exports = defineConfig({
     proxy: {
       '/api': {
         // 跨域请求的地址
-        //target: 'http://8.130.38.56:8043/api',
-        target: 'http://localhost:2015/api',
+        target: 'http://8.130.38.56:8043/api',
+        // target: 'http://localhost:2015/api',
         changeOrigin: true, // 是否允许跨域请求，在本地会创建一个虚拟服务端，发送接收请求数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         // 路径重写，替换请求地址
         pathRewrite: {
@@ -26,10 +26,10 @@ module.exports = defineConfig({
         }
       }
     },
-    // client: {
-    //   webSocketURL: "http://localhost:8080"
-    //   // overlay: false
-    // },
+    client: {
+      // webSocketURL: "http://localhost:8080"
+      overlay: false
+    },
   },
   configureWebpack: {
     name: '属地',
--
libgit2 0.21.4