From d8af3866069d44bbbe8f3f3cf5c6dc0da01e45f2 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Thu, 22 Aug 2024 17:51:54 +0800
Subject: [PATCH] 1

---
 src/views/DisposalSuggestions/Form.vue   | 70 ++++++++++++++++++++++++++++++----------------------------------------
 src/views/baseSpecialAction/index.vue    |  8 ++------
 src/views/baseSpecialAction/infoForm.vue | 69 +++++++++++++++++++++++++++++++++++----------------------------------
 3 files changed, 67 insertions(+), 80 deletions(-)

diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index bc1945f..8be1462 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -9,7 +9,7 @@
     v-loading="loading"
   >
     <el-row :gutter="15" class="NCC-dialog-content">
-      <el-col :span="10" style="border-right: 1px solid #e6e6e6">
+      <el-col :span="10" style="border-right: 1px solid #e6e6e6; height: 400px;">
         <el-row>
           <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
           <el-col :span="24">
@@ -73,6 +73,12 @@
               <div class="label w-100">取证内容</div>
             </div>
           </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">所属区域</div>
+              {{ dataForm.areaName || "--" }}
+            </div>
+          </el-col>
         </el-row>
       </el-col>
       <el-col :span="14">
@@ -86,32 +92,6 @@
             label-width="100px"
             label-position="right"
           >
-            <!-- <el-col :span="24">
-              <el-form-item
-                :label="isSHILevel ? '处置要求' : '处置建议'"
-                prop="disposalSuggestions"
-              >
-                <el-input
-                  v-model="suggestionForm.disposalSuggestions"
-                  placeholder="请输入处置建议"
-                  show-word-limit
-                  :style="{ width: '100%' }"
-                  type="textarea"
-                  :autosize="{ minRows: 4, maxRows: 4 }"
-                  maxlength="200"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :span="24">
-              <el-form-item label="截止时间" prop="deadline">
-                <el-date-picker
-                  v-model="suggestionForm.deadline"
-                  type="date"
-                  placeholder="选择日期"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col> -->
             <el-col :span="24">
               <el-form-item label="研判类型" prop="reviewType">
                 <el-radio-group
@@ -123,6 +103,13 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="24" v-if="!dataForm.areaId && showarea">
+              <el-form-item label="所属区县" prop="area">
+                <el-radio-group v-model="suggestionForm.area" 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" v-if="showSuggsetion">
               <el-form-item label="研判意见" prop="judgmentOpinions">
                 <el-input
@@ -149,10 +136,13 @@
 </template>
 <script>
 import request from "@/utils/request";
