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

# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

src/components/navMenu/index.vue

@@ -130,11 +130,11 @@ export default {
               menuId: '2b25c67f10abbbadf37d60daaaec54d3'
             },
 
-            // {
+            {
-            //   title: '国内外政策',
+              title: '国内外政策',
-            //   path: '/foreignRegulationsDatabase',
+              path: '/foreignRegulationsDatabase',
-            //   menuId: '4DB4Y2H3NH'
+              menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
-            // },
+            },
             // // // {
             // // //   title: '标准制修订管理',
             // // //   path: '/demo2One'

src/pages/config/pages/attributeCustom/components/laws.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="''" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
-      <el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="''">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -282,7 +282,7 @@
 </template>
 
 <script>
-const sarType = 'FOREIGN_LAWS'
+const sarType = 'LAWS_STAND'
 export default {
   name: 'attribute-custom',
   data () {
@@ -352,7 +352,7 @@ export default {
         showRegionId: '',
         selVal: '',
         isSearch: '1',
-        sarType: 'FOREIGN_LAWS',
+        sarType: 'LAWS_STAND',
         isWarn: '1'
       },
       attrTypeOptions: [
@@ -367,12 +367,12 @@ export default {
       ],
       sarTypeOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'FOREIGN_LAWS' }
+        { label: '国内外政策', value: 'LAWS_STAND' }
         // { label: '国内外政策', value: 'LAWS' }
       ],
       sarTypeLocationOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'FOREIGN_LAWS' }
