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

src/components/CustomFormComponents/InputForAllStandards.vue

@@ -5,6 +5,7 @@
       :prop="config.attrField"
       :label-width="labelWidth"
       class="add-form-item"
+      style="width: 100%;"
       :class="{'form-item-disabled': disabled}"
     >
       <el-input
@@ -42,7 +43,7 @@
                   v-model="replaceLawsNumForm.standType"
                   placeholder="请选择"
               >
-                <el-option value="ALL" label="全部"></el-option>
+                <el-option value="" label="全部"></el-option>
                 <el-option value="INLAND" label="国内"></el-option>
                 <el-option value="FOREIGN" label="海外"></el-option>
               </el-select>
@@ -125,8 +126,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button class="common-button-default" round size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button type="primary" round size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -176,7 +177,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: '',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -0,0 +1,349 @@
+<template>
+    <div>
+        <el-form-item
+                :label="config.attrName"
+                :prop="config.attrField"
+                :label-width="labelWidth"
+                class="add-form-item"
+                style="width: 100%;"
+                :class="{'form-item-disabled': disabled}"
+        >
+            <el-input
+                    :value="value"
+                    :placeholder="placeholder"
+                    :disabled="disabled"
+                    clearable
+                    @input="handleChange"
+            ></el-input>
+            <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="mini"
+                    style="position:absolute;top: 10px;right: 0;"
+                    @click="selectLaws"
+                    v-if="(processModel && !disabled) || !processModel"
+            >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
+        </el-form-item>
+        <el-dialog
+                :title="config.attrName"
+                :visible.sync="replaceLawsNumModel"
+                width="875px"
+                :close-on-click-modal="false"
+                @close="replaceLawsNumModelCancel"
+                :append-to-body="true"
+        >
+            <div class="search-area">
+                <div class="left">
+                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
+                        <el-form-item label="编号/名称" class="search-item">
+                            <el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据编号/名称查找" clearable :maxlength="100"></el-input>
+                        </el-form-item>
+                        <el-form-item label="国内/海外" class="search-item">
+                            <el-select
+                                    v-model="replaceLawsNumForm.standType"
+                                    placeholder="请选择"
+                            >
+                                <el-option value="1" label="企标"></el-option>
+                                <el-option value="INLAND" label="国内"></el-option>
+                                <el-option value="FOREIGN" label="海外"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    icon="el-icon-search"
+                                    type="primary"
+                                    class="common-button-primary"
+                                    round
+                                    @click="getReplaceLawsNumRowInfo">
+                            </el-button>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    class="common-button-default"
+                                    icon="el-icon-refresh-left"
+                                    round
+                                    type="default"
+                                    @click="getResetLawsNumRow"></el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <el-table
+                    ref="selections"
+                    :data="replaceLawsNumRow"
+                    tooltip-effect="dark"
+                    style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+                    border
+                    :height="300"
+                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+                    @selection-change="selectReplaceStandNumRowChange">
+                <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="标准编号"
+                        width="130">
+                    <template slot-scope="scope">
+                        <a v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="standName"
+                        label="标准名称"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="issueTime"
+                        label="发布日期"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="putTime"
+                        label="实施日期"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="standNatureShow"
+                        label="标准性质"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="standStateShow"
+                        label="标准状态"
+                        width="130">
+                </el-table-column>
+            </el-table>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+            <!--分页-->
+            <pagination
+                    style="position: relative;"
+                    :page="replacePage"
+                    :total="replaceTotal"
+                    @pageChange="pageChangeReplace"
+                    @pageSizeChange="pageSizeChangeReplace"></pagination>
+            <div slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" round size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+                <el-button type="primary" round size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'CustomInput',
+        props: {
+            config: {
+                type: Object,
+                required: true
+            },
+            value: {
+                required: true
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+            // 栅格比例
+            span: {
+                type: Number,
+                default: 24
+            },
+            // 是否为流程中使用
+            processModel: {
+                type: Boolean,
+                default: false
+            },
+            // label宽度
+            labelWidth: {
+                type: String,
+                default: '150px'
+            }
+        },
+        data () {
+            return {
+                replaceLawsNumModel: false,
+                sarBussionessLawsEO: {
+                    replaceLawsNum: ''
+                },
+                // 代替标准号
+                replaceLawsNumForm: {
+                    standNumber: '', // 政策编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'INLAND',
+                    quoteIdList: '',
+                    validFlag: '0',
+                    menuId: 'nomenu'
+                },
+                replaceLawsNumRow: [], // 代替政策号 数组内容
+                replaceTotal: 0,
+                selectedListRep: [],
+                replaceLoading: true,
+                replacePage: 1
+
+            }
+        },
+        computed: {
+            placeholder () {
+                return `请输入${this.config.attrName}`
+            },
+            showMessage () {
+                return `${this.config.attrName}不能为空`
+            },
+            isRequired () {
+                return !!this.config.isMust
+            }
+        },
+        methods: {
+            handleChange (event) {
+                const value = event
+                this.$emit('input', value)
+            },
+            selectLaws () {
+                this.replaceLawsNumModel = true
+                this.getReplaceLawsNumRow()
+            },
+            getReplaceLawsNumRowInfo() {
+                this.replaceLawsNumForm.page = 1
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策号 请求数据
+            getReplaceLawsNumRow () {
+                if (this.replaceLawsNumForm.standType === '1') {
+                    let json = {}
+                    json = this.replaceLawsNumForm
+                    json.userId = this.$store.getters.userInfo.userId
+                    json.standCode = this.replaceLawsNumForm.standNumber
+                    this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', json, {
+                        _this: this, loading: 'replaceLoading'
+                    }, res => {
+                        this.replaceLawsNumRow = res.data.list
+                        this.replaceTotal = res.data.count
+                        // if (this.selectedListRep.length !== 0) {
+                        //     this.selectedListRep.map((list) => {
+                        //         this.replaceLawsNumRow.map((item) => {
+                        //             if (list.id === item.id) {
+                        //                 item._checked = true
+                        //             }
+                        //         })
+                        //     })
+                        // }
+                    }, e => {
+                    })
+                } else {
+                    if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+                        this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+                    } else {
+                        this.quoteIdList1 = []
+                        this.replaceLawsNumForm.quoteIdList = ''
+                    }
+                    this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                        _this: this,
+                        loading: 'replaceLoading'
+                    }, res => {
+                        this.replaceLawsNumRow = res.data.list
+                        this.replaceTotal = res.data.count
+                        // if (this.selectedListRep.length !== 0) {
+                        //     this.selectedListRep.map((list) => {
+                        //         this.replaceLawsNumRow.map((item) => {
+                        //             if (list.id === item.id) {
+                        //                 item._checked = true
+                        //             }
+                        //         })
+                        //     })
+                        // }
+                    }, e => {
+                    })
+                }
+            },
+            // 代替政策编号-取消
+            replaceLawsNumModelCancel () {
+                this.$refs.selections.clearSelection()
+            },
+            // 代替政策号 table选择事件
+            selectReplaceStandNumRowChange (row) {
+                this.selectedListRep = row
+            },
+            // 代替政策分页
+            pageChangeReplace (page) {
+                this.replacePage = page
+                this.replaceLawsNumForm.page = page
+                this.getReplaceLawsNumRow()
+            },
+            pageSizeChangeReplace (pageSize) {
+                // this.replaceRows = pageSize
+                this.replaceLawsNumForm.pageSize = pageSize
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策编号确定
+            replaceLawsNumModelBt () {
+                let textArr = []
+
+                if (typeof this.value === 'string') {
+                    if (this.value) {
+                        textArr = this.value.split(',')
+                    }
+                }
+                if (this.selectedListRep.length === 0) {
+                    return this.$message({
+                        message: '请先选择数据',
+                        type: 'warning'
+                    })
+                }
+                if (this.selectedListRep.length + textArr.length > 20) {
+                    return this.$message({
+                        message: '代替标准号最多选择20项',
+                        type: 'warning'
+                    })
+                }
+                this.selectedListRep.map((item) => {
+                    let texts = ''
+                    if (item.standYear != null && item.standYear !== '') {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                    } else {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                    }
+                    textArr.push(texts)
+                    textArr = [...new Set(textArr)]
+                    this.replaceLawsNumModel = false
+                })
+                this.$emit('input', textArr.join(','))
+                this.$refs.selections.clearSelection()
+            },
+            // 点击查看
+            handlePreview (item) {
+                let routeUrl = this.$router.resolve({
+                    name: 'OtherBussStandardDetails',
+                    params: {
+                        id: item.id,
+                        pageType: 'BUSINESS_STAND'
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+            },
+            getResetLawsNumRow () {
+                this.replaceLawsNumForm = {
+                    standNumber: '', // 政策编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'ALL',
+                    quoteIdList: '',
+                    validFlag: '0'
+                }
+                this.getReplaceLawsNumRow()
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/pages/details/otherStandardDetails/index.vue

@@ -1724,6 +1724,7 @@ import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import {dateFormat} from '@/common/date'
 import RelatedTermsSelect from './components/RelatedTermsSelect'
 import { getBusStandFileByAttId } from 'api/process'
+import {dicTypeData} from "api/unqualProcess";
 
 
 export default {
@@ -1746,6 +1747,7 @@ export default {
   },
   data() {
     return {
+      CycxOptions: [],
       activeNames: ['基础信息','过程稿件','实施日期'],
       activeState: true,
       itemExistList: [],
@@ -2757,8 +2759,8 @@ export default {
         this.resolveListForm = editItem
         this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):''
         // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
-        this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.split(',')
-        this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.split(',')
+        this.resolveListForm.xccssrq = this.resolveListForm.xccssrq?this.resolveListForm.xccssrq.split(','):''
+        this.resolveListForm.zccssrq = this.resolveListForm.zccssrq?this.resolveListForm.zccssrq.split(','):''
       }else {
         this.$message.warning('请选择一条数据')
       }
@@ -3085,6 +3087,19 @@ export default {
       }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
+          console.log('3092',res.data.list)
+          res.data.list.forEach(item => {
+            let k = (item.applyArctic || "").split(',')
+            for (let i in this.applyArcticOptions.options) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.applyArcticOptions.options[i].value === k[m]) {
+                  k[m] = this.applyArcticOptions.options[i].label
+                }
+                item.applyArctic = k.join(',')
+              }
+            }
+            item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
+          })
           this.standItemList = res.data.list;
           this.total7 = res.data.count // 分页需要
         }
@@ -3583,6 +3598,12 @@ export default {
       return item.id
     }
   },
+  created() {
+    dicTypeData().then(res => {
+      // 能源类型数据字典
+      this.CycxOptions = res.data.CLLX
+    })
+  },
   async mounted() {
     this.sarStandardsInfoEO.id = this.$route.params.id
     // await this.selectStandMessage()
@@ -3722,41 +3743,18 @@ export default {
       }, {
         _this: this
       }, res => {
-        // displayLocation.map(item => {
-        //   if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
-        //     item.child.forEach(items =>{
-        //       let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
-        //       if (accessCountry.country === undefined) {
-        //         accessCountry.country = '文本'
-        //       }
-        //       if(items.attrField === 'SSRQ') {
-        //         items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
-        //         if (accessCountry.ssrq !== undefined) {
-        //           item.value = accessCountry.ssrq
-        //         }
-        //       } else if (items.attrField === 'ZCCSSRQ') {
-        //         items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
-        //         if (accessCountry.zccssrqgj !== undefined) {
-        //           item.value = accessCountry.zccssrqgj
-        //         }
-        //       } else if(items.attrField === 'XCXSSRQ') {
-        //         items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
-        //         if (accessCountry.xcxssrqgj !== undefined) {
-        //           item.value = accessCountry.xcxssrqgj
-        //         }
-        //
-        //       }
-        //     })
-        //     for (let key in res.data) {
-        //       item.one.push({
-        //         attrName: key,
-        //         value: res.data[key].join(','),
-        //         isShowImp: '0',
-        //         id: key
-        //       })
-        //     }
-        //   }
-        // })
+        displayLocation.map(item => {
+          if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
+            for (let key in res.data) {
+              item.one.push({
+                attrName: key,
+                value: res.data[key].join(','),
+                isShowImp: '0',
+                id: key
+              })
+            }
+          }
+        })
         this.dynamicFormField = displayLocation
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))

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

@@ -164,10 +164,10 @@
                         <el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                                    <h4>技术管理中心主任</h4>
+                                    <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="choiceZRRS('2')"></el-input>
+                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 " @click.native="choiceZRRS('2')"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -175,10 +175,10 @@
                         <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                                    <h4>工程研究总院院长</h4>
+                                    <h4>工程研究总院院长或标准法规主管副院长</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
+                                        <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长或标准法规主管副院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>

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

@@ -35,6 +35,7 @@
                 <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
                   <el-date-picker
                       v-model="form.date"
+                      :picker-options="pickerOptions"
                       type="date"
                       placeholder="请选择完成时间">
                   </el-date-picker>
@@ -164,11 +165,11 @@
             <el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>技术管理中心主任</h4>
+                  <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="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRRS('2')"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 " readonly="readonly"  @click.native="choiceZRRS('2')"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -176,10 +177,10 @@
             <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>工程研究总院院长</h4>
+                  <h4>工程研究总院院长或标准法规主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" readonly="readonly"  @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
+                    <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长或标准法规主管副院长" readonly="readonly"  @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -263,6 +264,11 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       drawerTitle2: '',
       type2: '',
       bpnId: '',
@@ -397,14 +403,14 @@ export default {
           this.nodeList2 = this.roleForm.dockUserList.split(',')
         }
       } else {
-        this.drawerTitle2 = '选择技术管理中心主任'
+        this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
         if ( this.roleForm.directorUser.length > 0) {
           this.nodeList2 = this.roleForm.directorUser.split(',')
         }
       }
       this.modalshowflag2 = true
     },