+import infoMixin from "@/mixins/info";
+import { dynamicText } from "@/filters/index";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import { getDetail, disposalSuggestions } from "@/api/systemData/dataInterface";
 export default {
   components: {},
+  mixins: [infoMixin], 
   props: [],
   data() {
     return {
@@ -190,17 +180,23 @@ export default {
         judgmentOpinions: "", //判断意见
         reviewType: "", //判断分类
         deadline: "",
+        area: '',
       },
       rules: {
         reviewType: [
-          { required: true, message: "请选择审核类型", trigger: "change" },
+          { required: true, message: "请选择审核类型", trigger: "blur" },
+        ],
+        area: [
+          { required: true, message: "请选择所属区域", trigger: "bulr" },
         ],
         judgmentOpinions: [
           { required: true, message: "请填写研判意见", trigger: "bulr" }
         ]
       },
       showSuggsetion: false,
+      showarea: false,
       judgmentClassOption: [],
+      areaOptions: [],
     };
   },
   computed: {
@@ -211,6 +207,7 @@ export default {
   },
   watch: {},
   created() {
+    this.initAreaTypeList();
     this.getplatformTypeOptions();
     this.getquestionTypeOptions();
     this.getjudgmentClassOptions();
@@ -249,6 +246,8 @@ export default {
           let res = await getDetail(this.dataForm.id);
           this.dataForm = res.data;
           this.loading = false;
+          this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
+          this.suggestionForm.area = res.data.areaId
           if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
           if (!this.dataForm.annex) this.dataForm.annex = [];
         }
@@ -256,22 +255,13 @@ export default {
     },
     judgmentClassChange(v) {
       this.suggestionForm.judgmentOpinions = '';
-      this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861");
+      this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861"); // 进一步处置，不采纳
+      this.showarea = Boolean(v == "590769199001896197" || v == "590769458901943557"); // 执法，进一步处置
     },
     dataFormSubmit() {
-      if (
-        !this.suggestionForm.disposalSuggestions &&
-        !this.suggestionForm.judgmentOpinions &&
-        !this.suggestionForm.reviewType
-      ) {
-        this.$message({
-          message: "研判建议不能为空！",
-          type: "danger",
-        });
-      }
       this.$refs["suggestionForm"].validate(async (valid) => {
         if (valid) {
-          let res = await disposalSuggestions(this.dataForm);
+          let res = await disposalSuggestions(this.suggestionForm);
           this.$message({
             message: res.msg,
             type: "success",
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 69c0536..7df11e8 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -27,15 +27,11 @@
               </el-col>
             </el-form>
             <div class="NCC-common-search-box-right">
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
+              <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
+              <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button> -->
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
-            <div class="NCC-common-head">
-              <div>
-                <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
-              </div>
-            </div>
             <NCC-table v-loading="listLoading" :data="list">
               <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip/>
diff --git a/src/views/baseSpecialAction/infoForm.vue b/src/views/baseSpecialAction/infoForm.vue
index 41fef3b..d551a60 100644
--- a/src/views/baseSpecialAction/infoForm.vue
+++ b/src/views/baseSpecialAction/infoForm.vue
@@ -10,14 +10,17 @@
   >
     <el-row :gutter="15" style="height: 65vh" class="NCC-dialog-content">
         <el-col :span="24" style="margin-bottom: 20px;">
-            <el-col :span="12" class="form-item">
+            <el-col :span="10" class="form-item">
                 <div class="label w-100">行动标题：</div>
                 <div>{{ form.title }}</div>
             </el-col>
-            <el-col :span="12" class="form-item">
+            <el-col :span="10" class="form-item">
                 <div class="label w-100">截止日期：</div>
                 <div>{{ ncc.dateFormat(form.deadline) }}</div>
             </el-col>
+            <el-col :span="2" class="form-item">
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport" :loading="exportBtnLoading">导出</el-button>
+            </el-col>
         </el-col>
         <el-col :span="24" style="height: calc(100% - 100px);">
             <NCC-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
@@ -60,6 +63,7 @@ export default {
       total: 0,
       form: {},
       dialogVisible: false,
+      exportBtnLoading: false,
     };
   },
   computed: {},
@@ -80,40 +84,37 @@ export default {
         })
     },
     initList() {
-        request({
-            url: `/Extend/BaseSpecialActionInfo/GetListById`,
-            method: "GET",
-            params: {
-              ...this.listQuery,
-              specialActionId: this.form.id,
-            },
-          }).then((res) => {
-            this.tableData = res.data.list;
-            this.total = res.data.pagination.total;
-            this.loading = false;
-          });
-        }
+      request({
+        url: `/Extend/BaseSpecialActionInfo/GetListById`,
+        method: "GET",
+        params: {
+          ...this.listQuery,
+          specialActionId: this.form.id,
+        },
+      }).then((res) => {
+        this.tableData = res.data.list;
+        this.total = res.data.pagination.total;
+        this.loading = false;
+      });
     },
-    toDetailForm(row) {
-      console.log(row);
-      
-      // this.dialogVisible = true;
-      // var  Itemid = row.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
-      // var  modelId = row.formId;//关联的表单id
-      // var taskId = row.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)
-      // });
+     // 导出
+    toExport() {
+      this.exportBtnLoading = true;
+      request({
+        url: `/Extend/BaseSpecialActionInfo/Actions/Export`,
+        method: "POST",
+        data: {specialActionId: this.form.id},
+      }).then((res) => {
+        const url = process.env.VUE_APP_BASE_API + res.data.url;
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = res.data.name;
+        link.click();
+        this.exportBtnLoading = false;
+      }).catch(() => this.exportBtnLoading = false);
     },
-};
+  },
+}
 </script>
 <style lang="scss" scoped>
 .NCC-dialog {
--
libgit2 0.21.4