From 2eca268fd0f12dd8d3747252f27bd057410a4f2a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 27 Jul 2021 15:49:45 +0800
Subject: [PATCH 1/3] commit

---
 src/components/navMenu/index.vue              |   2 +-
 .../pages/creatProcess/bzdy/step1-1.vue       |   4 +-
 .../pages/creatProcess/bzdy/step1.vue         |   4 +-
 .../pages/creatProcess/bzdy/step3.vue         |   4 +-
 .../pages/creatProcess/bzdy/step5.vue         |   4 +-
 .../pages/creatProcess/bzdy/step6.vue         |   4 +-
 .../pages/creatProcess/bzdy/step7.vue         |   4 +-
 .../pages/creatProcess/bzdy/step8.vue         |   4 +-
 .../pages/creatProcess/bzdy/step9.vue         |   4 +-
 .../pages/creatProcess/bzjd/step1.vue         | 217 ++++++++----------
 .../tabComponents/alreadyProcess/index.vue    |   2 +-
 .../tabComponents/alreadySend/index.vue       |   2 +-
 .../tabComponents/processCenter/index.vue     |   2 +-
 .../tabComponents/taskDraft/index.vue         |   2 +-
 .../pags/consultationDetails.vue              |  26 ++-
 15 files changed, 129 insertions(+), 156 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 2e85d241d..f9cb687af 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -458,7 +458,7 @@ export default {
     overflow-y: auto;
     user-select: none;
     box-sizing: border-box;
-    background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat;
+    background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat;
     background-size: 100% 100%;
     &:not(.is-collapse) {
       width: 212px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 6f7638f37..bb093c810 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -327,11 +327,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index db34d6fd9..4bed4251c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -318,11 +318,11 @@ export default {
       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') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
         return false
       }
       // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index 94122ef61..2166ae91f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -236,11 +236,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 47f247302..fd03d1776 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -260,11 +260,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index d9e652faa..307627111 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -259,11 +259,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 699657b95..caf5acd2d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -259,11 +259,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 220de8e65..df88eaaca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -259,11 +259,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 91fa08324..16c896fdb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -259,11 +259,11 @@
                 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') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 1ac24ea1b..d240a7ac1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -165,7 +165,7 @@
                                         <el-input
                                                 v-model="roleForm.deptUserIdName"
                                                 placeholder="选择标准法规部部长"
-                                                @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
+                                                @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
                                         />
                                     </div>
                                 </el-form-item>
@@ -313,58 +313,63 @@
                 </div>
             </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-drawer
-                title="选择责任部门对接人"
-                :visible.sync="modalshowflag2"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag2"
-                    node-key="id"
-                    style="height: 100%; overflow: auto;"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList2"
-                    highlight-current
-                    check-strictly
-                    @check="drawerCheck2"
-                    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>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="saveUserInfo"
+                :nodeList="nodeList"
+        ></Role-tree>
+<!--        <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"-->
+<!--                    :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-drawer-->
+<!--                title="选择责任部门对接人"-->
+<!--                :visible.sync="modalshowflag2"-->
+<!--                :wrapperClosable="false"-->
+<!--                size="800px">-->
+<!--            <el-tree-->
+<!--                    v-if="modalshowflag2"-->
+<!--                    node-key="id"-->
+<!--                    style="height: 100%; overflow: auto;"-->
+<!--                    class="filter-tree"-->
+<!--                    :data="treeData"-->
+<!--                    :props="defaultProps"-->
+<!--                    :default-checked-keys="nodeList2"-->
+<!--                    highlight-current-->
+<!--                    check-strictly-->
+<!--                    @check="drawerCheck2"-->
+<!--                    :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>-->
     </div>
 </template>
 
@@ -392,6 +397,7 @@
                 saveLoading: false,
                 // 基础信息form表单
                 form: {
+                    id: '',
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
@@ -570,7 +576,7 @@
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.id,
+                        infoId: this.form.standId,
                         page: 1,
                         pageSize: 9999
                     }, {
@@ -621,46 +627,25 @@
             },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
-            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
-                })
-            },
-            saveUserInfo () {
-                if (this.type === 'deptUserId') {
-                    this.roleForm.deptUserId = this.roleRow.id
-                    this.roleForm.deptUserIdName = this.roleRow.name
+            saveUserInfo (data) {
+                if (this.type === 0) {
+                    this.roleForm.deptUserId = data[0].id
+                    this.roleForm.deptUserIdName = data[0].name
+                } else if (this.type === 1) {
+                    this.itemList[this.zrIndex].zrUserId = data[0].id
+                    this.itemList[this.zrIndex].zrUserIdName = data[0].name
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zrIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zrUserId = data[0].id
+                                item.zrUserIdName = data[0].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]
-                }
-            },
-            drawerCheck2 (data) {
-                var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
-                if(getlist.length == 1) {
-                    this.roleRow = getlist[0]
-                }else {
-                    this.$refs.tree2.setCheckedKeys([data.id]);
-                    this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
-                }
-            },
             handleSelectionChange (val) {
                 this.zrIdList = []
                 val.forEach( item => {
@@ -668,51 +653,30 @@
                 })
             },
             choiceZRRS (row, type, index) {
+                this.type = type
                 if (type === 1) {
-                    this.nodeList2 = []
-                    this.zrIndex= index
+                    this.drawerTitle = '选择责任人'
+                    this.nodeList = []
+                    this.zrIndex = index
                     this.zrType = type
-                    this.nodeList2.push(row)
-                    this.modalshowflag2 = true
-                } else {
+                    this.nodeList.push(row)
+                    this.modalshowflag = true
+                } else if (type === 2) {
                     // 批量
                     if (this.zrIdList.length > 0) {
                         this.zrType = type
-                        this.nodeList2 = []
-                        this.modalshowflag2 = true
+                        this.nodeList = []
+                        this.modalshowflag = true
+                        this.drawerTitle = '批量选择责任人'
                     } else {
                      this.$message.warning('请选择要编辑的数据')
                     }
-                }
-            },
-            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
-                })
-                if (this.zrType == 1) {
-                    this.itemList[this.zrIndex].zrUserId = idList
-                    this.itemList[this.zrIndex].zrUserIdName = nameList
                 } else {
-                    this.itemList.forEach( item => {
-                        this.zrIdList.forEach( items => {
-                            if (item.id === items) {
-                                item.zrUserId = idList
-                                item.zrUserIdName = nameList
-                            }
-                        })
-                    })
+                    this.nodeList = []
+                    this.nodeList.push(row)
+                    this.drawerTitle = '选择标准法规部部长'
+                    this.modalshowflag = true
                 }