+        { label: '国内外政策', value: 'LAWS_STAND' }
       ],
       isMustOptions: [
         { label: '是', value: '0' },
@@ -710,7 +710,7 @@ export default {
       let texts = ''
       if (type === 'INLAND_LAWS') {
         texts = '国内政策'
-      } else if (type === 'FOREIGN_LAWS') {
+      } else if (type === 'LAWS_STAND') {
         texts = '国内外政策'
       } else if (type === 'LAWS') {
         texts = '国内外通用政策'

src/pages/config/pages/attributeCustom/index.vue

@@ -6,11 +6,11 @@
           <stand v-if="tabValue === 'stand'"></stand>
         </div>
       </el-tab-pane>
-<!--      <el-tab-pane label="国内外政策" name="laws">
+      <el-tab-pane label="国内外政策" name="laws">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <laws v-if="tabValue === 'laws'"></laws>
         </div>
-      </el-tab-pane>-->
+      </el-tab-pane>
       <el-tab-pane label="企业标准库" name="buss">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <buss v-if="tabValue === 'buss'"></buss>

src/pages/personal/pages/my-collection/components/CollectionLaws.vue

@@ -50,10 +50,10 @@
                     <div class="left-contents">标题：{{ item.collectTitle }}</div>
                   </el-tooltip>
                 </el-col>
-                <el-col :span="4" :offset="3"> 创建时间：{{item.creationTime}}</el-col>
+                <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'66SSMTSGN3UKCQB4LDRD'">{{$t('m.cancelCollection')}}</el-button>
+                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="''">{{$t('m.cancelCollection')}}</el-button>
 <!--                <el-button size="mini"  style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
               </el-col>
             </el-row>
@@ -144,6 +144,9 @@ export default {
     }
   },
   methods: {
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
     // 对话框关闭清除表单
     noteChange (type) {
       if (!type) {
@@ -271,33 +274,17 @@ export default {
       this.$http.get('person/personCollect/page', {
         pageNo: this.page,
         pageSize: this.$store.getters.userInfo.configContent,
-        modeType: 'LAWS',
+        modeType: 'LAWS_STAND',
         collectTitle: this.search.collectionLaws,
         userId: this.$store.getters.userInfo.userId
       }, {
         _this: this,
         loading: 'loading'
       }, res => {
-        // for (let i = 0; i < res.data.list.length; i++) {
-        //   res.data.list[i].check = false
-        //   res.data.list[i].checked = false
-        //   res.data.list[i].seeBtn = '查看笔记'
-        // }
         this.lawsList = []
-        res.data.list.map((item, index) => {
+        this.lawsList = res.data.records
-          item.checked = false
+        this.total = res.data.total
-        })
-        this.lawsList = res.data.list
-        this.total = res.data.count
         this.contentOpen = true
-        // if (this.saveNote !== '') {
-        //   this.lawsList[this.saveNote].check = true
-        //   if (this.lawsList[this.saveNote].check === true) {
-        //     this.lawsList[this.saveNote].seeBtn = '关闭笔记'
-        //   } else {
-        //     this.lawsList[this.saveNote].seeBtn = '查看笔记'
-        //   }
-        // }
       }, e => {})
     },
     //  取消收藏

src/pages/personal/pages/my-collection/index.vue

@@ -25,10 +25,12 @@ export default {
         // {
         //   title: '已收藏的动态&资料 ',
         //   name: 'CollectionDynamics'
-        // }, {
+        // },
-        //   title: '已收藏的政策',
+        {
-        //   name: 'CollectionLaws'
+          title: '已收藏的政策',
-        // }, {
+          name: 'CollectionLaws'
+        },
+        // {
         //   title: '已收藏的标准拆分',
         //   name: 'CollectionBreak'
         // }

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -70,7 +70,7 @@
         size="mini"
         class="common-button-primary"
         @click="handleSave"
-        :loading="submitLoading"
+        :loading="saveLoading"
         v-if="showSave">
         <i class="iconfont">&#xe608;</i>
         保存
@@ -80,7 +80,7 @@
         size="small"
         class="common-button-danger"
         @click="beforeBack"
-        :loading="submitLoading"
+        :loading="isSubmitBack"
         v-if="showBack">
         <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
         {{ backBTNText }}</el-button>
@@ -239,7 +239,7 @@ export default {
       type: Boolean,
       default: false
     },
-    // 保存按钮loading
+    // 退回按钮loading
     isSubmitBack: {
       type: Boolean,
       default: false

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -15,7 +15,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="auto">
+          <el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="协会名称:">
@@ -156,7 +156,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="任期:">
-                      <el-input v-model="rh_pageData.comityMake.makeTime" ></el-input>
+                      <el-input v-model="rh_pageData.comityMake.makeTime"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -196,35 +196,35 @@
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_name"
+                  prop="tel_name"
                   align="center"
                   label="联络人">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name"></el-input>
+                    <el-input v-model="scope.row.tel_name"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_unit"
+                  prop="tel_unit"
                   align="center"
                   label="单位">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_unit"></el-input>
+                    <el-input v-model="scope.row.tel_unit"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_phone"
+                  prop="tel_phone"
                   align="center"
                   label="电话">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone"></el-input>
+                    <el-input v-model="scope.row.tel_phone"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_mail"
+                  prop="tel_mail"
                   align="center"
                   label="邮箱">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_mail"></el-input>
+                    <el-input v-model="scope.row.tel_mail"/>
                   </template>
                 </el-table-column>
               </el-table>
@@ -252,7 +252,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>技术委员会分委会主任/技术主管部门负责人</h4>
@@ -264,85 +264,85 @@
                 </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.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="dockUserName1" style="margin-bottom: 0">
                   <h4>责任工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dutyUser1" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="责任工程师">
+                    <el-input v-model="roleForm.dutyUserName1" :disabled="true" placeholder="责任工程师">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="partUserId" style="margin-bottom: 0">
                   <h4>参会人员所在部门负责人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.partUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="参会人员所在部门负责人">
+                    <el-input v-model="roleForm.partUser" :disabled="true" placeholder="参会人员所在部门负责人">
                     </el-input>
                   </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.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="startUserName" 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.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部人员" @click.native="choiceZRR('dockUser', '选择标准法规部人员', roleForm.dockUser)">
+                    <el-input v-model="roleForm.startUserName" :disabled="true" 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.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.leaderUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="leaderUser" 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.leaderUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部主管领导" @click.native="choiceZRR('dockUser', '选择标准法规部主管领导', roleForm.dockUser)">
+                    <el-input v-model="roleForm.leaderUser"  placeholder="选择标准法规部主管领导" @click.native="choiceZRROne('leaderUser', '选择标准法规部主管领导', roleForm.leaderUser)">
                     </el-input>
                   </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.feeUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="feeUser" 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.feeUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择费用管理部门" @click.native="choiceZRR('dockUser', '选择费用管理部门', roleForm.dockUser)">
+                    <el-input v-model="roleForm.feeUser" placeholder="选择费用管理部门" @click.native="choiceZRR('feeUser', '选择费用管理部门', roleForm.feeUser)">
                     </el-input>
                   </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.engineerUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="engineerUser" 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.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择人员" @click.native="choiceZRR('dockUser', '选择人员', roleForm.dockUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
                     </el-input>
                   </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.startUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <el-form-item prop="totalLeader" 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.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRR('dockUser', '选择总院技术委员会主任', roleForm.dockUser)">
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('startUser', '选择总院技术委员会主任', roleForm.startUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -363,6 +363,12 @@
     </ProcessFooter>
     <Role-tree
       check-box
+      is-title="选择人员信息"
+      :is-visible.sync="roleShowflagOne"
+      :nodeList="nodeListOne"
+      @checkedRole="drawerCheckOne"
+    />
+    <Role-tree
       is-title="选择人员信息"
       :is-visible.sync="roleShowflag"
       :nodeList="nodeList"
@@ -375,7 +381,8 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, saveTaskFirst,completeTask } from '@/api/process.js'
+import {startProcess, saveTaskFirst, completeTask, queryTaskFirst} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -393,7 +400,7 @@ export default {
         comityRole: '',
         comityState: '',
         comityKind: '',
-        infoSources: '',
+        infoSources: [],
         comityMake: {
           makeQualification: '',
           makeRole: '',
@@ -402,26 +409,26 @@ export default {
           makeTime: '',
         },
         workPath: '',
-        comityTel:[],
+        comityTel: [],
       },
       comityNameOptions: [
-        { value: '0' ,label: '国内法规入库流程'},
+        {value: '0', label: '国内法规入库流程'},
-        { value: '1' ,label: '标准法规技术评估流程'},
+        {value: '1', label: '标准法规技术评估流程'},
       ],
       comityRoleOptions: [
-        { value: '0' ,label: '委员'},
+        {value: '0', label: '委员'},
-        { value: '1' ,label: '观察委员'},
+        {value: '1', label: '观察委员'},
-        { value: '2' ,label: '通讯委员'},
+        {value: '2', label: '通讯委员'},
-        { value: '3' ,label: '成员'}
+        {value: '3', label: '成员'}
       ],
       comityStateOptions: [
-        { value: '0' ,label: '常设机构'},
+        {value: '0', label: '常设机构'},
-        { value: '1' ,label: '临时机构'}
+        {value: '1', label: '临时机构'}
       ],
       comityKindOptions: [
-        { value: '0' ,label: '新增'},
+        {value: '0', label: '新增'},
-        { value: '1' ,label: '换届'},
+        {value: '1', label: '换届'},
-        { value: '2' ,label: '委员改选'}
+        {value: '2', label: '委员改选'}
       ],
       /** 上传相关   */
       acceptShow: false,
@@ -439,26 +446,51 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         dockUserName: '',
-        dockUser: ''
+        dockUser: '',
+        leaderUser: '',
+        leaderUserId: '',
+        feeUser: '',
+        feeUserId: '',
+        engineerUser: '',
+        engineerUserId: '',
+
       },
       rh_rules: {},
       roleFormRules: {
-        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
+        dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
       roleShowflag: false,
+      roleShowflagOne: false,
       nodeList: [],
+      nodeListOne: [],
       isSubmit: false,
       saveLoading: false,
     }
   },
+
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
+  },
   methods: {
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
     },
 
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.rh_pageData = mes.rh_pageData
+        this.roleForm = mes.roleForm
+      });
+    },
     //上传按钮
-    uploadFile (val) {
+    uploadFile(val) {
     },
     // 文件上传限制条件
     handleBeforeUpload(file) {
@@ -489,8 +521,8 @@ export default {
     handleBeforeRemove(file, fileList) {
       this.fileData = fileList
       this.fileTextList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
+        if (item.name === file.name || item.id === file.id) {
-          this.fileTextList.splice(index,1)
+          this.fileTextList.splice(index, 1)
         }
       })
     },
@@ -509,7 +541,7 @@ export default {
             name: res.data.standName
           })
         }
-        this.fileListData.fileText = this.newDataList
+        this.rh_pageData.infoSources = this.newDataList
         this.$message({
           showClose: true,
           message: res.message,
@@ -563,31 +595,85 @@ export default {
     },
 
     // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
+    choiceZRR(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
       this.drawerTitle = title
       this.roleShowflag = true
     },
-    drawerCheck (data) {
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      if (this.type === 'feeUser') {
+        this.roleForm.feeUser = nameList
+        this.roleForm.feeUserId = idList
+      } else {
+        this.roleForm.dockUser = idList
+        this.roleForm.dockUserName = nameList
+        this.rh_pageData.comityInRole = nameList
+        this.rh_pageData.comityInRoleId = idList
+      }
+      this.roleShowflag = false
+    },
+
+    // 流程阶段人选择
+    choiceZRROne(type, title, id) {
+      this.nodeListOne = []
+      this.nodeListOne.push(id)
+      this.type = type
+      this.drawerTitleOne = title
+      this.roleShowflagOne = true
+    },
+    drawerCheckOne(data) {
       this.unqualidiedData.forEach(item => {
         item.engineer = data[0].name
         item.engineerId = data[0].id
       })
-      this.roleForm.dockUser = data[0].id
+      if (this.type === 'leaderUser') {
-      this.roleForm.dockUserName = data[0].name
+        this.roleForm.leaderUser = data[0].name
-      this.roleShowflag = false
+        this.roleForm.leaderUserId = data[0].id
+      } else {
+        this.roleForm.engineerUser = data[0].name
+        this.roleForm.engineerUserId = data[0].id
+      }
+      this.roleShowflagOne = false
     },
+
     // 保存按钮
-    handleSave(){},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '20')
+      _formData.append('json', JSON.stringify({
+        roleForm: this.roleForm,
+        rh_pageData: this.rh_pageData
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       let json = {
-        prcCreateUser: this.$store.getters.userInfo.userId,
+        roleList: this.roleForm,
-        prcCreateUserName: this.$store.getters.userInfo.userName,
         rh_pageData: this.rh_pageData,
-        directorList: this.roleForm.dockUser,
+        directorList: this.rh_pageData.comityInRoleId,
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {
@@ -595,16 +681,16 @@ export default {
             if (valid) {
               this.isSubmit = true
               const paramsInfo = {
-                type: '11'
+                type: '20'
               }
-              startProcess(paramsInfo).then(res=>{
+              startProcess(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))
                 params.set('userId', this.$store.getters.userInfo.userId)
                 params.set('taskId', this.taskID)
                 completeTask(params).then(res => {
-                  if(res.success === true) {
+                  if (res.success === true) {
                     this.$message.success('提交成功')
                     this.$router.push("/processCenter");
                   }
@@ -613,7 +699,8 @@ export default {
               })
             }
           })
-        } })
+        }
+      })
     }
   }
 }
@@ -621,15 +708,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep1 {
   position: relative;
   height: 100%;
-  /deep/.el-drawer__container {
+
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -637,6 +727,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -644,21 +735,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -666,6 +761,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -673,36 +769,46 @@ export default {
       }
     }
   }
+
   .content_form {
     border: 1px solid #DCDFE6;
     padding-top: 15px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
-    /deep/.el-table__body-wrapper {
+
-      height: auto!important;
+    /deep/ .el-table__body-wrapper {
+      height: auto !important;
     }
-    /deep/.el-textarea__inner {
+
+    /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     .make_form {
       border: 1px solid #DCDFE6;
       padding: 10px;
-      /deep/.el-form-item__label-wrap {
+
-        margin-left: 0!important;
+      /deep/ .el-form-item__label-wrap {
+        margin-left: 0 !important;
       }
-      /deep/.el-form-item__content {
+
-        margin-left: 40px!important;
+      /deep/ .el-form-item__content {
+        margin-left: 40px !important;
       }
+
       .el-input {
         padding-bottom: 10px;
         width: 85%;
       }
     }
+
     .comityTel_btn {
       text-align: right;
     }
-    /deep/.el-table th {
+
+    /deep/ .el-table th {
       padding: 0px;
     }
   }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">选择人员确认</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="rh_pageData" :model="rh_pageData" label-width="auto" :rules="rh_rules">
+          <el-form ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="文件编号:" prop="comityFileNum">
@@ -87,27 +87,11 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
-                  v-model="rh_pageData.comityTel.tel_name"
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
-                  label="联络人">
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_unit"
-                  align="center"
-                  label="单位">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_phone"
-                  align="center"
-                  label="电话">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_mail"
-                  align="center"
-                  label="邮箱">
-                </el-table-column>
               </el-table>
             </el-form-item>
             <ProcessTitle>
@@ -115,16 +99,28 @@
             </ProcessTitle>
             <el-form-item label="入会人员:">
               <el-input
-                clearable
+                :disabled="true"
                 style="width: 30%"
-                placeholder="请选择入会人员"
+                v-model="rh_pageData.comityOpRole"
-                v-model="rh_pageData.comityInRole"
+              >
-                @click.native="inRoleChice">
               </el-input>
             </el-form-item>
           </el-form>
         </div>
       </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -194,23 +190,15 @@
       </div>
     </div>
     <ProcessFooter
-      show-save
       show-submit
       show-back
       backBTNTexts="不涉及"
+      :isSubmitBack="isBack"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
       @back="handleSubmitNo"
-      @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <Role-tree
-      is-title="选择人员信息"
-      :is-visible.sync="roleShowflag"
-      :nodeList="nodeList"
-      @checkedRole="drawerCheck"
-    />
   </div>
 </template>
 
@@ -221,10 +209,11 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
+  startProcess,
   saveinboundTask,
   saveTaskForPub,
-  changeAssigneeNew
 } from "@/api/process.js"
+
 export default {
   components: {
     ProcessHeader,
@@ -253,15 +242,18 @@ export default {
         },
         workPath: '',
         comityTel: [],
-        comityInRole: '',
+        comityOpRole: '',
         comityInRoleId: '',
       },
+      roleForm: {},
+      commentText: '',
       roleShowflag: false,
       nodeList: [],
       detailData: [],
       loading: false,
 
       isSubmit: false,
+      isBack: false,
       saveLoading: false,
 
       taskIds: this.$route.query.taskIds,
@@ -302,9 +294,11 @@ export default {
         this.getFormFieldList(processForm)
       })
     },
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -312,36 +306,57 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    // 流程阶段负责人选择
-    inRoleChice (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.roleShowflag = true
-    },
-    drawerCheck (data) {
-      var idList = ''
-      var nameList = ''
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ','
-          idList += ','
-        }
-        idList += item.id;
-        nameList += item.name;
-      });
-      this.rh_pageData.comityInRole = nameList
-      this.rh_pageData.comityInRoleId = idList
-      this.roleShowflag = false
-    },
     // 退回按钮
-    handleSubmitNo() {},
+    handleSubmitNo() {
-    // 保存按钮
+      let json = {
-    handleSave() {
+        roleList: this.roleForm,
+        memberId: this.$store.getters.userInfo.userId,
+        passFlag: '0',
+        commentText: this.commentText,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
     },
     // 提交按钮
     handleSubmit() {
+      let json = {
+        roleList: this.roleForm,
+        memberId: this.$store.getters.userInfo.userId,
+        passFlag: '1',
+        commentText: this.commentText,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
     }
   }
 }
@@ -349,15 +364,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep2 {
   position: relative;
   height: 100%;
-  /deep/.el-drawer__container {
+
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -365,6 +383,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -372,21 +391,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -394,6 +417,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -401,12 +425,15 @@ export default {
       }
     }
   }
+
   .content_form {
     padding: 15px;
+
     .comityTel_btn {
       text-align: right;
     }
-    /deep/.el-table th {
+
+    /deep/ .el-table th {
       padding: 0px;
     }
   }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep3">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">入选代表填写信息</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -84,27 +84,11 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
-                  v-model="rh_pageData.comityTel.tel_name"
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
-                  label="联络人">
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_unit"
-                  align="center"
-                  label="单位">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_phone"
-                  align="center"
-                  label="电话">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_mail"
-                  align="center"
-                  label="邮箱">
-                </el-table-column>
               </el-table>
             </el-form-item>
             <ProcessTitle>
@@ -116,6 +100,7 @@
                   <el-input
                     style="width: 100%"
                     placeholder="请填写"
+                    :disabled="true"
                     v-model="rh_pageData.fillPeople"
                   />
                 </el-form-item>
@@ -175,6 +160,7 @@
                     style="width: 100%"
                     placeholder="请填写"
                     v-model="rh_pageData.fillLeader"
+                    @click.native="choiceZRR"
                   />
                 </el-form-item>
               </el-col>
@@ -282,6 +268,12 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+} from "@/api/process.js"
 
 export default {
   components: {
@@ -317,8 +309,11 @@ export default {
         fillTel: '',
         fillMail: '',
         fillLeader: '',
+        fillLeaderId: '',
         fillFile: '',
       },
+      roleForm: {},
+      unqualidiedData: [],
       roleShowflag: false,
       nodeList: [],
       detailData: [],
@@ -368,6 +363,8 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -375,11 +372,65 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    choiceZRR(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.roleShowflag = true
+    },
+    drawerCheck (data) {
+      this.unqualidiedData.forEach(item => {
+        item.engineer = data[0].name
+        item.engineerId = data[0].id
+      })
+      this.rh_pageData.fillLeaderId = data[0].id
+      this.rh_pageData.fillLeader = data[0].name
+      this.roleShowflag = false
+    },
     // 保存按钮
     handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        roleList: this.roleForm,
+        selfUser: this.$store.getters.userInfo.userId,
+        charge: this.rh_pageData.fillLeaderId,
+        rh_pageData: this.rh_pageData,
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
     },
     // 提交按钮
     handleSubmit() {
+      let json = {
+        roleList: this.roleForm,
+        selfUser: this.$store.getters.userInfo.userId,
+        charge: this.rh_pageData.fillLeaderId,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
     }
   }
 }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep4">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">责任负责人审批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,27 +87,11 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
-                  v-model="rh_pageData.comityTel.tel_name"
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
-                  label="联络人">
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_unit"
-                  align="center"
-                  label="单位">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_phone"
-                  align="center"
-                  label="电话">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.comityTel.tel_mail"
-                  align="center"
-                  label="邮箱">
-                </el-table-column>
               </el-table>
             </el-form-item>
             <el-form-item label="入会人员:">
@@ -119,41 +103,13 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column
+                <el-table-column prop="fillPeople" align="center" label="参与人"/>
-                  v-model="rh_pageData.myPartRole.fillPeople"
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="fillDept" align="center" label="部门"/>
-                  label="参与人">
+                <el-table-column prop="fillPost" align="center" label="身份"/>
-                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
-                <el-table-column
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                  v-model="rh_pageData.myPartRole.fillUnit"
+                <el-table-column prop="fillFile" align="center" label="资料"/>
-                  align="center"
-                  label="单位">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillDept"
-                  align="center"
-                  label="部门">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillPost"
-                  align="center"
-                  label="身份">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillTel"
-                  align="center"
-                  label="电话">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillMail"
-                  align="center"
-                  label="邮箱">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillFile"
-                  align="center"
-                  label="资料">
-                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -245,7 +201,7 @@
       show-back
       backBTNTexts="驳回"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isBack"
       @back="handleSubmitNo"
       @submit="handleSubmit"
     >
@@ -290,6 +246,7 @@ export default {
           makeDuties: '',
           makeTime: '',
         },
+        prcCreateUser: {},
         workPath: '',
         comityTel: [],
         fillPeople: '',
@@ -302,13 +259,18 @@ export default {
         fillFile: '',
         myPartRole: [],
       },
-
+      roleForm: {},
+      selfUser: '',
       detailData: [],
       loading: false,
 
       textarea: '',
       isSubmit: false,
+      isBack: false,
       saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -349,11 +311,76 @@ export default {
         this.getFormFieldList(processForm)
       })
     },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.myPartRole = [{
+          fillPeople: this.rh_pageData.fillPeople,
+          fillUnit: this.rh_pageData.fillUnit,
+          fillDept: this.rh_pageData.fillDept,
+          fillPost: this.rh_pageData.fillPost,
+          fillTel: this.rh_pageData.fillTel,
+          fillMail: this.rh_pageData.fillMail,
+          fillFile: this.rh_pageData.fillFile,
+        }]
+        this.selfUser = JSON.parse(JSON.stringify(item)).selfUser
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
 
     // 退回按钮
