From 8f1d4460b9cd9e10560ece1ef322079c8b6392ce Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Tue, 13 Aug 2024 18:02:28 +0800
Subject: [PATCH] 实现专项行动详情查看

---
 package.json                                           |  2 +-
 src/components/FormDialog/index.vue                    | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/index.js                                |  2 ++
 src/views/baseSpecialAction/Form.vue                   |  2 +-
 src/views/baseSpecialAction/dynamicModel/list/Form.vue |  2 +-
 src/views/baseSpecialAction/index.vue                  |  2 ++
 src/views/baseSpecialAction/infoForm.vue               | 17 ++++++++++-------
 7 files changed, 78 insertions(+), 10 deletions(-)
 create mode 100644 src/components/FormDialog/index.vue

diff --git a/package.json b/package.json
index 7d5e088..c54d024 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "screenfull": "^4.2.0",
     "script-loader": "^0.7.2",
     "serve-static": "^1.13.2",
+    "sass": "^1.77.8",
     "style-loader": "^4.0.0",
     "vue": "^2.6.14",
     "vue-drag-resize": "^1.4.2",
@@ -58,7 +59,6 @@
     "@vue/cli-service": "~5.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
-    "sass": "^1.77.8",
     "vue-template-compiler": "^2.6.14"
   },
   "eslintConfig": {
diff --git a/src/components/FormDialog/index.vue b/src/components/FormDialog/index.vue
new file mode 100644
index 0000000..15ac0a7
--- /dev/null
+++ b/src/components/FormDialog/index.vue
@@ -0,0 +1,61 @@
+<template>
+    <div>
+        <div class="FormDialog" @click="openDialog">
+            <el-button type="text" :disabled="row.state != '已填写'" :loading="btnLoading">详情</el-button>
+        </div>
+        <NCCForm v-if="dialogVisible" ref="NCCForm" @refreshDataList="refresh"/>
+    </div>
+  </template>
+  
+  <script>
+    import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form'
+    import request from "@/utils/request";
+  export default {
+    components: { NCCForm },
+    props: {
+        row: {
+        type: Object,
+        default: {},
+      },
+      isDetail: {
+        type: Boolean,
+        default: true,
+      },
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        btnLoading: false,
+      }
+    },
+    methods: {
+        openDialog() {
+            console.log(11);
+            let row = this.row;
+            if(this.row.state != '已填写') return;
+            this.btnLoading = true;
+            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 = JSON.parse(res.data.formData);
+              formData.disabled = this.isDetail || false;
+              let form = JSON.stringify(formData);
+              this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, this.isDetail)
+              this.btnLoading = false;
+            }).catch(() => this.btnLoading = false);
+        },
+        refresh() {
+            this.dialogVisible = false;
+        },
+    }
+  }
+  </script>
\ No newline at end of file
diff --git a/src/components/index.js b/src/components/index.js
index 5867ebf..b1fce4a 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -16,6 +16,7 @@ import topOperation from '@/components/NCC-topOperation/index'
 import tableOperation from '@/components/NCC-tableOperation'
 import UserBox from '@/components/NCC-userBox'
 import ColumnSettings from '@/components/ColumnSettings'
+import FormDialog from '@/components/FormDialog'
 import UserSelect from '@/components/NCC-userSelect'
 import uploadBtn from '@/components/NCC-uploadBtn'
 // 代码生成器专供
@@ -72,6 +73,7 @@ export default {
     Vue.component('NCCQuill', NCCQuill)
     Vue.component('Screenfull', Screenfull)
     Vue.component('ColumnSettings', ColumnSettings)
+    Vue.component('FormDialog', FormDialog)
 
   }
 }
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index b097b00..5403ebf 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -274,7 +274,7 @@ export default {
       this.$emit("refresh");
     },
     init(row, isDetail) {
-      this.dataForm.id = row.id || 0;
+      this.dataForm.id = row ? row.id : '';
       this.visible = true;
       this.isDetail = isDetail || false;
       this.$nextTick(() => {
diff --git a/src/views/baseSpecialAction/dynamicModel/list/Form.vue b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
index 2e9d9f6..ba99753 100644
--- a/src/views/baseSpecialAction/dynamicModel/list/Form.vue
+++ b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
@@ -2,7 +2,7 @@
   <div>
 
     <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
-      class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth">
+      class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth" :modal="false">
       <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
         :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
         :setFieldOptions="setFieldOptions" v-if="!loading"/>
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 706594b..99471e8 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -149,6 +149,8 @@ export default {
         // console.log(this.list, 'list');
         this.total = res.data.pagination.total;
         this.listLoading = false;
+      }).catch(() => {
+        this.listLoading = false;
       });
     },
    
diff --git a/src/views/baseSpecialAction/infoForm.vue b/src/views/baseSpecialAction/infoForm.vue
index 4a447a3..41fef3b 100644
--- a/src/views/baseSpecialAction/infoForm.vue
+++ b/src/views/baseSpecialAction/infoForm.vue
@@ -20,20 +20,19 @@
             </el-col>
         </el-col>
         <el-col :span="24" style="height: calc(100% - 100px);">
-            <el-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
-              <el-table-column type="index" width="50" />
-              <el-table-column prop="originName" label="部门名称" />
-              <el-table-column prop="state" label="状态" >
+            <NCC-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
+              <el-table-column prop="originName" label="传达区县/外协" />
+              <el-table-column prop="state" label="状态">
                 <template slot-scope="scope">
                   <el-tag :type="scope.row.state == '已填写' ? 'success' : 'warning'">{{scope.row.state}}</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" width="80" >
+              <el-table-column label="操作" fixed="right" >
                 <template slot-scope="scope">
-                  <el-button type="text" @click="toDetailForm(scope.row)" :disabled="scope.row.state != '已填写'">详情</el-button>
+                  <FormDialog :row="scope.row" :isDetail="true" />
                 </template>
               </el-table-column>
-            </el-table>
+            </NCC-table>
             <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initList"/>
         </el-col>
     </el-row>
@@ -118,6 +117,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .NCC-dialog {
+    :deep(.el-table__body-wrapper.is-scrolling-none) {
+      height: calc(100% - 47px);
+      overflow-y: scroll;
+    }
     :deep(.el-pagination__total) {
         color: #606266;
     }
--
libgit2 0.21.4