commit

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -0,0 +1,168 @@
+<template>
+    <div class="ZQYJAddFileDetails">
+        <div class="left">
+            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
+                    width="100%" height="100%"
+                    frameborder="0" scrolling="no" ref="iframeDom"
+            ></iframe>
+        </div>
+        <div class="rightDiv">
+            <div class="height">
+                新增意见
+            </div>
+            <div class="search-area">
+                <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                    <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
+                        <el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
+                            <el-option
+                                    v-for="(item,index) in options"
+                                    :key="index"
+                                    :label="item.itemsNum"
+                                    :value="item.itemsNum"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改前" label-width="" class="add-form-item">
+                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
+                    </el-form-item>
+                    <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
+                    </el-form-item>
+                    <!--                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+                    <!--                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+                    <!--                    </el-form-item>-->
+                </el-form>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+                    提交
+                </el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "ZQYJAddFileDetails",
+        data () {
+            return {
+                options: [],
+                opinionContent: { // 抽屉数据
+                    partCode: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
+                    chapterName: '',
+                    // cause: '',
+                },
+                opinionContentRules: {
+                    partCode: [
+                        {required: true, message: '请输入章节编号', trigger: 'blur'},
+                    ],
+                    oldText: [
+                        {required: true, message: '请输入修改前内容', trigger: 'blur'}
+                    ],
+                    newText: [
+                        {required: true, message: '请输入修改后内容', trigger: 'blur'}
+                    ],
+                    reason: [
+                        {required: true, message: '请输入修改理由', trigger: 'blur'}
+                    ],
+                },
+                isSubmit: false,
+            }
+        },
+        methods: {
+            saveUserInfo () {
+                this.$refs['formAdd'].validate((valid) => {
+                    if (valid) {
+                        var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                        var form = {
+                            id: id,
+                            oldText: this.opinionContent.oldText,
+                            newText: this.opinionContent.newText,
+                            reason: this.opinionContent.reason,
+                            chapterNumber: this.opinionContent.partCode,
+                            chapterName: this.opinionContent.chapterName,
+                        }
+                        this.$store.commit('SET_REFRESH_FLAG', true)
+                        localStorage.setItem('bzzqyjForm', JSON.stringify(form))
+                        localStorage.setItem('freshClueNum', new Date().getTime())
+                        this.opinionContent.partCode = ''
+                        this.opinionContent.reason = ''
+                        this.opinionContent.oldText = ''
+                        this.opinionContent.newText = ''
+                        this.opinionContent.chapterName = ''
+                    }
+                })
+            },
+            optionsChange (data) {
+                for  (let a = 0; a < this.options.length; a++) {
+                    if (data === this.options[a].itemsNum) {
+                        this.opinionContent.oldText = this.options[a].termsConditions
+                        this.opinionContent.chapterName = this.options[a].itemsName
+                    }
+                }
+            },
+        },
+        mounted() {
+            this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+                standId: this.$route.query.standId,
+                fileType: this.$route.query.fileType,
+                pageSize: 9999,
+                page: 1
+            }, {}, res => {
+                if (res.ok) {
+                    this.options = res.data.list
+                }
+            }, e => {
+            })
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/mixins';
+    @import '~@/assets/styles/style';
+    .ZQYJAddFileDetails {
+        height: 100%;
+        display: flex;
+        .left {
+            width: 60%;
+            height: 100%;
+        }
+        .rightDiv {
+            background: #fff;
+            width: 40%;
+            height: 100%;
+            .height {
+                margin-bottom: 0;
+                padding: 10px 20px;
+                font-size: 18px;
+                font-weight: bold;
+                color: #333333;
+                border-bottom: 1px solid #e5e5e5;
+            }
+            .search-area {
+                height: calc(~'100% - 90px');
+                overflow: auto;
+            }
+            .demo-drawer-footer {
+                width: 100%;
+                padding: 0 20px;
+                height: 50px;
+                line-height: 50px;
+                border-top: 1px solid #e8e8e8;
+                text-align: right;
+                background: #fff;
+                z-index: 999;
+            }
+        }
+    }
+</style>

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -336,6 +336,7 @@
         name: "bzzqyjStep3",
         data() {
             return {
+                standId: '',
                 modaltitle2: '',
                 addType: '',
                 onlyKey: '',
@@ -464,22 +465,16 @@
                 }
             },
             addModal() {
-                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                localStorage.setItem('freshClueNum', new Date().getTime())
-                this.itemId = id
+                let routeData = this.$router.resolve({
-                this.editForm = {
+                    name: "ZQYJAddFileDetails",
-                    chapterNumber: '',
+                    query: {
-                    chapterName: '',
+                        standId: this.standId,
-                    oldText: '',
+                        attId: this.form.fjList[0].attId,
-                    newText: '',
+                        fileType: this.form.fjList[0].standFileClassify,
-                    reason: '',
+                    }
-                    id: id,
+                });
-                    department: this.$store.getters.userInfo.institutionName,
+                window.open(routeData.href, '_blank')
-                    responUserName: this.$store.getters.userInfo.userName,
-                    responUser: this.$store.getters.userInfo.userId
-                }
-                this.addType = 'add'
-                this.modaltitle2 = '新增'
-                this.modalshowflag2 = true
             },
             itemEdit (row) {
                 this.addType = 'edit'
@@ -712,6 +707,7 @@
                         this.todoId = res.id
                         this.json = data
                         this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
+                        this.standId = data.standId
                         this.getItemList(data.standId,data.textType)
                         this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : []))
                     }).catch(e => {
@@ -720,9 +716,18 @@
             },
         },
         mounted() {
+            window.addEventListener("storage", ev => {
+              if(ev.key === 'freshClueNum'){
+                  let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
+                  form.department = this.$store.getters.userInfo.institutionName
+                  form.responUserName = this.$store.getters.userInfo.userName
+                  form.responUser = this.$store.getters.userInfo.userId
+                  this.data.push(form)
+              }
+            })
             this.getHistoryData()
             this.getData()
-        }
+        },
     }
 </script>
 

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -346,6 +346,7 @@ export default {
   name: "bzzqyjStep4",
   data() {
     return {
+      standId: '',
       modaltitle2: '',
       addType: '',
       commentText4: '',
@@ -505,22 +506,32 @@ export default {
       }
     },
     addModal() {
-      var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+      localStorage.setItem('freshClueNum', new Date().getTime())
-      this.itemId = id
+      let routeData = this.$router.resolve({
-      this.editForm = {
+        name: "ZQYJAddFileDetails",
-        chapterNumber: '',
+        query: {
-        chapterName: '',
+          standId: this.standId,
-        oldText: '',
+          attId: this.form.fjList[0].attId,
-        newText: '',
+          fileType: this.form.fjList[0].standFileClassify,
-        reason: '',
+        }
-        id: id,
+      });
-        department: this.$store.getters.userInfo.institutionName,
+      window.open(routeData.href, '_blank')
-        responUserName: this.$store.getters.userInfo.userName,
+      // var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-        responUser: this.$store.getters.userInfo.userId
+      // this.itemId = id
-      }
+      // this.editForm = {
-      this.addType = 'add'
+      //   chapterNumber: '',
-      this.modaltitle2 = '新增'
+      //   chapterName: '',
-      this.modalshowflag2 = true
+      //   oldText: '',
+      //   newText: '',
+      //   reason: '',
+      //   id: id,
+      //   department: this.$store.getters.userInfo.institutionName,
+      //   responUserName: this.$store.getters.userInfo.userName,
+      //   responUser: this.$store.getters.userInfo.userId
+      // }
+      // this.addType = 'add'
+      // this.modaltitle2 = '新增'
+      // this.modalshowflag2 = true
     },
     itemEdit (row) {
       this.addType = 'edit'
@@ -673,6 +684,7 @@ export default {
           this.form.spId = data.spId || ''
           this.form.spName = data.spName || ''
           this.json = data
+          this.standId =  data.standId
           this.getItemList(data.standId,data.textType)
           this.data = data.info || data.data
         }).catch(e => {
@@ -683,6 +695,15 @@ export default {
   mounted() {
     this.getHistoryData()
     this.getData()
+    window.addEventListener("storage", ev => {
+      if(ev.key === 'freshClueNum'){
+        let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
+        form.department = this.$store.getters.userInfo.institutionName
+        form.responUserName = this.$store.getters.userInfo.userName
+        form.responUser = this.$store.getters.userInfo.userId
+        this.data.push(form)
+      }
+    })
   }
 }
 </script>

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -452,14 +452,6 @@
             }
           });
           window.open(routeData.href, '_blank')
-          //   return
-          // this.id = ''
-          // this.opiniontitle = '新增意见'
-          // this.opinionContent.partCode = ''
-          // this.opinionContent.reason = ''
-          // this.opinionContent.oldText = ''
-          // this.opinionContent.newText = ''
-          // this.opinionContent.cause = ''
         }
       },
       //删除

src/router/index.js

@@ -1363,6 +1363,17 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/ZQYJAddFileDetails',
+        name: 'ZQYJAddFileDetails',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue'),
+        meta: {
+          requireAuth: true,
+          title: '新增',
+          isBoolean: true,
+          // menuId: ''
+        }
+      },
       {
         path: '/bzzqyjStep1',
         name: 'bzzqyjStep1',