-    handleSubmitNo() {},
+    handleSubmitNo() {
+      let json = {
+        member: this.selfUser,
+        passFlag: '0',
+        roleList: this.roleForm,
+        commentText: this.textarea,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
     // 提交按钮
     handleSubmit() {
+      let json = {
+        member: this.selfUser,
+        passFlag: '1',
+        engineerSum: this.roleForm.startUser,
+        roleList: this.roleForm,
+        commentText: this.textarea,
+        rh_pageData: this.rh_pageData,
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
     }
   }
 }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep5">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">汇总修订</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,37 +87,37 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" width="55"/>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_name"
+                  prop="tel_name"
                   align="center"
                   label="联络人">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name"></el-input>
+                    <el-input v-model="scope.row.tel_name"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_unit"
+                  prop="tel_unit"
                   align="center"
                   label="单位">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_unit"></el-input>
+                    <el-input v-model="scope.row.tel_unit"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_phone"
+                  prop="tel_phone"
                   align="center"
                   label="电话">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone"></el-input>
+                    <el-input v-model="scope.row.tel_phone"/>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="rh_pageData.comityTel.tel_mail"
+                  prop="tel_mail"
                   align="center"
                   label="邮箱">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_mail"></el-input>
+                    <el-input v-model="scope.row.tel_mail"/>
                   </template>
                 </el-table-column>
               </el-table>
@@ -141,42 +141,14 @@
                 style="width: 100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" width="55"/>
-                <el-table-column
+                <el-table-column prop="fillPeople" align="center" label="参与人"/>
-                  v-model="rh_pageData.myPartRole.fillPeople"
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
-                  align="center"
+                <el-table-column prop="fillDept" align="center" label="部门"/>
-                  label="参与人">
+                <el-table-column prop="fillPost" align="center" label="身份"/>
-                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
-                <el-table-column
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                  v-model="rh_pageData.myPartRole.fillUnit"
+                <el-table-column prop="fillFile" align="center" label="资料"/>
-                  align="center"
-                  label="单位">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillDept"
-                  align="center"
-                  label="部门">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillPost"
-                  align="center"
-                  label="身份">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillTel"
-                  align="center"
-                  label="电话">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillMail"
-                  align="center"
-                  label="邮箱">
-                </el-table-column>
-                <el-table-column
-                  v-model="rh_pageData.myPartRole.fillFile"
-                  align="center"
-                  label="资料">
-                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -312,12 +284,16 @@ export default {
         myPartRole: [],
       },
 
+      roleForm: {},
       detailData: [],
       loading: false,
 
       textarea: '',
       isSubmit: false,
       saveLoading: false,
+
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -358,7 +334,13 @@ export default {
         this.getFormFieldList(processForm)
       })
     },