-    choiceZRR (type, title, id) {
+      choiceZRR (type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type

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

@@ -47,7 +47,7 @@
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
-                                                    @click="updateFile(item)"
+                                                    @click="updateFile2(item)"
                                                     icon="el-icon-download"
                                                     style="height: 32px; margin-left: 5px;"
                                             ></el-button>
@@ -63,7 +63,7 @@
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
-                                                    @click="updateFile(item)"
+                                                    @click="updateFile2(item)"
                                                     icon="el-icon-download"
                                                     style="height: 32px; margin-left: 5px;"
                                             ></el-button>
@@ -127,19 +127,19 @@
                     </div>
                 </el-form>
             </div>
-            <el-collapse accordion>
-                <el-collapse-item title="回执说明">
-                    <div style="margin: 10px 0;">
-                        <el-input
-                                type="textarea"
-                                :rows="3"
-                                resize="none"
-                                placeholder="请输入意见"
-                                v-model="commentText">
-                        </el-input>
-                    </div>
-                </el-collapse-item>
-            </el-collapse>
+<!--            <el-collapse accordion>-->
+<!--                <el-collapse-item title="回执说明">-->
+<!--                    <div style="margin: 10px 0;">-->
+<!--                        <el-input-->
+<!--                                type="textarea"-->
+<!--                                :rows="3"-->
+<!--                                resize="none"-->
+<!--                                placeholder="请输入意见"-->
+<!--                                v-model="commentText">-->
+<!--                        </el-input>-->
+<!--                    </div>-->
+<!--                </el-collapse-item>-->
+<!--            </el-collapse>-->
         </div>
         <div class="content" v-show="active === '2'">
             <el-table
@@ -346,6 +346,10 @@
             updateFile (item) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.fileId
             },
+            updateFile2 (item) {
+                let id = item.id
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
+            },
             // 导入按钮 上传之前的钩子
             beginImportFile (file) {
                 var filename = file.name
@@ -385,7 +389,6 @@
                 }
             },
             fileUpload () {
-
                 this.fileMadel = true
             },
             handleTabs(name) {
@@ -397,7 +400,7 @@
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
                     form: this.form,
-                    commentText: this.commentText,
+                    // commentText: this.commentText,
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
@@ -425,7 +428,7 @@
                         this.json.dyhz = this.form.dyhz
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        // json.commentText = this.commentText
                         json.fileId = this.form.fileId
                         json.fileName = this.form.fileName
                         this.$http.post('lawss/activiti/completeTask', {

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

@@ -47,7 +47,7 @@
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
-                                                    @click="updateFile(item)"
+                                                    @click="updateFile2(item)"
                                                     icon="el-icon-download"
                                                     style="height: 32px; margin-left: 5px;"
                                             ></el-button>
@@ -63,7 +63,7 @@
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
-                                                    @click="updateFile(item)"
+                                                    @click="updateFile2(item)"
                                                     icon="el-icon-download"
                                                     style="height: 32px; margin-left: 5px;"
                                             ></el-button>
@@ -322,6 +322,10 @@
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
+            updateFile2 (item) {
+                let id = item.id
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
+            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <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>

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

@@ -244,7 +244,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInfo">
             </el-input>
           </div>
         </el-collapse-item>
@@ -538,7 +538,7 @@ export default {
       isSubmit: false,
       saveLoading: false,
 
-      commentText: '',
+      commentInfo: '',
       bpnId: ''
     }
   },
@@ -585,6 +585,7 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         this.rh_pageData = mes.rh_pageData
+        this.commentInfo = mes.commentInfo
         this.roleForm = mes.roleForm
       });
     },
