Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

src/pages/personal/pages/individual-plate/index.vue

@@ -192,7 +192,7 @@ export default {
       height:100% !important;
     }
     .el-transfer-panel__list.is-filterable {
-      height: 360px;
+      height: calc(~'100% - 100px');
       padding-top: 0;
       overflow-y: auto;
     }

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -265,6 +265,7 @@
         name: "bzjdStep1",
         data() {
             return {
+                standId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -416,6 +417,7 @@
                         this.form.name = bringData[0].standName
                     }
                     this.form.id = bringData[0].id
+                    this.standId = bringData[0].standId
                     this.listModel = false;
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: this.form.id,
@@ -508,6 +510,7 @@
                                     if (res.ok) {
                                         var json = Object.assign(this.form, this.roleForm)
                                         json.commentText = this.commentText
+                                        json.standInData = this.standId
                                         json.itemList = this.itemList
                                         this.$http.post('lawss/activiti/completeTask', {
                                             json: JSON.stringify(json),

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -26,7 +26,7 @@
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.cid"
+                                            v-model="form.number"
                                             placeholder="请输入标准编号"
                                             clearable
                                     ></el-input>
@@ -34,26 +34,18 @@
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.cname"
+                                            v-model="form.name"
                                             placeholder="请输入标准名称"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.endTime"
-                                            type="date"
-                                            placeholder="请选择结束日期">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model="form.responUserList"
+                                            v-model="form.zxUserId"
                                             style="display: none;"
                                             clearable
                                     ></el-input>
-                                    <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -140,15 +132,14 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    cid: '', // 编号
+                    number: '', // 编号
-                    endTime: '', // 结束日期
+                    name: '', // 结束日期
-                    cname: '', // 名称
+                    zxUserId: '',
-                    responUserList: '',
+                    zxUserIdName: ''
-                    responUserListName: ''
                 },
                 formRules: {
-                    responUserList: [
+                    zxUserId: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+                        { required: true, message: '请选择执行人', trigger: 'change' },
                     ]
                 },
                 json: {}
@@ -171,8 +162,8 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.form.responUserList = idList
+                this.form.zxUserId = idList
-                this.form.responUserListName = nameList
+                this.form.zxUserIdName = nameList
                 this.modalshowflag = false
             },
             cancleUserInfo () {
@@ -180,8 +171,8 @@
             },
             choiceZRR () {
                 this.nodeList = []
-                if (this.form.responUserList.length > 0) {
+                if (this.form.zxUserId.length > 0) {
-                    this.nodeList = this.form.responUserList.split(',')
+                    this.nodeList = this.form.zxUserId.split(',')
                 }
                 this.modalshowflag = true
             },
@@ -199,8 +190,15 @@
                     if (valid) {
                         var json = this.json
                         json.commentText = this.commentText
-                        json.responUserList = this.form.responUserList
+                        var arr = this.form.zxUserId.split(',')
-                        json.responUserListName = this.form.responUserListName
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -223,9 +221,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.form.number = data.number
-                        this.form.endTime = data.endTime
+                        this.form.name = data.name
-                        this.form.cname = data.cname
                         this.json = data
                     }).catch(e => {
                     })

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

@@ -0,0 +1,297 @@
+<template>
+    <div class="bzjdStep3">
+        <!--    标准调研流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准征求意见流程</template>
+            <template slot="proNode">对接人选择责任人</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.zxUserId"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzjdStep3",
+        data() {
+            return {
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                roleRow: {},
+                nodeList: [],
+                type: '',
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalshowflag: false, // drawer开关
+                drawerTitle: '', //drawer标题
+                textarea: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    number: '', // 编号
+                    name: '', // 结束日期
+                    zxUserId: '',
+                    zxUserIdName: ''
+                },
+                formRules: {
+                    zxUserId: [
+                        { required: true, message: '请选择执行人', trigger: 'change' },
+                    ]
+                },
+                json: {}
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            saveUserInfo () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.form.zxUserId = idList
+                this.form.zxUserIdName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.zxUserId.length > 0) {
+                    this.nodeList = this.form.zxUserId.split(',')
+                }
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        var arr = this.form.zxUserId.split(',')
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
+                        this.$http.post('lawss/activiti/completeTask', {
+                            json: JSON.stringify(json),
+                            taskId: this.taskIds,
+                            userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
+                            if (res.success) {
+                                this.$message.success('提交成功')
+                                this.$router.push('/processCenter')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.number = data.number
+                        this.form.name = data.name
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzjdStep3 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>

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

@@ -569,7 +569,7 @@ export default {
           }
           break
         case '9':
-          if (row.taskInfo === '') {
+          if (row.taskInfo === '选择执行人') {
             this.$router.push({
               name: 'bzjdStep2',
               query: {
@@ -580,6 +580,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '填写解读分析') {
+            this.$router.push({
+              name: 'bzjdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
       }
     },

src/router/index.js

@@ -609,6 +609,15 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep3',
+        name: 'bzjdStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具