-
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
     /** 批量删除 */
     del_paryForm() {
       if (this.deleteDataList.length < 1) {
@@ -390,14 +372,32 @@ export default {
     selectedDelete(val) {
       this.deleteDataList = val
     },
-    // 退回按钮
-    handleSubmitNo() {},
-
     // 保存按钮
     handleSave() {
     },
     // 提交按钮
     handleSubmit() {
+        let json = {
+          leader: this.roleForm.leaderUserId,
+          rh_pageData: this.rh_pageData,
+          roleList: this.roleForm,
+        }
+        this.$refs['rh_pageData'].validate((valid) => {
+          if (valid) {
+            this.isSubmit = true
+            const params = new FormData();
+            params.set('json', JSON.stringify(json))
+            params.set('userId', this.$store.getters.userInfo.userId)
+            params.set('taskId', this.taskIds)
+            completeTask(params).then(res => {
+              if (res.success === true) {
+                this.$message.success('提交成功')
+                this.$router.push("/processCenter");
+              }
+              this.isSubmit = false
+            });
+          }
+        })
     }
   }
 }
@@ -466,6 +466,9 @@ export default {
     /deep/.el-table th {
       padding: 0px;
     }
+    /deep/.el-table__body-wrapper {
+      height: auto!important;
+    }
     .myPart_btn {
       text-align: right;
     }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -0,0 +1,506 @@
+<template>
+  <div class="bzrhStep6">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto;">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <div class="content_form">
+          <el-form ref="rh_pageData" :model="rh_pageData" label-width="auto" :rules="rh_rules">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="文件编号:" prop="comityFileNum">
+                  {{ rh_pageData.comityFileNum || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="文件名称:" prop="comityFileName">
+                  {{ rh_pageData.comityFileName || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="协会名称:">
+                  {{ rh_pageData.comityName || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="协会状态:" prop="comityState">
+                  {{ rh_pageData.comityState || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="入会性质:" prop="comityKind">
+                  {{ rh_pageData.comityKind || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="资质:">
+                  {{ rh_pageData.comityMake.makeQualification || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="成员:">
+                  {{ rh_pageData.comityMake.makeRole || '' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="费用估计:">
+                  {{ rh_pageData.comityMake.makeCost || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="职责:">
+                  {{ rh_pageData.comityMake.makeDuties || '-' }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="任期:">
+                  {{ rh_pageData.comityMake.makeTime || '-' }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="工作方向:" prop="workPath">
+              <el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
+            </el-form-item>
+            <el-form-item label="协会外部联系方式:">
+              <el-table
+                :data="rh_pageData.comityTel"
+                border
+                ref="entryTable"
+                height="49%"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column prop="tel_name" align="center" label="联络人"/>
+                <el-table-column prop="tel_unit" align="center" label="单位"/>
+                <el-table-column prop="tel_phone" align="center" label="电话"/>
+                <el-table-column prop="tel_mail" align="center" label="邮箱"/>
+              </el-table>
+            </el-form-item>
+            <el-form-item label="我司参与人员:">
+              <div class="myPart_btn">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  @click="del_paryForm">
+                  批量删除
+                </el-button>
+              </div>
+              <el-table
+                :data="rh_pageData.myPartRole"
+                border
+                ref="entryTable"
+                @selection-change="selectedDelete"
+                height="49%"
+                style="width: 100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '20px'}">
+                <el-table-column type="selection" width="55"/>
+                <el-table-column prop="fillPeople" align="center" label="参与人"/>
+                <el-table-column prop="fillUnit" align="center" label="单位"/>
+                <el-table-column prop="fillDept" align="center" label="部门"/>
+                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillTel" align="center" label="电话"/>
+                <el-table-column prop="fillMail" align="center" label="邮箱"/>
+                <el-table-column prop="fillFile" align="center" label="资料"/>
+              </el-table>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-submit
+      show-back
+      :isSubmitBack="isBack"
+      :submitLoading="isSubmit"
+      @back="handleSubmitNo"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {
+  completeTask,
+  inboundLiaisonDetail,
+  saveinboundTask,
+  saveTaskForPub,
+  changeAssigneeNew
+} from "@/api/process.js"
+
+export default {
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  name: "bzrhStep6",
+  data() {
+    return {
+      active: '1', // 默认显示
+      rh_rules: {},
+      rh_pageData: {
+        comityFileNum: '',
+        comityFileName: '',
+        comityName: '',
+        comityRole: '',
+        comityState: '',
+        comityKind: '',
+        InfoSources: '',
+        comityMake: {
+          makeQualification: '',
+          makeRole: '',
+          makeCost: '',
+          makeDuties: '',
+          makeTime: '',
+        },
+        workPath: '',
+        comityTel: [],
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+        myPartRole: [],
+      },
+
+      detailData: [],
+      loading: false,
+
+      roleForm: {},
+      textarea: '',
+      isSubmit: false,
+      isBack: false,
+      saveLoading: false,
+      taskInfo: this.$route.query.taskInfo,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  methods: {
+    // 右上标签页面切换
+    handleTabs(name) {
+      this.active = name
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        // this.rh_pageData.comityFileNum = this.fileTextList
+      })
+    },
+    /** 批量删除 */
+    del_paryForm() {
+      if (this.deleteDataList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.deleteDataList.map(item => {
+            let index;
+            index = this.rh_pageData.myPartRole.findIndex(items => {
+              return items.id === item;
+            });
+            if (index > -1) {
+              this.rh_pageData.myPartRole.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+
+    selectedDelete(val) {
+      this.deleteDataList = val
+    },
+    // 退回按钮
+    handleSubmitNo() {
+      let json = {
+        rh_pageData: this.rh_pageData,
+        roleList: this.roleForm
+      }
+      if (this.taskInfo === '标准法规部主管领导审核') {
+        json.passFlag = '0',
+        json.manageDepartmentList = this.roleForm.feeUserId
+      } else if (this.taskInfo === '费用管理部门会签') {
+        json.passFlag = '0',
+        json.manageDepartment = this.$store.getters.userInfo.userId
+        json.president = this.roleForm.engineerUserId
+      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+        json.passFlag = '0',
+        json.engineerSumDone = this.roleForm.startUser
+      } else {
+        json = json
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
+
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        rh_pageData: this.rh_pageData,
+        roleList: this.roleForm
+      }
+      if (this.taskInfo === '标准法规部主管领导审核') {
+        json.passFlag = '1',
+        json.manageDepartmentList = this.roleForm.feeUserId
+      } else if (this.taskInfo === '费用管理部门会签') {
+        json.passFlag = '1',
+        json.manageDepartment = this.$store.getters.userInfo.userId
+        json.president = this.roleForm.engineerUserId
+      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+        json.passFlag = '1',
+        json.engineerSumDone = this.roleForm.startUser
+      } else {
+        json = json
+      }
+      this.$refs['rh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzrhStep6 {
+  position: relative;
+  height: 100%;
+
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .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-center {
+    padding: 10px 0px 10px 10px;
+  }
+
+  .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;
+      }
+    }
+  }
+
+  .content_form {
+    padding: 15px;
+
+    .comityTel_btn {
+      text-align: right;
+    }
+
+    /deep/ .el-table th {
+      padding: 0px;
+    }
+
+    .myPart_btn {
+      text-align: right;
+    }
+  }
+}
+</style>

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

@@ -730,7 +730,7 @@
                                             v-model="form.glwjName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.glwjName">
+                                    <div v-if="glwjFileList.length>0">
 
                                       <el-button
                                           type="primary"
@@ -1814,47 +1814,52 @@
                     // 带入
                     case 2:
                         if (this.standardCheckedList.length === 1) {
-                            const bringData = this.standardCheckedList[0]
+                          this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
-                            bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+                            _this: this
-                            bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+                          }, res => {
+                            if(res && res.data){
+                              const bringData = res.data
+                              bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+                              bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
 
-                            const json = Object.assign(bringData, bringData.attrInfoCaseMap);
+                              const json = Object.assign(bringData, bringData.attrInfoCaseMap);
-                            this.form = JSON.parse(JSON.stringify(json))
+                              this.form = JSON.parse(JSON.stringify(json))
 
-                            this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
+                              this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
-                            this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
+                              this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
-                            this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
+                              this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
-                            this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
+                              this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
-                            this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
+                              this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
-                            this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
+                              this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
-                            this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
+                              this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
-                            this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
+                              this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
-                            this.defaultCheckedKeys = [this.form.standSystem];
+                              this.defaultCheckedKeys = [this.form.standSystem];
-                            this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+                              this.defaultCheckedKeys1 = [this.form.cycvppsbm];
-                            this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+                              this.defaultCheckedKeys2 = [this.form.kccvppsbm];
-                            this.defaultCheckedKeys3 = [this.form.dybxh];
+                              this.defaultCheckedKeys3 = [this.form.dybxh];
-                            this.key++
+                              this.key++
-                            this.key1++
+                              this.key1++
-                            this.key2++
+                              this.key2++
-                            this.key3++
+                              this.key3++
-                            this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                              this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-                            this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                              this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
-                            this.form.prcNum = this.prcNum
+                              this.form.prcNum = this.prcNum
-                            this.form.prcName = this.prcName
+                              this.form.prcName = this.prcName
-                            this.form['id'] = bringData.id
+                              this.form['id'] = bringData.id
-                            this.standardDrawer = false
+                              this.standardDrawer = false
-                            this.verifySarStandard = true
+                              this.verifySarStandard = true
-                            this.busVsFunc()
+                              this.busVsFunc()
-                            this.modelFunc()
+                              this.modelFunc()
-                            this.$forceUpdate()
+                              this.$forceUpdate()
-
-                          console.log("this.form",this.form);
-                          // 遍历对象初始化文件信息
-                          for(const p in this.form) {
-                            if (typeof (this.form[p]) != "function") {
-                              this.initializeFileList(p,this.form[p]);
                             }
-                          }
+                            // 遍历对象初始化文件信息
+                            for(const p in this.form) {
+                              if (typeof (this.form[p ]) != "function") {
+                                this.initializeFileList(p,this.form[p]);
+                              }
+                            }
+                            console.log("res",res);
+                          })
 
                         } else if (this.standardCheckedList.length > 1) {
                             this.$message.warning('最多可以带入一条标准信息')
@@ -1890,7 +1895,6 @@
                 this.getFileList(value,this.kwjFileList);
                 break;
               case 'jdwj':
-                debugger
                 this.getFileList(value,this.jdwjFileList);
                 break;
               case 'bpg':
@@ -1899,6 +1903,9 @@
               case 'zqyjg':
                 this.getFileList(value,this.zqyjgFileList);
                 break;
+              case 'glwj':
+                this.getFileList(value,this.glwjFileList);
+                break;
               default: ;
             }
           },getFileList(fileIds,defaultFileList){
@@ -1909,7 +1916,7 @@
             }, {
               _this: this
             }, res => {
-              debugger
+
               let fileList = res.data
               if (fileList != null && fileList.length > 0) {
                 for (let i = 0; i < fileList.length; i++) {
@@ -2365,7 +2372,6 @@
                     //     this.form.zbjbdName += response.data.name+',';
                     // }
 
-
                   switch (this.fileType){
                     case 'fbgbjbd':
                       this.FBGBJBDFileList=fileList;
@@ -2454,6 +2460,7 @@
                   break;
                 case 'jdwj':
                   this.fileList=this.jdwjFileList
+                  break;
                 case 'kwj':
                   this.fileList=this.kwjFileList
                   break;
@@ -2623,34 +2630,34 @@
 
             //拼接文件名和id 提交到流程Activity
             this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
-            this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",")
+            this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",")
 
             this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",")
-            this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",")
+            this.form.xgdName=this.xgdFileList.map(item => item.name).join(",")
 
             this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",")
-            this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",")
+            this.form.bpgName=this.bpgFileList.map(item => item.name).join(",")
 
             this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",")
-            this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",")
+            this.form.ssgName=this.ssgFileList.map(item => item.name).join(",")
 
             this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",")
-            this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",")
+            this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",")
 
             this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",")
-            this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",")
+            this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",")
 
             this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
-            this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",")
+            this.form.kwjName=this.kwjFileList.map(item => item.name).join(",")
 
             this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
-            this.form.caName=this.caFileList.map(item => item.response.data.name).join(",")
+            this.form.caName=this.caFileList.map(item => item.name).join(",")
 
             this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",")
-            this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",")
+            this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",")
 
             this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
-            this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",")
+            this.form.glwjName=this.glwjFileList.map(item => item.name).join(",")
 
 
           },

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

@@ -215,84 +215,164 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <div class="prc-content-border">
-                        <el-row :gutter="24">
+<!--                        <el-row :gutter="24">-->
-                            <el-col :span="12">
+<!--                            <el-col :span="12">-->
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">-->
-                                    <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+<!--                                    <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">-->
-                                        {{ form.xgdName }}
+<!--                                        {{ form.xgdName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">-->
-                                    <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+<!--                                    <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">-->
-                                        {{ form.fbgbjbdName }}
+<!--                                        {{ form.fbgbjbdName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+<!--                                    <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">-->
-                                        {{ form.zbjbdName }}
+<!--                                        {{ form.zbjbdName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+<!--                                    <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">-->
-                                        {{ form.ssgName }}
+<!--                                        {{ form.ssgName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+<!--                                    <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">-->
-                                        {{ form.caName }}
+<!--                                        {{ form.caName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                            </el-col>
+<!--                            </el-col>-->
-                            <el-col :span="12">
+<!--                            <el-col :span="12">-->
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+<!--                                    <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">-->
-                                        {{ form.kwjName }}
+<!--                                        {{ form.kwjName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+<!--                                    <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">-->
-                                        {{ form.jdwjName }}
+<!--                                        {{ form.jdwjName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+<!--                                    <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">-->
-                                        {{ form.bpgName }}
+<!--                                        {{ form.bpgName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">-->
-                                    <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+<!--                                    <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">-->
-                                        {{ form.zqyjgName }}
+<!--                                        {{ form.zqyjgName }}-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div v-else>
+<!--                                    <div v-else>-->
-                                        - -
+<!--                                        - - -->
-                                    </div>
+<!--                                    </div>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                            </el-col>
+<!--                            </el-col>-->
-                        </el-row>
+<!--                        </el-row>-->
+
+                      <el-row :gutter="24">
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                            <div  v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile('xgd',value.id)">
+                              <!-- {{ value.name }} -->
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                            <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                            <div  v-if="zbjbdFileMap.length>0"  v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                            <div v-if="ssgFileMap.length>0"  v-for="(value,index)  in this.ssgFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                            <div v-if="caFileMap.length>0" v-for="(value,index)  in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                            <div v-if="kwjFileMap.length>0" v-for="(value,index)  in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <div v-if="jdwjFileMap.length>0" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="zqyjgFileMap.length>0" v-for="(value,index)  in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -470,9 +550,9 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                  <div v-if="glwjFileMap.length>0" v-for="(value,index)  in this.glwjFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
-                                        {{ form.glwjName }}
+                                    {{value.name}}
-                                    </div>
+                                  </div>
                                     <div v-else>
                                         - -
                                     </div>
@@ -692,7 +772,22 @@
         name: "bzrkStep2",
         data () {
             return {
-                // 调整处理人抽屉状态
+              xgdFileMap: [],
+              fbgbjbdFileMap: [],
+              bpgFileMap: [],
+              ssgFileMap: [],
+              zqyjgFileMap: [],
+              jdwjFileMap: [],
+              kwjFileMap: [],
+              glwjFileMap: [],
+              caFileMap: [],
+              zbjbdFileMap: [],
+
+
+
+
+
+              // 调整处理人抽屉状态
                 drawerModal: false,
                 drawerTitle: '',
                 nodeList: [],
@@ -895,7 +990,6 @@
                 if(fileType === 'fbgbjbd'){
                     if(this.fbgbjbdFileId.search(',')){
                         this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
-                        console.log(this.fbgbjbdFileId);
                     }
                     window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
                 }else if(fileType === 'xgd'){
@@ -979,6 +1073,16 @@
                     this.detailData = res
                 }, e => {})
             },
+          assemble(ids,names){
+            let list= new Array();
+            let idArray=ids.split(',');
+            let nameArray=names.split(',');
+            for(var i=0;i<idArray.length;i++){
+              list.push({id:idArray[i],name:nameArray[i]});
+            }
+
+            return list;
+          },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
@@ -987,6 +1091,8 @@
                     }).then(res => {
                         if (res) {
                             const processForm = JSON.parse(res.mesg)
+
+                          console.log("processFrom",processForm)
                             this.xgdFileId = processForm.xgd
                             this.fbgbjbdFileId = processForm.fbgbjbd
                             this.bpgFileId = processForm.bpg
@@ -998,8 +1104,27 @@
                             this.caFileId = processForm.ca
                             this.zbjbdFileId = processForm.zbjbd
                             this.getFormFieldList(processForm)
-                            console.log(processForm);
+
-                            console.log("processForm");
+                          this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
+
+                          this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+                          // fbgbjbdFileMap: {},
+                          this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
+                          // bpgFileMap: {},
+                          this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName);
+                          // ssgFileMap: {},
+                          this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
+                          // zqyjgFileMap: {},
+                          this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName);
+                          // jdwjFileMap: {},
+                          this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
+                          // kwjFileMap: {},
+                          this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
+                          // glwjFileMap: {},
+                          this.caFileMap=this.assemble(processForm.ca,processForm.caName);
+                          // caFileMap: {},
+                          this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName);
+                          // zbjbdFileMap: {},
 
                         }
                     }).catch(e => {
@@ -1013,7 +1138,6 @@
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
                     this.defaultCheckedKeys = [this.form.standSystem]
-                    console.log(this.defaultCheckedKeys)
                     this.defaultCheckedKeys1 = [this.form.cycvppsbm]
                     this.defaultCheckedKeys2 = [this.form.kccvppsbm]
                     this.defaultCheckedKeys3 = [this.form.dybxh]
@@ -1082,7 +1206,6 @@
                         }, {
                             _this: this
                         }, res => {
-                            console.log(res);
                             if (res.success) {
                                 if(this.formTongGuo.approvalOpinion === '1'){
                                     this.$message.warning("驳回成功")

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

@@ -472,8 +472,8 @@
 <!--                  ></el-input>-->
 <!--                </el-form-item>-->
                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                  <div v-if="form.glwjName" v-for="(value,index)  in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
-                    {{ form.glwjName }}
+                    {{value.name}}
                   </div>
                   <div v-else>
                     - -
@@ -973,12 +973,9 @@ export default {
       }, e => {})
     },
     assemble(ids,names){
-        console.log("name",names)
-        console.log("id",ids)
         let list= new Array();
         let idArray=ids.split(',');
         let nameArray=names.split(',');
-        console.log("idarray",idArray);
         for(var i=0;i<idArray.length;i++){
           list.push({id:idArray[i],name:nameArray[i]});
         }
@@ -1007,7 +1004,6 @@ export default {
 
 
       this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
-      console.log("xgdName",this.xgdFileMap);
 
       this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
       // fbgbjbdFileMap: {},
@@ -1017,7 +1013,7 @@ export default {
       // ssgFileMap: {},
       this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
       // zqyjgFileMap: {},
-      this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwj);
+      this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName);
       // jdwjFileMap: {},
       this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
       // kwjFileMap: {},
@@ -1031,7 +1027,6 @@ export default {
 
 
 
-
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
@@ -1044,8 +1039,7 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        console.log("this.form");
+        console.log("this.form",this.form);
-        console.log(this.form);
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -968,8 +968,17 @@
                           v-model="form.glwjName"
                           clearable
                   ></el-input>
-                  <div v-if="form.glwjName">
+                  <div v-if="glwjFileList.length>0">
-                    {{ form.glwjName }}
+                    <!--                                        {{ form.fbgbjbdName }}-->
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('glwj')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
+                    </el-button>
                   </div>
                   <div v-else>
                     <el-button
@@ -2249,6 +2258,9 @@ export default {
           case 'zqyjg':
             this.getFileList(value,this.zqyjgFileList);
             break;
+        case 'glwj':
+          this.getFileList(value,this.glwjFileList);
+          break;
           default: ;
       }
     },getFileList(fileIds,defaultFileList){

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

@@ -1,8 +1,8 @@
 <!-- 加入标准化协会信息备案流程-->
 <template>
-  <div class="jrbzhxh-step1">
+  <div class="cywbbz-step1">
     <ProcessHeader>
-      <template slot="proName">参与外部标准制修订信息备案流程</template>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="content">
@@ -28,14 +28,14 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准化员进行入会信息填报" placement="top"
+            <el-timeline-item timestamp="责任部门对接人选择责任人填写信息" placement="top"
                               :color="roleForm.dockUser ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="dockUserName" 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>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准化员"
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
                               @click.native="choiceZRRS">
                     </el-input>
                   </div>
@@ -116,7 +116,7 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          {required: true, message: "请选择标准化员", trigger: "change"}
+          {required: true, message: "请选择责任部门对接人", trigger: "change"}
         ],
         directorUserName: [
           {required: true, message: "请选择标准法规部部长", trigger: "change"}
@@ -201,7 +201,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.jrbzhxh-step1 {
+.cywbbz-step1 {
   height: 100%;
   position: relative;
   .content {

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

@@ -1,13 +1,263 @@
+<!-- 加入标准化协会信息备案流程-->
 <template>
-
+  <div class="cywbbz-step2">
+    <ProcessHeader>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="content">
+      <ProcessTitle>
+        <template slot="title">人员信息</template>
+      </ProcessTitle>
+      <div class="block" style="padding-top: 20px; height: 100%">
+        <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="prcCreateUserName" style="margin-bottom: 0">
+                  <h4>标准法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                              disabled></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="choiceZRRS" disabled>
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择责任工程师填写信息" placement="top"
+                              :color="roleForm.workPeople ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="workPeopleName" style="margin-bottom: 0">
+                  <h4>责任工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.workPeople" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.workPeopleName" placeholder="选择责任工程师"
+                              @click.native="choiceZRRS">
+                    </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)" disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!--    多选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+
 export default {
-  name: "cywbbzzxdStep1"
+  name: "cywbbzzxdStep2",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isSubmit: false,
+      saveLoading: false,
+      modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
+      drawerTitle: "", //drawer标题
+      nodeList: [],
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: "",
+        directorUser: "",
+        workPeople: "",
+        dockUserName: "",
+        workPeopleName: "",
+        directorUserName: ""
+      },
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择标准化员", trigger: "change"}
+        ],
+        workPeopleName: [
+          {required: true, message: '请选择责任工程师', trigger: "change"}
+        ],
+        directorUserName: [
+          {required: true, message: "请选择标准法规部部长", trigger: "change"}
+        ]
+      },
+    };
+  },
+  methods:{
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.workPeople.length > 0) {
+        this.nodeList2 = this.roleForm.workPeople.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole(data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
+      } else if(this.type === "workPeople"){
+        this.roleForm.workPeople = data[0].id;
+        this.roleForm.workPeopleName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.workPeople = idList;
+      this.roleForm.workPeopleName = nameList;
+    },
+    handleSubmit(){
+      var json = this.roleForm
+      this.$refs["Form"].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$http.post("lawss/activiti/completeTask", {
+                taskIds: res.data,
+                userId: this.$store.getters.userInfo.userId,
+                json: JSON.stringify(json)
+              }, {
+                _this: this
+              }, res => {
+                if (res.success) {
+                  this.$message.success(res.message);
+                  this.$router.push("/processCenter");
+                }
+                this.isSubmit = false
+              });
+            }
+          });
+        } else {
+          return this.$message.warning("请完善人员信息");
+        }
+      });
+
+    },
+    handleSave(){
+
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+.cywbbz-step2 {
+  height: 100%;
+  position: relative;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .form-select{
+      display: flex;
+    }
+  }
+  .headerTabs {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    height: 52px;
+    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;
+    }
+  }
+
+}
 </style>

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

@@ -89,6 +89,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 
 export default {
   name: "jrbzhxhStep1",
@@ -124,7 +125,22 @@ export default {
       },
     };
   },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
+  },
   methods:{
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.roleForm = mes.roleForm
+      });
+    },
+
     choiceZRR(type, title, id) {
       this.nodeList = [];
       this.nodeList.push(id);
@@ -194,7 +210,23 @@ export default {
 
     },
     handleSave(){
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
+      _formData.append("prcType", "15");
+      _formData.append("json", JSON.stringify({
+        taskInfo: '备案任务下发',
+        roleForm: this.roleForm,
+      }));
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
   },
 };

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

@@ -329,7 +329,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
-import { inboundLiaisonDetail } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub } from "api/process";
 
 export default {
   name: "jrbzhxhStep2",
@@ -353,6 +353,7 @@ export default {
       nodeList: [],
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      fileName:'',
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       dlFlag: '', // 1为通过 0为不通过
@@ -416,6 +417,18 @@ export default {
       }, e => {
       });
     },
+    getDatas() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        console.log(mes);
+        this.wbbzform = mes.form
+        this.associationData = mes.form.associationData
+        this.getFileInfo();
+        this.processTable();
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -430,6 +443,27 @@ export default {
         });
       });
     },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
     /**
      * @description: 动态表单读取
      */
@@ -506,11 +540,28 @@ export default {
       });
     },
     //流程保存
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      this.wbbzform.fileName = this.fileInfoList
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        roleList: this.roleForm,
+        wbbzform: this.wbbzform,
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     //流程提交
     handleSubmit() {
       this.isSubmit = true
       this.wbbzform.dlFlag = '1',
+      this.wbbzform.fileName = this.fileInfoList
       this.wbbzform.passUser = this.$store.getters.userInfo.userId,
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
@@ -634,6 +685,10 @@ export default {
     },
   },
   mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDatas()
+    }
     this.getData()
     this.processTable()
   },

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

@@ -484,6 +484,10 @@ export default {
         this.wbbzform = JSON.parse(JSON.stringify(item));
         this.associationData = item.associationData
         this.participantsData = item.participantsData
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
       });
     },
     // 请求上传的文件信息

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -484,6 +484,10 @@ export default {
         this.wbbzform = JSON.parse(JSON.stringify(item));
         this.associationData = item.associationData
         this.participantsData = item.participantsData
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
       });
     },
     // 请求上传的文件信息

