布局政策征求意见流程

src/pages/processCenter/pages/components/processFile.vue

@@ -84,11 +84,12 @@
                     let templateFileList = []
                     let list = []
                     fileList.forEach(item => {
-                        templateFileList.push(item)
+                        let data = item.response ? item.response.data : item
-                        list.push(item.name)
+                        templateFileList.push(data)
+                        list.push(data.id)
                     })
-                    let templateFileName = list.join(',')
+                    let templateFileId = list.join(',')
-                    this.$emit('uploadSuccess', templateFileList, templateFileName)
+                    this.$emit('uploadSuccess', templateFileList, templateFileId)
                     this.$message({
                         // showClose: true,
                         message: response.message,

src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue

@@ -42,7 +42,7 @@
                                   placeholder="请输入修改理由"
                                   clearable></el-input>
                     </el-form-item>
-                    <el-form-item label="模板"
+                    <el-form-item label="附件"
                                   label-width="150px"
                                   class="add-form-item">
                         <el-input
@@ -220,6 +220,8 @@
                 this.$refs.processFileRef.getFile(this.sarStandardsInfoEO[this.fileListName])
             },
             uploadSuccess(fileList, fileId) {
+                console.log(fileList);
+                console.log(fileId);
                 this.sarStandardsInfoEO[this.fileListName] = fileList
                 this.sarStandardsInfoEO[this.fileName] = fileId
                 this.sarStandardsInfoEO = {...this.sarStandardsInfoEO}
@@ -236,15 +238,25 @@
                 this.modalshowflag = false
             },
             saveOrUpdateStands() {
-                let timestamp = new Date().getTime();
+                this.$refs['sarStandardsInfoForm'].validate((valid) => {
-                if (!this.sarStandardsInfoEO.dataId) {
+                    if (valid) {
-                    this.sarStandardsInfoEO.dataId = timestamp
+                        if (!this.sarStandardsInfoEO.chapterNumber && !this.sarStandardsInfoEO.chapterEntry
-                }
+                            && !this.sarStandardsInfoEO.beforeRevision && !this.sarStandardsInfoEO.afterRevision
-                this.isSubmit = true
+                            && !this.sarStandardsInfoEO.revisionModification && !this.sarStandardsInfoEO.templateFileId) {
-                this.$emit('addModelForm', this.sarStandardsInfoEO)
+                            this.$message.warning('请至少填写一条数据，不能都为空')
-                this.modalshowflag = false
+                            return
-                this.$nextTick(() => {
+                        }
-                    this.isSubmit = false
+                        let timestamp = new Date().getTime();
+                        if (!this.sarStandardsInfoEO.dataId) {
+                            this.sarStandardsInfoEO.dataId = timestamp
+                        }
+                        this.isSubmit = true
+                        this.$emit('addModelForm', this.sarStandardsInfoEO)
+                        this.modalshowflag = false
+                        this.$nextTick(() => {
+                            this.isSubmit = false
+                        })
+                    }
                 })
             },
         }

src/pages/processCenter/pages/creatProcess/policyConsultation/components/fileViewModel.vue

@@ -0,0 +1,75 @@
+<template>
+    <el-dialog width='400px'
+               :visible.sync="fileMadel"
+               :title="title">
+        <div v-for="(item, index) in fileList" :key="index"
+             style="margin-right: 5px;padding-left: 10px;margin-bottom: 6px">
+            <div class="fileClass">
+                <span @click="handlePreview(item)">{{ item.name }}</span>
+                <el-button size="small"
+                           @click="clickButtonToUpload(item)"
+                           icon="el-icon-download"
+                           class="fileButton"
+                ></el-button>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+    export default {
+        name: "fileViewModel",
+        props: {
+            title: {
+                type: String,
+                default: '查看文件'
+            }
+        },
+        data() {
+            return {
+                fileMadel: false,
+                fileList: [],
+            }
+        },
+        methods: {
+            getData(row) {
+                this.fileList = row
+                this.fileMadel = true
+            },
+            handlePreview(file) {
+                let attId = ""
+                if (file && file.id) {
+                    attId = file.id
+                } else {
+                    attId = file.response.data.id
+                }
+                this.$preview(attId)
+            },
+            clickButtonToUpload(file) {
+                const attId = file.attId
+                if (attId) {
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+                } else {
+                    this.$message.warning('文件不存在,下载失败')
+                }
+            },
+        }
+    }
+</script>
+
+<style scoped>
+    .fileClass span {
+        cursor: pointer;
+    }
+
+    .fileClass span:hover {
+        color: #00a0e9;
+    }
+
+    .fileButton {
+        height: 22px;
+        margin-left: 5px;
+        line-height: 22px;
+        padding: 0 15px;
+    }
+</style>

src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue

@@ -97,6 +97,10 @@
                     prop="completeFlag"
                     label="附件"
                     align="center">
+                <template slot-scope="scope">
+                    <a v-if="scope.row.templateFileId" @click="fileClick(scope.row.templateFileList)" class="textClass">查看文件</a>
+                    <span v-else>--</span>
+                </template>
             </el-table-column>
 
             <el-table-column
@@ -156,18 +160,21 @@
         </el-table>
 
         <addModel ref="addModelRef" @addModelForm="addModelForm"/>
+        <fileViewModel ref="fileViewModelRef"/>
     </div>
 </template>
 
 <script>
     import ProcessTitle from "../../../components/ProcessTitle";
+    import fileViewModel from "./fileViewModel";
     import addModel from "./addModel";
 
     export default {
         name: "solicitationList",
         components: {
             ProcessTitle,
-            addModel
+            addModel,
+            fileViewModel
         },
         data() {
             return {
@@ -175,6 +182,7 @@
                 addOrEdit: 'add',
                 editNum: 0,
                 selectList: [],
+                deleteList: [],
                 taskKey: this.$route.query.taskKey,//流程节点key
             }
         },
@@ -264,6 +272,9 @@
                         roundButton: false
                     }).then(() => {
                         this.selectList.forEach(val => {
+                            if (val.id) {
+                                this.deleteList.push(val.id)
+                            }
                             this.histortData = this.histortData.filter(res => {
                                 return res.dataId != val.dataId
                             })
@@ -286,11 +297,11 @@
                         this.$refs.addModelRef.edit(command[0])
                         break;
                     case "删除":
-                        this.deleteSarAccess(command[1]);
+                        this.deleteSarAccess(command[1], command[0]);
                         break;
                 }
             },
-            deleteSarAccess(num) {
+            deleteSarAccess(num, row) {
                 this.$confirm('确认删除数据?', '提示', {
                     confirmButtonText: '确定',
                     confirmButtonClass: 'common-button-primary',
@@ -298,6 +309,9 @@
                     type: 'warning',
                     roundButton: false
                 }).then(() => {
+                    if (row.id) {
+                        this.deleteList.push(row.id)
+                    }
                     this.histortData.splice(num, 1)
                     this.histortData = [...this.histortData]
                 }).catch(() => {
@@ -313,7 +327,13 @@
                     this.histortData = [...this.histortData]
                 }
             },
-
+            fileClick(list) {
+                if (list && list.length > 0) {
+                    this.$refs.fileViewModelRef.getData(list)
+                } else {
+                    this.$message.warning('没有可查看的文件')
+                }
+            },
         },
     }
 </script>

src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue

@@ -225,10 +225,10 @@
                 </el-collapse-item>
             </el-collapse>
         </div>
-        <div class="content" v-if="showPersonnel && active === '2'">
+        <div class="content" v-show="showPersonnel && active === '2'">
             <personnelInformation ref="personnelInformationRef"/>
         </div>
-        <div class="content" v-if="showApprovalHistory && active === '3'"
+        <div class="content" v-show="showApprovalHistory && active === '3'"
              style="padding-top: 20px">
             <approvalHistory/>
         </div>
@@ -528,7 +528,7 @@
                 this.$http.post('lawss/activiti/startProcessRollBack', {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
-                    type: 'laws2',
+                    type: '29',
                     json: JSON.stringify({
                         form: json,
                         roleForm: this.roleForm,
@@ -555,14 +555,6 @@
                 }, {_this: this}, res => {
                     if (res.success) {
                         this.$message.success(res.message);
-                        if (this.bpnId !== '') {
-                            let taskId = {
-                                id: this.bpnId
-                            }
-                            taskDel(taskId).then(res => {
-                                return res
-                            })
-                        }
                         this.$router.push("/processCenter");
                     }
                     this.isSubmit = false;

src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue

@@ -517,7 +517,7 @@ export default {
         case '12':
           // 政策征求意见流程
           this.$router.push({
-            name: 'zczqyjStep1'
+            path: 'policyConsultation'
           })
           break
         case '13':

src/sysConfig/index.js

@@ -11,20 +11,20 @@
 // const devIp = '10.10.10.46'
 // const devInterfacePORT = '4202'
 // // const devIp = '10.0.3.10'
-const devIp = 'localhost'
+const devIp = '10.0.3.11'
 const devInterfacePORT = '10086'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证
-const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
+const ssoLogin = 'http://localhost:9090/#/'
 // 配置 前端服务
-const devWebUrl = 'http://62.234.136.153:8038/#/'
+const devWebUrl = 'http://localhost:9090/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-// const onlyOfficeUrl = 'http://127.0.0.1:8080'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
-const onlyOfficeUrl = 'http://10.10.10.46:8889'
+// const onlyOfficeUrl = 'http://10.10.10.46:8889'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -50,8 +50,8 @@ const processPort = '17210'
 // 生产环境配置
 // const prodIp = '39.98.140.126'
 // const prodInterfacePORT = '4201'
-// const prodIp = '10.10.10.46'
+const prodIp = '10.10.10.46'
-// const prodInterfacePORT = '4202'
+const prodInterfacePORT = '4202'
 // const prodIp = 'slrs.foton.com.cn'
 // const prodInterfacePORT = ''