From 8df229c9b4741f9196d4f6bae874139191e9600d Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Tue, 20 Jul 2021 17:57:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E8=B4=A3=E4=BB=BB=E4=BA=BA=E4=BC=9A?=
 =?UTF-8?q?=E7=AD=BE=E8=8A=82=E7=82=B9=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 21 ++++++++------
 .../pages/creatProcess/bzrk/step3.vue         | 29 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e7dbc3d63..aa58f9b7b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1497,14 +1497,14 @@
                             console.log(bringData)
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
-                            this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw.split(',')
-                            this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr.split(',')
-                            this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs.split(',')
-                            this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm.split(',')
-                            this.form.syrz = JSON.parse(JSON.stringify(json)).syrz.split(',')
-                            this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx.split(',')
-                            this.form.nylx = JSON.parse(JSON.stringify(json)).nylx.split(',')
-                            this.form.cllx = JSON.parse(JSON.stringify(json)).cllx.split(',')
+                            this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
+                            this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
+                            this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
+                            this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
+                            this.form.syrz = JSON.parse(JSON.stringify(json)).syrz ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
+                            this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
+                            this.form.nylx = JSON.parse(JSON.stringify(json)).nylx ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
+                            this.form.cllx = JSON.parse(JSON.stringify(json)).cllx ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
                             this.defaultCheckedKeys = [this.form.standSystem];
                             this.defaultCheckedKeys1 = [this.form.cycvppsbm];
                             this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -1949,7 +1949,8 @@
               saveTaskFirst(_formData).then(res => {
                 this.saveLoading = false
                 this.$message.success('保存成功')
-                // this.$router.push('/processCenter')
+                // 流程保存之后，应该流转至草稿页面
+                this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
                 // this.bpnId = res.result
               }).catch(e => {
                 this.saveLoading = false
@@ -1982,6 +1983,8 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 this.isSubmit = false
+                                              // 流程提交之后，应该流转至待办任务页面
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             }
                                         })
                                     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 29007b56f..4e6defe76 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -679,6 +679,7 @@
 </template>
 
 <script>