-                this.modalshowflag2 = false
-            },
-            cancleUserInfo2 () {
-                this.modalshowflag2 = false
             },
             handleTabs(name) {
                 this.active = name
@@ -766,7 +730,6 @@
             }
         },
         mounted () {
-            this.getTree()
             this.sarStandCompareHis()
             this.sarStandCompareHis2()
             this.tableHeight = $('.content').height() - 44
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 2e9643307..a68ddea6e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index 647a5fd38..d1bdadf80 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 64152b927..4075151f6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -124,7 +124,7 @@
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
-                <el-dropdown trigger="click" @command="handleCommand">
+                <el-dropdown trigger="click" @command="handleCommand" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 3029caa96..f42b51d7a 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 262bdadba..684ffedb8 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -19,16 +19,17 @@
               </p>
               <p class="transition-box-p">
                   <label class="transition-box-label">上传时间：</label>
+                  <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
+              </p>
+              <p class="transition-box-p">
+                  <label class="transition-box-label">征求意见周期：</label>
                   <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
-                  <span class="transition-box-span">-</span>
-              </p> <p class="transition-box-p">
-              <label class="transition-box-label">征求意见周期：</label>
-              <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
-          </p>
+                  <span class="transition-box-span" v-else>-</span>
+              </p>
           </div>
       </transition>
       <div class="effect">
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
+          <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
           <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
       </div>
       <div class="container" style="position:relative;">
@@ -64,7 +65,7 @@
                           label="提出人"
                   >
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="50" fixed="right">
+                  <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
                       <template slot-scope="scope">
                           <div @click.stop style="display: inline-block">
                               <el-dropdown trigger="click" @command="handleCommand">
@@ -146,7 +147,9 @@ export default {
             page: 1,
             size: this.$store.getters.userInfo.configContent,
             userId: this.$store.getters.userInfo.userId,
-        } // 详情数据
+            endTime:  this.$route.query.item.endTime
+        }, // 详情数据
+        ideaKey: false
     }
   },
   methods: {
@@ -162,6 +165,13 @@ export default {
               this.standinfoList = res.data.records
               this.total = res.data.total
               this.spinShow = false
+              res.data.records.forEach(item => {
+                  if (item.ideaKey == 1) {
+                      this.ideaKey = false
+                  } else {
+                      this.ideaKey = true
+                  }
+              })
           }, e => {
           })
       },

