合并代码

src/api/onlineDeclartion/declareAddContent.js

@@ -7,7 +7,28 @@ export function getTemplateInfo(query) {
     method: 'get',
   })
 }
+export function systemfill(data) {
+  return request({
+    url: `/system/fill`,
+    method: 'post',
+    data
+  })
+}
 
+export function systemfillupdate(data) {
+  return request({
+    url: `/system/fill/update`,
+    method: 'post',
+    data
+  })
+}
+export function systemfilluploadFile(data) {
+  return request({
+    url: `/system/fill/uploadFile`,
+    method: 'post',
+    data
+  })
+}
 // 获取公司信息
 export function getBasicInfo(query) {
   return request({
@@ -51,6 +72,7 @@ export function getDeclarationRecords(query) {
 }
 
 
+
 // 查询申报模版列表
 export function templateList(query) {
   return request({

src/api/onlineDeclartion/pendingReview.js

@@ -5,7 +5,11 @@ export function approvalList(query) {
   return request({
     url: '/system/declarationRecords/approvalList',
     method: 'get',
-    params: query
+    params: query,
+    headers:{
+      isRepeatSubmit:false
+      
+    }
   })
 }
 

src/views/ServiceAndDevelopment/index.vue

@@ -0,0 +1,294 @@
+<template>
+    <div class="L-public-main yewufazhan-box">
+        <div class="yewufazhanbox-left">
+            <div class="yewufazhan-title">文本编辑器</div>
+            <el-form :model="addFrom" size="small" ref="importFrom" :rules="rules" class="newArticle">
+                <el-row :gutter="20">
+                    <el-col>
+                        <el-form-item class="yewufazhanbox-input" prop="name">
+                            <el-input v-model.trim="addFrom.name" placeholder="请输入报告模板标题"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col>
+                        <el-form-item class="yewufazhanbox-input" prop="enterUnit">
+                            <el-input v-model.trim="addFrom.enterUnit" placeholder="副标题"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item prop="enterContent">
+                            <myEditor :height="200" v-model="addFrom.enterContent"></myEditor>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+            <div class="dialog-footer">
+                <el-form size="small">
+                    <el-form-item class="dialog-from-item">
+                        <el-button @click="footbtn('预览')">预览</el-button>
+                        <el-button type="primary" @click="footbtn('保存')">保存</el-button>
+                        <el-button type="primary" @click="footbtn('一键生成')">一键生成</el-button>
+                        <el-button type="primary" @click="footbtn('导出')">导出</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+        <div class="yewufazhanbox-right">
+            <div class="yewufazhan-title">文本编辑器</div>
+            <div class="yewufazhanbox-right-from">
+                <span>年份：</span>
+                <el-date-picker v-model="nianfenvalue3" type="year" placeholder="选择年">
+                </el-date-picker>
+            </div>
+            <div class="yewufazhanbox-right-table">
+                <el-table :data="tableData" border header-align="center" stripe>
+                <el-table-column prop="shuju" label="数据项" width="180" align="center">
+                </el-table-column>
+                <el-table-column prop="nianfen" label="统计年份" align="center">
+                </el-table-column>
+                <el-table-column prop="shuzhi" label="数值" align="center">
+                </el-table-column>
+                <el-table-column prop="shuzhi" label="操作" align="center">
+                    <template slot-scope="scope">
+                        <div class="yewufazhanbox-charu" @click="charu(scope.row)">插入</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            </div>
+       
+
+        </div>
+    </div>
+</template>
+
+<script>
+import myEditor from "@/views/components/myEditor/index.vue"
+
+export default {
+    name: '',
+    components: { myEditor },
+    data() {
+        return {
+            nianfenvalue3: "",
+            addFrom: {
+                name: "",
+                joinProject: "",
+                enterUnit: "",
+                policyLevel: "",
+            },
+            rules: {
+                name: [
+                    { required: true, message: '请填写政策文件名称', trigger: 'blur' }
+                ],
+                // joinProject:[
+                //   { required: true, message: '请填写政策等级', trigger: 'blur' }
+                // ],
+                enterUnit: [
+                    { required: true, message: '请填写发文单位', trigger: 'blur' }
+                ],
+                policyLevel: [
+                    { required: true, message: '请选择政策等级', trigger: 'change' }
+                ],
+                enterTime: [
+                    { required: true, message: '请选择发文时间', trigger: 'change' }
+                ],
+            },
+            tableData: [
+                {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                }, {
+                    shuju: "服务业企业总数 ",
+                    nianfen: "2023",
+                    shuzhi: "524"
+                },
+            ]
+        }
+    },
+    created() { },
+    mounted() { },
+    methods: {
+        // 插入
+        charu(item){
+            console.log(item);
+            this.addFrom.enterContent = item.shuzhi
+        },
+        // 底部按钮
+
+        footbtn(type) {
+            if (type == '预览') {
+
+            }
+            if (type == '保存') {
+
+            }
+            if (type == '一键生成') {
+
+            }
+            if (type == '导出') {
+
+            }
+        }
+    },
+    computed: {}
+}
+</script>
+<style scoped lang='scss'></style>

src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue

@@ -52,6 +52,7 @@ export default {
     DraggableItem
   },
   dicts: ['bms_responsibility_unit', 'bms_level'],
+  
   data() {
     let validateTime = (rule, value, callback) => {
       if (new Date(value[1]) < new Date()) {
@@ -68,7 +69,7 @@ export default {
       selectComponents,
       layoutComponents,
       labelWidth: 100,
-      drawingList: drawingDefault,
+      drawingList: "",
       drawingData: {},
       activeId: drawingDefault[0].formId,
       drawerVisible: false,
@@ -78,49 +79,10 @@ export default {
       showFileName: false,
       activeData: drawingDefault[0],
       options: [],
-      props: {
+
-        lazy: true,
-        lazyLoad(node, resolve) {
-          const { level, data, children } = node;
-          if (children?.length == 0) {
-            getAllList({ dictType: data.dict }).then(res => {
-              const nodes = Array.from(res.data).map((item) => {
-                return {
-                  value: item.dictValue,
-                  label: item.dictLabel,
-                  dict: item.remark,
-                  leaf: level >= 2
-                }
-              })
-              resolve(nodes)
-            })
-          }
-        }
-      },
       // 表单参数
       dialogForm: {},
-      // 表单校验
+
-      rules: {
-        // year: [
-        //   { required: true, message: "请选择年份", trigger: "blur" },
-        // ],
-        responsibilityUnit: [
-          { required: true, message: "请选择责任单位", trigger: "blur" }
-        ],
-        level: [
-          { required: true, message: "请选择级别", trigger: "blur" }
-        ],
-        projectClassify: [
-          { required: true, message: "请选择项目分类", trigger: "blur" }
-        ],
-        templateName: [
-          { required: true, message: "请输入模板名称", trigger: "blur" }
-        ],
-        reportTime: [
-          { required: true, message: "请选择模板使用有效期", trigger: "blur" },
-          { validator: validateTime, trigger: 'blur' },
-        ],
-      },
       projectBigType: undefined,
       projectMiddleType: undefined,
       projectSmallType: undefined,
@@ -176,17 +138,20 @@ export default {
       this.$message.error('代码复制失败')
     })
     this.getDataList();
-    this.JsonShow()
 
   },
   methods: {
-    yanzheng() {
+    
-
+    jsonOpen(templateJson){
-      this.$refs["myfrom"].validate(valid => {
+      let list = []
-      console.log(123123);
+        list = JSON.parse(templateJson).fields
-
+        console.log(list);
-
+        list.forEach(item => {
-      })
+          if (item.tag == "el-upload") {
+            item.headers.Authorization = 'Bearer ' + getToken()
+          }
+        })
+        this.drawingList = list
 
     },
     activeFormItem() {
@@ -199,19 +164,7 @@ export default {
     drawingItemDelete() {
       console.log("drawingItemDelete");
     },
-    JsonShow() {
+   
-      if (localStorage.getItem("myJSON")) {
-        JSON.parse(localStorage.getItem("myJSON")).fields
-
-        let list = JSON.parse(localStorage.getItem("myJSON")).fields
-        list.forEach(item => {
-          if (item.tag == "el-upload") {
-            item.headers.Authorization = 'Bearer ' + getToken()
-          }
-        })
-        this.drawingList = list
-      }
-    },
 
     getDataList() {
       getAllList({ dictType: "project_categories" }).then(res => {
@@ -427,7 +380,8 @@ export default {
         })
       }
     }
-  }
+  },
+
 }
 </script>
 
@@ -582,7 +536,7 @@ $lighterBlue: #409EFF;
 .container {
   position: relative;
   width: 100%;
-  height: 50vh;
+  min-height: 50vh;
 }
 
 .components-list {

src/views/onlineDeclaration/template/index.vue

@@ -304,8 +304,8 @@ export default {
     getList() {
       this.loading = true;
       listInfo(this.queryParams).then(response => {
-        this.InfoList = response.rows;
+        this.InfoList = response.data.records;
-        this.total = response.total
+        this.total = response.data.total
         this.loading = false;
       });
     },
@@ -370,6 +370,7 @@ export default {
           type: "success",
           message: "新增模板成功!",
         });
+        this.FromOpen = false
       } else if(code == 800) {
         this.$message({
           type: "success",

src/views/tool/build/index.vue

@@ -555,6 +555,8 @@ export default {
             //   params: {code:200},
             // })
             this.$emit("successCode",200)
+            this.reset()
+            this.drawingList = []
           }
         })
         
@@ -566,6 +568,8 @@ export default {
             //   params: {code:800},
             // })
             this.$emit("successCode",800)
+            this.reset()
+            this.drawingList = []
           }
         })
       } else {