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

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

@@ -7,9 +7,9 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
-    <div class="content" v-if="active === '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
         <el-form
             ref="qbkwForm"
@@ -56,23 +56,8 @@
           </div>
         </el-form>
       </div>
-      <div>
-<!--        <el-collapse accordion>-->
-<!--          <el-collapse-item title="调研描述">-->
-<!--            <div style="margin: 10px 0;">-->
-<!--              <el-input-->
-<!--                  type="textarea"-->
-<!--                  :rows="3"-->
-<!--                  resize="none"-->
-<!--                  placeholder="请输入调研描述"-->
-<!--                  v-model="textarea">-->
-<!--              </el-input>-->
-<!--            </div>-->
-<!--          </el-collapse-item>-->
-<!--        </el-collapse>-->
-      </div>
     </div>
-    <div class="content" v-if="active === '2'">
+    <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
@@ -156,8 +141,8 @@
             size="800px">
       <el-tree
               v-if="modalshowflag"
-              style="height: 100%;"
               node-key="id"
+              style="height: 100%; overflow: auto;"
               class="filter-tree"
               :data="treeData"
               :props="defaultProps"
@@ -216,11 +201,9 @@ export default {
           { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
         ]
       },
-      data: [], // 标准列表数据
-      ListForm: {}, // 新增数据
       roleForm: {
-        startUserName: this.$store.getters.userInfo.account,
+        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.id,
+        startUser: this.$store.getters.userInfo.userId,
         dockUser: '',
         responUserList: '',
         ministerUser: '',
@@ -234,16 +217,16 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'blur' },
+          { required: true, message: '请输入调研标题', trigger: 'change' },
         ],
         ministerUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'blur' },
+          { required: true, message: '请输入调研标题', trigger: 'change' },
         ],
         directorUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'blur' },
+          { required: true, message: '请输入调研标题', trigger: 'change' },
         ],
         presidentUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'blur' },
+          { required: true, message: '请输入调研标题', trigger: 'change' },
         ]
       }
     }
@@ -294,30 +277,40 @@ export default {
         this.treeData = res.data
       })
     },
-    closeDrawer() {
-      this.ListModel = false
-    },
-    OkDrawer() {
-      this.ListModel = false
-      var item = {
-        remarks: '123'
-      }
-      this.data.push(item)
-    },
-    addList() {
-      this.title = '新增标准'
-      this.ListModel = true
-    },
     handleTabs(name) {
       this.active = name
     },
     handleSave() {},
     handleSubmit() {
-      this.$refs['Form'].validate((valid) => {
+      this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
-          alert('submit!');
+          this.$refs['Form'].validate((valid) => {
+            if (valid) {
+              this.$http.get('lawss/activiti/startProcess', {
+                type: '2'
+              }, {}, res => {
+                if (res.ok) {
+                  var json = Object.assign(this.form, this.roleForm)
+                  this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: res.data,
+                    userId: this.$store.getters.userInfo.userId
+                  }, {}, res => {
+                    if (res.success) {
+                      this.$message.success('流程发起成功')
+                      this.$router.push('/processCenter')
+                    }
+                  })
+                } else {
+                  this.$message.warning('流程启动失败')
+                }
+              })
+            } else {
+              return this.$message.warning('请完善人员信息')
+            }
+          })
         } else {
-          return false;
+          return this.$message.warning('请完善基础信息')
         }
       })
     }

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

@@ -0,0 +1,283 @@
+<template>
+    <div class="bzdyStep2">
+        <!--    标准调研流程-->
+        <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="qbkwForm"
+                        :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="12">
+                                <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.title"
+                                            placeholder="请输入调研标题"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.date"
+                                            type="date"
+                                            placeholder="请选择完成时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
+                                    <div v-if="form.model">
+                                        {{ form.model }}
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.responUserList"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+        </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: "bzdyStep2",
+        data() {
+            return {
+                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: {
+                    title: '', // 调研标题
+                    date: '', // 完成时间
+                    model: '', // 上传模板
+                    responUserList: '',
+                    responUserListName: '',
+                },
+                formRules: {
+                    responUserList: [
+                        { 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.responUserList = idList
+                this.form.responUserListName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.responUserList.length > 0) {
+                    this.nodeList = this.form.responUserList.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['qbkwForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.responUserList = this.form.responUserList
+                        json.responUserListName = this.form.responUserListName
+                        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.title = data.title
+                        this.form.date = data.date
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzdyStep2 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        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/creatProcess/bzdy/step3.vue

@@ -0,0 +1,295 @@
+<template>
+    <div class="bzdyStep3">
+        <!--    标准调研流程-->
+        <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="qbkwForm"
+                        :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="12">
+                                <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.title"
+                                            placeholder="请输入调研标题"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.date"
+                                            type="date"
+                                            placeholder="请选择完成时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
+                                    <div v-if="form.model">
+                                        {{ form.model }}
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.fileName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.fileName" @click="fileUpload" class="fileClass">
+                                        {{ form.fileName }}
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                @click="fileUpload"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+            <el-upload
+                    multiple
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :show-file-list="false"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
+    </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: "bzdyStep3",
+        data() {
+            return {
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    title: '', // 调研标题
+                    date: '', // 完成时间
+                    model: '', // 上传模板
+                    fileId: '',
+                    fileName: '',
+                    responUserList: '',
+                    responUserListName: '',
+                },
+                formRules: {
+                    fileName: [
+                        { required: true, message: '请上传调研结果', trigger: 'change' },
+                    ]
+                },
+                json: {},
+                fileUrl: 'api/att/attFile/upload',
+                fileMadel: false,
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            // 导入按钮 上传之前的钩子
+            beginImportFile (file) {
+                var filename = file.name
+                var index1 = filename.lastIndexOf('.')
+                var index2 = filename.length
+                var fileSuffix = filename.substring(index1, index2)
+                // const fileSuffix = file.name.split('.')[1] // 后缀名
+                // 判断上传文件格式
+                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.spinShow = false
+                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    return false
+                }
+                // 判断文件上传大小
+                // eslint-disable-next-line no-unreachable
+                if (file.size / 1024 / 1024 <= 200) {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '大小不超过200M')
+                    return false
+                }
+                return true
+            },
+            // 导入标准数据成功后执行
+            importFileSuccess (response, file) {
+                if (response.ok) {
+                    this.fileMadel = false
+                    this.form.fileId = response.data.id
+                    this.form.fileName = response.data.name
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                }
+            },
+            fileUpload () {
+                this.fileMadel = true
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['qbkwForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.fileId = this.form.fileId
+                        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.title = data.title
+                        this.form.date = data.date
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzdyStep3 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        position: relative;
+        height: 100%;
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        .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

@@ -214,7 +214,6 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
-      console.log(row);
       this.setHandleInfo(JSON.stringify(row))
       const prcType = row.prcType
       switch(prcType) {
@@ -253,6 +252,30 @@ export default {
               }
             })
           }
+        case '2':
+          if (row.taskInfo === '责任对接人选择责任人') {
+            this.$router.push({
+              name: 'bzdyStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人上传调研结果') {
+            this.$router.push({
+              name: 'bzdyStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
           break;
           //标准清单更新/发布流程
           case'4' :

src/router/index.js

@@ -330,6 +330,24 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzdyStep2',
+        name: 'bzdyStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep3',
+        name: 'bzdyStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
       {
         path: '/zqyjStep1',
         name: 'zqyjStep1',