@@ -804,7 +805,7 @@ export default {
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         rh_pageData: this.rh_pageData,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
@@ -821,7 +822,8 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         roleList: this.roleForm,
         rh_pageData: this.rh_pageData,
-        commentText: this.commentText,
+        commentText: this.commentInfo,
+        roleForm: this.roleForm,
         directorList: this.roleForm.dockUser,
       }
       this.$refs['rh_pageData'].validate((valid) => {
@@ -830,15 +832,11 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '20')
-              paramsInfo.append('json', JSON.stringify({
-                roleForm: this.roleForm,
-                rh_pageData: this.rh_pageData,
-                commentText: this.commentText
-              }))
+              paramsInfo.append('json', JSON.stringify({json}))
               processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();

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

@@ -219,7 +219,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep3">
             </el-input>
           </div>
         </el-collapse-item>
@@ -379,7 +379,7 @@ export default {
 
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      commentText: '',
+      commentStep3: '',
       infoSourcesLength: '',
 
       /** 上传相关   */
@@ -435,6 +435,7 @@ export default {
         if (this.rh_pageData.fillFile !== undefined) {
           this.fillFileList = this.rh_pageData.fillFile
         }
+        this.commentStep3 =  JSON.parse(JSON.stringify(item)).commentStep3
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -471,6 +472,7 @@ export default {
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.rh_pageData.fillLeaderId,
         rh_pageData: this.rh_pageData,
+        commentStep3: this.commentStep3
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -486,7 +488,7 @@ export default {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.rh_pageData.fillLeaderId,
-        commentText: this.commentText,
+        commentText: this.commentStep3,
         rh_pageData: this.rh_pageData,
       }
       this.$refs['rh_pageData'].validate((valid) => {

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

@@ -221,7 +221,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep5">
             </el-input>
           </div>
         </el-collapse-item>
@@ -458,7 +458,7 @@ export default {
       deleteDataList: [],
 
       infoSourcesLength: '',
-      commentText: '',
+      commentStep5: '',
 
       editFlag: false,
       editForm: {
@@ -522,6 +522,7 @@ export default {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
         this.infoSourcesLength = this.rh_pageData.infoSources.length
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
@@ -702,7 +703,7 @@ export default {
       _formData.append('json', JSON.stringify({
         rh_pageData: this.rh_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -718,7 +719,7 @@ export default {
         leader: this.roleForm.leaderUserId,
         rh_pageData: this.rh_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentText: this.commentStep5
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -242,7 +242,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js'
+import { saveTaskForPub, completeTask, inboundLiaisonDetail,upFile,taskDel} from '@/api/process.js'
 
 export default {
   components: {
@@ -652,15 +652,16 @@ 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', '22')
+      // _formData.append('id', this.bpnId || '')
+      // _formData.append('createUser', this.$store.getters.userInfo.userId)
+      // _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      // _formData.append('prcType', '22')
+      _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
-        hh_pageData: this.hh_pageData
+        hh_pageData: this.hh_pageData,
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -175,7 +175,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep1">
             </el-input>
           </div>
         </el-collapse-item>
@@ -452,7 +452,7 @@ export default {
       roleShowflagOne: false,
       isSubmit: false,
       saveLoading: false,
-      commentText: '',
+      commentInfo: '',
       bpnId: ''
     }
   },
@@ -513,7 +513,7 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         this.ch_pageData = mes.ch_pageData
-        this.commentText = mes.commentText
+        this.commentInfo = mes.commentInfo
         this.roleForm = mes.roleForm
       });
     },
@@ -709,7 +709,7 @@ export default {
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
 
       }))
       saveTaskFirst(_formData).then(res => {
@@ -727,8 +727,9 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         roleList: this.roleForm,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText,
+        commentText: this.commentInfo,
         directorList: this.roleForm.dockUser,
+        roleForm: this.roleForm,
       }
       this.$refs['ch_pageData'].validate((valid) => {
         if (valid) {
@@ -736,16 +737,11 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '21')
-              paramsInfo.append('json', JSON.stringify({
-                roleForm: this.roleForm,
-                ch_pageData: this.ch_pageData,
-                commentText: this.commentText
-
-              }))
+              paramsInfo.append('json', JSON.stringify({json}))
               processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -181,7 +181,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep3">
             </el-input>
           </div>
         </el-collapse-item>
@@ -323,7 +323,7 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: ''
+      commentStep3: ''
     }
   },
   computed: {
@@ -374,6 +374,7 @@ export default {
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName  + '(' + this.$store.getters.userInfo.userId + ')'
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -400,7 +401,7 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleList: this.roleForm,
-        commentText: this.commentText,
+        commentStep3: this.commentStep3,
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.ch_pageData.fillLeaderId,
         ch_pageData: this.ch_pageData,
@@ -418,7 +419,7 @@ export default {
       let json = {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
-        commentText: this.commentText,
+        commentText: this.commentStep3,
         charge: this.ch_pageData.fillLeaderId,
         ch_pageData: this.ch_pageData,
       }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -183,7 +183,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep5">
             </el-input>
           </div>
         </el-collapse-item>
@@ -345,7 +345,7 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: '',
+      commentStep5: '',
       roleShowflag: false,
       nodeList: [],
       // 人员编辑
@@ -402,6 +402,7 @@ export default {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
         // this.ch_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -491,7 +492,7 @@ export default {
       _formData.append('json', JSON.stringify({
         ch_pageData: this.ch_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -506,7 +507,7 @@ export default {
       let json = {
         leader: this.roleForm.leaderUserId,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText,
+        commentText: this.commentStep5,
         roleList: this.roleForm,
       }
       this.$refs['ch_pageData'].validate((valid) => {

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

@@ -119,7 +119,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -587,75 +587,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+            <div class="table-height">
+              <el-table
+                :data="standardData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="table"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow
-                    }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
+                @selection-change="selectThree"
               >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="XCXSSRQ"
-                align="center"
-                label="新车型实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="ZCCSSRQ"
-                align="center"
-                label="在产车实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="code"
+                  align="center"
+                  label="标准号">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.standYear" class="table-jump"
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                        scope.row.standSortShow
+                      }}
+                      {{ scope.row.standNumber }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standName"
+                  align="center"
+                  label="标准名称"
+                >
+                  <template slot-scope="scope">
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  align="center"
+                  label="发布日期">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="XCXSSRQ"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"
@@ -1134,7 +1136,6 @@ export default {
               if (valid) {
                 this.isSubmit = true
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '4',
@@ -1157,6 +1158,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false

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

@@ -119,7 +119,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -557,75 +557,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+            <div class="table-height">
+              <el-table
+                :data="standardData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="table"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow
-                    }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
+                @selection-change="selectThree"
               >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="XCXSSRQ"
-                align="center"
-                label="新车型实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="ZCCSSRQ"
-                align="center"
-                label="在产车实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="code"
+                  align="center"
+                  label="标准号">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.standYear" class="table-jump"
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                        scope.row.standSortShow
+                      }}
+                      {{ scope.row.standNumber }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standName"
+                  align="center"
+                  label="标准名称"
+                >
+                  <template slot-scope="scope">
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  align="center"
+                  label="发布日期">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="XCXSSRQ"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"
@@ -690,7 +692,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {saveTaskFirst} from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
@@ -1064,7 +1066,6 @@ export default {
               if (valid) {
                 this.isSubmit = true
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '4',
@@ -1087,6 +1088,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false

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

@@ -111,7 +111,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -311,7 +311,7 @@
                 label="标准名称"
               >
                 <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -561,12 +561,12 @@ export default {
     },
     //标准查询按钮
     getStandDataBtn(){
-      this.loading = true
+      // this.loading = true
       this.pageNo = 1;
       this.getStandData();
     },
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
@@ -587,7 +587,7 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.loading = true
+      // this.loading = true
       this.getStandDataBtn()
     },
     //添加标准select的改变

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

@@ -468,6 +468,7 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.isSubmit = true
         this.listForm.approvalOpinion = "1";
         this.saveLoading = true
         this.listForm.commentText = this.commentText;
@@ -484,6 +485,7 @@ export default {
             this.$router.push("/processCenter");
           }
           this.saveLoading = false
+          this.isSubmit = false
         });
       }/**/
     },

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

@@ -365,6 +365,14 @@
                               - -
                             </div>
                           </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
+                            <div v-if="xdbFileMap.length>0" v-for="(value,index)  in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
+                              {{value.name}}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
                           <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                           <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
                             <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -548,6 +556,17 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
+                              <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+                                  <el-option
+                                      v-for="item in cyzbpmOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -721,7 +740,7 @@
                             sortable="custom"
                             align="center">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -729,7 +748,7 @@
                             label="完成时间"
                             align="center">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -797,6 +816,7 @@
               zqyjgFileMap: [],
               jdwjFileMap: [],
               kwjFileMap: [],
+              xdbFileMap: [],
               glwjFileMap: [],
               caFileMap: [],
               zbjbdFileMap: [],
@@ -896,6 +916,7 @@
                     qcdw: '', // 起草单位
                     wssmr: '', // 我司署名人
                     cysd: '', // 我司参与深度
+                  cyzbpm:[],// 我司参与制标排名
                     cllx: '', // 适用车型
                     nylx: '',// 能源类型
                     sycpx: '',// 适用产品线
@@ -953,6 +974,7 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                cyzbpmOptions:[], // 我司参与制标排名
                 wssmrOptions: [], // 我司署名人
                 qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
@@ -1137,6 +1159,8 @@
                           // jdwjFileMap: {},
                           this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
                           // kwjFileMap: {},
+                          this.xdbFileMap=this.assemble(processForm.xdb,processForm.xdbName);
+                          // xdbFileMap: {},
                           this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
                           // glwjFileMap: {},
                           this.caFileMap=this.assemble(processForm.ca,processForm.caName);
@@ -1252,6 +1276,7 @@
                                 console.log("shibai");
                                 this.$message.warning("驳回成功")
                                     this.isSubmit = false
+                                    this.formTongGuo.commentText = ''
                                     // 流程提交之后，应该流转至待办任务页面
                                     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 }else{
@@ -1304,6 +1329,7 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+              this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
                 this.wssmrOptions = res.data.WSSMR // 我司署名人
                 this.qcdwOptions = res.data.QCDW // 起草单位
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线

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

@@ -443,7 +443,7 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                  <span>{{form.wssmr}}</span>
+                  <span style="color: rgb(118 122 120)">{{form.wssmr}}</span>
 <!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
 <!--                      <el-option-->
 <!--                              v-for="item in wssmrOptions"-->
@@ -649,7 +649,7 @@
               sortable="custom"
               align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -657,7 +657,7 @@
               label="完成时间"
               align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -1207,7 +1207,7 @@
               sortable="custom"
               align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -1215,7 +1215,7 @@
               label="完成时间"
               align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -2374,7 +2374,7 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-            this.commentText = processForm.commentText
+            // this.commentText = processForm.commentText
             if (processForm.form === undefined) {
               this.getFormFieldList(processForm)
             } else {

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

@@ -430,10 +430,12 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                                        <el-option label="署名人1" value="1"></el-option>
-                                        <el-option label="署名人2" value="2"></el-option>
-                                    </el-select>
+                                  <el-input v-model="form.wssmr">
+                                  </el-input>
+<!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
+<!--                                        <el-option label="署名人1" value="1"></el-option>-->
+<!--                                        <el-option label="署名人2" value="2"></el-option>-->
+<!--                                    </el-select>-->
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -633,7 +635,7 @@
                   sortable="custom"
                   align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -641,7 +643,7 @@
                   label="完成时间"
                   align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
                 </template>
               </el-table-column>
               <el-table-column

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

@@ -137,7 +137,7 @@
                     <el-input
                       v-model="roleForm.dockUserListName"
                       placeholder="选择责任部门对接人"
-                      @click.native="choiceZRRS">
+                      @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -161,13 +161,13 @@
             <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUser" style="margin-bottom: 0">
-                  <h4>技术管理中心主任</h4>
+                  <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"/>
                     <el-input
                       v-model="roleForm.directorUserName"
-                      placeholder="选择技术管理中心主任"
-                      @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
+                      placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
+                      @click.native="choiceZRRS('2')"
                     />
                   </div>
                 </el-form-item>
@@ -176,13 +176,13 @@
             <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="presidentUser" style="margin-bottom: 0">
-                  <h4>工程研究总院院长</h4>
+                  <h4>工程研究总院院长或标准法规主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.presidentUser" style="display: none;"/>
                     <el-input
                       v-model="roleForm.presidentUserName"
-                      placeholder="选择工程研究总院院长"
-                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
+                      placeholder="选择工程研究总院院长或标准法规主管副院长"
+                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
                     />
                   </div>
                 </el-form-item>
@@ -287,7 +287,7 @@
       </div>
     </el-drawer>
     <Role-tree
-      is-title="选择责任部门对接人"
+      :is-title="drawerTitle2"
       :is-visible.sync="modalshowflag2"
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
@@ -365,6 +365,8 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      drawerTitle2: '',
+      type2: '',
       activeNames: '1',
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
@@ -738,8 +740,13 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.roleForm.dockUserList = idList
-      this.roleForm.dockUserListName = nameList
+      if (this.type2 === '1') {
+        this.roleForm.dockUserList = idList
+        this.roleForm.dockUserName = nameList
+      } else {
+        this.roleForm.directorUser = idList
+        this.roleForm.directorUserName = nameList
+      }
     },
     checkedRole(data) {
       if (this.type === 'ministerUser') {
@@ -753,10 +760,19 @@ export default {
         this.roleForm.presidentUserName = data[0].name
       }
     },
-    choiceZRRS() {
+    choiceZRRS(type) {
+      this.type2 = type
       this.nodeList2 = []
-      if (this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      if (type === '1') {
+        this.drawerTitle2 = '选择责任部门对接人'
+        if ( this.roleForm.dockUserList.length > 0) {
+          this.nodeList2 = this.roleForm.dockUserList.split(',')
+        }
+      } else {
+        this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
+        if (this.roleForm.directorUser.length > 0) {
+          this.nodeList2 = this.roleForm.directorUser.split(',')
+        }
       }
       this.modalshowflag2 = true
     },

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

@@ -138,7 +138,7 @@
                     <el-input
                       v-model="roleForm.dockUserListName"
                       placeholder="选择责任部门对接人"
-                      @click.native="choiceZRRS">
+                      @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -162,13 +162,13 @@
             <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUser" style="margin-bottom: 0">
-                  <h4>技术管理中心主任</h4>
+                  <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"/>
                     <el-input
                       v-model="roleForm.directorUserName"
-                      placeholder="选择技术管理中心主任"
-                      @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
+                      placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
+                      @click.native="choiceZRRS('2')"
                     />
                   </div>
                 </el-form-item>
@@ -177,13 +177,13 @@
             <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="presidentUser" style="margin-bottom: 0">
-                  <h4>工程研究总院院长</h4>
+                  <h4>工程研究总院院长或标准法规主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.presidentUser" style="display: none;"/>
                     <el-input
                       v-model="roleForm.presidentUserName"
-                      placeholder="选择工程研究总院院长"
-                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
+                      placeholder="选择工程研究总院院长或标准法规主管副院长"
+                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
                     />
                   </div>
                 </el-form-item>
@@ -289,7 +289,7 @@
       </div>
     </el-drawer>
     <Role-tree
-      is-title="选择责任部门对接人"
+      :is-title="drawerTitle2"
       :is-visible.sync="modalshowflag2"
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
@@ -375,6 +375,8 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      drawerTitle2: '',
+      type2: '',
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -745,8 +747,13 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.roleForm.dockUserList = idList
-      this.roleForm.dockUserListName = nameList
+      if (this.type2 === '1') {
+        this.roleForm.dockUserList = idList
+        this.roleForm.dockUserListName = nameList
+      } else {
+        this.roleForm.directorUser = idList
+        this.roleForm.directorUserName = nameList
+      }
     },
     checkedRole(data) {
       if (this.type === 'ministerUser') {
@@ -760,10 +767,19 @@ export default {
         this.roleForm.presidentUserName = data[0].name
       }
     },
-    choiceZRRS() {
+    choiceZRRS(type) {
+      this.type2 = type
       this.nodeList2 = []
-      if (this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      if (type === '1') {
+        this.drawerTitle2 = '选择责任部门对接人'
+        if ( this.roleForm.dockUserList.length > 0) {
+          this.nodeList2 = this.roleForm.dockUserList.split(',')
+        }
+      } else {
+        this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
+        if (this.roleForm.directorUser.length > 0) {
+          this.nodeList2 = this.roleForm.directorUser.split(',')
+        }
       }
       this.modalshowflag2 = true
     },

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

@@ -464,7 +464,7 @@ export default {
       if (this.commentText) {
         this.isSubmit = true
         var json = this.json
-        json.directorFlag = '0'
+        json.directorFlag = '1'
         json.commentText = this.commentText
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <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>

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

@@ -187,7 +187,6 @@ export default {
         if (valid) {
           this.isSubmit = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
-            id: this.bpnId || '',
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
             type: '14',

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

@@ -186,7 +186,6 @@ export default {
         if (valid) {
           this.isSubmit = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
-            id: this.bpnId || '',
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
             type: '15',

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

@@ -49,7 +49,7 @@
                         :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''"  v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''" @change="comityChangeTwo" v-model="wbbzform.workingGroup" placeholder="请选择工作组">
                       <el-option
                         v-for="item in comityOptionsOneThree"
                         :key="item.id"
@@ -127,7 +127,7 @@
             <template slot-scope="scope">
               <el-input  v-model="scope.row.workPeopleId" style="display: none;" readonly/>
               <el-input  v-model="scope.row.workPeople" placeholder="请选择分发责任人"
-                        @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
+                         @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
             </template>
           </el-table-column>
           <el-table-column
@@ -135,24 +135,36 @@
             width="180"
             label="职务"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.duties" placeholder="请输入职务"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="institutionName"
             label="所在部门"
             width="200"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.institutionName" placeholder="请输入所在部门"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="email"
             label="联系方式"
             width="350"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.email" placeholder="请输入联系方式"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="tenure"
             width="200"
             label="任期"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.tenure" placeholder="请输入任期"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="accounts"
@@ -160,7 +172,7 @@
             width="300"
             align="center">
             <template slot-scope="scope">
-                 <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
+              <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -193,7 +205,6 @@
                   row-key="id">
           <el-table-column type="selection" width="55" align="center"/>
           <el-table-column
-            prop="contactPerson"
             label="协会联络人"
             align="center">
             <template slot-scope="scope">
@@ -205,7 +216,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="telephone"
             label="电话"
             align="center">
             <template slot-scope="scope">
@@ -217,7 +227,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="mailbox"
             label="邮箱"
             align="center">
             <template slot-scope="scope">
@@ -357,6 +366,7 @@ export default {
       recordLoading: false,
       loading: false,
       modalshowflag: false,
+      fileIds: "",
       comityOptionsOne: [],  //工作组数据
       comityOptionsTwo: [],  //分标委数据
       comityOptionsOneThree: [], //工作组数据
@@ -460,7 +470,7 @@ export default {
         this.$nextTick(() => {
           res.data.map(item => {
             // 赋值要回显的上传文件内容
-            this.fileList.push({
+            this.fileInfoList.push({
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
@@ -478,32 +488,60 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         if(!item.directorUser){
-          this.wbbzform = JSON.parse(JSON.stringify(item));
-          this.associationData = item.associationData
-          this.participantsData = item.participantsData
+          this.wbbzform = JSON.parse(JSON.stringify(item.form));
+          this.wbbzform.comityOptionsOne.forEach(item =>{
+            if(this.wbbzform.associationName === item.id){
+              this.wbbzform.associationName = item.name
+            }
+          })
+          this.wbbzform.comityOptionsTwo.forEach(item =>{
+            if(this.wbbzform.committee === item.id){
+              this.wbbzform.committee = item.name
+            }
+          })
+          this.wbbzform.comityOptionsOneThree.forEach(item =>{
+            if(this.wbbzform.workingGroup === item.id){
+              this.wbbzform.workingGroup = item.name
+            }
+          })
+          if (item.form.associationData) {
+            this.associationData = item.form.associationData
+          }
+          if (item.form.participantsData) {
+            this.participantsData = item.form.participantsData
+          }
+          item.form.fileName.forEach(fileId => {
+            this.fileIds = fileId.id
+            this.getFileInfo();
+          })
         }else{
-
+          this.wbbzform = JSON.parse(JSON.stringify(item));
+          if (item.associationData) {
+            this.associationData = item.associationData
+          }
+          if (item.participantsData) {
+            this.participantsData = item.participantsData
+          }
         }
       });
     },
     choiceZRRS(row, index) {
-        this.selectedId = index;
-        this.drawerTitle = "选择责任人";
-        this.nodeList = [];
-        this.zrIndex = index;
-        this.nodeList.push(row);
-        this.modalshowflag = true;
-      },
+      this.selectedId = index;
+      this.drawerTitle = "选择责任人";
+      this.nodeList = [];
+      this.zrIndex = index;
+      this.nodeList.push(row);
+      this.modalshowflag = true;
+    },
     checkedRole(data){
       if(this.participantsData.length > 1){
         let parList = data
         this.participantsData.forEach(item =>{
           parList.forEach(items => {
             if(items.name === item.workPeople){
-                this.$message.warning('请勿重复添加参与人')
-                return
+              this.$message.warning('请勿重复添加参与人')
+              return
             }else{
-              console.log(items);
             }
           })
         })
@@ -525,7 +563,7 @@ export default {
     //不备案
     handleRecord(){
       this.recordLoading = true
-      this.dlFlag = '0',
+      this.dlFlag = '0'
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
@@ -550,11 +588,17 @@ export default {
     handleSave() {
       this.saveLoading = true
       this.wbbzform.fileName = this.fileInfoList
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleList: this.roleForm,
-        wbbzform: this.wbbzform,
+        form: this.wbbzform,
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -577,7 +621,6 @@ export default {
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
       let json = JSON.stringify( this.wbbzform)
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -606,7 +649,7 @@ export default {
     },
     //添加参与人信息
     addPeople(){
-      var list =[]
+      let list =[]
       this.participantsData.push(list)
     },
     //批量删除参与人信息
@@ -638,11 +681,12 @@ export default {
     },
     //添加协会信息
     addSociety(){
-      var list = {
+      let list = {
         contactPerson: this.contactPerson,
         telephone: this.telephone,
         mailbox: this.mailbox,
       }
+      console.log(this.associationData);
       this.associationData.push(list)
     },
     //批量删除协会信息
@@ -669,7 +713,6 @@ export default {
     },
     // 上传之前钩子
     beforeUpload(file) {
-      console.log(file);
       var filename = file.name;
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
@@ -701,6 +744,7 @@ export default {
       this.comityOptionsOne.forEach(item => {
         if (item.children !== null && item.id === this.wbbzform.associationName) {
           this.comityOptionsTwo = item.children
+          this.$forceUpdate()
         }
       })
     },
@@ -710,9 +754,13 @@ export default {
       this.comityOptionsTwo.forEach(item => {
         if (item.children !== null && item.id === this.wbbzform.committee) {
           this.comityOptionsOneThree = item.children
+          this.$forceUpdate()
         }
       })
     },
+    comityChangeTwo(){
+      this.$forceUpdate()
+    },
   },
   mounted() {
     /*  获取标准法规工作组数据  */

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

@@ -584,7 +584,6 @@ export default {
                 this.qbfsForm.commentText = this.commentText
                 var json = Object.assign(this.qbfsForm, this.roleForm)
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '23',

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

@@ -625,7 +625,6 @@ export default {
                 this.standardSearch.commentText = this.commentText
                 var json = Object.assign(this.standardSearch, this.roleForm)
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '24',

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

@@ -472,10 +472,9 @@ export default {
             if (flag) {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
-                  // this.isSubmit = true;
-                  var json = Object.assign(qbzxdFrom, this.roleForm);
+                  this.isSubmit = true;
+                  let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '25',

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

@@ -681,7 +681,6 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '16',

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

@@ -578,7 +578,7 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '8')

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

@@ -73,7 +73,7 @@
                 :rows="3"
                 resize="none"
                 placeholder="请输入意见"
-                v-model="commentText">
+                v-model="commentInfo">
               </el-input>
             </div>
           </el-collapse-item>
@@ -182,7 +182,7 @@ export default {
       passInfo: 0,
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      commentInfo: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
@@ -282,6 +282,7 @@ export default {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
         }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
+        this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
       })
     },
     // 批量选择分发责任人
@@ -290,13 +291,13 @@ export default {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
         this.nodeList = []
+        this.drawerTitle = '选择分发责任人'
         this.nodeList.push(id)
         this.modalshowflag = true
       }
     },
     // 每行选择负责人点击操作
     clickOpen(val, id) {
-      console.log(val)
       this.$refs.multipleTable.clearSelection()
       this.rowDutyPeople = val
       this.nodeList = []
@@ -325,7 +326,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         standardInfoList: this.dataList,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -358,7 +359,7 @@ export default {
       let json = {
         dockUserList: list,
         passInfo: this.passInfo,
-        commentText: this.commentText
+        commentText: this.commentInfo
       }
       let flag=false
       this.dataList.forEach(item => {

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

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="textarea">
             </el-input>
           </div>
         </el-collapse-item>
@@ -186,7 +186,7 @@ export default {
       passInfo: 0,
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -266,6 +266,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[0].standardInfoList
               this.standardInfoList = this.dataList
+              this.textarea = JSON.parse(JSON.stringify(item)).textarea
             }
           }
         } else {
@@ -274,6 +275,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[i].standardInfoList
               this.standardInfoList = this.dataList
+              // this.textarea = JSON.parse(JSON.stringify(item)).commentText
             }
           }
         }
@@ -311,12 +313,11 @@ export default {
     },
     // 退回按钮
     handleSubmitNo() {
-      if (this.commentText) {
-
+      if (this.textarea) {
         var json = {
           passInfo: 1,
           actionFlag: 1,
-          commentText: this.commentText,
+          commentText: this.textarea,
           standardInfoList: this.standardInfoList,
         }
         const params = new FormData();
@@ -370,7 +371,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         dockUserList: list,
-        commentText: this.commentText
+        textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -411,7 +412,7 @@ export default {
       let json = {
         passInfo: this.passInfo,
         responUserList: list,
-        commentText: this.commentText,
+        commentText: this.textarea,
         actionFlag: 0
       }
       if(flag)return;

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

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInput">
             </el-input>
           </div>
         </el-collapse-item>
@@ -189,7 +189,7 @@ export default {
       modalshowflag: false, // drawer开关
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      commentInput: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -273,7 +273,8 @@ export default {
       this.$nextTick(() => {
         if (item.responUserList !== undefined) {
           let listJSON = JSON.parse(JSON.stringify(item.responUserList))
-          this.dataList = [listJSON][0]
+          this.dataList = listJSON
+          this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
         } else {
           if (item.dockUserList !== undefined) {
             let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
@@ -433,10 +434,8 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
-        responUserList: {
-          standardInfoList: this.dataList
-        },
-        commentText: this.commentText
+        responUserList: this.dataList,
+        commentInput: this.commentInput
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -474,7 +473,7 @@ export default {
       let json = {
         info: { fileDataList },
         username: this.$store.getters.userInfo.userName,
-        commentText: this.commentText,
+        commentText: this.commentInput,
       }
       const params = new FormData();
       params.set('json', JSON.stringify(json))

src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue

@@ -779,6 +779,7 @@ export default {
             }
           });
           this.selectList = [];
+          this.$refs.selection.clearSelection()
         }).catch(() => {
         });
       }
@@ -876,7 +877,6 @@ export default {
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '5',
@@ -899,6 +899,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false;

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

@@ -511,7 +511,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
@@ -774,6 +774,7 @@ export default {
             }
           });
           this.selectList = [];
+          this.$refs.selection.clearSelection()
         }).catch(() => {
         });
       }
@@ -869,7 +870,6 @@ export default {
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '5',
@@ -892,6 +892,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false;

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

@@ -832,7 +832,6 @@ export default {
           this.listForm.dataList = this.dataList;
           const json = JSON.stringify(this.listForm);
           this.isSubmit = true
-          return
           this.$http.post("lawss/activiti/completeTask", {
             taskIds: this.taskIds,
             userId: this.userId,

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -613,7 +613,6 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '6',
@@ -635,6 +634,14 @@ export default {
                       }, res => {
                         if (res.success) {
                           this.$message.success(res.message);
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;

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

@@ -346,7 +346,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
@@ -630,7 +630,6 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '6',
@@ -652,6 +651,14 @@ export default {
                       }, res => {
                         if (res.success) {
                           this.$message.success(res.message);
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;

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

@@ -415,6 +415,7 @@ export default {
           this.listForm.breakdownList = item.breakdownList;
         } else {
           this.listForm = item.form
+          this.commentText = item.commentText
           this.dataList = item.form.dataList
         }
 

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

@@ -418,6 +418,7 @@ export default {
           this.listForm.breakdownList = item.breakdownList;
         } else {
           this.listForm = item.form;
+          this.commentText = item.commentText
           this.dataList = item.form.dataList;
         }
 

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -362,11 +362,7 @@ export default {
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
-          this.dataList.forEach(item => {
-            this.$set(item, "workPeople", "请选择责任人");
-            this.$set(item, "workPeopleId", "");
-          });
-          console.log(this.dataList);
+          this.commentText = item.commentText
         }
       });
     },

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -717,6 +717,7 @@ export default {
           this.total = this.dataList.length;
         } else {
           this.listForm = item.form;
+          this.commentText = item.commentText
           let dataChildren = []
           let dataListChildren = []
           this.listForm.dataList.forEach(item => {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -655,7 +655,6 @@ export default {
             if (valid) {
               this.isSubmit = true;
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '10',
@@ -678,6 +677,14 @@ export default {
                   }, res => {
                     if (res.success) {
                       this.$message.success(res.message);
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false;

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

@@ -388,7 +388,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 
 export default {
   name: "xmqdqrStep1",
@@ -665,7 +665,6 @@ export default {
             if (valid) {
               this.isSubmit = true;
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '10',
@@ -688,6 +687,14 @@ export default {
                   }, res => {
                     if (res.success) {
                       this.$message.success(res.message);
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false;

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

@@ -0,0 +1,316 @@
+<!-- 参与外部标准制修订信息提报流程-->
+<template>
+  <div class="phoneCywbbzzxdStep2 phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proNode">选择责任工程师</template>
+    </ProcessHeaderPhone>
+    <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;">
+                    <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;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
+                               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;">
+                    <el-input v-model="roleForm.workPeople" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.workPeopleName" placeholder="选择责任工程师"
+                              @click.native="choiceZRR">
+                    </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;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部部长"
+                             disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+        <ProcessFooter
+          show-save
+          show-submit
+          :submitLoading="isSubmit"
+          :saveLoading="saveLoading"
+          @save="handleSave"
+          @submit="handleSubmit"
+        >
+        </ProcessFooter>
+      </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>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import { Dialog } from 'vant';
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+import { inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "phoneCywbbzzxdStep2",
+  components: {
+    ProcessHeaderPhone,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
+      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"}
+        // ]
+      },
+    };
+  },
+  mounted() {
+    this.getData();
+  },
+  methods:{
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.roleForm = item
+      });
+    },
+    choiceZRR() {
+      this.drawerTitle = '选择责任工程师';
+      this.phoneshowflag = true;
+    },
+    drawerCheck(data){
+      this.roleForm.workPeople = data[0].id
+      this.roleForm.workPeopleName = data[0].name
+    },
+    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(){
+      if(this.roleForm.workPeople !== undefined){
+        let json = this.roleForm
+        this.$refs["Form"].validate((valid) => {
+          if (valid) {
+            this.isSubmit = true
+            this.$http.post("lawss/activiti/completeTask", {
+              taskIds: this.$route.query.taskIds,
+              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("请完善人员信息");
+          }
+        });
+      }else{
+        this.$message.warning('请选择责任工程师')
+      }
+
+    },
+    handleSave(){
+
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.phoneCywbbzzxdStep2 {
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  //.headerTabs {
+  //  height: 52px;
+  //  display: flex;
+  //  align-items: center;
+  //  position: absolute;
+  //  top: 75px;
+  //  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 {
+    border-top: 1px solid #DCDFE6;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 52px;
+    //height: calc(~'100% - 180px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/phone/qbfs/step2.vue

@@ -0,0 +1,458 @@
+<!--企标复审-->
+<template>
+  <div class="phoneQbfsStep2 phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">企标复审流程</template>
+      <template slot="proNode">工作组组长指派责任人</template>
+    </ProcessHeaderPhone>
+    <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">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entNumber"
+                  placeholder="请输入企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.cnName"
+                  placeholder="请输入中文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.enName"
+                  placeholder="请输入英文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entCategory"
+                  placeholder="请输入企标类别"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replaceNumber"
+                  placeholder="请输入代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replacedNumber"
+                  placeholder="请输入被代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.releaseDate"
+                  placeholder="请输入发布日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.implementDate"
+                  placeholder="请输入实施日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.reviewDate"
+                  placeholder="请输入复审日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="fileList.length > 0">
+                  <p v-for="item in fileList"
+                     :key="item.id"> {{ item.oldFileName }}
+                    <i
+                      title="下载"
+                      @click="downloadFile(item.id)"
+                      class="icon-download"
+                      v-btn-permission="''"
+                    />
+                    <i
+                      title="下载带水印"
+                      @click="downloadFileByWater(item.id, item.name)"
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
+              </el-form-item>
+              <el-form-item label="工作组成员" prop="jgUser" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qbfsForm.jgUser"
+                  placeholder="请选择工作组成员"
+                  clearable
+                  @click.native="choiceZRRS"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </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>
+    <div class="content" v-show="active === '3'">
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
+<!--    &lt;!&ndash;    选择责任人&ndash;&gt;-->
+<!--    <Role-tree-->
+<!--      :is-title="drawerTitle"-->
+<!--      :is-visible.sync="modalshowflag"-->
+<!--      @checkedRole="checkedRole"-->
+<!--      :nodeList="nodeList2"-->
+<!--    ></Role-tree>-->
+    <phone-role
+      check-more
+      role-title="选择工作组成员"
+      :result-list="nodeList"
+      :is-show-phone.sync="drawerModal"
+      @checkedRole="checkedRole"
+    />
+  </div>
+</template>
+
+<script>
+import { Dialog } from 'vant';
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "phoneQbfsStep2",
+  components:{
+    ProcessFooter,
+    ProcessTitle,
+    ProcessHeaderPhone
+
+  },
+  data() {
+    return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
+      active: '1',
+      fileList: [],
+      commentText: '',
+      detailData: [],
+      nodeList: [],
+      nodeList2: [],
+      isSubmit: false,
+      saveLoading: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        jgUser: '',
+        jgUserId: '',
+      },
+      roleForm: {
+        jgUser: ""
+      },
+      formRules: {
+        jgUser: [
+          {required: true, message: "请选择工作组成员", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    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() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+        this.fileList = item.fileList
+      })
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+//转办按钮
+    handleTransfer(){
+      this.phoneshowflag = true
+      this.phoneRoleList = this.roleTransfer
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    choiceZRRS() {
+      if (this.qbfsForm.jgUserId) {
+        this.phoneRoleList = this.listForm.jgUserId.split(',')
+      }
+      this.drawerModal = true;
+    },
+    checkedRole(data) {
+      let idList = "";
+      let nameList = "";
+      data.forEach(item => {
+        if (nameList.length) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.$set(this.qbfsForm, 'jgUser', nameList)
+      this.$set(this.qbfsForm, 'jgUserId', idList)
+      if(this.qbfsForm.jgUser){
+        this.$refs.qbfsForm.validateField('jgUser')
+      }
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.phoneQbfsStep2 {
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  //.headerTabs {
+  //  height: 52px;
+  //  display: flex;
+  //  align-items: center;
+  //  position: absolute;
+  //  top: 52px;
+  //  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 {
+    border-top: 1px solid #DCDFE6;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 52px;
+    //height: calc(~'100% - 180px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>

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

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInfo">
             </el-input>
           </div>
         </el-collapse-item>
@@ -120,7 +120,7 @@ export default {
     return {
       passInfo: 0,
       loading: false,
-      commentText: '', // 意见
+      commentInfo: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
@@ -208,7 +208,7 @@ export default {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
         }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
-        this.commentText = JSON.parse(JSON.stringify(item)).commentText
+        this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
       })
     },
     // 批量选择分发责任人
@@ -225,7 +225,6 @@ export default {
     },
     // 每行选择负责人点击操作
     clickOpen(val, id) {
-      console.log()
       this.$refs.multipleTable.clearSelection()
       this.rowDutyPeople = val
       if (this.rowDutyPeople.dutyPeopleId.length > 0) {
@@ -256,7 +255,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         standardInfoList: this.dataList,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -288,7 +287,8 @@ export default {
       }
       let json = {
         dockUserList: list,
-        passInfo: this.passInfo
+        passInfo: this.passInfo,
+        commentText: this.commentInfo
       }
       let flag=false
       this.dataList.forEach(item => {

src/pages/processCenter/pages/phone/wfhxzg/step3.vue

@@ -74,14 +74,14 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="textarea">
             </el-input>
           </div>
         </el-collapse-item>
@@ -127,7 +127,7 @@ export default {
     return {
       passInfo: 0,
       loading: false,
-      commentText: '', // 意见
+      textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -195,6 +195,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[0].standardInfoList
               this.standardInfoList = this.dataList
+              this.textarea = JSON.parse(JSON.stringify(item)).textarea
             }
           }
         } else {
@@ -246,12 +247,12 @@ export default {
     },
     // 退回按钮
     handleSubmitNo() {
-      if (this.commentText) {
+      if (this.textarea) {
 
         var json = {
           passInfo: 1,
           actionFlag: 1,
-          commentText: this.commentText,
+          commentText: this.textarea,
           standardInfoList: this.standardInfoList,
         }
         const params = new FormData();
@@ -305,7 +306,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         dockUserList: list,
-        commentText: this.commentText
+        textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -346,6 +347,7 @@ export default {
       let json = {
         passInfo: this.passInfo,
         responUserList: list,
+        commentText: this.textarea,
         actionFlag: 0
       }
       if(flag)return;

src/pages/processCenter/pages/phone/wfhxzg/step5.vue

@@ -261,9 +261,7 @@ export default {
       this.backLoading = true
       if (this.commentText) {
         var json = {
-          responUserList: {
-            standardInfoList: this.dataList
-          },
+          responUserList: this.dataList,
           actionFlag: 1,
           commentText: this.commentText
         }

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

@@ -1165,6 +1165,7 @@ export default {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
+        console.log('1168',this.selectedAccInfoSearchList)
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
@@ -1472,6 +1473,7 @@ export default {
       this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+          console.log('1476',res.data.list)
           this.sarAccessInfoSearchList = res.data.list
           this.sarAccessInfoSearchList.forEach(item => {
             if (item.standYear === null) {
@@ -1479,6 +1481,10 @@ export default {
             } else {
               item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
             }
+            item.zrbm = item.attrInfoCaseMap.zrbm
+            item.sycpx = item.attrInfoCaseMap.sycpx
+            item.typeApplicable = item.attrInfoMap.CLLX
+            item.nylx = item.attrInfoMap.NYLX
           })
           this.drawerTotal = res.data.count
         }, e => {

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

@@ -1229,19 +1229,102 @@ export default {
         }
       })
     },
+    // 字段转化
+    changeText(val) {
+      val.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m] = this.zrbmOptions[i].label
+              }
+              item.zrbm = k.join(',')
+            }
+          }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m] = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.CycxOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.CycxOptions[i].value === k[m]) {
+                k[m] = this.CycxOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m] = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+        // 适用认证转换
+        if (item.syrz !== null) {
+          let k = (item.syrz || "").split(',')
+          for (let i in this.syrzOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.syrzOptions[i].value === k[m]) {
+                k[m] = this.syrzOptions[i].label
+              }
+              item.syrz = k.join(',')
+            }
+          }
+        }
+      })
+    },
     pageInfo() {
       this.sarAccessInfoSearch.pageNo = 1
       this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
+          console.log('1476',res.data.list)
           this.sarAccessInfoSearchList.forEach(item => {
             if (item.standYear === null) {
               item.standNumber = item.standSortShow + ' ' + item.standNumber
             } else {
               item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
             }
+            item.zrbm = item.attrInfoCaseMap.zrbm
+            item.sycpx = item.attrInfoCaseMap.sycpx
+            item.typeApplicable = item.attrInfoMap.CLLX
+            // 适用车型转换
+            if (item.typeApplicable !== null) {
+              let k = (item.typeApplicable || "").split(',')
+              for (let i in this.CycxOptions) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.CycxOptions[i].value === k[m]) {
+                    k[m] = this.CycxOptions[i].label
+                  }
+                  item.typeApplicable = k.join(',')
+                }
+              }
+            }
+            item.nylx = item.attrInfoMap.NYLX
           })
+          this.changeText(this.sarAccessInfoSearchList)
           this.drawerTotal = res.data.count
         }, e => {
         })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1306,7 +1306,7 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
-
+          console.log('1476',res.data.list)
           //为空转换
           for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
             //适用车型为空
@@ -1324,6 +1324,10 @@ export default {
             } else {
               item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
             }
+            item.zrbm = item.attrInfoCaseMap.zrbm
+            item.sycpx = item.attrInfoCaseMap.sycpx
+            item.typeApplicable = item.attrInfoMap.CLLX
+            item.nylx = item.attrInfoMap.NYLX
           })
           this.changeText(this.sarAccessInfoSearchList)
           this.drawerTotal = res.data.count

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -163,12 +163,12 @@
                    v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'249aaa052affd5ad579ecffb8fd6b084'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'7b0ee71c73a89a28e8e754b371e50dde'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
         </el-button>
@@ -1745,6 +1745,13 @@
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
 
+                  <!--    模块结构单元名称     -->
+                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+                              placeholder="模块结构单元名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+
                 </el-col>
                 <el-col :span="12">
                   <!--            起草单位-->
@@ -1839,6 +1846,12 @@
                               placeholder="关联模块--卡车VPPS中文名称"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
+
+                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+                              placeholder="模块结构单元变型号"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -2314,7 +2327,9 @@ export default {
         , CBCD: ''//采标程度
         , YYBJ: ''//引用标准
         , BYYBJ: ''//被引用标准
-        , TXLB: ''//体系类别
+        , TXLB: '',//体系类别
+        DYBXH: '',// 模块结构单元变形号
+        DYMC: '',//模块结构单元名称
       },
       // 树形结构
       // tree function
@@ -3561,7 +3576,7 @@ export default {
     // },
     // 清空搜索框
     clearAllSearch(flag) {
-      if (flag === 'sarStandardsSearch') {
+      if (flag === 'sarStandardsSearch' || flag === 'standCommonlySearch') {
         // 标准搜索
         this.sarStandardsSearch.country = ''
         this.sarStandardsSearch.standSort = ''
@@ -3578,7 +3593,7 @@ export default {
         this.sarStandardsSearch.synopsis = ''
         this.sarStandardsSearch.category = ''
         this.isAdvancedSearch = false
-      } else if (flag === 'standCommonlySearch') {
+      // } else if (flag === 'standCommonlySearch') {
         this.standCommonlySearch.standName = ''
         this.standCommonlySearch.standNumber = ''
         this.pageChange(1)
@@ -4257,7 +4272,12 @@ export default {
         this.sarStandardsSearch.page = page
       }
       this.standCommonlySearch.page = page
-      this.getDomesticStandardTable(this.standCommonlySearch)
+      if (this.sarStandardsSearch) {
+        this.getDomesticStandardTable(this.sarStandardsSearch)
+      } else {
+        this.getDomesticStandardTable(this.standCommonlySearch)
+      }
+
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
@@ -4268,6 +4288,7 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
+      console.log(item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4278,6 +4299,7 @@ export default {
       }
       // this.sarStandardsSearch.menuId = this.selectSarMenu.id
       const formData = {...data}
+      console.log(formData)
       if (!item) {
         formData.menuId = this.sarStandardsSearch.menuId
       } else {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4566,7 +4566,6 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系
-        console.log(this.standSystemOptions);
         this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
         this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -263,42 +263,97 @@
                                                         v-model="addForm.unit">
                                                 </el-input>
                                                 <el-input
-                                                        :key="addForm.unit"
-                                                        :config="addForm"
                                                         clearable
                                                         v-model="addForm.unitName"
                                                         placeholder="请选择起草责任单位"
                                                         readonly
                                                         @click.native="choiceZRBM(addForm.unit)">
                                                 </el-input>
-
-<!--                                                <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">-->
-<!--                                                    <el-input-->
-<!--                                                            :disabled="DrawerType === 'see'"-->
-<!--                                                            clearable-->
-<!--                                                            v-model="addForm.unit"-->
-
-<!--                                                            placeholder="选择或输入起草单位">-->
-<!--                                                    </el-input>-->
-<!--                                                </el-tooltip>-->
-<!--                                                <div v-else>-->
-<!--                                                    <el-input-->
-<!--                                                            :disabled="DrawerType === 'see'"-->
-<!--                                                            clearable-->
-<!--                                                            v-model="addForm.unit"-->
-<!--                                                            placeholder="选择或输入起草单位">-->
-<!--                                                    </el-input>-->
-<!--                                                </div>-->
-<!--                                                <div>-->
-<!--                                                    <el-button-->
-<!--                                                            :disabled="DrawerType === 'see'"-->
-<!--                                                            size="mini"-->
-<!--                                                            type="primary"-->
-<!--                                                            @click="QCDWClick"-->
-<!--                                                            class="common-button-primary">手动查找</el-button>-->
-<!--                                                </div>-->
                                             </div>
                                         </el-form-item>
+                                        <el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        style="display: none;"
+                                                        v-model="addForm.rqbJson">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.rqbName"
+                                                        placeholder="请选择企业标准"
+                                                        readonly
+                                                        @click.native="choiceQYBZ(addForm.rqbJson)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        style="display: none;"
+                                                        v-model="addForm.tsJson">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.tsJsonName"
+                                                        placeholder="请选择体系结构"
+                                                        readonly
+                                                        @click.native="choiceTXJG(addForm.tsJson)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                                                    <el-option
+                                                            v-for="item in BZList"
+                                                            :key="item.value"
+                                                            :label="item.label"
+                                                            :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
+                                                <el-radio-group v-model="addForm.isRelate">
+                                                    <el-radio label="是" value="是"></el-radio>
+                                                    <el-radio label="否" value="否"></el-radio>
+                                                </el-radio-group>
+                                            </div>
+                                        </el-form-item>
+                                        <template v-if="addForm.isRelate === '是'">
+                                            <custom-input-for-all-standards
+                                                    class="classDisplay"
+                                                    :config="{attrName: '采用标准'}"
+                                                    :labelWidth="'180px'"
+                                                    v-model="addForm.esStandRelations"
+                                            ></custom-input-for-all-standards>
+                                        </template>
+                                        <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
+                                                <el-radio-group v-model="addForm.useLevel">
+                                                    <el-radio label="等同" value="等同"></el-radio>
+                                                    <el-radio label="修改" value="修改"></el-radio>
+                                                    <el-radio label="非等效" value="非等效"></el-radio>
+                                                </el-radio-group>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        v-model="addForm.technologic"
+                                                        placeholder="请简述技术指标依据">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <template>
+                                            <custom-input-for-all-standards2
+                                                    class="classDisplay"
+                                                    :config="{attrName: '配套标准'}"
+                                                    :labelWidth="'180px'"
+                                                    v-model="addForm.esMatingRelations"
+                                            ></custom-input-for-all-standards2>
+                                        </template>
                                     </el-form>
                                 </el-col>
                             </el-row>
@@ -361,19 +416,165 @@
                     :nodeList="nodeListZRBM"
                     @checkedRole="drawerCheckZRBM"
             />
+            <el-drawer
+                    title="选择企业标准"
+                    :visible.sync="QYBZmodal"
+                    size="900px"
+                    custom-class="demo-drawer"
+            >
+                <div class="standardForComments">
+                    <div class="content" style="height: 100%;">
+                        <!-- 顶部工具栏 -->
+                        <div class="search-area">
+                            <el-form :model="QYBZform" inline class="label-input-form">
+                                <el-formItem label="标准号" prop="numberName" class="search-item">
+                                    <el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+                                </el-formItem>
+                                <el-formItem label="标准名称" prop="standName" class="search-item">
+                                    <el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+                                </el-formItem>
+                                <el-formItem class="search-item btn-box">
+                                    <el-button
+                                            type="primary"
+                                            size="mini"
+                                            class="common-button-primary"
+                                            @click="QYBZget">查询
+                                    </el-button>
+                                    <el-button
+                                            class="common-button-default"
+                                            size="mini"
+                                            @click="clearQYBZ">清空
+                                    </el-button>
+                                </el-formItem>
+                            </el-form>
+                        </div>
+                        <div class="table-wrap" style="height: 100%;">
+                            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                                <el-table
+                                        ref="selection"
+                                        :data="QYBZList"
+                                        tooltip-effect="dark"
+                                        style="width: 100%;padding:0 0 20px 0;"
+                                        height="100%"
+                                        border
+                                        @selection-change="handleSelectionQYBZ"
+                                        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                    <el-table-column type="selection" width="55" align="center"/>
+                                    <el-table-column
+                                            label="企标编号"
+                                            prop="standCode"
+                                    >
+                                    </el-table-column>
+                                    <el-table-column
+                                            show-overflow-tooltip
+                                            prop="standName"
+                                            label="中文名称"
+                                    >
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="issueTime"
+                                            label="发布日期"
+                                            width="120"
+                                    >
+                                        <template slot-scope="scope">
+                                            <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="putTime"
+                                            label="实施日期"
+                                            sortable
+                                            width="120"
+                                    >
+                                        <template slot-scope="scope">
+                                            <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="standStatusShow"
+                                            label="文本状态"
+                                            width="110"
+                                    >
+                                        <template slot-scope="scope">
+                                             <span>{{scope.row.standStatusShow}}</span>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </div>
+                            <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
+                            <loading :loading="QYBZShow">数据加载中……</loading>
+                        </div>
+                    </div>
+                    <div class="demo-drawer-footer">
+                        <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+                        <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+                    </div>
+                </div>
+            </el-drawer>
+            <el-drawer
+                    title="选择体系结构"
+                    :visible.sync="TXJGmodal"
+                    size="900px"
+                    custom-class="demo-drawer"
+            >
+                <div class="standardForComments">
+                    <div class="content" style="height: 100%;">
+                        <el-tree
+                                v-if="TXJGmodal"
+                                ref="TXJGTree"
+                                :data="standSystemOptions"
+                                show-checkbox
+                                node-key="id"
+                                default-expand-all
+                                check-strictly
+                                :default-checked-keys="TXJGList"
+                                :props="defaultProps">
+                        </el-tree>
+                    </div>
+                    <div class="demo-drawer-footer">
+                        <el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
+                        <el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
+                    </div>
+                </div>
+            </el-drawer>
         </div>
     </div>
 </template>
 
 <script>
+    import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
+    import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
     export default {
         name: "enterpriseStandardPlan",
-        components: {},
+        components: {
+            CustomInputForAllStandards,
+            CustomInputForAllStandards2
+        },
         data() {
             return {
+                BZList: [],
+                TXJGList: [],
+                TXJGmodal: false,
+                standSystemOptions: [],
+                defaultProps: {
+                    children: 'children',
+                    label: 'menuName'
+                },
+                QYBZShow: false,
+                QYBZList: [],
                 modalshowflagZRBM: false,
                 nodeListZRBM: [],
-
+                QYBZformSelect: [],
+                QYBZmodal: false,
+                QYBZform: {
+                    page: 1,
+                    pageSzie: this.$store.getters.userInfo.configContent,
+                    validFlag: '0',
+                    userId: this.$store.getters.userInfo.userId,
+                    standCode: '',
+                    standName: '',
+                    total: 0,
+                },
                 QCDWmodal: false,
                 QCDWValue: [],
                 QCDWList: [],
@@ -390,6 +591,16 @@
                 DrawerType: '',
                 ids: [],
                 addForm: {
+                    esMatingRelations: '',
+                    technologic: '',
+                    useLevel: '',
+                    isRelate: '',
+                    esStandRelations: '',
+                    area: '',
+                    tsJson: '',
+                    tsJsonName: '',
+                    rqbJson: '',
+                    rqbName: '',
                     unit: '', // 单位
                     unitName: '',
                     esName: '', // 企标名称
@@ -450,6 +661,83 @@
         props: {},
         watch: {},
         methods: {
+            TXJGcloseDrawer () {
+                this.TXJGmodal = false
+            },
+            TXJGenterDrawer () {
+                let list = this.$refs.TXJGTree.getCheckedNodes()
+                let id = ''
+                let name = ''
+                list.map(item => {
+                    if (id.length > 0) {
+                        id += ','
+                        id += item.id
+                        name += ','
+                        name += item.menuName
+                    } else {
+                        id = item.id
+                        name = item.menuName
+                    }
+                })
+                this.addForm.tsJson = id
+                this.addForm.tsJsonName = name
+                this.TXJGmodal = false
+            },
+            choiceTXJG (id) {
+                if (id) {
+                    this.TXJGList = id.split(',')
+                } else {
+                    this.TXJGList = []
+                }
+                this.TXJGmodal = true
+            },
+            QYBZcloseDrawer () {
+                this.clearQYBZ()
+            },
+            QYBZenterDrawer () {
+                if (this.QYBZformSelect.length > 1) {
+                    this.$message.warning('请选择一条标准')
+                } else if (this.QYBZformSelect.length < 1){
+                 this.$message.warning('请选择要带入的标准')
+                } else {
+                    this.addForm.rqbJson = this.QYBZformSelect[0].id
+                    this.addForm.rqbName = this.QYBZformSelect[0].standName
+                    this.clearQYBZ()
+                    this.QYBZmodal = false
+                }
+            },
+            handleSelectionQYBZ  (val) {
+                this.QYBZformSelect = val
+            },
+            QYBZpageChange (page) {
+                this.QYBZform.page = page
+                this.QYBZget()
+            },
+            QYBZpageSizeChange (pageSize) {
+                this.QYBZform.pageSize = pageSize
+                this.QYBZget()
+            },
+            QYBZget () {
+                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+                    _this: this, loading: 'QYBZShow'
+                }, res => {
+                    this.QYBZList = res.data.list
+                    this.QYBZform.total = res.data.count
+                }, e => {
+                })
+            },
+            clearQYBZ () {
+                this.QYBZform = {
+                    page: 1,
+                    standCode: '',
+                    standName: '',
+                }
+            },
+            choiceQYBZ (id) {
+                this.QYBZformSelect = []
+                this.QYBZget()
+                this.QYBZmodal = true
+            },
             drawerCheckZRBM (data) {
                 let list = ''
                 let listName = ''
@@ -718,6 +1006,9 @@
                 _this: this
             }, res => {
                 this.QCDWList = res.data.QCDW // 起草单位
+                this.standSystemOptions = res.data.TXLBBUSS // 体系结构
+                this.BZList = res.data.ENERGYTYPES
+                console.log(this.BZList);
             }, e => {
             })
         },
@@ -730,6 +1021,44 @@
     #enterpriseStandardPlan {
         height: 100%;
         background: #fff;
+        .classDisplay {
+            /deep/.el-form-item__content {
+                width: calc(~'100% - 180px');
+                .el-input__inner {
+                    width: calc(~'100% - 80px');
+                }
+            }
+        }
+        .standardForComments {
+            height: calc(~'100% - 56px');
+            background: #fff;
+            flex-direction: column;
+            .action-bar {
+                margin-bottom: 5px;
+                padding: 0;
+            }
+
+            .content {
+                flex: auto;
+                overflow: hidden;
+                display: flex;
+                flex-direction: column;
+
+                .table-wrap {
+                    flex: auto;
+                    overflow: hidden;
+                    position: relative;
+                }
+            }
+
+            & > .pagination {
+                position: static;
+
+                /deep/ .pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
         /deep/.table-wrap {
             .el-table__fixed {
                 height: calc(~'100% - 20px') !important;
@@ -738,6 +1067,7 @@
         .add-form-item {
             /deep/.el-form-item__content {
                 width: calc(~'100% - 180px');
+                height: 50px;
             }
         }
         display: flex;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -68,16 +68,16 @@
           <div class="search-area">
             <div class="left">
               <el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
-<!--                <el-form-item label="标准类别" class="search-item">-->
-<!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
-<!--                    <el-option-->
-<!--                      v-for="item in standSortOptions"-->
-<!--                      :key="item.value"-->
-<!--                      :value="item.value"-->
-<!--                      :label="item.label"-->
-<!--                    ></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
+<!--                <el-form-item label="标准类别" class="search-item">
+                  <el-select v-model="standCommonlySearch.standSort" filterable>
+                    <el-option
+                      v-for="item in standSortOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>-->
                 <el-form-item label="标准号" class="search-item search-item-last">
                   <el-input v-model="standCommonlySearch.standNumber"
                             placeholder="请输入标准号"
@@ -395,66 +395,66 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
-      <!--      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
-      <!--                       @reset="clearAllSearch('sarStandardsSearch')">-->
-      <!--        <div slot="content">-->
-      <!--          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
-      <!--            &lt;!&ndash;            标准号&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            标准名称&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            标准类别&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">-->
-      <!--              <search-select-->
-      <!--                v-model="sarStandardsSearch.standSort"-->
-      <!--                :placeholder="$t('m.standardCategoryTips')"-->
-      <!--                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
-      <!--                :options="standSortOptions"-->
-      <!--                clearable/>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            文本状态&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            代替标准号&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">-->
-      <!--              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
-      <!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            适用车型&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--            &lt;!&ndash;            关联模块（新增字段）&ndash;&gt;-->
-      <!--            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">-->
-      <!--              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
-      <!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-      <!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
-      <!--                </el-option>-->
-      <!--              </el-select>-->
-      <!--            </el-form-item>-->
-      <!--          </el-form>-->
-      <!--        </div>-->
-      <!--      </table-tools-bar>-->
+<!--            <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"
+                             @reset="clearAllSearch('sarStandardsSearch')">
+              <div slot="content">
+                <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+                  &lt;!&ndash;            标准号&ndash;&gt;
+                  <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
+                    <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  &lt;!&ndash;            标准名称&ndash;&gt;
+                  <el-form-item :label="$t('m.standName')" class="serch-form-item">
+                    <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  &lt;!&ndash;            标准类别&ndash;&gt;
+                  <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
+                    <search-select
+                      v-model="sarStandardsSearch.standSort"
+                      :placeholder="$t('m.standardCategoryTips')"
+                      @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                      :options="standSortOptions"
+                      clearable/>
+                  </el-form-item>
+                  &lt;!&ndash;            文本状态&ndash;&gt;
+                  <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
+                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    </el-select>
+                  </el-form-item>
+                  &lt;!&ndash;            代替标准号&ndash;&gt;
+                  <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
+                    <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  &lt;!&ndash;            适用车型&ndash;&gt;
+                  <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
+                    <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    </el-select>
+                  </el-form-item>
+                  &lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;
+                  <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
+                    <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    </el-select>
+                  </el-form-item>
+                  &lt;!&ndash;            关联模块（新增字段）&ndash;&gt;
+                  <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
+                    <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </table-tools-bar>-->
       <!--    高级筛选-->
       <el-drawer
         title="高级搜索"
@@ -617,39 +617,37 @@
                   <!--            适用车型-->
                   <template>
                     <custom-select-array
-                        :key="applyArcticOptions.options"
                         :config="applyArcticOptions"
                         style="margin-left: -14px"
                         v-model="sarStandardsSearch['applyArctic']"
                     ></custom-select-array>
                   </template>
-<!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="sarStandardsSearch.applyArctic"-->
-<!--                               :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"-->
-<!--                                 :key="opt.value" :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
+                    <el-select v-model="sarStandardsSearch.applyArctic"
+                               :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="opt.value" :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            适用产品线（新增字段）-->
                   <template>
                     <custom-select-array
-                        :key="sycpxOptions.options"
                         :config="sycpxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['SYCPX']"
                     ></custom-select-array>
                   </template>
-<!--                  <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"-->
-<!--                               clearable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
-<!--                                 :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
+                               clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            体系类别-->
                   <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@@ -672,21 +670,21 @@
                       </el-input>
                     </el-form-item>
                   </template>
-<!--                  <template>-->
-<!--                    <custom-select-array-->
-<!--                        :key="zrgcsOptions.options"-->
-<!--                        :config="zrgcsOptions"-->
-<!--                        v-model="advanceSearchMapping['ZRGCS']"-->
-<!--                    ></custom-select-array>-->
-<!--                  </template>-->
-<!--                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
-<!--                                 :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <template>
+                    <custom-select-array
+                        :key="zrgcsOptions.options"
+                        :config="zrgcsOptions"
+                        v-model="advanceSearchMapping['ZRGCS']"
+                    ></custom-select-array>
+                  </template>
+                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--           关联模块--乘用车vpps中文名称-->
                   <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
@@ -699,43 +697,46 @@
                               placeholder="关联模块--卡车VPPS中文名称"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
-
+                  <!--    模块结构单元名称     -->
+                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+                              placeholder="模块结构单元名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <!--            能源类型-->
                   <template>
                     <custom-select-array
-                        :key="nylxOptions.options"
                         :config="nylxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['NYLX']"
                     ></custom-select-array>
                   </template>
-<!--                  <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
-<!--                                 :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <el-form-item label="能源类型" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            适用认证-->
                   <template>
                     <custom-select-array
-                        :key="syrzOptions.options"
                         :config="syrzOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['SYRZ']"
                     ></custom-select-array>
                   </template>
-<!--                  <el-form-item label="适用认证" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
-<!--                                 :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <el-form-item label="适用认证" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            责任部门-->
                   <template>
                     <el-form-item
@@ -745,7 +746,6 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                          :key="zrbmOptions.options"
                           :config="zrbmOptions"
                           clearable
                           v-model="advanceSearchMapping['ZRBM']"
@@ -754,21 +754,21 @@
                       </el-input>
                     </el-form-item>
                   </template>
-<!--                  <template>-->
-<!--                    <custom-select-array-->
-<!--                        :key="zrbmOptions.options"-->
-<!--                        :config="zrbmOptions"-->
-<!--                        v-model="advanceSearchMapping['ZRBM']"-->
-<!--                    ></custom-select-array>-->
-<!--                  </template>-->
-<!--                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
-<!--                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
-<!--                      <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
-<!--                                 :label="opt.label">{{ opt.label }}-->
-<!--                      </el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
+<!--                  <template>
+                    <custom-select-array
+                        :key="zrbmOptions.options"
+                        :config="zrbmOptions"
+                        v-model="advanceSearchMapping['ZRBM']"
+                    ></custom-select-array>
+                  </template>
+                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            关联模块--乘用车VPPS编码-->
                   <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
@@ -781,6 +781,12 @@
                               placeholder="关联模块--卡车VPPS编码"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
+                  <!-- 模块结构单元变型号 -->
+                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+                              placeholder="模块结构单元变型号"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -805,10 +811,10 @@
                 </el-col>
                 <el-col :span="12">
                   <!--            被代替标准号-->
-<!--                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
-<!--                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
-<!--                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-<!--                  </el-form-item>-->
+<!--                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
+                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>-->
                   <!--            被引用标准-->
                   <el-form-item label="被引用标准" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.BYYBJ" clearable
@@ -852,31 +858,31 @@
             :rules="sarStandardsInfoRules"
             class="label-input-form"
           >
-            <!--            <el-form-item-->
-            <!--                prop="isRelateAccess"-->
-            <!--                label-width="150px"-->
-            <!--                class="add-form-item"-->
-            <!--                title="A类必填项多，仅A类可纳入法规清单。"-->
-            <!--            >-->
-            <!--              <template slot="label">重要度<i class="el-icon-warning-outline"></i></template>-->
-            <!--              <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">-->
-            <!--                <el-option value="1" label="A" key="1"></el-option>-->
-            <!--                <el-option value="0" label="B" key="0"></el-option>-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
-            <!--            <el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">-->
-            <!--              <el-select v-model="sarStandardsInfoEO.country" disabled >-->
-            <!--                <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
-            <!--            <el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">-->
-            <!--              <el-input-->
-            <!--                type="text"-->
-            <!--                v-model="sarStandardsInfoEO.synopsis"-->
-            <!--                placeholder="请输入"-->
-            <!--                clearable-->
-            <!--              ></el-input>-->
-            <!--            </el-form-item>-->
+<!--                        <el-form-item
+                            prop="isRelateAccess"
+                            label-width="150px"
+                            class="add-form-item"
+                            title="A类必填项多，仅A类可纳入法规清单。"
+                        >
+                          <template slot="label">重要度<i class="el-icon-warning-outline"></i></template>
+                          <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
+                            <el-option value="1" label="A" key="1"></el-option>
+                            <el-option value="0" label="B" key="0"></el-option>
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">
+                          <el-select v-model="sarStandardsInfoEO.country" disabled >
+                            <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">
+                          <el-input
+                            type="text"
+                            v-model="sarStandardsInfoEO.synopsis"
+                            placeholder="请输入"
+                            clearable
+                          ></el-input>
+                        </el-form-item>-->
             <!--      动态数据-->
             <template v-for="(displayLocation, index) in dynamicFormField">
               <el-col :span="24" :key="index">
@@ -916,7 +922,6 @@
                 <template v-for="field in displayLocation.child">
                   <template v-if="field.attrType === 'FILE' && field.attrField === 'FBGBJBD'">
                     <custom-file
-                        :key="field.attrField"
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="formdisableflag"
@@ -992,22 +997,22 @@
                     <el-option value="2" label="否" key="2"></el-option>
                   </el-select>
                 </el-form-item>
-                <!--                <el-form-item-->
-                <!--                        prop="standSystem"-->
-                <!--                        label-width="150px"-->
-                <!--                        class="add-form-item"-->
-                <!--                >-->
-                <!--                  <template slot="label">标准体系</template>-->
-                <!--                  <tree-select-->
-                <!--                          :data="standSystemOptions"-->
-                <!--                          :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
-                <!--                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
-                <!--                </el-form-item>-->
+<!--                                <el-form-item
+                                        prop="standSystem"
+                                        label-width="150px"
+                                        class="add-form-item"
+                                >
+                                  <template slot="label">标准体系</template>
+                                  <tree-select
+                                          :data="standSystemOptions"
+                                          :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+                                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                                </el-form-item>-->
               </template>
               <template v-for="field in displayLocation.child">
                 <template v-if="field.attrField === 'EOPSSRQ'">
                   <custom-eop-date-pick
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1015,7 +1020,7 @@
                 </template>
                 <template v-else-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1024,7 +1029,7 @@
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
                   <custom-date-pick-group
                     v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1032,7 +1037,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1042,7 +1047,7 @@
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
                     <custom-input-for-standards
-                      :key="field.attrField"
+
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -1108,7 +1113,6 @@
                   </template>
                   <template v-else>
                     <custom-input
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -1118,7 +1122,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'INPUT_NUM'">
                   <custom-input-num
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1126,7 +1130,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
@@ -1136,7 +1140,7 @@
 <!--                发布稿的组件 -->
                 <template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD'">
                   <custom-file
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1145,7 +1149,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
                   <custom-textarea
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1153,7 +1157,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <custom-select
-                    :key="field.attrField"
+
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -1168,7 +1172,7 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                        :key="field.attrField"
+
                         :config="field"
                         clearable
                         v-model="sarStandardsInfoEO['ZRBM']"
@@ -1186,19 +1190,18 @@
                       <template slot="label">责任工程师</template>
                       <el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
                       </el-input>
-<!--                      <el-input-->
-<!--                        :key="field.attrField"-->
-<!--                        :config="field"-->
-<!--                        clearable-->
-<!--                        v-model="sarStandardsInfoEO['ZRGCS']"-->
-<!--                        :disabled="formdisableflag" placeholder="选择责任工程师"-->
-<!--                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
-<!--                      </el-input>-->
+<!--                      <el-input
+                        :key="field.attrField"
+                        :config="field"
+                        clearable
+                        v-model="sarStandardsInfoEO['ZRGCS']"
+                        :disabled="formdisableflag" placeholder="选择责任工程师"
+                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
+                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else>
                     <custom-select-array
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -1856,17 +1859,19 @@ export default {
         CYSD: '', //我司参与深度
         GKDW: '', //归口管理部门
         SSRQ: '',//实施日期
-        XCXSSRQ: ''//新车型实施日期
-        , ZCCSSRQ: ''//在产车实施日期
-        , QCDW: ''//起草单位
-        , NYLX: ''//能源类型
-        , SYRZ: ''//适用认证
-        , ZRGCS: ''//责任工程师
-        , CBBH: ''//采标编号
-        , CBCD: ''//采标程度
-        , YYBJ: ''//引用标准
-        , BYYBJ: ''//被引用标准
-        , TXLB: ''//体系类别
+        XCXSSRQ: '',//新车型实施日期
+        ZCCSSRQ: '',//在产车实施日期
+        QCDW: '',//起草单位
+        NYLX: '',//能源类型
+        SYRZ: '',//适用认证
+        ZRGCS: '',//责任工程师
+        CBBH: '',//采标编号
+        CBCD: '',//采标程度
+        YYBJ: '',//引用标准
+        BYYBJ: '',//被引用标准
+        TXLB: '',//体系类别
+        DYMC: '', //模块结构单元名称
+        DYBXH: '',// 模块结构单元变形号
       },
 
       // 分页查询过程中用到的对象
@@ -5099,6 +5104,8 @@ export default {
       this.nylxOptions.options = res.data.NYLXCLASS;//能源类型
       this.syrzOptions.options = res.data.SYRZCLASS;//适用认证
       this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
+      // 模块结构单元变型号
+      this.dybxhOptions.options = res.data.DYBXH
 
       this.getGzzOption()
       this.setMap(this.standStateOptions)

src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue

@@ -122,12 +122,7 @@ export default {
   },
   watch: {
     value (val) {
-      if(val !== '' && val !== null) {
-        this.tagList = []
-      } else {
-        this.tagList = val.split(',')
-      }
-      // this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList = val !== '' && val !== null ? val.split(',') : []
     },
     tagList: {
       handler (val) {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -132,11 +132,6 @@
             label="责任部门"
             width="180px"
           >
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">
-                {{ zrbmMap[scope.row.zrbm] }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -507,7 +502,6 @@ export default {
       standList1: [],//调取添加的数据
       id: '',//批量删除.
       saveExportType: '',// 导出文件模态框控制，和文件名称
-      zrbmMap: {},
       textStatusMap: {} // 文本状态id与name对应
     }
   },
@@ -975,7 +969,6 @@ export default {
       }, res => {
         this.energyKindOptions = res.data.ENERGYTYPES //适用车型
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-        this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
         this.showLocalProductData(this.getLocalPro)
       }, e => {

src/router/index.js

@@ -2513,6 +2513,16 @@ const routes = [
           title: '未符合项整改流程'
         }
       },
+      {
+        path: '/phoneCywbbzzxdStep2',
+        name: 'phoneCywbbzzxdStep2',
+        component: () => import('@/pages/processCenter/pages/phone/cywbbzzxd/step2.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
       {
         path: '/phoneCywbbzzxdStep4',
         name: 'phoneCywbbzzxdStep4',
@@ -2583,6 +2593,16 @@ const routes = [
           title: '企标制修订计划管控流程'
         }
       },
+      {
+        path: '/phoneQbfsStep2',
+        name: 'phoneQbfsStep2',
+        component: () => import('@/pages/processCenter/pages/phone/qbfs/step2.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
       {
         path: '/phoneQbfsStep4',
         name: 'phoneQbfsStep4',