+import {saveTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
@@ -943,7 +944,31 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', this.$route.query.type)
+      _formData.append('json', JSON.stringify({
+        prcForm: this.prcForm,
+        sarAccessInfoList: this.sarAccessInfoList,
+        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+        bzqdForm: this.bzqdForm,
+        listInfo: this.listInfo,
+        id: this.id
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        // 流程保存之后，应该流转至草稿页面
+        this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
+        // this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     handleSubmit() {
       this.isSubmit = false
       this.form.commentText = this.commentText
@@ -958,6 +983,8 @@ export default {
       }, res => {
         if (res.success) {
             this.$message.success(res.message)
+          // 流程提交之后，应该流转至待办任务页面
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
         }else {
             this.$message.success(res.message)
         }

From e69f39f4f0b448e6dfb7fac6eb837ba8aa06c8de Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Tue, 20 Jul 2021 17:59:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?bug:=20=E6=8A=8A=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=B3=E4=BE=A7=E7=9A=84=E5=8F=B9=E5=8F=B7=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2074d8414..4fd7cf277 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -357,7 +357,7 @@
                   </el-form-item>
                   <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                                 prop="textStatus" label-width="150px" class="add-form-item">
-                      <template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
+                      <template slot="label">文本状态</template>
                       <el-select v-model="sarStandardsInfoEO.textStatus"
                                  placeholder="请选择文本状态"
                                  clearable>

From 1bf09d7ee9bdffafc55f960b2e27a3b33ab96f5c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 20 Jul 2021 18:00:11 +0800
Subject: [PATCH 3/4] commit

---
 .../pages/creatProcess/bzdy/step1-1.vue       | 556 ++++++++++++++++++
 .../pages/creatProcess/bzdy/step1.vue         |  24 +-
 .../pages/creatProcess/bzdy/step2.vue         |   1 -
 .../tabComponents/taskDraft/index.vue         |  17 +
 src/router/index.js                           |   9 +
 5 files changed, 604 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
new file mode 100644
index 000000000..178d7f8c3
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -0,0 +1,556 @@
+<template>
+    <div class="bzdyStep1-1">
+        <!--    标准调研流程-->
+        <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 class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</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
+                                            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
+                                            v-model="form.date"
+                                            type="date"
+                                            placeholder="请选择完成时间">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="调研模板" prop="modelName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.modelName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.modelName" @click="fileUpload" class="fileClass">
+                                        {{ form.modelName }}
+                                    </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>
+            <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>
+        <div class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                                    <h4>责任部门对接人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
+                                        </el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                                    <h4>标准法规部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                                    <h4>技术管理中心主任</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
+                                    <h4>工程研究总院院长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
+                                        <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                    </el-form>
+                </el-timeline>
+            </div>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任部门对接人"
+                :visible.sync="modalshowflag2"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag2"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList2"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree2">
+            </el-tree>
+            <div id="roleFormButton2" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
+            </div>
+        </el-drawer>
+        <el-drawer
+                :title="drawerTitle"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    node-key="id"
+                    style="height: 100%; overflow: auto;"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    @check="drawerCheck"
+                    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>
+        <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 { saveTaskFirst, queryTaskFirst } from 'api/process'
+
+    export default {
+        name: "bzdyStep1-1",
+        data() {
+            return {
+                commentText: '',
+                roleRow: {},
+                nodeList: [],
+                type: '',
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalshowflag: false, // drawer开关
+                drawerTitle: '', //drawer标题
+                textarea: '', // 意见
+                title: '', // 新增编辑抽屉标题
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    title: '', // 调研标题
+                    date: '', // 完成时间
+                    model: '', // 上传模板
+                    modelName: ''
+                },
+                formRules: {
+                    title: [
+                        { required: true, message: '请输入调研标题', trigger: 'blur' },
+                    ],
+                    date: [
+                        { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
+                    ],
+                    modelName: [
+                        { required: true, message: '请上传调研结果', trigger: 'change' },
+                    ]
+                },
+                roleForm: {
+                    startUserName: this.$store.getters.userInfo.userName,
+                    startUser: this.$store.getters.userInfo.userId,
+                    dockUserList: '',
+                    responUserList: '',
+                    ministerUser: '',
+                    directorUser: '',
+                    presidentUser: '',
+                    dockUserName: '',
+                    responUserListName: '',
+                    ministerUserName: '',
+                    directorUserName: '',
+                    presidentUserName: ''
+                },
+                roleFormRules: {
+                    dockUserName: [
+                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+                    ],
+                    ministerUserName: [
+                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                    ],
+                    directorUserName: [
+                        { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+                    ],
+                    presidentUserName: [
+                        { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+                    ]
+                },
+                fileUrl: 'api/att/attFile/upload',
+                fileMadel: false,
+                nodeList2: [],
+                modalshowflag2: false,
+
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            getData () {
+                queryTaskFirst({
+                    bpnId: this.$route.query.bpnId
+                }).then(res => {
+                    let mes = JSON.parse(res.mes)
+                    mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                    this.form = mes.form
+                    this.roleForm = mes.roleForm
+                    this.commentText = mes.commentText
+                })
+            },
+            choiceZRRS () {
+                this.nodeList2 = []
+                if ( this.roleForm.dockUserList.length > 0) {
+                    this.nodeList2 = this.roleForm.dockUserList.split(',')
+                }
+                this.modalshowflag2 = true
+            },
+            saveUserInfo2 () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.roleForm.dockUserList = idList
+                this.roleForm.dockUserName = nameList
+                this.modalshowflag2 = false
+            },
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
+            },
+            // 导入按钮 上传之前的钩子
+            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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                    return true
+                } else {
+                    this.spinShow = false
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    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.model = response.data.id
+                    this.form.modelName = response.data.name
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                }
+            },
+            fileUpload () {
+                this.fileMadel = true
+            },
+            saveUserInfo () {
+                if (this.type === 'dockUser') {
+                    this.roleForm.dockUser = this.roleRow.id
+                    this.roleForm.dockUserName = this.roleRow.name
+                } else if (this.type === 'ministerUser') {
+                    this.roleForm.ministerUser = this.roleRow.id
+                    this.roleForm.ministerUserName = this.roleRow.name
+                } else if (this.type === 'directorUser') {
+                    this.roleForm.directorUser = this.roleRow.id
+                    this.roleForm.directorUserName = this.roleRow.name
+                } else if (this.type === 'presidentUser') {
+                    this.roleForm.presidentUser = this.roleRow.id
+                    this.roleForm.presidentUserName = this.roleRow.name
+                }
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            drawerCheck (data) {
+                var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+                if(getlist.length == 1) {
+                    this.roleRow = getlist[0]
+                }else {
+                    this.$refs.tree.setCheckedKeys([data.id]);
+                    this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                }
+            },
+            choiceZRR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('id', this.bpnId || '')
+                _formData.append('createUser', this.$store.getters.userInfo.userId)
+                _formData.append('createUserName', this.$store.getters.userInfo.userName)
+                _formData.append('prcType', '2')
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    roleForm: this.roleForm
+                }))
+                saveTaskFirst(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                    this.bpnId = res.result
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
+            handleSubmit() {
+                this.$refs['qbkwForm'].validate((valid) => {
+                    if (valid) {
+                        this.$refs['Form'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.$http.get('lawss/activiti/startProcess', {
+                                    type: '2'
+                                }, {}, res => {
+                                    if (res.ok) {
+                                        var json = Object.assign(this.form, this.roleForm)
+                                        json.commentText = this.commentText
+                                        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')
+                                            }
+                                            this.isSubmit = false
+                                        })
+                                    } else {
+                                        this.isSubmit = false
+                                        this.$message.warning('流程启动失败')
+                                    }
+                                })
+                            } else {
+                                return this.$message.warning('请完善人员信息')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }
+        },
+        mounted () {
+            this.getData()
+            this.getTree()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzdyStep1-1 {
+        /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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index c6005f448..d4a1a258a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -96,7 +96,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>责任部门对接人</h4>
@@ -230,6 +230,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
+import { saveTaskFirst } from 'api/process'
 
 export default {
   name: "bzdyStep1",
@@ -419,7 +420,26 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '2')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     handleSubmit() {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index 13e9b5058..1169ad9bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -75,7 +75,6 @@
             </el-collapse>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index b6842a975..25fccf741 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -82,6 +82,9 @@
                   align="center"
                   width="180"
           >
+            <template slot-scope="scope">
+              {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
+            </template>
           </el-table-column>
           <el-table-column
                   prop="prcName"
@@ -210,6 +213,20 @@ export default {
     },
     dealWith (row) { // 办理
       //草稿办理待开发
+      const { prcType, id } = row
+      switch (prcType) {
+              // 法规入库及评估流程
+        case '2':
+          this.$router.push({
+            name: 'bzdyStep1-1',
+            query: {
+              type: '2',
+              processName: '标准调研流程',
+              bpnId: id
+            }
+          })
+          break
+      }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
     ...mapActions(['setMenu'])
diff --git a/src/router/index.js b/src/router/index.js
index 8d295b2a8..5c93b42a3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -438,6 +438,15 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzdyStep1-1',
+        name: 'bzdyStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
       {
         path: '/bzdyStep2',
         name: 'bzdyStep2',

From db975d3ea26aa267f419cb29c46b6825f9d67e18 Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Wed, 21 Jul 2021 10:25:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E3=80=81=E6=8C=89=E9=92=AE=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue            |  2 +-
 .../pages/otherAddEit.vue                              |  3 ++-
 .../pages/projectAddEit.vue                            | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index cc91e1c98..ffe6f3326 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -190,7 +190,7 @@
                                   placeholder="请输入角色描述"
                                   clearable></el-input>
                     </el-form-item>
-                    <el-form-item label="角色状态" prop="useFlag" label-width="145px">
+                    <el-form-item label="角色状态" prop="useFlag" style="margin-left: 10px">
                         <el-select class="bead-input" v-model="addForm.useFlag">
                             <el-option
                                     v-for="item in options"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index caab34005..6c2af2375 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1770,9 +1770,10 @@ export default {
       const accessRow = this.getAccessStandardRegRow
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
-        this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+        //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
         // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
+        this.sarAccessEO.detailedList = accessRow.detailedList
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index b1b3ba854..ecf20717b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -417,7 +417,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column>
+        <el-table-column width="150">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -428,6 +428,7 @@
             <el-button
               class="common-button-default"
               type="danger"
+              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
@@ -1242,8 +1243,6 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.$nextTick(() => {
-        })
       }, e => {
 
       })
@@ -1734,7 +1733,7 @@ export default {
   },
   mounted () {
     this.zqaId =this.$route.query.id;
-    // this.getData()
+    //this.getData()
     this.getDept()
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -1771,9 +1770,10 @@ export default {
       const accessRow = this.getAccessStandardRegRow
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
-        this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+        //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
         // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
+        this.sarAccessEO.projectName = accessRow.projectName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile