From 1916a5ed215884f8e37ab8eba454eda2512ed013 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 31 Jul 2024 00:24:56 +0800
Subject: [PATCH] 1

---
 .DS_Store                                                       | Bin 8196 -> 0 bytes
 src/.DS_Store                                                   | Bin 6148 -> 0 bytes
 src/api/onlineDev/visualDev.js                                  |  54 +++++++++++++++++++++++++++---------------------------
 src/views/baseSpecialAction/dynamicModel/list/ExportBox.vue     |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/Form.vue          | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/ImportBox.vue     |  92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/Search.vue        | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/detail/Item.vue   | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/detail/Parser.vue |  31 +++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/detail/index.vue  | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialAction/dynamicModel/list/index.vue         | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSpecialhandle/index.vue                           | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 12 files changed, 1560 insertions(+), 210 deletions(-)
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/ExportBox.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/Form.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/ImportBox.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/Search.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/detail/Item.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/detail/Parser.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/detail/index.vue
 create mode 100644 src/views/baseSpecialAction/dynamicModel/list/index.vue

diff --git a/.DS_Store b/.DS_Store
index 3a7c2e4..4a9931a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/src/.DS_Store b/src/.DS_Store
index db3e295..42c8343 100644
Binary files a/src/.DS_Store and b/src/.DS_Store differ
diff --git a/src/api/onlineDev/visualDev.js b/src/api/onlineDev/visualDev.js
index 2281b0f..b69db84 100644
--- a/src/api/onlineDev/visualDev.js
+++ b/src/api/onlineDev/visualDev.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取功能列表
 export function getVisualDevList(data) {
   return request({
-    url: '/api/visualdev/Base',
+    url: '/visualdev/Base',
     method: 'get',
     data
   })
@@ -11,7 +11,7 @@ export function getVisualDevList(data) {
 // 获取功能信息
 export function getVisualDevInfo(id) {
   return request({
-    url: `/api/visualdev/Base/${id}`,
+    url: `/visualdev/Base/${id}`,
     method: 'get'
   })
 }
@@ -20,14 +20,14 @@ export function getVisualDevInfo(id) {
 // 删除功能
 export function Delete(id) {
   return request({
-    url: `/api/visualdev/Base/${id}`,
+    url: `/visualdev/Base/${id}`,
     method: 'DELETE'
   })
 }
 // 修改功能
 export function Update(data) {
   return request({
-    url: `/api/visualdev/Base/${data.id}`,
+    url: `/visualdev/Base/${data.id}`,
     method: 'PUT',
     data
   })
@@ -35,7 +35,7 @@ export function Update(data) {
 // 新建功能
 export function Create(data) {
   return request({
-    url: '/api/visualdev/Base',
+    url: '/visualdev/Base',
     method: 'post',
     data
   })
@@ -43,21 +43,21 @@ export function Create(data) {
 // 复制功能
 export function Copy(id) {
   return request({
-    url: `/api/visualdev/Base/${id}/Actions/Copy`,
+    url: `/visualdev/Base/${id}/Actions/Copy`,
     method: 'POST'
   })
 }
 // 获取模块命名
 export function getAreasName() {
   return request({
-    url: `/api/visualdev/Generater/AreasName`,
+    url: `/visualdev/Generater/AreasName`,
     method: 'get'
   })
 }
 // 代码下载
 export function DownloadCode(id, data) {
   return request({
-    url: `/api/visualdev/Generater/${id}/Actions/DownloadCode`,
+    url: `/visualdev/Generater/${id}/Actions/DownloadCode`,
     method: 'POST',
     data
   })
@@ -65,7 +65,7 @@ export function DownloadCode(id, data) {
 // 代码预览
 export function CodePreview(id, data) {
   return request({
-    url: `/api/visualdev/Generater/${id}/Actions/CodePreview`,
+    url: `/visualdev/Generater/${id}/Actions/CodePreview`,
     method: 'POST',
     data
   })
@@ -74,28 +74,28 @@ export function CodePreview(id, data) {
 // 获取列表表单配置JSON
 export function getConfigData(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/Config`,
+    url: `/visualdev/OnlineDev/${modelId}/Config`,
     method: 'get'
   })
 }
 // 获取列表配置JSON
 export function getColumnData(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/ColumnData`,
+    url: `/visualdev/OnlineDev/${modelId}/ColumnData`,
     method: 'get'
   })
 }
 // 获取表单配置JSON
 export function getFormData(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/FormData`,
+    url: `/visualdev/OnlineDev/${modelId}/FormData`,
     method: 'get'
   })
 }
 // 获取数据列表
 export function getModelList(modelId, data) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/List`,
+    url: `/visualdev/OnlineDev/${modelId}/List`,
     method: 'post',
     data
   })
@@ -103,7 +103,7 @@ export function getModelList(modelId, data) {
 // 添加数据
 export function createModel(modelId, data) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}`,
+    url: `/visualdev/OnlineDev/${modelId}`,
     method: 'POST',
     data
   })
@@ -111,7 +111,7 @@ export function createModel(modelId, data) {
 // 修改数据
 export function updateModel(modelId, data) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/${data.id}`,
+    url: `/visualdev/OnlineDev/${modelId}/${data.id}`,
     method: 'PUT',
     data
   })
@@ -119,28 +119,28 @@ export function updateModel(modelId, data) {
 // 获取数据信息
 export function getModelInfo(modelId, id) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/${id}`,
+    url: `/visualdev/OnlineDev/${modelId}/${id}`,
     method: 'GET'
   })
 }
 // 获取数据详情
 export function getDataChange(modelId, id) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/${id}/DataChange`,
+    url: `/visualdev/OnlineDev/${modelId}/${id}/DataChange`,
     method: 'GET'
   })
 }
 // 获取表单主表属性列表
 export function getFormDataFields(modelId) {
   return request({
-    url: `/api/visualdev/Base/${modelId}/FormDataFields`,
+    url: `/visualdev/Base/${modelId}/FormDataFields`,
     method: 'GET'
   })
 }
 // 获取表单主表属性下拉框
 export function getFieldDataSelect(modelId, data) {
   return request({
-    url: `/api/visualdev/Base/${modelId}/FieldDataSelect`,
+    url: `/visualdev/Base/${modelId}/FieldDataSelect`,
     method: 'GET',
     data
   })
@@ -148,14 +148,14 @@ export function getFieldDataSelect(modelId, data) {
 // 删除数据
 export function deteleModel(modelId, id) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/${id}`,
+    url: `/visualdev/OnlineDev/${modelId}/${id}`,
     method: 'DELETE'
   })
 }
 // 批量删除数据
 export function batchDelete(modelId, ids) {
   return request({
-    url: `/api/visualdev/OnlineDev/batchDelete/${modelId}`,
+    url: `/visualdev/OnlineDev/batchDelete/${modelId}`,
     method: 'post',
     data: { ids }
   })
@@ -163,7 +163,7 @@ export function batchDelete(modelId, ids) {
 // 导出
 export function exportModel(modelId, data) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/Actions/Export`,
+    url: `/visualdev/OnlineDev/${modelId}/Actions/Export`,
     method: 'POST',
     data
   })
@@ -171,14 +171,14 @@ export function exportModel(modelId, data) {
 // 下载模板
 export function getTemplate(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/Template`,
+    url: `/visualdev/OnlineDev/${modelId}/Template`,
     method: 'GET'
   })
 }
 // 获取功能下拉框列表
 export function getFeatureSelector(data) {
   return request({
-    url: '/api/visualdev/Base/Selector',
+    url: '/visualdev/Base/Selector',
     method: 'GET',
     data
   })
@@ -186,7 +186,7 @@ export function getFeatureSelector(data) {
 // App预览(后台APP表单设计)
 export function Preview(data) {
   return request({
-    url: `/api/visualdev/OnlineDev/App/Preview`,
+    url: `/visualdev/OnlineDev/App/Preview`,
     method: 'post',
     data: { data }
   })
@@ -194,14 +194,14 @@ export function Preview(data) {
 // 导出模板
 export function exportData(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/${modelId}/Actions/ExportData`,
+    url: `/visualdev/OnlineDev/${modelId}/Actions/ExportData`,
     method: 'post'
   })
 }
 // 导出App
 export function exportAppData(modelId) {
   return request({
-    url: `/api/visualdev/OnlineDev/App/${modelId}/Actions/ExportData`,
+    url: `/visualdev/OnlineDev/App/${modelId}/Actions/ExportData`,
     method: 'post'
   })
 }
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/ExportBox.vue b/src/views/baseSpecialAction/dynamicModel/list/ExportBox.vue
new file mode 100644
index 0000000..6d68988
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/ExportBox.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center NCC-dialog-export" lock-scroll width="600px">
+    <el-form label-position="top">
+      <el-form-item>
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item class="export-line">
+        <p slot="label" class="export-label">列表数据<span>请选择导出字段</span></p>
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop"
+            class="column-item">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <p class="footer-tip">提示:系统将导出列表中选中的数据</p>
+      <el-button @click="visible=false">{{$t('common.cancelButton')}}</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns })
+    }
+  }
+}
+</script>
diff --git a/src/views/baseSpecialAction/dynamicModel/list/Form.vue b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
new file mode 100644
index 0000000..f68b40c
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <template>
+      <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false"
+        :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll
+        :width="formConf.generalWidth">
+        <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm"
+          :setFormData="setFormData" :setShowOrHide="setShowOrHide" :setRequired="setRequired"
+          :setDisabled="setDisabled" :setFieldOptions="setFieldOptions"/>
+        <span slot="footer" class="dialog-footer">
+          <template v-if="formConf.hasPrintBtn && formConf.printId && dataForm.id && false">
+            <el-button type="primary" @click="print">
+              {{formConf.printButtonText||'打 印'}}
+            </el-button>
+          </template>
+          <el-button @click="visible = false">{{formConf.cancelButtonText||'取 消'}}</el-button>
+          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+            {{formConf.confirmButtonText||'确 定'}}</el-button>
+        </span>
+      </el-dialog>
+    </template>
+    <!-- <template>
+      <transition name="el-zoom-in-center">
+        <div class="NCC-preview-main">
+          <div class="NCC-common-page-header">
+            <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
+            <div class="options">
+              <template v-if="formConf.hasPrintBtn && formConf.printId && dataForm.id && false">
+                <el-button type="primary" @click="print">
+                  {{formConf.printButtonText||'打 印'}}
+                </el-button>
+              </template>
+              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+                {{formConf.confirmButtonText||'确 定'}}</el-button>
+              <el-button @click="goBack">{{formConf.cancelButtonText||'取 消'}}</el-button>
+            </div>
+          </div>
+          <div class="dynamic-form-main" :style="{margin: '0 auto',width:formConf.fullScreenWidth}">
+            <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm"
+              :setFormData="setFormData" :setShowOrHide="setShowOrHide" :setRequired="setRequired"
+              :setDisabled="setDisabled" :setFieldOptions="setFieldOptions" v-if="!loading" />
+          </div>
+        </div>
+      </transition>
+    </template> -->
+    <print-browse :visible.sync="printBrowseVisible" :id="formConf.printId" :formId="dataForm.id" />
+  </div>
+</template>
+
+<script>
+import { createModel, updateModel, getModelInfo } from '@/api/onlineDev/visualDev'
+import Parser from '@/components/Generator/parser/Parser'
+import ParserMixin from '@/components/Generator/parser/mixin'
+import PrintBrowse from '@/components/PrintBrowse'
+import { deepClone } from '@/utils'
+export default {
+  components: { Parser, PrintBrowse },
+  mixins: [ParserMixin],
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        data: ''
+      },
+      modelId: '',
+      formData: {},
+      btnLoading: false,
+      loading: true,
+      isPreview: false,
+      useFormPermission: false,
+      printBrowseVisible: false,
+      formOperates: [],
+    }
+  },
+  methods: {
+    goBack() {
+      this.$emit('refreshDataList')
+    },
+    print() {
+      if (this.isPreview) return this.$message({ message: '功能预览不支持打印', type: 'warning' })
+      this.printBrowseVisible = true
+    },
+    init(formConf, modelId, id, isPreview, useFormPermission) {
+    
+      this.formConf = deepClone(JSON.parse(formConf))
+      var formConf  = this.formConf;
+      this.modelId = modelId
+      this.isPreview = isPreview
+      this.useFormPermission = useFormPermission
+      this.dataForm.id = id || ''
+      debugger
+      this.getFormOperates()
+      this.loading = true
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          getModelInfo(modelId, this.dataForm.id).then(res => {
+            this.dataForm = res.data
+            if (!this.dataForm.data) return
+            this.formData = JSON.parse(this.dataForm.data)
+            this.fillFormData(formConf, this.formData)
+            this.$nextTick(() => {
+              this.visible = true
+              this.loading = false
+            })
+          })
+        } else {
+          this.formData = {}
+          this.fillFormData(formConf, this.formData)
+          this.visible = true
+          this.loading = false
+        }
+        this.key = +new Date()
+      })
+    },
+    getFormOperates() {
+      if (this.isPreview || !this.useFormPermission) return
+      const permissionList = this.$store.getters.permissionList
+      const modelId = this.modelId
+      const list = permissionList.filter(o => o.modelId === modelId)
+      this.formOperates = list[0] && list[0].form ? list[0].form : []
+    },
+    fillFormData(form, data) {
+      const loop = list => {
+        for (let i = 0; i < list.length; i++) {
+          let item = list[i]
+          if (item.__vModel__) {
+            const val = data[item.__vModel__]
+            if (val !== undefined) item.__config__.defaultValue = val
+            if (!this.isPreview && this.useFormPermission) {
+              let noShow = true
+              if (this.formOperates && this.formOperates.length) {
+                noShow = !this.formOperates.some(o => o.enCode === item.__vModel__)
+              }
+              noShow = item.__config__.noShow ? item.__config__.noShow : noShow
+              this.$set(item.__config__, 'noShow', noShow)
+            }
+          }
+          if (item.__config__ && item.__config__.nccKey !== 'table' && item.__config__.children && Array.isArray(item.__config__.children)) {
+            loop(item.__config__.children)
+          }
+        }
+      }
+      loop(form.fields)
+    },
+    sumbitForm(data, callback) {
+      if (!data) return
+      this.btnLoading = true
+      this.dataForm.data = JSON.stringify(data)
+      const formMethod = this.dataForm.id ? updateModel : createModel
+      formMethod(this.modelId, this.dataForm).then(res => {
+        this.$message({
+          message: res.msg,
+          type: 'success',
+          duration: 1500,
+          onClose: () => {
+            if (callback && typeof callback === "function") callback()
+            this.visible = false
+            this.btnLoading = false
+            this.$emit('refreshDataList', true)
+          }
+        })
+      }).catch(() => { this.btnLoading = false })
+    },
+    dataFormSubmit() {
+      if (this.isPreview) return this.$message({ message: '功能预览不支持数据保存', type: 'warning' })
+      this.$refs.dynamicForm && this.$refs.dynamicForm.submitForm()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/ImportBox.vue b/src/views/baseSpecialAction/dynamicModel/list/ImportBox.vue
new file mode 100644
index 0000000..07678bf
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/ImportBox.vue
@@ -0,0 +1,92 @@
+<template>
+  <el-dialog title="导入数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-row>
+      <el-col :span="12" class="grid-content">
+        <p>下载导入模板，填写数据</p>
+        <!-- <img src="@/assets/images/xsl1.png" alt=""> -->
+        <p>
+          <el-button type="primary" round @click="downLoad()">下载导入模板</el-button>
+        </p>
+      </el-col>
+      <el-col :span="12" class="grid-content">
+        <p>上传填写好的文件</p>
+        <!-- <img src="@/assets/images/xsl1.png" alt=""> -->
+        <p>
+          <el-upload
+            :action="define.comUrl+'/api/VisualDevelopment/Model/'+ modelId +'/Actions/Uploader'"
+            :headers="{ Authorization: $store.getters.token}" :on-success="handleSuccess"
+            :show-file-list="false" accept=".xls,.xlsx" :before-upload="beforeUpload">
+            <el-button type="primary" round :loading="btnLoading">上传文件</el-button>
+            <!-- <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件，且不超过500kb</div> -->
+          </el-upload>
+        </p>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { getTemplate, importModel } from '@/api/onlineDev/visualDev'
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      modelId: ''
+    }
+  },
+  methods: {
+    init(modelId) {
+      if (!modelId) return
+      this.visible = true
+      this.modelId = modelId
+    },
+    // 下载模板
+    downLoad() {
+      getTemplate(this.modelId).then(res => {
+        if (res.data.url) window.location.href = this.define.comUrl + res.data.url
+      })
+    },
+    beforeUpload() { this.btnLoading = true },
+    handleSuccess(res, file) {
+      this.btnLoading = false
+      if (res.code == 200) {
+        this.$message({
+          message: '导入成功',
+          type: 'success',
+          duration: 1000,
+          onClose: () => {
+            this.visible = false
+            this.$emit('refreshDataList')
+          }
+        })
+      } else {
+        this.$message({ message: '导入失败', type: 'error', duration: 1000 })
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding: 40px 30px !important;
+}
+
+.grid-content {
+  &:first-child {
+    border-right: 1px solid #dcdfe6;
+  }
+
+  text-align: center;
+
+  p {
+    text-align: center;
+  }
+
+  img {
+    width: 128px;
+    margin: 10px 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/Search.vue b/src/views/baseSpecialAction/dynamicModel/list/Search.vue
new file mode 100644
index 0000000..e5fb7b6
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/Search.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-row class="NCC-common-search-box" :gutter="16" v-if="searchList.length">
+    <el-form @submit.native.prevent>
+      <el-col :span="6" v-for="(item, index) in searchList" :key="index">
+        <el-form-item :label="item.__config__.label" v-show="index<3 || (index>=3 && showAll)">
+          <template v-if="useInputList.indexOf(item.__config__.nccKey)>-1">
+            <el-input v-model="item.value" :placeholder="item.__config__.label" clearable
+              class="item">
+            </el-input>
+          </template>
+          <template v-else-if="useDateList.indexOf(item.__config__.nccKey)>-1">
+            <el-date-picker v-model="item.value" value-format="timestamp" format="yyyy-MM-dd"
+              start-placeholder="开始日期" end-placeholder="结束日期" class="item" type="daterange" />
+          </template>
+          <template v-else-if="useSelectList.indexOf(item.__config__.nccKey)>-1">
+            <el-select v-model="item.value" :placeholder="'请选择'+item.__config__.label" clearable
+              filterable class="item">
+              <el-option :label="oItem[item.__config__.props.label]"
+                v-for="(oItem, i) in item.__slot__.options"
+                :value="oItem[item.__config__.props.value]" :key="i"></el-option>
+            </el-select>
+          </template>
+          <template v-else>
+            <template
+              v-if="item.__config__.nccKey==='numInput'||item.__config__.nccKey==='calculate'">
+              <num-range v-model="item.value"></num-range>
+            </template>
+            <template v-if="item.__config__.nccKey==='cascader'">
+              <el-cascader v-model="item.value" :options="item.options" clearable
+                :show-all-levels="item['show-all-levels']" :props="item.props.props" filterable
+                :placeholder="'请选择'+item.__config__.label" class="item"></el-cascader>
+            </template>
+            <template
+              v-if="item.__config__.nccKey==='time'|| item.__config__.nccKey==='timeRange'">
+              <el-time-picker v-model="item.value" start-placeholder="开始时间" end-placeholder="结束时间"
+                clearable :value-format="item['value-format']" :format="item.format" is-range
+                class="item" />
+            </template>
+            <template v-if="item.__config__.nccKey==='date'">
+              <el-date-picker v-model="item.value" :type="item.type+'range'"
+                :value-format="item['value-format']" :format="item.format" start-placeholder="开始日期"
+                end-placeholder="结束日期" class="item">
+              </el-date-picker>
+            </template>
+            <template v-if="item.__config__.nccKey==='dateRange'">
+              <el-date-picker v-model="item.value" :type="item.type"
+                :value-format="item['value-format']" :format="item.format" start-placeholder="开始日期"
+                end-placeholder="结束日期" class="item">
+              </el-date-picker>
+            </template>
+            <template v-if="commonList.includes(item.__config__.nccKey)">
+              <component :is="item.__config__.tag" v-model="item.value"
+                :placeholder="'请选择'+item.__config__.label" class="item" />
+            </template>
+            <template v-if="item.__config__.nccKey==='address'">
+              <NCCAddress v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                :level="item.level" class="item" clearable />
+            </template>
+            <template v-if="item.__config__.nccKey==='treeSelect'">
+              <NCC-TreeSelect v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                :options="item.options" :multiple="item.multiple" class="item" clearable />
+            </template>
+            <template
+              v-if="item.__config__.nccKey==='createUser'||item.__config__.nccKey==='modifyUser'">
+              <userSelect v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                class="item" />
+            </template>
+            <template v-if="item.__config__.nccKey==='currOrganize'">
+              <comSelect v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                class="item" />
+            </template>
+            <template v-if="item.__config__.nccKey==='currDept'">
+              <depSelect v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                class="item" />
+            </template>
+            <template v-if="item.__config__.nccKey==='currPosition'">
+              <posSelect v-model="item.value" :placeholder="'请选择'+item.__config__.label"
+                class="item" />
+            </template>
+          </template>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="search()">{{$t('common.search')}}
+          </el-button>
+          <el-button icon="el-icon-refresh-right" @click="reset()">{{$t('common.reset')}}
+          </el-button>
+          <template v-if="searchList.length>3">
+            <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              展开
+            </el-button>
+            <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+              收起</el-button>
+          </template>
+        </el-form-item>
+      </el-col>
+    </el-form>
+  </el-row>
+</template>
+
+<script>
+import { deepClone } from '@/utils'
+import { dyOptionsList, useInputList, useDateList, useSelectList } from '@/components/Generator/generator/comConfig'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+export default {
+  props: ['list'],
+  data() {
+    return {
+      showAll: false,
+      searchList: [],
+      commonList: ['comSelect', 'depSelect', 'posSelect', 'userSelect', 'dicSelect'],
+      useInputList,
+      useDateList,
+      useSelectList
+    }
+  },
+  watch: {
+    list: {
+      handler: function (val) {
+        this.searchList = deepClone(val)
+        this.buildOptions(this.searchList)
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    buildOptions(componentList) {
+      componentList.forEach(cur => {
+        const config = cur.__config__
+        if (dyOptionsList.indexOf(config.nccKey) > -1) {
+          let isTreeSelect = config.nccKey === 'treeSelect' || config.nccKey === 'cascader'
+          if (config.dataType === 'dictionary') {
+            if (!config.dictionaryType) return
+            getDictionaryDataSelector(config.dictionaryType).then(res => {
+              isTreeSelect ? cur.options = res.data.list : cur.__slot__.options = res.data.list
+            })
+          }
+          if (config.dataType === 'dynamic') {
+            if (!config.propsUrl) return
+            previewDataInterface(config.propsUrl).then(res => {
+              isTreeSelect ? cur.options = res.data : cur.__slot__.options = res.data
+            })
+          }
+        }
+      })
+    },
+    search() {
+      let obj = {}
+      for (let i = 0; i < this.searchList.length; i++) {
+        const e = this.searchList[i]
+        if (e.value) {
+          if (Array.isArray(e.value)) {
+            if (e.value.length) obj[e.__vModel__] = e.value
+          } else {
+            obj[e.__vModel__] = e.value
+          }
+        }
+      }
+      let json = JSON.stringify(obj) === "{}" ? '' : JSON.stringify(obj)
+      this.$emit('search', json)
+    },
+    reset() {
+      this.searchList = deepClone(this.list)
+      this.$emit('search', '')
+    },
+    treeReset() {
+      this.searchList = deepClone(this.list)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/detail/Item.vue b/src/views/baseSpecialAction/dynamicModel/list/detail/Item.vue
new file mode 100644
index 0000000..7b725b8
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/detail/Item.vue
@@ -0,0 +1,182 @@
+<template>
+  <el-col :span="item.__config__.span"
+    :class="{'item-card':item.__config__.nccKey==='card','item-table':item.__config__.nccKey==='table'}">
+    <template v-if="item.__config__.layout==='colFormItem'">
+      <template v-if="item.__config__.nccKey==='divider'">
+        <el-divider :content-position="item['content-position']">{{item.__slot__.default}}
+        </el-divider>
+      </template>
+      <template v-else-if="item.__config__.nccKey==='NCCText'">
+        <el-form-item label-width="0">
+          <NCCText :lineHeight="item.lineHeight" :fontSize="item.fontSize"
+            v-model="item.__config__.defaultValue" :textStyle="item.textStyle" />
+        </el-form-item>
+      </template>
+      <template v-else-if="item.__config__.nccKey==='groupTitle'">
+        <el-form-item label-width="0">
+          <groupTitle :content="item.content" :content-position="item['content-position']" />
+        </el-form-item>
+      </template>
+      <template v-else>
+        <el-form-item :prop="item.__vModel__"
+          :label-width="item.__config__.labelWidth?`${item.__config__.labelWidth}px`: null"
+          :label="item.__config__.showLabel ? item.__config__.label : '' "
+          v-if="!item.__config__.noShow">
+          <template v-if="item.__config__.nccKey==='uploadFz'">
+            <div class="dy-fileList">
+              <el-link :underline="false" class="dy-fileList-item"
+                v-for="(cItem,ci) in item.__config__.defaultValue" :key="ci"
+                @click="downloadFile(cItem)"><i class="el-icon-document"></i>{{cItem.name}}
+              </el-link>
+            </div>
+          </template>
+          <template v-else-if="item.__config__.nccKey==='uploadImg'">
+            <el-image :src="define.comUrl+cItem.url" class="dy-img"
+              v-for="(cItem,ci) in item.__config__.defaultValue" :key="ci"
+              :preview-src-list="getImgList(item.__config__.defaultValue)" :z-index="10000">
+            </el-image>
+          </template>
+          <template v-else-if="item.__config__.nccKey==='colorPicker'">
+            <el-color-picker v-model="item.__config__.defaultValue" :show-alpha="item['show-alpha']"
+              :color-format="item['color-format']" :size="item.size" disabled />
+          </template>
+          <template v-else-if="item.__config__.nccKey==='rate'">
+            <el-rate v-model="item.__config__.defaultValue" :max="item.max"
+              :allow-half="item['allow-half']" :show-text="item['show-text']"
+              :show-score="item['show-score']" disabled />
+          </template>
+          <template v-else-if="item.__config__.nccKey==='switch'">
+            <el-switch v-model="item.__config__.defaultValue" :active-value="item['active-value']"
+              :active-color="item['active-color']" :active-text="item['active-text']"
+              :inactive-color="item['inactive-color']" :inactive-text="item['inactive-text']"
+              :inactive-value="item['inactive-value']" disabled />
+          </template>
+          <template v-else-if="item.__config__.nccKey==='slider'">
+            <div class="slider-box">
+              <el-slider v-model="item.__config__.defaultValue" :range='item.range'
+                :show-stops="item['show-stops']" />
+              <div class="slider-mark"></div>
+            </div>
+          </template>
+          <template v-else-if="item.__config__.nccKey==='editor'">
+            <div v-html="item.__config__.defaultValue"></div>
+          </template>
+          <template v-else-if="item.__config__.nccKey==='relationForm'">
+            <el-link :underline="false" @click.native="toDetail(item)" type="primary">
+              {{ item.name }}</el-link>
+          </template>
+          <template v-else-if="item.__config__.nccKey==='relationFormAttr'">
+            <p class="dynamicDetail-text">
+              {{ relationData[item.relationField] &&relationData[item.relationField][item.showField] ? relationData[item.relationField][item.showField] : '' }}
+            </p>
+          </template>
+          <template v-else>
+            <p class="dynamicDetail-text">{{ getValue(item) }}</p>
+          </template>
+        </el-form-item>
+      </template>
+    </template>
+    <template v-else>
+      <template v-if="item.__config__.nccKey==='card'">
+        <el-card :shadow="item.shadow" :header="item.header" class="mb-20">
+          <Item v-for="(childItem, childIndex) in item.__config__.children" :key="childIndex"
+            :item="childItem" v-bind="$props" v-on="$listeners" />
+        </el-card>
+      </template>
+      <template v-if="item.__config__.nccKey==='row'">
+        <el-row :gutter="formConf.gutter">
+          <Item v-for="(childItem, childIndex) in item.__config__.children" :key="childIndex"
+            :item="childItem" v-bind="$props" v-on="$listeners" />
+        </el-row>
+      </template>
+      <template v-if="item.__config__.nccKey==='table'">
+        <el-form-item label-width="0" v-if="!item.__config__.noShow">
+          <div class="NCC-common-title" v-if="item.__config__.showTitle">
+            <h2>{{item.__config__.label}}</h2>
+          </div>
+          <NCC-table :data="item.__config__.defaultValue">
+            <template v-for="(column,columnIndex) in item.__config__.children">
+              <el-table-column :key="columnIndex" :prop="column.__vModel__"
+                :label="column.__config__.label" v-if="column.__config__.nccKey==='relationForm'">
+                <template slot-scope="scope">
+                  <el-link :underline="false" type="primary"
+                    @click.native="toTableDetail(column,scope.row[column.__vModel__+'_id'])">
+                    {{ scope.row[column.__vModel__] }}</el-link>
+                </template>
+              </el-table-column>
+              <el-table-column :key="columnIndex" :prop="column.__vModel__"
+                :label="column.__config__.label" v-else />
+            </template>
+          </NCC-table>
+        </el-form-item>
+      </template>
+      <template v-if="item.__config__.nccKey==='tab'">
+        <el-tabs :type="item.type" :tab-position="item['tab-position']"
+          v-model="item.__config__.active" class="mb-10">
+          <el-tab-pane v-for="(pane,i) in item.__config__.children" :key="i" :label="pane.title">
+            <Item v-for="(childItem, childIndex) in pane.__config__.children" :key="childIndex"
+              :item="childItem" v-bind="$props" v-on="$listeners" />
+          </el-tab-pane>
+        </el-tabs>
+      </template>
+      <template v-if="item.__config__.nccKey==='collapse'">
+        <el-collapse :accordion="item.accordion" v-model="item.__config__.active" class="mb-20">
+          <el-collapse-item v-for="(pane,i) in item.__config__.children" :key="i"
+            :title="pane.title" :name="pane.name">
+            <Item v-for="(childItem, childIndex) in pane.__config__.children" :key="childIndex"
+              :item="childItem" v-bind="$props" v-on="$listeners" />
+          </el-collapse-item>
+        </el-collapse>
+      </template>
+    </template>
+  </el-col>
+</template>
+<script>
+import { getDownloadUrl } from '@/api/common'
+
+export default {
+  name: 'Item',
+  props: {
+    item: {
+      type: Object,
+      required: true
+    },
+    formConf: {
+      type: Object,
+      required: true
+    },
+    relationData: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  methods: {
+    toDetail(item) {
+      this.$emit('toDetail', item)
+    },
+    toTableDetail(item, value) {
+      item.__config__.defaultValue = value
+      this.$emit('toDetail', item)
+    },
+    downloadFile(file) {
+      if (!file.fileId) return
+      getDownloadUrl('annex', file.fileId).then(res => {
+        if (res.data.url) window.location.href = this.define.comUrl + res.data.url
+      })
+    },
+    getImgList(list) {
+      const newList = list.map(o => this.define.comUrl + o.url)
+      return newList
+    },
+    getValue(item) {
+      if (Array.isArray(item.__config__.defaultValue)) {
+        if (['timeRange', 'dateRange'].includes(item.__config__.nccKey)) {
+          return item.__config__.defaultValue.join('')
+        }
+        return item.__config__.defaultValue.join()
+      }
+      return item.__config__.defaultValue
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/detail/Parser.vue b/src/views/baseSpecialAction/dynamicModel/list/detail/Parser.vue
new file mode 100644
index 0000000..8e5832a
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/detail/Parser.vue
@@ -0,0 +1,31 @@
+<template>
+  <el-row :gutter="formConf.gutter"
+    :class="formConf.formStyle?formConf.formStyle+' word-from-detail':''">
+    <el-form :size="formConf.size" :label-position="formConf.labelPosition"
+      :label-width="`${formConf.labelWidth}px`" :ref="formConf.formRef">
+      <Item v-for="(item, index) in formConf.fields" :key="index" :item="item" v-bind="$props"
+        v-on="$listeners" />
+    </el-form>
+  </el-row>
+</template>
+<script>
+
+import Item from './Item'
+export default {
+  components: { Item },
+  props: {
+    formConf: {
+      type: Object,
+      required: true
+    },
+    relationData: {
+      type: Object,
+      default: () => { }
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/detail/index.vue b/src/views/baseSpecialAction/dynamicModel/list/detail/index.vue
new file mode 100644
index 0000000..9f78538
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/detail/index.vue
@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <template v-if="formData.popupType==='general'">
+      <el-dialog title="详情" :close-on-click-modal="false" :visible.sync="visible"
+        class="NCC-dialog NCC-dialog_center" lock-scroll :width="formData.generalWidth"
+        append-to-body>
+        <div class="dynamicDetail" v-loading="loading || mainLoading"
+          :element-loading-text="$t('common.loadingText')">
+          <Parser :formConf="formData" :relationData="relationData" @toDetail="toDetail"
+            v-if="!loading" />
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <template v-if="formData.hasPrintBtn && formData.printId">
+            <el-button type="primary" @click="printBrowseVisible=true">
+              {{formData.printButtonText||'打 印'}}
+            </el-button>
+          </template>
+          <el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
+        </span>
+      </el-dialog>
+    </template>
+    <template v-if="formData.popupType==='fullScreen'">
+      <transition name="el-zoom-in-center">
+        <div class="NCC-preview-main">
+          <div class="NCC-common-page-header">
+            <el-page-header @back="goBack" content="详情" />
+            <div class="options">
+              <template v-if="formData.hasPrintBtn && formData.printId">
+                <el-button type="primary" @click="printBrowseVisible=true">
+                  {{formData.printButtonText||'打 印'}}
+                </el-button>
+              </template>
+              <el-button @click="goBack">{{$t('common.cancelButton')}}</el-button>
+            </div>
+          </div>
+          <div class="dynamic-form-main dynamicDetail"
+            :style="{margin: '0 auto',width:formData.fullScreenWidth}"
+            v-loading="loading || mainLoading" :element-loading-text="$t('common.loadingText')">
+            <Parser :formConf="formData" :relationData="relationData" @toDetail="toDetail"
+              v-if="!loading" />
+          </div>
+        </div>
+      </transition>
+    </template>
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    <print-browse :visible.sync="printBrowseVisible" :id="formData.printId" :formId="dataForm.id" />
+  </div>
+</template>
+
+<script>
+import { getDataChange, getConfigData } from '@/api/onlineDev/visualDev'
+import { deepClone } from '@/utils'
+import Parser from './Parser'
+import PrintBrowse from '@/components/PrintBrowse'
+export default {
+  name: 'Detail',
+  components: { Parser, PrintBrowse },
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        data: ''
+      },
+      modelId: '',
+      formData: {},
+      formValue: {},
+      loading: true,
+      mainLoading: false,
+      detailVisible: false,
+      relationData: {},
+      useFormPermission: false,
+      printBrowseVisible: false,
+      formOperates: []
+    }
+  },
+  methods: {
+    goBack() {
+      this.$emit('close')
+    },
+    init(formData, modelId, id, useFormPermission) {
+      this.formData = deepClone(formData)
+      this.modelId = modelId
+      this.useFormPermission = useFormPermission
+      this.dataForm.id = id || ''
+      this.getFormOperates()
+      this.loading = true
+      this.relationData = {}
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          getDataChange(modelId, this.dataForm.id).then(res => {
+            this.dataForm = res.data
+            if (!this.dataForm.data) return
+            this.formValue = JSON.parse(this.dataForm.data)
+            this.fillFormData(this.formData, this.formValue)
+            this.visible = true
+          })
+        } else {
+          this.formValue = {}
+          this.loading = false
+          this.visible = false
+          this.$emit('close')
+        }
+      })
+    },
+    unique(arr, attrName) {
+      const res = new Map()
+      return arr.filter(o => !res.has(o[attrName]) && res.set(o[attrName], 1))
+    },
+    handleAttrList(list) {
+      let realList = this.unique(list, 'relationField')
+      for (let i = 0; i < realList.length; i++) {
+        const item = realList[i];
+        let modelId = '', id = "", field = ""
+        const loop = list => {
+          for (let i = 0; i < list.length; i++) {
+            if (item.relationField === list[i].__vModel__) {
+              modelId = list[i].modelId
+              id = list[i].__config__.defaultValue
+              field = list[i].__vModel__
+              break
+            }
+            if (list[i].__config__ && list[i].__config__.nccKey !== 'table' && list[i].__config__.children && Array.isArray(list[i].__config__.children)) {
+              loop(list[i].__config__.children)
+            }
+          }
+        }
+        loop(this.formData.fields)
+        if (!id) {
+          this.$set(this.relationData, field, "")
+          continue
+        }
+        getDataChange(modelId, id).then(res => {
+          if (!res.data || !res.data.data) {
+            this.$set(this.relationData, field, "")
+            return
+          }
+          let data = JSON.parse(res.data.data)
+          this.$set(this.relationData, field, data)
+        }).catch(() => { this.$set(this.relationData, field, "") })
+      }
+    },
+    toDetail(item) {
+      if (!item.__config__.defaultValue) return
+      this.mainLoading = true
+      getConfigData(item.modelId).then(res => {
+        this.mainLoading = false
+        if (!res.data) return
+        if (!res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = this.formData.popupType
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, item.modelId, item.__config__.defaultValue)
+        })
+      }).catch(() => { this.mainLoading = false })
+    },
+    getFormOperates() {
+      if (!this.useFormPermission) return
+      const permissionList = this.$store.getters.permissionList
+      const modelId = this.$route.meta.modelId
+      const list = permissionList.filter(o => o.modelId === modelId)
+      this.formOperates = list[0] && list[0].form ? list[0].form : []
+    },
+    fillFormData(form, data) {
+      let relationFormAttrList = []
+      const loop = list => {
+        for (let i = 0; i < list.length; i++) {
+          let item = list[i]
+          if (item.__vModel__) {
+            if (item.__config__.nccKey === 'relationForm') {
+              let id = data[item.__vModel__ + '_id']
+              if (id) item.__config__.defaultValue = id
+              this.$set(item, 'name', data[item.__vModel__] || '')
+            } else {
+              const val = data[item.__vModel__]
+              if (val) item.__config__.defaultValue = val
+            }
+            if (this.useFormPermission) {
+              let noShow = true
+              if (this.formOperates && this.formOperates.length) {
+                noShow = !this.formOperates.some(o => o.enCode === item.__vModel__)
+              }
+              noShow = item.__config__.noShow ? item.__config__.noShow : noShow
+              this.$set(item.__config__, 'noShow', noShow)
+            }
+          }
+          if (item.__config__.nccKey === 'relationFormAttr') relationFormAttrList.push(item)
+          if (item.__config__ && item.__config__.nccKey !== 'table' && item.__config__.children && Array.isArray(item.__config__.children)) {
+            loop(item.__config__.children)
+          }
+        }
+      }
+      loop(form.fields)
+      this.handleAttrList(relationFormAttrList)
+      this.loading = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/dynamicModel/list/index.vue b/src/views/baseSpecialAction/dynamicModel/list/index.vue
new file mode 100644
index 0000000..0a35027
--- /dev/null
+++ b/src/views/baseSpecialAction/dynamicModel/list/index.vue
@@ -0,0 +1,419 @@
+
+<template>
+  <div class="NCC-common-layout">
+    <div class="NCC-common-layout-left" v-if="columnData.type === 2">
+      <div class="NCC-common-title" v-if="columnData.treeTitle">
+        <h2>{{columnData.treeTitle}}</h2>
+      </div>
+      <el-tree :data="treeData" :props="treeProps" default-expand-all highlight-current
+        ref="treeBox" :expand-on-click-node="false" @node-click="handleNodeClick"
+        class="NCC-common-el-tree" :node-key="treeProps.value">
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <i :class="data.icon"></i>
+          <span class="text">{{node.label}}</span>
+        </span>
+      </el-tree>
+    </div>
+    <div class="NCC-common-layout-center">
+      <Search ref="Search" :list="columnData.searchList" @reset="reset" @search="search" />
+      <div class="NCC-common-layout-main NCC-flex-main">
+        <div class="NCC-common-head">
+          <div v-if="isPreview || !columnData.useBtnPermission">
+            <el-button :type="i==0?'primary':'text'" :icon="item.icon"
+              @click="headBtnsHandel(item.value)" v-for="(item, i) in columnData.btnsList" :key="i">
+              {{item.label}}</el-button>
+          </div>
+          <div v-else>
+            <el-button :type="i==0?'primary':'text'" :icon="item.icon" v-has="'btn_'+item.value"
+              @click="headBtnsHandel(item.value)" v-for="(item, i) in columnData.btnsList" :key="i">
+              {{item.label}}</el-button>
+          </div>
+          <div class="NCC-common-head-right">
+            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+                @click="initData()" />
+            </el-tooltip>
+            <screenfull />
+          </div>
+        </div>
+        <NCC-table v-loading="listLoading" :data="list" row-key="id" default-expand-all
+          :tree-props="{children: 'children', hasChildren: ''}" @sort-change='sortChange'
+          :has-c="hasBatchBtn" @selection-change="handleSelectionChange" v-if="refreshTable">
+          <el-table-column :prop="item.prop" :label="item.label" :align="item.align"
+            :width="item.width" v-for="(item, i) in columnList" :key="i"
+            :sortable="item.sortable?'custom':item.sortable" />
+          <el-table-column prop="flowState" label="状态" width="100" v-if="config.webType == 3">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
+              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
+              <el-tag type="warning" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+              <el-tag type="info" v-else>等待提交</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" :width="columnData.columnBtnsList.length*50"
+            v-if="columnData.columnBtnsList.length">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <template v-if="isPreview || !columnData.useBtnPermission">
+                <template v-for="(item, i) in columnData.columnBtnsList">
+                  <template v-if="item.value=='edit'">
+                    <el-button size="mini" type="text" :key="i"
+                      :disabled="config.webType == 3 && [1,2,5].indexOf(scope.row.flowState)>-1"
+                      @click="columnBtnsHandel(item.value,scope.row)">
+                      {{item.label}}</el-button>
+                  </template>
+                  <template v-if="item.value=='remove'">
+                    <el-button size="mini" type="text" :key="i" class="NCC-table-delBtn"
+                      :disabled="config.webType == 3 && [1,2,3,5].indexOf(scope.row.flowState)>-1"
+                      @click="columnBtnsHandel(item.value,scope.row)">
+                      {{item.label}}</el-button>
+                  </template>
+                  <template v-if="item.value=='detail'">
+                    <el-button size="mini" type="text" :key="i"
+                      :disabled="config.webType == 3 && !scope.row.flowState"
+                      @click="columnBtnsHandel(item.value,scope.row)">
+                      {{item.label}}</el-button>
+                  </template>
+                </template>
+              </template>
+              <template v-else>
+                <template v-for="(item, i) in columnData.columnBtnsList">
+                  <template v-if="item.value=='edit'">
+                    <el-button size="mini" type="text" :key="i"
+                      :disabled="config.webType == 3 && [1,2,5].indexOf(scope.row.flowState)>-1"
+                      @click="columnBtnsHandel(item.value,scope.row)" v-has="'btn_'+item.value">
+                      {{item.label}}</el-button>
+                  </template>
+                  <template v-if="item.value=='remove'">
+                    <el-button size="mini" type="text" :key="i" class="NCC-table-delBtn"
+                      :disabled="config.webType == 3 && [1,2,3,5].indexOf(scope.row.flowState)>-1"
+                      @click="columnBtnsHandel(item.value,scope.row)" v-has="'btn_'+item.value">
+                      {{item.label}}</el-button>
+                  </template>
+                  <template v-if="item.value=='detail'">
+                    <el-button size="mini" type="text" :key="i"
+                      :disabled="config.webType == 3 && !scope.row.flowState"
+                      @click="columnBtnsHandel(item.value,scope.row)" v-has="'btn_'+item.value">
+                      {{item.label}}</el-button>
+                  </template>
+                </template>
+              </template>
+            </template>
+          </el-table-column>
+        </NCC-table>
+        <template v-if="columnData.type !== 3 && columnData.hasPage">
+          <pagination :total="total" :page.sync="listQuery.currentPage"
+            :limit.sync="listQuery.pageSize" @pagination="initData" />
+        </template>
+      </div>
+    </div>
+    <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
+    <Form v-show="formVisible" ref="Form" @refreshDataList="refresh" />
+    <Detail v-show="detailVisible" ref="Detail" @close="detailVisible = false" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+  </div>
+</template>
+
+<script>
+import { getModelList, deteleModel, batchDelete, exportModel } from '@/api/onlineDev/visualDev'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+import Form from './Form'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import Detail from './detail'
+import ExportBox from './ExportBox'
+import Search from './Search'
+export default {
+  name: 'dynamicModel',
+  components: { Form, ExportBox, Search, Detail, FlowBox },
+  props: ['config', 'modelId', 'isPreview'],
+  data() {
+    return {
+      keyword: '',
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id'
+      },
+      list: [],
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: 'desc',
+        sidx: '',
+        menuId: '',
+        json: ''
+      },
+      flowVisible: false,
+      formVisible: false,
+      detailVisible: false,
+      importBoxVisible: false,
+      exportBoxVisible: false,
+      treeData: [],
+      treeActiveId: '',
+      columnData: {
+        columnBtnsList: []
+      },
+      formData: {},
+      columnList: [],
+      hasBatchBtn: false,
+      refreshTable: true,
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.listQuery.menuId = this.$route.meta.modelId
+      this.refreshTable = false
+      if (!this.config.columnData || !this.config.formData) return
+      this.columnData = JSON.parse(this.config.columnData)
+      if (this.columnData.type === 3) {
+        this.columnData.columnList = this.columnData.columnList.filter(o => o.prop != this.columnData.groupField)
+      }
+      this.hasBatchBtn = this.columnData.btnsList.some(o => o.value == 'batchRemove')
+      this.$nextTick(() => {
+        this.refreshTable = true
+      })
+      this.formData = JSON.parse(this.config.formData)
+      this.getColumnList()
+      if (this.isPreview) return
+      this.listQuery.pageSize = this.columnData.pageSize
+      this.listQuery.sort = this.columnData.sort
+      this.listQuery.sidx = this.columnData.defaultSidx
+      if (this.columnData.type === 3 || !this.columnData.hasPage) this.listQuery.pageSize = 10000
+      if (this.columnData.type === 2) {
+        this.treeProps.value = this.columnData.treePropsValue || 'id'
+        this.treeProps.label = this.columnData.treePropsLabel || 'fullName'
+        this.treeProps.children = this.columnData.treePropsChildren || 'children'
+        this.getTreeView()
+      } else {
+        this.initData()
+      }
+    },
+    initData() {
+      if (this.isPreview) return
+      this.listLoading = true
+      getModelList(this.modelId, this.listQuery).then(res => {
+        this.list = res.data.list
+        if (this.columnData.type !== 3 && this.columnData.hasPage) this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    getTreeView() {
+      if (this.columnData.treeDataSource === "dictionary") {
+        if (!this.columnData.treeDictionary) return
+        getDictionaryDataSelector(this.columnData.treeDictionary).then(res => {
+          this.treeData = res.data.list
+          this.initData()
+        })
+      }
+      if (this.columnData.treeDataSource === "organize") {
+        this.$store.dispatch('generator/getCompanyTree').then(res => {
+          this.treeData = res
+          this.initData()
+        })
+      }
+      if (this.columnData.treeDataSource === "department") {
+        this.$store.dispatch('generator/getDepTree').then(res => {
+          this.treeData = res
+          this.initData()
+        })
+      }
+      if (this.columnData.treeDataSource === "api") {
+        if (!this.columnData.treePropsUrl) return
+        previewDataInterface(this.columnData.treePropsUrl).then(res => {
+          if (Array.isArray(res.data)) {
+            this.treeData = res.data
+          } else {
+            this.treeData = []
+          }
+          this.initData()
+        })
+      }
+    },
+    getColumnList() {
+      if (this.isPreview || !this.columnData.useColumnPermission) {
+        this.columnList = this.columnData.columnList
+      } else {
+        const permissionList = this.$store.getters.permissionList
+        const modelId = this.$route.meta.modelId
+        const list = permissionList.filter(o => o.modelId === modelId)
+        const columnList = list[0] && list[0].column ? list[0].column : []
+        let realList = []
+        for (let i = 0; i < columnList.length; i++) {
+          inner: for (let j = 0; j < this.columnData.columnList.length; j++) {
+            if (columnList[i].enCode === this.columnData.columnList[j].prop) {
+              realList.push(this.columnData.columnList[j])
+              break inner
+            }
+          }
+        }
+        this.columnList = realList
+      }
+    },
+    handleNodeClick(data) {
+      if (this.treeActiveId == data[this.treeProps.value]) return
+      this.treeActiveId = data[this.treeProps.value]
+      this.$refs.Search.treeReset()
+      let json = { [this.columnData.treeRelation]: data[this.treeProps.value] }
+      this.search(JSON.stringify(json))
+    },
+    handleDel(id) {
+      this.$confirm(this.$t('common.delTip'), this.$t('common.tipTitle'), {
+        type: 'warning'
+      }).then(() => {
+        deteleModel(this.modelId, id).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            duration: 1000,
+            onClose: () => { this.initData() }
+          });
+        })
+      }).catch(() => { });
+    },
+    addOrUpdateHandle(id, flowState) {
+      if (this.config.webType == 3) {
+        let data = {
+          id: id || '',
+          enCode: this.config.flowEnCode,
+          flowId: this.config.flowId,
+          formType: 2,
+          type: 1,
+          opType: '-1',
+          modelId: this.modelId,
+          isPreview: this.isPreview
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      } else {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.Form.init(this.formData, this.modelId, id, this.isPreview, this.columnData.useFormPermission)
+        })
+      }
+    },
+    headBtnsHandel(key) {
+      if (key === 'add') {
+        this.addOrUpdateHandle()
+      }
+      if (key == 'download') {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      }
+      if (this.isPreview) return
+      if (key === 'batchRemove') {
+        this.batchRemove()
+      }
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    batchRemove() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        batchDelete(this.modelId, this.multipleSelection).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            duration: 1500,
+            onClose: () => {
+              this.initData()
+            }
+          })
+        })
+      }).catch(() => { })
+    },
+    download(data) {
+      if (this.isPreview) return this.$message({ message: '功能预览不支持数据导出', type: 'warning' })
+      let query = { ...this.listQuery, ...data }
+      exportModel(this.modelId, query).then(res => {
+        if (!res.data.url) return
+        window.location.href = this.define.comUrl + res.data.url
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    columnBtnsHandel(key, row) {
+      if (key === 'edit') {
+        this.addOrUpdateHandle(row.id)
+      }
+      if (key === 'detail') {
+        this.goDetail(row.id, row.flowState)
+      }
+      if (key == 'remove') {
+        this.handleDel(row.id)
+      }
+    },
+    goDetail(id, flowState) {
+      if (this.config.webType == 3) {
+        let data = {
+          id,
+          enCode: this.config.flowEnCode,
+          flowId: this.config.flowId,
+          formType: 2,
+          type: 1,
+          opType: 0,
+          modelId: this.modelId,
+          isPreview: this.isPreview,
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      } else {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(this.formData, this.modelId, id, this.columnData.useFormPermission)
+        })
+      }
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    refresh(isRefresh) {
+      this.formVisible = false
+      if (isRefresh) this.initData()
+    },
+    colseFlow(isRefresh) {
+      this.flowVisible = false
+      if (isRefresh) this.initData()
+    },
+    reset() {
+      this.listQuery.sort = 'desc'
+      this.listQuery.sidx = ''
+      this.$refs.Search.reset()
+    },
+    search(json) {
+      if (this.isPreview) return
+      if (!json) this.$refs.treeBox && this.$refs.treeBox.setCurrentKey(null);
+      this.listQuery.json = json
+      this.listQuery.currentPage = 1
+      this.initData()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index ac1beb4..5be31f6 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -1,53 +1,56 @@
 <template>
-    <div class="baseSpecialAction item-box common-info-box">
-      <div class="item-title">专项行动处理</div>
-      <div class="item-body">
-        <div class="NCC-common-layout">
-          <div class="NCC-common-layout-center">
-            <el-row class="NCC-common-search-box" :gutter="16">
-              <el-form @submit.native.prevent size="mini">
-                <el-col :span="6">
-                  <el-form-item label="">
-                    <el-input v-model="query.title" placeholder="标题" clearable/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="">
-                    <el-select v-model="query.state" placeholder="请选择状态" clearable>
-                      <el-option label="已填写" value="已填写"></el-option>
-                      <el-option label="未填写" value="未填写"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item>
-                    <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                    <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                  </el-form-item>
-                </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>
-              </div>
-            </el-row>
-            <div class="NCC-common-layout-main NCC-flex-main">
-              <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/>
-                <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip/>
-                <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
-                <el-table-column label="操作" fixed="right" width="130">
-                  <template slot-scope="scope">
-                    <el-button type="text" @click="toFillForm(scope.row)">处理</el-button>
-                  </template>
-                </el-table-column>
-              </NCC-table>
-              <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+  <div class="baseSpecialAction item-box common-info-box">
+    <div class="item-title">专项行动处理</div>
+    <div class="item-body">
+      <div class="NCC-common-layout">
+        <div class="NCC-common-layout-center">
+          <el-row class="NCC-common-search-box" :gutter="16">
+            <el-form @submit.native.prevent size="mini">
+              <el-col :span="6">
+                <el-form-item label="">
+                  <el-input v-model="query.title" placeholder="标题" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="">
+                  <el-select v-model="query.state" placeholder="请选择状态" clearable>
+                    <el-option label="已填写" value="已填写"></el-option>
+                    <el-option label="未填写" value="未填写"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item>
+                  <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                </el-form-item>
+              </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>
             </div>
+          </el-row>
+          <div class="NCC-common-layout-main NCC-flex-main">
+            <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 />
+              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip />
+              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat"
+                show-overflow-tooltip />
+              <el-table-column label="操作" fixed="right" width="130">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="toFillForm(scope.row)">处理</el-button>
+                </template>
+              </el-table-column>
+            </NCC-table>
+            <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+              @pagination="initData" />
           </div>
         </div>
       </div>
-      <el-dialog title="专项行动处理" :visible.sync="dialogVisible" fullscreen :modal="false">
+    </div>
+    <NCCForm v-show="dialogVisible" ref="NCCForm" @refresh="refresh" />
+    <!-- <el-dialog title="专项行动处理" :visible.sync="dialogVisible" fullscreen :modal="false">
         <iframe 
           :src="nestedPageUrl" 
           width="100%" 
@@ -55,148 +58,162 @@
           frameborder="0" 
           allowfullscreen>
         </iframe>
-      </el-dialog>
-    </div>
-  </template>
-  <script>
-  import request from "@/utils/request";
-  export default {
-    components: {  },
-    data() {
-      return {
-        query: {
-          title: undefined,
-          state: undefined,
-        },
-        list: [],
-        listLoading: false,
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        communicationAreaOptions: [],
-        communicationOutOptions: [],
-        dialogVisible: false,
-        nestedPageUrl: '',
-        viewportHeight: 0,
-      };
-    },
-    created() {
-      this.updateViewportHeight();
-      this.initData()
-       // 监听窗口大小变化事件
-       window.addEventListener('resize', this.updateViewportHeight);
-    },
-    beforeDestroy() {
-      // 移除窗口大小变化事件监听器
-      window.removeEventListener('resize', this.updateViewportHeight);
-    },
-    computed: {
-          isSHILevel() {
-              // 判断角色是否为‘市级办公室’
-              return this.$store.state.user.islader;
-            },
+      </el-dialog> -->
+  </div>
+</template>
+<script>
+import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form'
+import request from "@/utils/request";
+export default {
+  components: { NCCForm },
+  data() {
+    return {
+      query: {
+        title: undefined,
+        state: undefined,
       },
-    methods: {
-      updateViewportHeight() {
-        // 获取页面显示高度
-        this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+      list: [],
+      listLoading: false,
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-        };
-        let query = {};
-        for (let key in _query) {
-          if (Array.isArray(_query[key])) {
-            query[key] = _query[key].join();
-          } else {
-            query[key] = _query[key];
-          }
+      communicationAreaOptions: [],
+      communicationOutOptions: [],
+      dialogVisible: false,
+      nestedPageUrl: '',
+      viewportHeight: 0,
+    };
+  },
+  created() {
+    this.updateViewportHeight();
+    this.initData()
+    // 监听窗口大小变化事件
+    window.addEventListener('resize', this.updateViewportHeight);
+  },
+  beforeDestroy() {
+    // 移除窗口大小变化事件监听器
+    window.removeEventListener('resize', this.updateViewportHeight);
+  },
+  computed: {
+    isSHILevel() {
+      // 判断角色是否为‘市级办公室’
+      return this.$store.state.user.islader;
+    },
+  },
+  methods: {
+    updateViewportHeight() {
+      // 获取页面显示高度
+      this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+      };
+      let query = {};
+      for (let key in _query) {
+        if (Array.isArray(_query[key])) {
+          query[key] = _query[key].join();
+        } else {
+          query[key] = _query[key];
         }
-        request({
-          url: '/Extend/BaseSpecialAction/getCurrentUserSpecialAction',
-          method: "GET",
-          params: query,
-        }).then((res) => {
-          this.list = res.data.list;
-          this.total = res.data.pagination.total;
-          this.listLoading = false;
-        });
-      },
-      toFillForm(row) {
-        this.dialogVisible = true;
-        this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
-        request({
-          url: '/visualdev/Base',
-          method: "GET",
-          data: {type: 1},
-        }).then((res) => {
-        this.BaseList = res.data.list[0].children.find(v => v.category == row.originId);
+      }
+      request({
+        url: '/Extend/BaseSpecialAction/getCurrentUserSpecialAction',
+        method: "GET",
+        params: query,
+      }).then((res) => {
+        this.list = res.data.list;
+        this.total = res.data.pagination.total;
+        this.listLoading = false;
+      });
+    },
+    toFillForm(row) {
+      this.dialogVisible = true;
+      var  Itemid= "";//数据id，没有的话就是新增 ，有的话就是修改
+      var  modelId= "585804670891459845";//关联的表单id
+      var isPreview = false;//固定死，值不变
+      var useFormPermission = false;//固定死，值不变
+      var formData = [];
+      request({
+        url: '/visualdev/OnlineDev/585804670891459845/Config',
+        method: "GET",
+        params:null
+      }).then(res => {
+        formData = res.data.formData;
+        this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission)
+      });
+    
+      // this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
+      // request({
+      //   url: '/visualdev/Base',
+      //   method: "GET",
+      //   data: {type: 1},
+      // }).then((res) => {
+      // this.BaseList = res.data.list[0].children.find(v => v.category == row.originId);
 
-          res.data.
-         console.log(res);
-        });
-      },
+      //   res.data.
+      //  console.log(res);
+      // });
+    },
 
-      exportData() {
-        this.exportBoxVisible = true;
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.list);
-        });
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query };
-        request({
-          url: `/Extend/BaseSpecialAction/Actions/Export`,
-          method: "GET",
-          data: query,
-        }).then((res) => {
-          if (!res.data.url) return;
-          window.location.href = this.define.comUrl + res.data.url;
-          this.$refs.ExportBox.visible = false;
-          this.exportBoxVisible = false;
-        });
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        };
-        this.initData();
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false;
-        if (isrRefresh) this.reset();
-      },
-      reset() {
-        for (let key in this.query) {
-          this.query[key] = undefined;
-        }
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        };
-        this.initData();
-      },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.list);
+      });
+    },
+    download(data) {
+      let query = { ...data, ...this.listQuery, ...this.query };
+      request({
+        url: `/Extend/BaseSpecialAction/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        window.location.href = this.define.comUrl + res.data.url;
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery = {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.listQuery = {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      };
+      this.initData();
     },
-  };
-  </script>
-  <style scoped lang="scss">
-  .common-info-box {
-    :deep(.el-table__body-wrapper.is-scrolling-none) {
-      height: calc(100% - 47px);
-      overflow-y: scroll;
-    }
+  },
+};
+</script>
+<style scoped lang="scss">
+.common-info-box {
+  :deep(.el-table__body-wrapper.is-scrolling-none) {
+    height: calc(100% - 47px);
+    overflow-y: scroll;
   }
-  </style>
-  
\ No newline at end of file
+}
+</style>
\ No newline at end of file
--
libgit2 0.21.4