研判页面添加研判按钮校验和详情弹框

monkeyhouyi
1 parent 7180000e
Showing 6 changed files with 46 additions and 25 deletions
src/views/DisposalSuggestions/Form.vue
src/views/DisposalSuggestions/HandleForm.vue
src/views/DisposalSuggestions/index.vue
src/views/baseInspectionReport/Form.vue
src/views/baseInspectionReport/index.vue
src/views/baseListHazardousSamples/index.vue
@@ -213,9 +213,7 @@ export default {
   },
   watch: {},
   created() {
-    this.getSourceOptions();
-    this.initAreaTypeList();
-    this.getjudgmentClassOptions();
+    
   },
   mounted() {},
   methods: {
@@ -236,8 +234,8 @@ export default {
         this.questionTypeOptions = res.data.list;
       });
     },
-    getjudgmentClassOptions() {
-      request({
+    async getjudgmentClassOptions() {
+      await request({
         url: `/Extend/BaseInspectionReport/GetReviewTypeList`,
         method: 'GET',
       }).then(res => {
@@ -247,23 +245,28 @@ export default {
     goBack() {
       this.$emit("refresh");
     },
-    init(id, isDetail) {
+    async init(id, isDetail) {
       this.dataForm.id = id || 0;
       this.visible = true;
       this.showSuggsetion = false;
       this.showarea = false;
+      this.loading = true;
+      await this.getSourceOptions();
+      await this.initAreaTypeList();
+      await this.getjudgmentClassOptions();
       this.$nextTick(async () => {
         this.$refs["suggestionForm"].resetFields();
         if (this.dataForm.id) {
-          this.loading = true;
           let res = await getDetail(this.dataForm.id);
           this.dataForm = res.data;
           this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
           this.suggestionFormAreaChange(res.data.areaId)
-          this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName;
+          this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
           if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
           if (!this.dataForm.annex) this.dataForm.annex = [];
           this.loading = false;
+        } else {
+          this.loading = false;
         }
       });
     },
@@ -220,7 +220,7 @@
             let res = await getDetail(this.dataForm.id);
             this.dataForm = res.data;
             this.loading = false;
-            this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName;
+            this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
             this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
             this.suggestionForm.area = res.data.areaId
             if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
@@ -59,8 +59,10 @@
                    </el-table-column> -->
                    <el-table-column label="操作" fixed="right" width="100">
                         <template slot-scope="scope">
-                           <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" >研判</el-button>
+                                <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’可以研判 -->
+                           <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">{{ scope.row.stage == '577006621985604869' ? '研判' : '下发'}}</el-button>
                            <el-button type="text" v-else @click="toHandle(scope.row.id)" >处理</el-button>
+                           <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button>
                        </template>
                    </el-table-column>
                </NCC-table>
@@ -69,6 +71,7 @@
        </div>
        <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
        <HandleForm v-if="HandleFormVisible" ref="HandleForm" @refresh="refresh" />
+       <ReportForm v-if="ReportFormVisible" ref="ReportForm" @refresh="refresh" />
    </div>
    </div>
    </div>
@@ -80,8 +83,9 @@
    import NCCForm from './Form'
    import HandleForm from './HandleForm'
    import { getListForJudge, previewDataInterface } from '@/api/systemData/dataInterface'
+   import ReportForm from '@/views/baseInspectionReport/Form.vue' // 巡查处置
    export default {
-        components: { NCCForm, HandleForm },
+        components: { NCCForm, HandleForm, ReportForm },
         mixins: [infoMixin], 
         data() {
            return {
@@ -122,7 +126,8 @@
                questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
                stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-               HandleFormVisible: false
+               HandleFormVisible: false,
+               ReportFormVisible: false,
            }
        },
        computed: {
@@ -173,9 +178,10 @@
                this.initData()
            },
            refresh(isrRefresh) {
-               this.formVisible = false
-               this.HandleFormVisible = false
-               if (isrRefresh) this.reset()
+               this.formVisible = false;
+               this.HandleFormVisible = false;
+               this.ReportFormVisible = false;
+               if (isrRefresh) this.reset();
            },
         // 处理
             toHandle(id, isDetail) {
@@ -184,6 +190,15 @@
                     this.$refs.HandleForm.init(id, isDetail)
                 })
             },
+
+            // 详情
+            toDetail(id) {
+               this.ReportFormVisible = true;
+                this.$nextTick(() => {
+                  this.$refs.ReportForm.init(id, true);
+                });
+            },
+            
            reset() {
                for (let key in this.query) {
                    this.query[key] = undefined
@@ -8,8 +8,9 @@
     width="50%"
     :modal="false"
   >
-    <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail" v-loading="form_loading">
-      <el-form
+    <el-row v-loading="form_loading">
+      <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail">
+        <el-form
         ref="elForm"
         :model="dataForm"
         size="small"
@@ -129,12 +130,12 @@
             <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
           </el-form-item>
         </el-col>
-      </el-form>
-    </el-row>
-    <el-row v-else>
+        </el-form>
+      </el-row>
+      <el-row v-else>
       <el-col class="form-item">
         <div class="label w-120">问题来源：</div>
-        <div class="text">{{ sourceOptions.find(v => v.Id == dataForm.reportSource).FullName || '--' }}</div>
+        <div class="text">{{ dataForm.reportSourceName || '--' }}</div>
       </el-col>
       <el-col class="form-item">
         <div class="label w-120">应用名称：</div>
@@ -184,6 +185,7 @@
         <div class="label w-120">处理结果：</div>
         <div class="text">{{ dataForm.disposalSuggestions || '--' }}</div>
       </el-col>
+      </el-row>
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
@@ -226,6 +228,7 @@ export default {
         otherQuestionType: undefined,
         selfMediaPlatformTypeOther: undefined,
         company: undefined,
+        reportSourceName: undefined,
       },
       rules: {
         platformName: [
@@ -368,6 +371,7 @@ export default {
           if(res.code != 200) return this.form_loading = false;
           if(!res.data) return;
           this.dataForm = res.data;
+          this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
           if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) {
             this.dataForm.otherQuestionType = res.data.questionType;
             this.dataForm.questionType = '其他';
@@ -68,7 +68,7 @@
 					</el-table-column> -->
 					<el-table-column label="操作" fixed="right" width="100">
 							<template slot-scope="scope">
-                                <!-- 未研判/未下发可以修改 -->
+                                <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’可以修改 -->
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button>
 							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
 						</template>
@@ -96,6 +96,7 @@
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
          <!-- 案件处理 -->
         <HandForm v-if="HandFormVisible" ref="HandForm" @refresh="(val) => {taskRefresh('HandFormVisible', val)}" />
+          <!-- 巡查处置 -->
         <ReportForm v-if="ReportFormVisible" ref="ReportForm" @refresh="(val) => {taskRefresh('ReportFormVisible', val)}" />
       </div>
     </div>
@@ -108,7 +109,7 @@ import NCCForm from &quot;./Form&quot;;
 import ExportBox from "./ExportBox";
 import { previewDataInterface } from "@/api/systemData/dataInterface";
 import HandForm from '@/views/baseCaseHandling/Form.vue' // 案件处理
-import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理
+import ReportForm from '@/views/baseInspectionReport/Form.vue' // 巡查处置
 export default {
   components: { NCCForm, ExportBox, HandForm, ReportForm },
   data() {
@@ -245,8 +246,6 @@ export default {
         .catch(() => {});
     },
     addOrUpdateHandle(row, isDetail) {
-      console.log(row);
-      
       switch (row.source) {
         case "核查处置":
         this.ReportFormVisible = true;