Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/sysConfig/index.js

src/components/navMenu/index.vue

@@ -300,11 +300,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            {
+        //     {
-              title: '菜单管理',
+        //       title: '菜单管理',
-              path: '/menuManage',
+        //       path: '/menuManage',
-              menuId: '82665e94d406c6fc0d1f627e5880230b'
+        //       menuId: '82665e94d406c6fc0d1f627e5880230b'
-            },
+        //     },
         //     // {
         //     //   title: '保密管理',
         //     //   path: '/convertDocView'

src/pages/home1/components/navMenu/index.vue

@@ -3,15 +3,11 @@
     <div class="nav-menu">
         <div class="lattice">
             <div class="menu-wrap">
-                <enter-card  label="高级检索" path="/advancedSearch"></enter-card>
+                <enter-card v-for="(item, index) in list"
-                <enter-card  label="个人中心" path="/collection"></enter-card>
+                            :key="index"
-                <enter-card  label="统计图表" path="/"></enter-card>
+                            :label="item.label"
-                <enter-card  label="国内法规" path="/domesticStandardsAndRegulations"></enter-card>
+                            :path="item.path"
-                <enter-card  label="国外法规" path="/foreignStandardsAndRegulations"></enter-card>
+                            :class="list.length === 1 ? 'wx-card1' : (list.length == 2 ? 'wx-card2' :'')"></enter-card>
-                <enter-card  label="标准清单" path="/accessStandardsAndRegulations"></enter-card>
-                <enter-card  label="国内外政策" path="/"></enter-card>
-                <enter-card  label="企业标准" path="/"></enter-card>
-                <enter-card  label="标准预警" path="/standardWarning"></enter-card>
             </div>
         </div>
     </div>
@@ -25,12 +21,32 @@
         mixins: [],
         data() {
             return {
+                list: []
             }
         },
         computed: {},
         watch: {},
-        mounted() {},
+        mounted() {
+            this.getData()
+        },
         methods: {
+            getData (){
+                this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
+                    {
+                        userId: this.$store.getters.userInfo.userId
+                    }, {_this: this}, res => {
+                    if (res.ok) {
+                        res.data.records.forEach( item => {
+                            if (item.state == 1) {
+                                var json = {}
+                                json.label = item.menuName
+                                json.path = item.menuUrl
+                                this.list.push(json)
+                            }
+                        })
+                    }
+                    })
+            },
             toPage() {
                 this.$router.push(this.path)
             }