src/pages/processCenter/pages/newProcess/index.vue

@@ -142,6 +142,21 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8" v-btn-permission="''">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('laws1')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">政策入库流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
         <el-col :span="size ? 6 : 8" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('17')">
@@ -345,6 +360,12 @@ export default {
             name: 'bzdyStep1'
           })
           break
+        case 'laws1':
+          // 政策入库流程
+          this.$router.push({
+            name: 'zcrkStep1'
+          })
+          break
         case '1':
           // 标准入库流程
           this.$router.push({

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

@@ -320,6 +320,31 @@ export default {
             })
           }
           break
+        case 'laws1':
+          if (row.taskInfo === '政策入库审批') {
+            this.$router.push({
+              name: 'zcrkStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '重新发起入库流程'){
+            this.$router.push({
+              name: 'zcrkStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
         case '2':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
@@ -919,7 +944,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '入会代表填写入会信息表') {
             this.$router.push({
               name: 'bzrhStep3',
               query:{
@@ -930,7 +955,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '入会人员所在部门负责人审核') {
             this.$router.push({
               name: 'bzrhStep4',
               query:{
@@ -941,7 +966,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '') {
+          } else if (row.taskInfo === '标准法规工程师汇总修订') {
             this.$router.push({
               name: 'bzrhStep5',
               query:{
@@ -952,13 +977,11 @@ export default {
                 prcType: row.prcType
               }
             })
-          }
+          }else if (row.taskInfo === '标准法规部主管领导审核') {
-          break
-        case '17':
-          if (row.taskInfo === '法规认证部副部长审核') {
             this.$router.push({
-              name: 'zcrhStep2',
+              name: 'bzrhStep6',
-              query: {
+              query:{
+                taskInfo: row.taskInfo,
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
@@ -966,10 +989,11 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '法规认证部副总监批准') {
+          } else if (row.taskInfo === '费用管理部门会签') {
             this.$router.push({
-              name: 'zcrhStep3',
+              name: 'bzrhStep6',
-              query: {
+              query:{
+                taskInfo: row.taskInfo,
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
@@ -977,10 +1001,11 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '公司副总批准') {
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
             this.$router.push({
-              name: 'zcrhStep4',
+              name: 'bzrhStep6',
-              query: {
+              query:{
+                taskInfo: row.taskInfo,
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
@@ -988,10 +1013,11 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '修订入会信息') {
+          } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
             this.$router.push({
-              name: 'zcrhStep1-1',
+              name: 'bzrhStep6',
-              query: {
+              query:{
+                taskInfo: row.taskInfo,
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,

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

@@ -409,6 +409,76 @@ export default {
             }
           })
           break
+        case '15':
+          if(mes !== null && mes.taskInfo !== null){
+            if (mes.taskInfo === '备案任务下发') {
+              this.$router.push({
+                name: 'jrbzhxhStep1',
+                query: {
+                  type: '15',
+                  processName: '加入标准化协会信息提报流程',
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
+            }else if(mes.taskInfo === '入会信息填报'){
+              this.$router.push({
+                name: 'jrbzhxhStep2',
+                query: {
+                  type: '15',
+                  processName: '加入标准化协会信息提报流程',
+                  bpnId: id,
+                }
+              })
+            }
+            }else{
+
+            }
+          this.$router.push({
+            name: 'jrbzhxhStep1',
+            query: {
+              type: '15',
+              processName: '加入标准化协会信息提报流程',
+              bpnId: id
+            }
+          })
+          break
+        case '20':
+          this.$router.push({
+            name: 'bzrhStep1',
+            query: {
+              type: '20',
+              processName: '外部标准化协会入会流程',
+              bpnId: id
+            }
+          })
+          break
+              // 标准入库、
+        case 'laws1':
+          if(mes !== null && mes.taskInfo !== null){
+            if (mes.taskInfo === '申请人发起') {
+              this.$router.push({
+                name: 'zcrkStep1',
+                query: {
+                  type: '1',
+                  processName: '申请人发起流程',
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
+            }
+          }else {
+            this.$router.push({
+              name: 'zcrkStep1',
+              query: {
+                type: '1',
+                processName: '申请人发起流程',
+                bpnId: id,
+                verifySarStandard: true,
+              }
+            })
+          }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js

@@ -36,6 +36,8 @@ export default {
   },
   data () {
     return {
+      filterText: '', // 企业标准库过滤
+      treeList: [],
       visibleOrgTable: false,
       orgTableVal: '',
       orgTableValName: '',

src/pages/searchCenter/pages/advancedSearch.vue

@@ -39,9 +39,9 @@
                 <el-radio label="INLAND_STAND">
                   <span>{{ $t("m.standAll") }}</span>
                 </el-radio>
-<!--                <el-radio label="INLAND_LAWS">-->
+                <el-radio label="INLAND_LAWS">
-<!--                  <span>{{ $t("m.lawsAll") }}</span>-->
+                  <span>{{ $t("m.lawsAll") }}</span>
-<!--                </el-radio>-->
+                </el-radio>
                 <el-radio label="BUSINESS_STAND">
                   <span>{{ $t("m.enterpriseStandard") }}</span>
                 </el-radio>
@@ -402,28 +402,35 @@
               <el-form :model="standForm" ref="standForm" label-position="right" label-width="150px">
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="政策分类" prop="nameShow">
+                    <el-form-item label="政策分类" prop="lawsType">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据政策分类查找"
+                      <el-select v-model="standForm.lawsType" filterable clearable @keyup.enter.native="btnSearch">
-                                @keyup.enter.native="btnSearch"></el-input>
+                        <el-option
+                                v-for="item in lawsTypeOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="政策编号" prop="numberShow">
+                    <el-form-item label="政策编号" prop="lawsNumber">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据政策编号查找"
+                      <el-input v-model="standForm.lawsNumber" clearable placeholder="根据政策编号查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="中文名称" prop="nameShow">
+                    <el-form-item label="中文名称" prop="lawsName">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据中文名称查找"
+                      <el-input v-model="standForm.lawsName" clearable placeholder="根据中文名称查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="英文名称" prop="numberShow">
+                    <el-form-item label="英文名称" prop="lawsEnName">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据英文名称查找"
+                      <el-input v-model="standForm.lawsEnName" clearable placeholder="根据英文名称查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
@@ -436,156 +443,255 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="发文日期" prop="numberShow">
+                    <el-form-item label="发文日期" prop="issueTime">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据发文日期查找"
+                      <el-datePicker v-model="standForm.issueTime"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     @keyup.enter.native="btnSearch"
+                                     :editable="false"
+                                     placeholder="请选择发文日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable></el-datePicker>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="发文单位" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据发文单位查找"
+                      <el-input v-model="standForm.issueCompany" clearable placeholder="根据发文单位查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="征集意见周期" prop="numberShow">
+                    <el-form-item label="征集意见周期" prop="commentCycleDate">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据征集意见周期查找"
+                        <el-date-picker
+                                v-model="commentCycleDate"
+                                @keyup.enter.native="btnSearch"
+                                type="datetimerange"
+                                :picker-options="pickerOptions"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="文本状态" prop="lawsTextState">
+                      <el-select v-model="standForm.lawsTextState"
+                                 @keyup.enter.native="btnSearch"
+                                 placeholder="请选择文本状态"
+                                 clearable>
+                        <el-option
+                                v-for="opt in lawsTextStateOptions"
+                                :key="opt.value"
+                                :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                        >
+                          {{ opt.label }}
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="适用区域" prop="lawsSyqy">
+                      <el-select v-model="standForm.lawsSyqy" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in lawsSyqyOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="适用车型" prop="lawsSycx">
+                      <el-select v-model="standForm.lawsSycx" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in lawsSycxOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="是否纳入标准清单" prop="isRelateAccess">
+                      <el-select v-model="standForm.isRelateAccess" @keyup.enter.native="btnSearch">
+                        <el-option value="1" label="是" key="1"></el-option>
+                        <el-option value="2" label="否" key="2"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="年度" prop="lawsYear">
+                      <el-select v-model="standForm.lawsYear" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in lawsYearOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="福田转发通知文号" prop="lawsNotisyncNum">
+                      <el-input v-model="standForm.lawsNotisyncNum" clearable placeholder="根据福田转发通知文号查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="文本状态" prop="nameShow">
+                    <el-form-item label="信息简报" prop="lawsBulletin">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据文本状态查找"
+                      <el-input v-model="standForm.lawsBulletin" clearable placeholder="根据信息简报查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="适用区域" prop="numberShow">
+                    <el-form-item label="实施日期" prop="SSRQLAWS">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据适用区域查找"
+                      <el-datePicker v-model="standForm.SSRQLAWS"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     @keyup.enter.native="btnSearch"
-                    </el-form-item>
+                                     :editable="false"
-                  </el-col>
+                                     placeholder="请选择实施日期"
-                </el-row>
+                                     value-format="yyyy-MM-dd"
-                <el-row type="flex" justify="space-around" class="code-row-bg">
+                                     clearable></el-datePicker>
-                  <el-col :span="12">
-                    <el-form-item label="适用车型" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据适用车型查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="是否纳入标准清单" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据是否纳入标准清单查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="年度" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据年度查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="福田转发通知文号" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据福田转发通知文号查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="信息简报" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据信息简报查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="实施日期" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据实施日期查找"
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="新车型实施日期" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据新车型实施日期查找"
+                      <el-datePicker v-model="standForm.XCXSSRQLAWS"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     @keyup.enter.native="btnSearch"
+                                     :editable="false"
+                                     placeholder="请选择新车型实施日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable></el-datePicker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="在产车实施日期" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据在产车实施日期查找"
+                      <el-datePicker v-model="standForm.ZCXSSRQLAWS"
+                                     @keyup.enter.native="btnSearch"
+                                     :editable="false"
+                                     placeholder="请选择在产车实施日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable></el-datePicker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="我司参与深度" prop="CYSDLAWS">
+                      <el-select v-model="standForm.CYSDLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in CYSDLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="投稿人" prop="TGRLAWS">
+                      <el-select v-model="standForm.TGRLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in TGRLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="投稿单位" prop="TGDWLAWS">
+                      <el-select v-model="standForm.TGDWLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in TGDWLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="适用认证" prop="YYRZLAWS">
+                      <el-select v-model="standForm.YYRZLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in YYRZLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="责任部门" prop="ZRBMLAWS">
+                      <el-select v-model="standForm.ZRBMLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in ZRBMLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="责任工程师" prop="ZRGCSLAWS">
+                      <el-select v-model="standForm.ZRGCSLAWS" filterable clearable @keyup.enter.native="btnSearch">
+                        <el-option
+                                v-for="item in ZRGCSLAWSOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+                  <el-col :span="12">
+                    <el-form-item label="代替文件号" prop="DTWJHLAWS">
+                      <el-input v-model="standForm.DTWJHLAWS" clearable placeholder="根据代替文件号查找"
+                                @keyup.enter.native="btnSearch"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="被代替文件号" prop="BDTWJHLAWS">
+                      <el-input v-model="standForm.BDTWJHLAWS" clearable placeholder="根据被代替文件号查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="我司参与深度" prop="nameShow">
+                    <el-form-item label="引用标准&政策" prop="YYBZZCLAWS">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据我司参与深度查找"
+                      <el-input v-model="standForm.YYBZZCLAWS" clearable placeholder="根据引用标准&政策查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="投稿人" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据投稿人查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="投稿单位" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据投稿单位查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="适用认证" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据适用认证查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="责任部门" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据责任部门查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="责任工程师" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据责任工程师查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="代替文件号" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据代替文件号查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="被代替文件号" prop="numberShow">
-                      <el-input v-model="standForm.numberShow" clearable placeholder="根据被代替文件号查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="引用标准&政策" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据引用标准&政策查找"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
@@ -891,12 +997,11 @@
                 </el-table-column>
                 <el-table-column
                   align="center"
-                  :label="selectIndex === 'INLAND_STAND' ? this.$t('m.standNumber') : (this.selectIndex === 'INLAND_LAWS' ? this.$t('m.documentNumber') : this.$t('m.enterpriseStandardNumber'))"
+                  :label="selectIndex === 'INLAND_STAND' ? this.$t('m.standNumber') : (this.selectIndex === 'INLAND_LAWS' ? '政策编号' : this.$t('m.enterpriseStandardNumber'))"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.numbershow
+                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : scope.row.numbershow}}</span>
-                      }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -963,11 +1068,11 @@
                 </el-table-column>
                 <el-table-column
                   align="center"
-                  :label="selectIndex === 'INLAND_STAND' ? '标准名称' : (this.selectIndex === 'INLAND_LAWS' ? '文件名称' : '企业标准名称')"
+                  :label="selectIndex === 'INLAND_STAND' ? '标准名称' : (this.selectIndex === 'INLAND_LAWS' ? '中文名称' : '企业标准名称')"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.nameshow
+                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsName : scope.row.nameshow
                       }}</span>
                   </template>
                 </el-table-column>
@@ -985,11 +1090,11 @@
                 </el-table-column>
                 <el-table-column
                   align="center"
-                  :label="$t('m.putTime')"
+                  :label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
                   width="130">
                   <template slot-scope="scope">
                     <div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
-                      {{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+                      {{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)), "yyyy-MM-dd") }}
                     </div>
                     <div v-else></div>
                   </template>
@@ -999,9 +1104,9 @@
                   width="180"
                   :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
                   <template slot-scope="scope">
-                      <div :style="selectIndex === 'BUSINESS_STAND' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
+                      <div :style="selectIndex === 'BUSINESS_STAND' || selectIndex === 'INLAND_LAWS' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
-                      (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
+                      (scope.row.textStatusBussName === '作废' || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
-                      {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
+                      {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
                     </div>
                   </template>
                 </el-table-column>
@@ -1142,6 +1247,33 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       tableLoading: false,
       // 分享抽屉状态
       saveRoleBuss: [],
@@ -1205,6 +1337,7 @@ export default {
       // 国内标准检索条件
       regionOptions: [], // 区域
       partsOptions: [], // 关联零部件
+      commentCycleDate:'',
       standForm: {
         region: "",
         isHigh:'stand',
@@ -1327,6 +1460,46 @@ export default {
         glwj: '', // 关联文件
         xglc: '', // 相关流程
         chjl: '', // 参会记录
+        lawsType: '',
+        lawsNumber: '',
+        lawsName: '',
+        lawsEnName: '',
+        lawsNo: '',
+        issueTime: '',
+        issueCompany: '',
+        commentCycleStart: '',
+        commentCycleEnd: '',
+        lawsTextState: '',
+        lawsSyqy: '',
+        lawsSycx: '',
+        isRelateAccess: '',
+        lawsYear: '',
+        lawsNotisyncNum: '',
+        lawsBulletin: '',
+        lawsLabel: '',
+        lawsRemark: '',
+        SSRQLAWS:'',
+        XCXSSRQLAWS:'',
+        ZCXSSRQLAWS:'',
+        // 文本信息
+        ZCWBLAWS:'',
+        GCWBLAWS:'',
+        JDWJLAWS:'',
+        // 适用范围
+        FBJGLAWS: '',
+        CYSDLAWS: '',
+        TGRLAWS: '',
+        TGDWLAWS: '',
+        NYLXLAWS: '',
+        YYRZLAWS: '',
+        ZRBMLAWS: '',
+        ZRGCSLAWS: '',
+        DTWJHLAWS: '',
+        BDTWJHLAWS: '',
+        YYBZZCLAWS: '',
+        XGLC: '',
+        CHJLLAWS: '',
+        GLWJLAWS: '',
       },
       // 国家/地区
       countryOptions: [],
@@ -1348,6 +1521,19 @@ export default {
       qcrOptions:[],//起草人下拉框
       nylxOptions:[],//能源类型下拉框
       syrzOptions:[],//适用认证下拉框
+      lawsTypeOptions: [],
+      lawsTextStateOptions: [],
+      lawsSyqyOptions: [],
+      lawsSycxOptions: [],
+      lawsYearOptions: [],
+      lawsLabelOptions: [],
+      CYSDLAWSOptions: [],
+      TGRLAWSOptions: [],
+      TGDWLAWSOptions: [],
+      NYLXLAWSOptions: [],
+      YYRZLAWSOptions: [],
+      ZRBMLAWSOptions: [],
+      ZRGCSLAWSOptions: [],
       // 我司署名人
       wssmrOptions: [],
       // 体系类别
@@ -1753,7 +1939,6 @@ export default {
       this.searchSarBykey();
     },
     judgeRolePermiOnSar(item, type) {
-      debugger
       let pagetype;
       if (type !== 5 && item.type === "msgdyinfo") {
         if (type === 2) {
@@ -1846,6 +2031,12 @@ export default {
             sarStandAttrObj[item.attrField] = nowStandForm[attrField]
         })
       nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+
+      if(this.commentCycleDate && this.commentCycleDate.length === 2){
+        nowStandForm['commentCycleStart'] = this.commentCycleDate[0]
+        nowStandForm['commentCycleEnd'] = this.commentCycleDate[1]
+      }
+
       this.exportSearchInfo = nowStandForm;
       this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, {
         _this: this,
@@ -1991,7 +2182,6 @@ export default {
     },
     // 查看 查看跳转详情页
     detailsStandardLaws(item) {
-      debugger
       let routername = "";
       let pagetype = "";
       if (item.type === "stand") {
@@ -2003,19 +2193,20 @@ export default {
               pagetype = "FOREIGN_STAND";
           }
       } else if (item.type === "laws") {
-        if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
+        routername = "OtherLawsStandDetails";
-          routername = "OtherLawsDetails";
+        pagetype = "LAWS_STAND";
-          if (item.laws_type === "INLAND") {
+        // if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
-            pagetype = "INLAND_LAWS";
+        //   if (item.laws_type === "INLAND") {
-          } else {
+        //     pagetype = "INLAND_LAWS";
-            pagetype = "FOREIGN_LAWS";
+        //   } else {
-          }
+        //     pagetype = "FOREIGN_LAWS";
-        } else {
+        //   }
-          this.$message({
+        // } else {
-            message: "无权访问",
+        //   this.$message({
-            type: "warning"
+        //     message: "无权访问",
-          });
+        //     type: "warning"
-        }
+        //   });
+        // }
       } else {
           routername = "OtherBussStandardDetails";
           pagetype = "BUSINESS_STAND ";
@@ -2255,7 +2446,7 @@ export default {
           }
         } else if (item.typeShow === "INLAND_LAWS" || item.typeShow === "FOREIGN_LAWS") {
           if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
-            routername = "OtherLawsDetails";
+            routername = "OtherLawsStandDetails";
           } else {
             this.$message({
               message: "无权访问",
@@ -2483,6 +2674,19 @@ export default {
       this.qcdwOptions = res.data.QCDW // 起草单位
       this.qcrOptions = res.data.QCRBUSS // 起草人
       this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.lawsTypeOptions = res.data.lawsType
+      this.lawsTextStateOptions = res.data.lawsTextState
+      this.lawsSyqyOptions = res.data.lawsSyqy
+      this.lawsSycxOptions = res.data.lawsSycx
+      this.lawsYearOptions = res.data.lawsYear
+      this.lawsLabelOptions = res.data.lawsLabel
+      this.CYSDLAWSOptions = res.data.CYSDLAWS
+      this.TGRLAWSOptions = res.data.TGRLAWS
+      this.TGDWLAWSOptions = res.data.TGDWLAWS
+      this.NYLXLAWSOptions = res.data.NYLXLAWS
+      this.YYRZLAWSOptions = res.data.YYRZLAWS
+      this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+      this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
     }, e => {
     });
     // 根据资源类型过滤表头

src/pages/searchCenter/pages/standardSearch.vue

@@ -85,18 +85,18 @@
                                                 show-overflow-tooltip
                                                 v-if="selectIndex !== 'msgdyinfo'"
                                                 align="center"
-                                                :label="selectIndex === 'stand'|| 'bussstand'? $t('m.standNumber') : (selectIndex === 'laws' ? $t('m.documentNumber') : $t('m.enterpriseStandardNumber'))">
+                                                :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws' ? $t('m.standNumber') : (selectIndex === 'laws' ? '政策编号' : $t('m.enterpriseStandardNumber'))">
                                             <template slot-scope="scope">
-                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.numbershow }}</a>
+                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsNumber :scope.row.numbershow }}</a>
                                             </template>
                                         </el-table-column>
                                         <el-table-column
                                                 show-overflow-tooltip
                                                 v-if="selectIndex !== 'msgdyinfo'"
                                                 align="center"
-                                                :label="selectIndex === 'stand'||'bussstand' ? $t('m.standName') : (selectIndex === 'laws' ? $t('m.fileName') : $t('m.enterpriseStandardName'))">
+                                                :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws'  ? $t('m.standName') : (selectIndex === 'laws' ? '中文名称' : $t('m.enterpriseStandardName'))">
                                             <template slot-scope="scope">
-                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.nameshow }}</a>
+                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>
                                             </template>
                                         </el-table-column>
                                         <el-table-column
@@ -111,11 +111,12 @@
                                         </el-table-column>
                                         <el-table-column
                                                 align="center"
-                                                :label="$t('m.putTime')"
+                                                :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws' ? $t('m.putTime') : '新车实施日期'"
                                                 width="130">
                                             <template slot-scope="scope">
-                                                <div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
+                                                <div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '')
-                                                    {{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+                                                 : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== ''))">
+                                                    {{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS :scope.row.putTime)), "yyyy-MM-dd") }}
                                                 </div>
                                                 <div v-else></div>
                                             </template>
@@ -126,10 +127,10 @@
                                                 :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
                                                 width="200">
                                             <template slot-scope="scope">
-                                                <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
+<!--                                                <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
-                                                <div v-else  :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
+                                                <div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
-                                                (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
+                                                (scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
-                                                {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
+                                                {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>
                                             </template>
                                         </el-table-column>
                                         <el-table-column
@@ -368,7 +369,7 @@
                 seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'],
                 seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'],
                 // seniortypeLaws: ['selectIndex', 'country', 'SYCLLX', 'ZRLX', 'WSSFCY'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样
-                seniortypeLaws: ['selectIndex', 'country', 'CLLX', 'ZRLX', 'CYSD'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样
+                seniortypeLaws: ['selectIndex', 'lawsSyqy', 'lawsSycx', 'CYSDLAWS'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样
                 seniortypeEnterprise : ['selectIndex','BUSSSTATE','ORGLIST'],
                 seniortypeMsg: ['selectIndex', 'module'],
                 // 检索选项
@@ -388,10 +389,10 @@
                                 label: '海外标准法规', // value没改
                                 value: 'bussstand'
                             },
-                            // {
+                            {
-                            //     label: '国内外政策',
+                                label: '国内外政策',
-                            //     value: 'laws'
+                                value: 'laws'
-                            // },
+                            },
                             {
                                 label: '企业标准',
                                 value: 'enterprise'
@@ -719,10 +720,10 @@
                                     label: '海外标准法规',
                                     value: 'bussstand'
                                 },
-                                // {
+                                {
-                                //     label: '国内外政策',
+                                    label: '国内外政策',
-                                //     value: 'laws'
+                                    value: 'laws'
-                                // },
+                                },
                                 {
                                     label: '企业标准',
                                     value: 'enterprise'
@@ -1042,6 +1043,18 @@
                                 case 'ORGLIST':
                                     option.title = '主起草部门'
                                     option.index = 15
+                                    break
+                                case 'lawsSyqy':
+                                    option.title = '适用区域'
+                                    option.index = 16
+                                    break
+                                case 'lawsSycx':
+                                    option.title = '适用车型'
+                                    option.index = 17
+                                    break
+                                case 'CYSDLAWS':
+                                    option.title = '我司参与深度'
+                                    option.index = 18
                             }
                             option.showOpenBtn = false
                             option.options = data[key]
@@ -1105,22 +1118,22 @@
                             break
                         //  国内外政策
                         case 'laws':
-                            filterOptions.country = originOptions.country
+                            filterOptions.lawsSyqy = originOptions.lawsSyqy
-                            filterOptions.country.title = '适用区域'
+                            filterOptions.lawsSyqy.title = '适用区域'
-                            filterOptions.country.index = 1
+                            filterOptions.lawsSyqy.index = 1
                             //  适用车辆类型
-                            filterOptions.CLLX = originOptions.CLLX
+                            filterOptions.lawsSycx = originOptions.lawsSycx
                             // filterOptions.SYCLLX = originOptions.CLLX
-                            filterOptions.CLLX.title = '适用车辆类型'
+                            filterOptions.lawsSycx.title = '适用车辆'
-                            filterOptions.CLLX.index = 2
+                            filterOptions.lawsSycx.index = 2
                             //  监管类型
-                            filterOptions.ZRLX = originOptions.ZRLX
+                            // filterOptions.ZRLX = originOptions.ZRLX
-                            filterOptions.ZRLX.title = '准入类型'
+                            // filterOptions.ZRLX.title = '准入类型'
-                            filterOptions.ZRLX.index = 3
+                            // filterOptions.ZRLX.index = 3
                             // 我司参与状态
-                            filterOptions.CYSD = originOptions.SHIFOU
+                            filterOptions.CYSDLAWS = originOptions.CYSDLAWS
-                            filterOptions.CYSD.title = '我司是否参与'
+                            filterOptions.CYSDLAWS.title = '我司是否参与'
-                            filterOptions.CYSD.index = 4
+                            filterOptions.CYSDLAWS.index = 3
                             break
                         //  海外标准法规
                         case 'bussstand':
@@ -1257,10 +1270,6 @@
                 let searchKeys = Object.keys(this.searchOptions)
                 for (let key in searchCondition) {
                     if (searchKeys.indexOf(key) !== -1) {
-                        if (condition.selectIndex === 'laws') {
-                            condition.SYCLLX = condition.CLLX
-                            condition.WSSFCY = condition.CYSD
-                        }
                         condition[key] = searchCondition[key].join(',') === 'all' ? '' : searchCondition[key].join(',')
                     }
                 }
@@ -1285,10 +1294,7 @@
                 }
                 // 查询为国内外政策时，改变查询参数名
                 if (condition.selectIndex === 'laws') {
-                    condition.SYCLLX = condition.CLLX
+                    condition.type = 'laws'
-                    condition.WSSFCY = condition.CYSD
-                    delete condition.CLLX
-                    delete condition.CYSD
                 }
                 if(condition.selectValue === undefined){
                     condition.selectValue = ''
@@ -2321,12 +2327,13 @@
                     //   }
                 } else if (item.type === 'laws') {
                     // if (this.$hasPermission('HK36LHK9444NPN8X634W')){
-                    routername = 'OtherLawsDetails'
+                    routername = 'OtherLawsStandDetails'
-                    if (item.lawsType === 'INLAND') {
+                    pagetype = 'LAWS_STAND'
-                        pagetype = 'INLAND_LAWS'
+                    // if (item.lawsType === 'INLAND') {
-                    } else {
+                    //     pagetype = 'INLAND_LAWS'
-                        pagetype = 'FOREIGN_LAWS'
+                    // } else {
-                    }
+                    //     pagetype = 'FOREIGN_LAWS'
+                    // }
                     // }else {
                     //   this.$message({
                     //     message: '无权访问',

src/router/index.js

@@ -709,6 +709,33 @@ const routes = [
           title: '标准入库流程'
         }
       },
+      {
+        path: '/zcrkStep1',
+        name: 'zcrkStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
+      {
+        path: '/zcrkStep2',
+        name: 'zcrkStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
+      {
+        path: '/zcrkStep5',
+        name: 'zcrkStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
       {
         path: '/bzdyStep1',
         name: 'bzdyStep1',
@@ -1205,6 +1232,15 @@ const routes = [
           title: '外部标准化协会入会流程（修订）'
         }
       },
+      {
+        path: '/bzrhStep6',
+        name: 'bzrhStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（审批)'
+        }
+      },
 
       // 外部标准化协会参会流程
       {
@@ -1690,7 +1726,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '国内外政策',
-          menuId: '4DB4Y2H3NH'
+          menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
         }
       },
       {
@@ -2216,6 +2252,17 @@ const routes = [
           title: '企标详情'
         }
       },
+      {
+        path: '/otherLawsStandDetails/:id/:pageType',
+        name: 'OtherLawsStandDetails',
+        component: () =>
+          import('@/pages/details/otherLawsStandDetails'),
+        meta: {
+          requireAuth: true,
+          isBoolean: true,
+          title: '政策详情'
+        }
+      },
       {
         path: '/itemsDetails',
         name: 'itemsDetails',