From 43913fc598f8f1fc115d4b9a1dc4a08b2f0dfb06 Mon Sep 17 00:00:00 2001
From: zqx0221 <2119066161@qq.com>
Date: Tue, 27 Jul 2021 16:07:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE+=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standInvolveProjectDetail.vue             | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index d526d1e58..5cfaa58ff 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -138,7 +138,7 @@
               ref="multipleTable"
               :data="sarProStateListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%;"
               border
               :height="sarProStateTableHeight"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -157,7 +157,7 @@
             <el-table-column
               width="150px"
               align="center"
-                prop="standNumber"
+                prop="productId"
                 label="项目编号">
             </el-table-column>
             <el-table-column
@@ -354,6 +354,13 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
+            res.data.records.forEach((item)=>{
+              for(let key  in item){
+                if(item[key] == null){
+                  item[key]='无'
+                }
+              }
+            })
             this.sarProStateListDatas = res.data.records
             this.sarProStateTotal = res.data.total
           }
@@ -385,8 +392,10 @@ export default {
   mounted () {
     this.queryStandAndLaws()
     this.tableHeight = $('.regulatory-repository').height() - 159
+    this.sarProStateTableHeight=$('.regulatory-repository').height() -120
     window.onresize = () => {
       this.tableHeight = $('.regulatory-repository').height() - 159
+      this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
     }
   }
 }

From f3f4620cfdaeee0ce3a31021981230376d975ac2 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 27 Jul 2021 16:15:58 +0800
Subject: [PATCH 3/3] commit

---
 .../images/shangqi/sideBar/newside-bar-bg1.png  | Bin 0 -> 17685 bytes
 src/pages/config/pages/postManage/index.vue     |   3 ++-
 src/sysConfig/index.js                          |   9 +++------
 3 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 src/assets/images/shangqi/sideBar/newside-bar-bg1.png

diff --git a/src/assets/images/shangqi/sideBar/newside-bar-bg1.png b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a66bc8bdf03f61c60a3965daab314c391529c68b
GIT binary patch
literal 17685
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
UhCMki`~Uy|07*qoM6N<$f<<mRXaE2J

literal 0
HcmV?d00001

diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index e3853293a..d30c6b433 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -147,7 +147,8 @@
                 },
                 sarStandardsInfoRules: {
                     name: [
-                        { required: true, message: '请输入岗位名称', trigger: 'blur' }
+                        { required: true, message: '请输入岗位名称', trigger: 'blur' },
+                        { min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' }
                     ]
                 },
                 modalRole: false,
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 91385b552..e4412898b 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,12 +4,9 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '39.98.140.126'
-// const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
-// const devIp = '101.36.227.25'
-// const devInterfacePORT = '8038'
-const devIp = '10.96.170.156'
+// const devIp = '10.96.10.171'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.1.145'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'