@@ -42,6 +58,7 @@
     .nav-menu {
         .lattice {
             .menu-wrap {
+                height: 324px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content:space-between;
@@ -55,6 +72,12 @@
                     width: 32%;
                     margin: 0 0 10px 0;
                 }
+                .wx-card1 {
+                    width: 100%;
+                }
+                .wx-card2 {
+                    width: 49%;
+                }
                 .menu-item {
                     flex: 1;
                     line-height: 88px;

src/pages/localTool/standContrast/index.vue

@@ -31,8 +31,8 @@
       </table-tools-bar>
       <div class="content">
         <div class="action-bar">
-          <el-button size="mini" v-btn-permission="'HS9BVNTNX2PNRRWL42AW'" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
+          <el-button size="mini" v-btn-permission="''" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
-          <el-button size="mini" v-btn-permission="'Z9SMGAUX2JA3X3CTVVCP'" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+          <el-button size="mini" v-btn-permission="''" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         </div>
         <div class="table-wrap">
           <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
@@ -120,19 +120,19 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'C6P4Z2E7MJ5RBTYCS554'" :command="[scope.row, '查看']">查看</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'Z9SMGAUX2JA3X3CTVVCP'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'WEJNHYG4J5ETSA9VFJWP'" :command="[scope.row, '分享']">分享</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
                       <el-dropdown-item
                         v-if="scope.row.collectBtn"
-                        v-btn-permission="'UGBLFYXKA78BHHJSNSER'"
+                        v-btn-permission="''"
                         :command="[scope.row, '收藏']"
                       >
                         收藏
                       </el-dropdown-item>
                       <el-dropdown-item
                         v-else
-                        v-btn-permission="'UGBLFYXKA78BHHJSNSER'"
+                        v-btn-permission="''"
                         :command="[scope.row, '取消收藏']"
                       >
                         取消收藏

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

@@ -6,23 +6,19 @@
         <el-transfer
           :data="data"
           v-model="value"
-          :titles="['可选模块','个人模块']"
+          :titles="['可选模块','个人展示模块']"
           @change="handleChange"
           @left-check-change="selectedChange"
           @right-check-change="selectedChange"
           filterable>
         </el-transfer>
         <div class="btn-group">
-<!--          <div class="button-wrapper">-->
-<!--            <el-button type="primary" size="small"  class="searchAngNewBtn" @click="reloadMockData(1)">{{$t('m.moveUp')}}</el-button>-->
-<!--            <el-button type="primary"  size="small"  class="searchAngNewBtn"  @click="reloadMockData(2)" style="margin-left: 0.5rem;">{{$t('m.moveDown')}}</el-button>-->
-<!--          </div>-->
         </div>
       </div>
     </div>
     <el-divider></el-divider>
     <div class="footer">
-      <el-button type="primary"  size="small"  class="searchAngNewBtn" v-btn-permission="'NQDDVW8JW3EUVAEXZH3F'"  @click="savePersonal">保存修改</el-button>
+      <el-button type="primary"  size="small"  class="searchAngNewBtn"  @click="savePersonal">保存修改</el-button>
     </div>
   </div>
 </template>
@@ -47,47 +43,40 @@ export default {
       listStyle: {
         width: '5rem',
         height: '8rem'
-      }
+      },
+        oldData: []
     }
   },
   methods: {
     // 右侧列表元素变化时触发
     handleChange (newTargetKeys, direction, moveKeys) {
-      this.targetKeys = newTargetKeys
+      if (newTargetKeys.length > 9) {
-      this.numData = []
+        this.$message.warning('个人展示模块最多仅能展示9个')
+      }
+      if (direction === 'left') {
+            this.oldData.forEach( item => {
+                moveKeys.forEach( items => {
+                    if (items === item.id) {
+                        item.state = 0
+                    }
+                })
+            })
+        } else if (direction === 'right'){
+            this.oldData.forEach( item => {
+                moveKeys.forEach( items => {
+                    if (items === item.id) {
+                        item.state = 1
+                    }
+                })
+            })
+        }
+        this.targetKeys = newTargetKeys
+        this.numData = []
     },
     selectedChange (sourceSelectedKeys, targetSelectedKeys) {
       this.numData = sourceSelectedKeys
       this.sourceSelectedKeys = targetSelectedKeys
     },
-    renderPersonal (item) {
-      return item.label
-    },
-    // 上移，下移
-    reloadMockData (flag) {
-      if (this.numData.length > 1 || this.numData.length === 0) {
-        this.$message({
-          message: '选择个人板块一条板块进行上移下移操作',
-          type: 'warning'
-        })
-      } else {
-        // numData : 选中的值
-        let num = this.targetKeys.indexOf(this.numData[0])
-        if (flag === 1) {
-          // 1表示上移
-          if (num > 0) {
-            this.value.splice(num, 1)
-            this.value.splice(num - 1, 0, this.numData[0])
-          }
-        } else {
-          // 2表示下移
-          this.targetKeys.splice(num, 1)
-          this.targetKeys.splice(num + 1, 0, this.numData[0])
-          //    targetKeys 变了
-          // this.data = JSON.stringify(this.targetKeys)
-        }
-      }
-    },
     savePersonal () {
       if (this.targetKeys.length === 0) {
         this.$message({
@@ -95,10 +84,14 @@ export default {
           type: 'warning'
         })
         return
+      } else if (this.targetKeys.length > 9) {
+        this.$message.warning('个人展示模块最多仅能展示9个')
+        return
       }
-      this.$http.post('person/personModuleUser/insertModule',
+      this.$http.postData('sarPersonalCenter/sar-user-personal-menu/update',
         {
-          moduleIds: this.targetKeys
+            sarUserPersonalMenus: this.oldData,
+            userId: this.$store.getters.userInfo.userId
         }, {
         _this: this
         }, res => {
@@ -113,16 +106,14 @@ export default {
     },
     // 获取模块
     selectPersonConf () {
-      this.$http.get('person/personModule/queryByList',
+      this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
         {
           userId: this.$store.getters.userInfo.userId
         }, {_this: this}, res => {
-          res.data.map((item) => {
+          res.data.records.map((item) => {
-            if (item.moduleName === '首页') {
+            if (item.menuName === '首页') {
               this.selected.push(item)
-            } else if (item.moduleName === '待办任务') {
+            } else if (item.state == 1) {
-              this.selected.push(item)
-            } else if (item.flag === '0') {
               this.selected.push(item)
             }
           })
@@ -132,16 +123,17 @@ export default {
           }
           //  左侧数据会筛选出右侧数据进行显示
           var j
-          for (j = 0; j < res.data.length; j++) {
+          for (j = 0; j < res.data.records.length; j++) {
             let moduleLabel = {}
-            moduleLabel = res.data[j].moduleName
+            moduleLabel = res.data.records[j].menuName
             let moduleid = {}
-            moduleid = res.data[j].id
+            moduleid = res.data.records[j].id
             this.data.push({
               label: moduleLabel,
               key: moduleid,
-              disabled: moduleLabel === '首页' || moduleLabel === '待办任务'
+              disabled: moduleLabel === '首页'
             })
+              this.oldData = JSON.parse(JSON.stringify(res.data.records))
           }
           this.value = this.targetKeys
         }, e => {

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

@@ -260,16 +260,16 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'change' },
+          { required: true, message: '请选择责任部门对接人', trigger: 'change' },
         ],
         ministerUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'change' },
+          { required: true, message: '请选择标准法规部部长', trigger: 'change' },
         ],
         directorUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'change' },
+          { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
         ],
         presidentUserName: [
-          { required: true, message: '请输入调研标题', trigger: 'change' },
+          { required: true, message: '请选择工程研究院院长', trigger: 'change' },
         ]
       },
       fileUrl: 'api/att/attFile/upload',

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

@@ -978,6 +978,7 @@ export default {
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id);
       }
+      console.log(this.selectedList);
     },
     //标准表格选择框改变
     selectStandChange(data) {

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

@@ -7,13 +7,14 @@
     </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="bzzqyjForm"
             :model="form"
+            :rules="formRules"
             class="label-input-form"
             label-width="210px"
         >
@@ -27,25 +28,29 @@
                   <div class="addButton">
                     <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
                   </div>
-
                 </el-form-item>
                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cid" placeholder="请选择标准编号">
+                  <el-input
-                    <el-option label="GB 472726" value="1"></el-option>
+                          disabled
-                    <el-option label="GB/T 8453291" value="2"></el-option>
+                          v-model="form.cid"
-                  </el-select>
+                          placeholder="请输入标准编号"
+                          clearable
+                  ></el-input>
                 </el-form-item>
                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cname" placeholder="请选择标准名称">
+                  <el-input
-                    <el-option label="标准1" value="1"></el-option>
+                          disabled
-                    <el-option label="标准2" value="2"></el-option>
+                          v-model="form.cname"
-                  </el-select>
+                          placeholder="请输入标准名称"
+                          clearable
+                  ></el-input>
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      v-model="form.endTime"
+                          disabled
-                      type="date"
+                          v-model="form.endTime"
-                      placeholder="请选择结束日期">
+                          type="date"
+                          placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -53,13 +58,27 @@
           </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-if="active === '2'">
+    <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>
@@ -67,66 +86,66 @@
                   <h4>流程发起人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"/>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"/>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
                   </div>
                 </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.dockUserList ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="dockUserList" style="margin-bottom: 0">
-                  <h4>责任对接人</h4>
+                  <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"/>
+                    <el-input v-model="roleForm.dockUserList" style="display: none;"/>
                     <el-input
-                      v-model="roleForm.dockUserName"
+                      v-model="roleForm.dockUserListName"
-                      placeholder="选择责任人"
+                      placeholder="选择责任部门对接人"
-                      @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                      @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-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="mainUserName" style="margin-bottom: 0">
+                <el-form-item prop="ministerUser" style="margin-bottom: 0">
-                  <h4>责任人</h4>
+                  <h4>标准法规部部长</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.mainUser" style="display: none;"/>
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"/>
                     <el-input
-                      v-model="roleForm.mainUserName"
+                      v-model="roleForm.ministerUserName"
-                      placeholder="选择责任人·"
+                      placeholder="选择标准法规部部长·"
-                      @click.native="choiceZRR('mainUser', '选择责任人', roleForm.mainUser)"
+                      @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
                     />
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="engineerUserName" style="margin-bottom: 0">
+                <el-form-item prop="directorUser" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
+                  <h4>技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.engineerUser" style="display: none;"/>
+                    <el-input v-model="roleForm.directorUser" style="display: none;"/>
                     <el-input
-                      v-model="roleForm.engineerUserName"
+                      v-model="roleForm.directorUserName"
-                      placeholder="选择标准法规工程师"
+                      placeholder="选择技术管理中心主任"
-                      @click.native="choiceZRR('engineerUser', '选择标准法规工程师', roleForm.engineerUser)"
+                      @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
                     />
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="审核" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="checkUserName" style="margin-bottom: 0">
+                <el-form-item prop="presidentUser" style="margin-bottom: 0">
-                  <h4>责任对接人，标准法规部门负责人</h4>
+                  <h4>工程研究总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.checkUser" style="display: none;"/>
+                    <el-input v-model="roleForm.presidentUser" style="display: none;"/>
                     <el-input
-                      v-model="roleForm.checkUserName"
+                      v-model="roleForm.presidentUserName"
-                      placeholder="选择责任对接人，标准法规部门负责人"
+                      placeholder="选择工程研究总院院长"
-                      @click.native="choiceZRR('checkUser', '选择责任对接人，标准法规部门负责人', roleForm.checkUserName)"
+                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
                     />
                   </div>
                 </el-form-item>
@@ -152,42 +171,43 @@
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
-        <!-- 顶部工具栏 -->
-        <table-tools-bar>
-          <div slot="left">
-            <div class="search-area">
-              <el-form :model="standCommonlySearch" inline class="label-input-form">
-                <el-formItem label="类别" class="search-item">
-                  <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>
-                </el-formItem>
-                <el-formItem label="关键字" class="search-item">
-                  <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>
-                </el-formItem>
-                <el-formItem label="开始日期" class="search-item">
-                  <el-datePicker v-model="standCommonlySearch.start" :editable="false"
-                                 placeholder="请选择开始日期"></el-datePicker>
-                </el-formItem>
-                <el-formItem label="结束日期" class="search-item">
-                  <el-datePicker v-model="standCommonlySearch.end" :editable="false"
-                                 placeholder="请选择结束日期"></el-datePicker>
-                </el-formItem>
-                <el-formItem class="search-item btn-box">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    class="common-button-primary"
 
-                    @click="sarStandCompareHisInfo">查询</el-button>
-                  <el-button
-                    class="common-button-default"
-                    size="mini"
-                    @click="clearSearchStand">清空</el-button>
-                </el-formItem>
-              </el-form>
-            </div>
-          </div>
-        </table-tools-bar>
         <div class="content">
+          <!-- 顶部工具栏 -->
+          <table-tools-bar>
+            <div slot="left">
+              <div class="search-area">
+                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                  <el-formItem label="类别" class="search-item">
+                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>
+                  </el-formItem>
+                  <el-formItem label="关键字" class="search-item">
+                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>
+                  </el-formItem>
+                  <el-formItem label="开始日期" class="search-item">
+                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"
+                                   placeholder="请选择开始日期"></el-datePicker>
+                  </el-formItem>
+                  <el-formItem label="结束日期" class="search-item">
+                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"
+                                   placeholder="请选择结束日期"></el-datePicker>
+                  </el-formItem>
+                  <el-formItem class="search-item btn-box">
+                    <el-button
+                            type="primary"
+                            size="mini"
+                            class="common-button-primary"
+
+                            @click="sarStandCompareHisInfo">查询</el-button>
+                    <el-button
+                            class="common-button-default"
+                            size="mini"
+                            @click="clearSearchStand">清空</el-button>
+                  </el-formItem>
+                </el-form>
+              </div>
+            </div>
+          </table-tools-bar>
           <div class="table-wrap">
             <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
               <el-table
@@ -216,6 +236,57 @@
         </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"
+              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>
   </div>
 </template>
 
@@ -229,6 +300,7 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      commentText: '',
       textarea: '', // 意见
       title: '', // 新增抽屉标题
       listModel: false, // 新增抽屉开关
@@ -241,6 +313,17 @@ export default {
         endTime: '', // 结束日期
         cname: '', // 名称
       },
+      formRules: {
+        cid: [
+          { required: true, message: '请输入标准编号', trigger: 'change' },
+        ],
+        endTime: [
+          { required: true, message: '请输入标准结束日期', trigger: 'change' },
+        ],
+        cname: [
+          { required: true, message: '请输入标准名称', trigger: 'change' },
+        ],
+      },
       // 标准征求意见数据可库
       standCommonlySearch: {
         categorg: '',
@@ -259,15 +342,41 @@ export default {
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
+        dockUserList: '',
-        dockUserName: '',
+        dockUserListName: '',
-        mainUser: '',
+        ministerUser: '',
-        mainUserName: '',
+        ministerUserName: '',
-        engineerUser: '',
+        directorUser: '',
-        engineerUserName: '',
+        directorUserName: '',
-        checkUser: '',
+        presidentUser: '',
-        checkUserName: '',
+        presidentUserName: '',
-      }
+      },
+      roleFormRules: {
+        dockUserList: [
+          { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+        ],
+        ministerUser: [
+          { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+        ],
+        directorUser: [
+          { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+        ],
+        presidentUser: [
+          { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+        ]
+      },
+      treeData: [],
+      nodeList: [],
+      nodeList2: [],
+      type: '',
+      drawerTitle: '',
+      modalshowflag: false,
+      modalshowflag2: false,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      roleRow: {},
     }
   },
   components: {
@@ -276,6 +385,7 @@ export default {
     ProcessTitle
   },
   mounted () {
+    this.getTree()
     this.sarStandCompareHis()
     this.tableHeight = $('.content').height() - 44
     window.onresize = () => {
@@ -287,7 +397,6 @@ export default {
       this.title = '标准征求意见库'
       this.listModel = true
     },
-
     /** 标准征求意见库方法*
      * **********************************************/
     // 清空
@@ -348,7 +457,6 @@ export default {
         for (let i = 0; i < this.selectedList.length; i++) {
           bringData.push(deposit.get(this.selectedList[i]));
         }
-        console.log(bringData)
         this.form.cid = bringData[0].cid
         this.form.cname = bringData[0].cname;
         this.form.endTime = bringData[0].endTime;
@@ -360,18 +468,107 @@ export default {
       }
     },
     /*** **********************************************/
-
     /** 流程节点负责人的选择 *****************************/
-    choiceZRR() {
+    choiceZRR (type, title, id) {
-      // this.choice
+      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 === '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]
+      }
+    },
+    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.dockUserListName = nameList
+      this.modalshowflag2 = false
+    },
+    cancleUserInfo2 () {
+      this.modalshowflag2 = false
     },
-
     handleTabs(name) {
       this.active = name
     },
-    // 流程也的提交按钮和保存按钮操作
     handleSave() {},
-    handleSubmit() {}
+    handleSubmit() {
+      this.$refs['bzzqyjForm'].validate((valid) => {
+        if (valid) {
+          this.$refs['Form'].validate((valid) => {
+            if (valid) {
+              this.$http.get('lawss/activiti/startProcess', {
+                type: '3'
+              }, {}, 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')
+                    }
+                  })
+                } else {
+                  this.$message.warning('流程启动失败')
+                }
+              })
+            } else {
+              return this.$message.warning('请完善人员信息')
+            }
+          })
+        } else {
+          return this.$message.warning('请完善基础信息')
+        }
+      })
+    }
   }
 }
 </script>
@@ -412,7 +609,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 107px');
     overflow: auto;
   }
   .standardForComments {

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

@@ -1,13 +1,300 @@
 <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="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cid"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cname"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.endTime"
+                                            type="date"
+                                            placeholder="请选择结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.responUserList"
+                                            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>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
 </template>
 
 <script>
-export default {
+    import ProcessHeader from '../../components/ProcessHeader'
-  name: "step2"
+    import ProcessFooter from '../../components/ProcessFooter'
-}
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzzqyjStep2",
+        data() {
+            return {
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                roleRow: {},
+                nodeList: [],
+                type: '',
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalshowflag: false, // drawer开关
+                drawerTitle: '', //drawer标题
+                textarea: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    cid: '', // 编号
+                    endTime: '', // 结束日期
+                    cname: '', // 名称
+                    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['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        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.cid = data.cid
+                        this.form.endTime = data.endTime
+                        this.form.cname = data.cname
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
-
+    @import '~@/assets/styles/style';
+    .bzdyStep2 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
 </style>

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

@@ -198,7 +198,7 @@
         height="100%"
         :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
+        @selection-change="selectedChange"
       >
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column prop="standId" label="标准号/标准名称"/>
@@ -316,6 +316,9 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
+  mounted () {
+    this.getTree()
+  },
   methods: {
     //点击新增事件
     addList() {
@@ -367,27 +370,15 @@ export default {
     //未符合项整合确定事件
     OkDrawer() {
       if (this.selectedList.length !== 0) {
-        let deposit = new Map();
+        this.dataList = this.selectedList
-        this.unqualidiedData.forEach(item => {
-          deposit.set(item.id, item);
-        });
-        let bringData = [];
-        for (let i = 0; i < this.selectedList.length; i++) {
-          bringData.push(deposit.get(this.selectedList[i]));
-        }
-        this.dataList.standId = bringData[0].standId
-        this.dataList.productName = bringData[0].productName;
-        this.dataList.itemsNum = bringData[0].itemsNum;
-        this.dataList.itemsName = bringData[0].itemsName;
-        this.dataList.planCloseTime = bringData[0].planCloseTime;
-        this.dataList.responsibleUnit = bringData[0].responsibleUnit;
-        this.dataList.dutyEngineer = bringData[0].dutyEngineer;
         this.ListModel = false;
       } else {
         this.$message.warning("请选择至少一条数据进行带入");
       }
     },
-    selectThree() {},
+    selectedChange(val) {
+      this.selectedList = val
+    },
     handleTabs(name) {
       this.active = name
     },

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

@@ -6,7 +6,6 @@
     </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-if="active === '1'">
       <div style="flex: auto;">
@@ -16,18 +15,20 @@
         <el-form :modal="dataList" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input v-model="dataList.standId"
+                size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="项目名称" class="search-item">
               <el-input v-model="dataList.productName"
+                size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
-            <el-form-item label="责任部门" class="search-item">
+          <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="dataList.responsibleUnit" v-show="false" />
+              <el-input v-model="dataList.responsibleUnit" v-show="false"/>
               <el-popover
                 placement="bottom"
                 popper-class="user-dept-popper"
@@ -35,6 +36,7 @@
                 :value="false"
               >
                 <el-input
+                  size="small"
                   slot="reference"
                   v-model="dataList.responseUnitShow"
                   placeholder="根据责任部门查找"
@@ -60,7 +62,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage('dataList')">
+                @click="getTableByPage">
                 查询
               </el-button>
             </el-form-item>
@@ -104,7 +106,12 @@
           <el-table-column label="选择分发责任人" prop="dutyPeople">
               <template slot-scope="scope">
                 <span v-if="scope.row.show">
-                  <el-input v-model="scope.row.dutyPeople"  size="mini" placeholder="请输入内容" @click.native="choiceDuty"></el-input>
+                  <el-input
+                    v-model="scope.row.dutyPeople"
+                    size="mini"
+                    placeholder="请输入内容"
+                    @click.native="choiceDuty"
+                  />
                 </span>
                 <span v-else>{{scope.row.dutyPeople}}</span>
             </template>
@@ -126,74 +133,6 @@
           </el-collapse-item>
         </el-collapse>
     </div>
-    <div class="content" v-if="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="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#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.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </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
@@ -272,13 +211,6 @@ export default {
         dutyEngineer: ''
       }],
       clearSelection: false,
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
       nodeList: [],
       drawerTitle: '', //drawer标题
       modalshowflag: false, // drawer开关
@@ -340,22 +272,6 @@ export default {
         },
       ]
     },
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
 
     // 批量选择分发责任人
     dutyEngineerList() {
@@ -398,14 +314,6 @@ export default {
         this.treeData = res.data
       })
     },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
     drawerCheck (data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
       if(getlist.length == 1) {
@@ -429,27 +337,15 @@ export default {
         this.multipleSelection = []
         this.$refs.multipleTable.clearSelection();
       }
-      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
     },
-    //未整改项抽屉中的查询按钮
+    //查询按钮
     getTableByPage() {
+      this.getData()
     },
     // 清空 查询条件
     clearAllSearch (search = true) {
@@ -513,19 +409,6 @@ export default {
     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/wfhxzg/step3.vue

@@ -6,7 +6,6 @@
     </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-if="active === '1'">
       <div style="flex: auto;">
@@ -15,16 +14,20 @@
         </ProcessTitle>
         <el-form :modal="dataList" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.standId"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.productName"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
             <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
               :value="false"
             >
               <el-input
+                size="small"
                 slot="reference"
                 v-model="dataList.responseUnitShow"
                 placeholder="根据责任部门查找"
@@ -81,7 +85,6 @@
           style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
-          <el-table-column type="selection" width="55" align="center"/>
           <el-table-column prop="standId" label="标准号/标准名称"/>
           <el-table-column prop="productName" label="项目名称"/>
           <el-table-column prop="itemsNum" label="条款号"/>
@@ -89,9 +92,21 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择责任人">
+          <el-table-column label="选择责任人" prop="dutyPeople" width="200">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="selectPeople(scope.row)">选择责任人</el-button>
+              <div style="display: inline;">
+                <el-input
+                  class="input-button"
+                  style="width: 60%"
+                  :disabled="true"
+                  v-model="scope.row.dutyPeople"
+                  size="mini"
+                  placeholder="请选择责任人"
+                />
+              </div>
+              <div style="display: inline">
+                <el-button size="mini" type="primary" @click="selectPeople(scope.row)">选择</el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -111,74 +126,6 @@
         </el-collapse-item>
       </el-collapse>
     </div>
-    <div class="content" v-if="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="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#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.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </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
@@ -246,7 +193,8 @@ export default {
           itemsName: '1',
           planCloseTime: '1',
           responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
         },{
           standId: '',
           productName: '',
@@ -254,30 +202,14 @@ export default {
           itemsName: '',
           planCloseTime: '',
           responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: ''
         }],
-      // 当前页数
+      newDataList: [],
-      pageNo: 1,
+
-      total: 0,
-      myLoading: false,
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
+
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
       nodeList: [],
       drawerTitle: '', //drawer标题
       modalshowflag: false, // drawer开关
@@ -294,26 +226,13 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getTree()
   },
   methods: {
-    getList() {
+    // 选择责任人的按钮操作
-      this.myLoading.loadData = true
+    selectPeople(val) {
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
+      this.newDataList = val
-        ...this.nonConformitySearch,
+      this.nodeList = []
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
-
-    selectPeople(row) {
       this.modalshowflag = true
     },
     handleTabs(name) {
@@ -331,14 +250,6 @@ export default {
         this.treeData = res.data
       })
     },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
     drawerCheck (data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
       if(getlist.length == 1) {
@@ -350,26 +261,15 @@ export default {
     },
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
-      if (this.type === 'dockUser') {
+      // 选择责任人时input框内值
-        this.roleForm.dockUser = this.roleRow.id
+      this.newDataList.dutyPeople = this.roleRow.name
-        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
     },
-    //未整改项抽屉中的查询按钮
+    //查询按钮
     getTableByPage() {
     },
     // 清空 查询条件
@@ -434,19 +334,6 @@ export default {
     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/wfhxzg/step4.vue

@@ -6,7 +6,6 @@
     </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-if="active === '1'">
       <div style="flex: auto;">
@@ -15,16 +14,20 @@
         </ProcessTitle>
         <el-form :modal="dataList" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.standId"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.productName"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
             <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
               :value="false"
             >
               <el-input
+                size="small"
                 slot="reference"
                 v-model="dataList.responseUnitShow"
                 placeholder="根据责任部门查找"
@@ -87,11 +91,27 @@
           <el-table-column prop="itemsName" label="条款名称"/>
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
-          <el-table-column prop="duty" label="负责人"/>
+          <el-table-column prop="dutyPeople" label="负责人"/>
           <el-table-column label="佐证材料">
             <template slot-scope="scope">
-              <el-upload>
+              <el-upload
-                <el-button type="primary" size="small" @click="uploadText(scope.row)">上传佐证材料</el-button>
+                v-model="fileText"
+                ref="uploadFile"up
+                :action="uploadPath"
+                class="upload-demo"
+                :http-request="handleUpload"
+                :on-success="handleOnsuccess"
+                :on-error="handleOnError"
+                :before-upload="handleBeforeUpload"
+                :before-remove="handleBeforeRemove"
+                :on-remove="handleOnRemove"
+                :on-exceed="handleExceed"
+                :limit="10"
+                :file-list="uploadFileList"
+                list-type="picture"
+                :auto-upload="true"
+              >
+                <el-button type="text">上传佐证材料</el-button>
               </el-upload>
             </template>
           </el-table-column>
@@ -112,74 +132,6 @@
         </el-collapse-item>
       </el-collapse>
     </div>
-    <div class="content" v-if="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="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#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.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </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
@@ -189,32 +141,6 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%;"
-        node-key="id"
-        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>
   </div>
 </template>
 
@@ -247,7 +173,8 @@ export default {
           itemsName: '1',
           planCloseTime: '1',
           responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
         },{
           standId: '',
           productName: '',
@@ -255,38 +182,19 @@ export default {
           itemsName: '',
           planCloseTime: '',
           responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: '13123'
         }],
       // 当前页数
       pageNo: 1,
       total: 0,
       myLoading: false,
+      // 上传路径
+      uploadPath: 'api/att/attFile/upload',
+      // 上传文件所储存的数组
+      uploadFileList: [],
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
-      nodeList: [],
-      drawerTitle: '', //drawer标题
-      modalshowflag: false, // drawer开关
-      treeData: [], // 人员数据
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
     }
   },
   components: {
@@ -297,78 +205,36 @@ export default {
   created() {
   },
   methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
 
-    uploadText(row) {
+
-    },
     handleTabs(name) {
       this.active = name
     },
-
+    /************ 上传佐证材料 *****************/
+    // 上传材料
+    handleUpload() {},
+    // 文件上传成功
+    handleOnsuccess(res, file) {
+      this.$message.success('上传成功!')
+      console.log(file)
+    },
+    // 文件上传失败后回调
+    handleOnError(res, file) {},
+    // 文件上传限制条件
+    handleBeforeUpload() {},
+    // 移除上传的文件
+    handleBeforeRemove() {},
+    handleOnRemove() {},
+    // 文件超过限制数量提示
+    handleExceed() {
+      this.$message.error(``)
+    },
+    /************ ********* *****************/
     // 保存按钮
     handleSave() {},
     // 提交按钮
     handleSubmit() {},
 
-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    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]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    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
-    },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
     },
@@ -434,19 +300,6 @@ export default {
     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/wfhxzg/step5.vue

@@ -6,7 +6,6 @@
     </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-if="active === '1'">
       <div style="flex: auto;">
@@ -15,16 +14,20 @@
         </ProcessTitle>
         <el-form :modal="dataList" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.standId"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.productName"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
             <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
               :value="false"
             >
               <el-input
+                size="small"
                 slot="reference"
                 v-model="dataList.responseUnitShow"
                 placeholder="根据责任部门查找"
@@ -108,74 +112,6 @@
         </el-collapse-item>
       </el-collapse>
     </div>
-    <div class="content" v-if="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="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#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.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </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-back
       show-submit
@@ -185,32 +121,6 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%;"
-        node-key="id"
-        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>
   </div>
 </template>
 
@@ -259,34 +169,9 @@ export default {
       myLoading: false,
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
       // 驳回弹窗状态
       backDialog: false,
 
-
-      nodeList: [],
-      drawerTitle: '', //drawer标题
-      modalshowflag: false, // drawer开关
-      treeData: [], // 人员数据
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
     }
   },
   components: {
@@ -297,80 +182,13 @@ export default {
   created() {
   },
   methods: {
-    getList() {
+
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
-    // 批准俺妞妞操作
-    handleBack() {
-      this.backDialog = true
-    },
-    handleSuccess() {},
     handleTabs(name) {
       this.active = name
     },
 
-    // 保存按钮
-    handleSave() {},
     // 提交按钮
     handleSubmit() {},
-
-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    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]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    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
-    },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
     },
@@ -436,19 +254,6 @@ export default {
     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/xmpg/step1.vue

@@ -76,7 +76,12 @@
           <el-table-column
             prop="ffzrr"
             label="分发责任人">
-
+            <template>
+              <el-input
+                placeholder="请选择分发责任人"
+              >
+              </el-input>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -270,12 +275,12 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="issueTime"
+                prop="productLine"
                 label="产品线">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="textStatus"
+                prop="projectManager"
                 label="产品线责任人">
               </el-table-column>
             </el-table>
@@ -399,32 +404,14 @@ export default {
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
-      dataList:[
+      dataList:[],
-        {
-          id: 1,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        },
-        {
-          id: 2,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        }, {
-          id: 3,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        },
-
-      ],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       pageNo: 1,
       totalNo: 0,
       pageSizeNo: this.$store.getters.userInfo.configContent,
+      product: new Map(),
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
@@ -491,7 +478,20 @@ export default {
     },
     //确认添加事件
     okStand() {
-      this.standModel = false
+      if(this.standList.length >= 1){
+        let deposit = new Map();
+        this.sarAccessListDatas.forEach(item => {
+          deposit.set(item.id, item);
+        });
+        let bringData = [];
+        for (let i = 0; i < this.standList.length; i++) {
+          bringData.push(deposit.get(this.standList[i]));
+        }
+        console.log(bringData);
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
     },
     //保存事件
     handleSave() {
@@ -581,7 +581,10 @@ export default {
     },
     //添加产品线select的改变
     selectThree(data) {
-      this.standList = data;
+      this.standList = [];
+      for(let i=0;i<data.length; i++){
+        this.standList.push(data[i].id)
+      }
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];
@@ -607,10 +610,21 @@ export default {
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get('sarStandProjectLibrary/queryProjectManager','',{
+        _this: this
+      }, res => {
+        this.productData = res.data
+      }, e => {
+
+      })
+    },
   },
   computed: {},
   mounted() {
     this.getTree();
+    this.getProductData()
   }
 
 };

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

@@ -1,225 +0,0 @@
-<template>
-  <div class="zqyjStep1">
-    <!--    标准征求意见流程-->
-    <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-if="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="qbkwForm"
-            :model="form"
-            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-select v-model="form.encodes" placeholder="请选择标准编号">
-                    <el-option label="GB 472726" value="1"></el-option>
-                    <el-option label="GB/T 8453291" value="2"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准名称" prop="title" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.names" placeholder="请选择标准名称">
-                    <el-option label="标准1" value="1"></el-option>
-                    <el-option label="标准2" value="2"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="征求意见结束日期" prop="year" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.year"
-                      type="year"
-                      placeholder="请选择结束日期">
-                  </el-date-picker>
-                </el-form-item>
-
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-      </div>
-    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>流程发起人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user1" placeholder="流程发起人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任对接人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user2" placeholder="选择责任人">
-
-                </el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user3" placeholder="责任人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="user4 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准法规工程师</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user4" placeholder="标准法规工程师"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任对接人，标准法规部部门负责人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user5" placeholder="责任对接人，标准法规部部门负责人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </div>
-    <ProcessFooter
-        show-save
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        @save="handleSave"
-        @submit="handleSubmit"
-    >
-    </ProcessFooter>
-
-  </div>
-</template>
-
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-
-export default {
-  name: "zqyjStep1",
-  data() {
-    return {
-      textarea: '', // 意见
-      title: '', // 新增编辑抽屉标题
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        encodes: '', // 编号
-        year: '', // 结束日期
-        names: '', // 名称
-      },
-      data: [], // 标准列表数据
-      ListForm: {}, // 新增数据
-      user1: '',
-      user2: '',
-      user3: '',
-      user4: '',
-      user5: '',
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    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() {}
-  },
-  mounted () {}
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-.zqyjStep1 {
-  /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/newProcess/index.vue

@@ -11,7 +11,7 @@
         <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
-        <div class="process-name" @click="handleCreateProcess('7')">未符合项整改流程</div>
+        <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
       </div>
     </div>
     <div v-if="zcgllc">
@@ -88,7 +88,7 @@ export default {
         case '7':
           //项目评估流程
           this.$router.push({
-            name:'xmpgStep1'
+            name: 'xmpgStep1'
           })
           break
         case '8':

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

@@ -252,6 +252,7 @@ export default {
               }
             })
           }
+          break
         case '2':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
@@ -343,43 +344,59 @@ export default {
             })
           }
           break;
+          break
+        case '3':
+          if (row.taskInfo === '责任对接人选择责任人') {
+            this.$router.push({
+              name: 'bzzqyjStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
           //标准清单更新/发布流程
-          case'4' :
+        case'4' :
-            if (row.taskInfo === '进行会签，填写意见') {
+          if (row.taskInfo === '进行会签，填写意见') {
-              this.$router.push({
+            this.$router.push({
-                name: 'bzqdfbStep2',
+              name: 'bzqdfbStep2',
-                query: {
+              query: {
-                  taskIds: row.taskIds,
+                taskIds: row.taskIds,
-                  prcId: row.prcId,
+                prcId: row.prcId,
-                  prcNum: row.prcNum,
+                prcNum: row.prcNum,
-                  prcName: row.prcName,
+                prcName: row.prcName,
-                  prcType: row.prcType
+                prcType: row.prcType
-                }
+              }
-              })
+            })
-            } else if (row.taskInfo === '根据会签意见修订') {
+          } else if (row.taskInfo === '根据会签意见修订') {
-              this.$router.push({
+            this.$router.push({
-                name: 'bzqdfbStep3',
+              name: 'bzqdfbStep3',
-                query: {
+              query: {
-                  taskIds: row.taskIds,
+                taskIds: row.taskIds,
-                  prcId: row.prcId,
+                prcId: row.prcId,
-                  prcNum: row.prcNum,
+                prcNum: row.prcNum,
-                  prcName: row.prcName,
+                prcName: row.prcName,
-                  prcType: row.prcType
+                prcType: row.prcType
-                }
+              }
-              })
+            })
-            }else if (row.taskInfo === '业务经理审批') {
+          }else if (row.taskInfo === '业务经理审批') {
-              this.$router.push({
+            this.$router.push({
-                name: 'bzqdfbStep4',
+              name: 'bzqdfbStep4',
-                query: {
+              query: {
-                  taskIds: row.taskIds,
+                taskIds: row.taskIds,
-                  prcId: row.prcId,
+                prcId: row.prcId,
-                  prcNum: row.prcNum,
+                prcNum: row.prcNum,
-                  prcName: row.prcName,
+                prcName: row.prcName,
-                  prcType: row.prcType
+                prcType: row.prcType
-                }
+              }
-              })
+            })
-            }
+          }
-            break;
+          break;
+          break
         //项目合规评估流程
         case '5' :
           if(row.taskInfo === ''){
@@ -394,6 +411,7 @@ export default {
               }
             })
           }
+          break
 
       }
     },

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -189,14 +189,14 @@
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
           v-show="!isListType"
+          ref="searchTable"
+          @selection-change="sarAccessInfoSearchSelect"
           :data="sarAccessInfoSearchList"
           style="width: 100%"
           border
           height="300px"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="sarAccessInfoSearchSelect"
-          ref="searchTable"
         >
           <el-table-column
             type="selection"
@@ -253,7 +253,7 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="accessSarTypeSelect"
-          ref="searchTable"
+          ref="accessTypeSelect"
         >
           <el-table-column
             type="selection"
@@ -293,15 +293,6 @@
     <div class="list-entry">
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveUp" v-if="!disabledFlag"
-        >上移</el-button>
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveDown"
-          v-if="!disabledFlag"
-        >下移</el-button>
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
@@ -315,7 +306,7 @@
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <el-table
-               ref="entryTable"
+              ref="entryTable"
               :data="sarAccessInfoList"
               class="un-select"
               style="width: 100%"
@@ -366,6 +357,22 @@
           width="120px"
           label="文本状态">
         </el-table-column>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >上移</el-button>
+            <el-button
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >下移</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="footer">
@@ -1011,72 +1018,45 @@ export default {
             })
             if(addList > -1){
               this.$message.warning('请勿添加重复数据')
-            } else(
+              this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            } else{
               this.sarAccessInfoList.push(item)
-            )
+              this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            }
           })
-          this.$refs.entryTable.clearSelection()
-          this.$refs.searchTable.clearSelection()
         } else {
           this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
         }
     },
+
     // 上移 事件
-    moveUp () {
+    moveUp (index, row) {
-      // i   全部对象数组的下标
+      if (index === 0) {
-      // s   选中对象数组的下标
+        this.$message({
-        let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
+          message: '已经是列表中第一个素材！',
-        if (sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-          //数组交换下标
+        })
-          console.log('s', sarAccessInfoListArry);
+      } else {
-          console.log('i',this.sarAccessInfoList);
+        let temp = this.sarAccessInfoList[index - 1]
-          for (var s in sarAccessInfoListArry) {
+        this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
-            for (var i in this.sarAccessInfoList) {
+        this.$set(this.sarAccessInfoList, index, temp)
-              if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
+      }
-                if (Number(i) !== 0) {
-                  let tempOption = this.sarAccessInfoList[i - 1]
-                  this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
-                  this.$set(this.sarAccessInfoList, i, tempOption)
-                  // this.sarAccessInfoListArry = []
-                  return
-                } else {
-                  this.$message.error('数据已经是第一个,请选择其他数据上移!')
-                }
-              }
-            }
-          }
-        } else if (this.sarAccessInfoListArry.length === 0) {
-          this.$message.error('请选择需要移动的数据!')
-        } else {
-          this.$message.error('请选择单一数据进行移动!')
-        }
     },
-    // 下移事件
+    moveDown (index) {
-    moveDown () {
+      if (index === (this.sarAccessInfoList.length - 1)) {
-      // y   全部对象数组的下标
+        this.$message({
-      // t   选中对象数组的下标
+          message: '已经是列表中最后一个素材！',
-        if (this.sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-          for (var t in this.sarAccessInfoListArry) {
+        })
-            for (var y in this.sarAccessInfoList) {
+      } else {
-              if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
+        let i = this.sarAccessInfoList[index + 1]
-                var ass = this.sarAccessInfoList.length - 1
+        this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
-                if (Number(y) !== Number(ass)) {
+        this.$set(this.sarAccessInfoList, index, i)
-                  var s = parseInt(y) + 1
+      }
-                  var tempOption = this.sarAccessInfoList[parseInt(s)]
-                  this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
-                  this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
-                  return
-                } else {
-                  this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
-                }
-              }
-            }
-          }
-        } else if (this.sarAccessInfoListArry.length === 0) {
-          this.$message.error('请选择需要移动的数据!')
-        } else {
-          this.$message.error('请选择单一数据进行移动!')
-        }
     },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
@@ -1202,12 +1182,9 @@ export default {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (selectData) {
+    sarAccessInfoSearchSelect (val) {
-      this.selectedAccInfoSearchList = selectData
+      this.selectedAccInfoSearchList = val
-      this.selectSearch = []
+      console.log(val)
-      for(let i = 0; i <selectData.length; i++) {
-        this.selectSearch.push(selectData[i].id)
-      }
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -238,7 +238,7 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="accessSarTypeSelect"
-          ref="searchTable"
+          ref="accessTypeSelect"
         >
           <el-table-column
             type="selection"
@@ -278,15 +278,6 @@
     <div class="list-entry">
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveUp" v-if="!disabledFlag"
-        >上移</el-button>
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveDown"
-          v-if="!disabledFlag"
-        >下移</el-button>
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
@@ -351,6 +342,22 @@
           width="120px"
           label="文本状态">
         </el-table-column>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >上移</el-button>
+            <el-button
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >下移</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="footer">
@@ -996,9 +1003,15 @@ export default {
           })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-          } else(
+            this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
+          } else{
             this.sarAccessInfoList.push(item)
-          )
+            this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
+          }
         })
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
@@ -1008,60 +1021,28 @@ export default {
       }
     },
     // 上移 事件
-    moveUp () {
+    moveUp (index, row) {
-      // i   全部对象数组的下标
+      if (index === 0) {
-      // s   选中对象数组的下标
+        this.$message({
-      let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
+          message: '已经是列表中第一个素材！',
-      if (sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-        //数组交换下标
+        })
-        console.log('s', sarAccessInfoListArry);
-        console.log('i',this.sarAccessInfoList);
-        for (var s in sarAccessInfoListArry) {
-          for (var i in this.sarAccessInfoList) {
-            if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
-              if (Number(i) !== 0) {
-                let tempOption = this.sarAccessInfoList[i - 1]
-                this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
-                this.$set(this.sarAccessInfoList, i, tempOption)
-                // this.sarAccessInfoListArry = []
-                return
-              } else {
-                this.$message.error('数据已经是第一个,请选择其他数据上移!')
-              }
-            }
-          }
-        }
-      } else if (this.sarAccessInfoListArry.length === 0) {
-        this.$message.error('请选择需要移动的数据!')
       } else {
-        this.$message.error('请选择单一数据进行移动!')
+        let temp = this.sarAccessInfoList[index - 1]
+        this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
+        this.$set(this.sarAccessInfoList, index, temp)
       }
     },
-    // 下移事件
+    moveDown (index) {
-    moveDown () {
+      if (index === (this.sarAccessInfoList.length - 1)) {
-      // y   全部对象数组的下标
+        this.$message({
-      // t   选中对象数组的下标
+          message: '已经是列表中最后一个素材！',
-      if (this.sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-        for (var t in this.sarAccessInfoListArry) {
+        })
-          for (var y in this.sarAccessInfoList) {
-            if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
-              var ass = this.sarAccessInfoList.length - 1
-              if (Number(y) !== Number(ass)) {
-                var s = parseInt(y) + 1
-                var tempOption = this.sarAccessInfoList[parseInt(s)]
-                this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
-                this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
-                return
-              } else {
-                this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
-              }
-            }
-          }
-        }
-      } else if (this.sarAccessInfoListArry.length === 0) {
-        this.$message.error('请选择需要移动的数据!')
       } else {
-        this.$message.error('请选择单一数据进行移动!')
+        let i = this.sarAccessInfoList[index + 1]
+        this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
+        this.$set(this.sarAccessInfoList, index, i)
       }
     },
     // 点击清单条目导入按钮事件
@@ -1188,12 +1169,9 @@ export default {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (selectData) {
+    sarAccessInfoSearchSelect (val) {
-      this.selectedAccInfoSearchList = selectData
+      this.selectedAccInfoSearchList = val
-      this.selectSearch = []
+      console.log(val)
-      for(let i = 0; i <selectData.length; i++) {
-        this.selectSearch.push(selectData[i].id)
-      }
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue

@@ -3,7 +3,7 @@
   <div id="enterBSysRevPlanManaLib" class="v-class">
     <div class="search-area">
       <div class="left">
-        <el-form :modal="condition" :inline="true" class="label-input-form"  @keyup.enter.native="handleSearchByCondition">
+        <el-form :modal="condition" :inline="true" class="lab-form"  @keyup.enter.native="handleSearchByCondition">
           <el-form-item label="计划状态" class="search-item">
             <el-select
               v-model="condition.planStatus"

src/router/index.js

@@ -276,15 +276,6 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
-      {
-        path: '/wfhxzgStep1',
-        name: 'wfhxzgStep1',
-        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
-        meta: {
-          requireAuth: true,
-          title: '未符合项整改流程'
-        }
-      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -294,6 +285,15 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/wfhxzgStep1',
+        name: 'wfhxzgStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改发布/更新流程'
+        }
+      },
       {
         path: '/wfhxzgStep2',
         name: 'wfhxzgStep2',
@@ -501,15 +501,6 @@ const routes = [
           title: '标准调研流程'
         }
       },
-      {
-        path: '/zqyjStep1',
-        name: 'zqyjStep1',
-        component: () => import('@/pages/processCenter/pages/creatProcess/zqyj/step1.vue'),
-        meta: {
-          requireAuth: true,
-          title: '标准征求意见流程'
-        }
-      },
     ]
   },
   // 本地工具

src/sysConfig/index.js

@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.30'
+const devIp = '192.168.10.121'
-const devInterfacePORT = '9999'
+const devInterfacePORT = '9988'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'
@@ -51,4 +51,4 @@ module.exports = {
     enterprise: enterprise, // GQ广汽 SJZX数据中心
     theme: theme, // 主题
     processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
-}
+}