From ad906769e6ec21eae0f26d6701d40c12eb12f4e4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 5 Jan 2022 17:53:53 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../qbrk-product/common/formEditList.vue      |  14 +-
 .../pages/creatProcess/qbrk-product/step1.vue |  28 +-
 .../pages/creatProcess/qbrk-product/step6.vue |  54 ++-
 .../creatProcess/qbrk-product/stepC3.vue      | 336 ++++++++++--------
 .../creatProcess/qbrk-product/stepC6.vue      |  74 +++-
 .../creatProcess/qbrk/common/formEditList.vue |  89 +++--
 .../creatProcess/qbrk/common/formList.vue     |  41 ++-
 .../creatProcess/qbrk/common/formListIn.vue   |  39 +-
 .../pages/creatProcess/qbrk/step1.vue         | 165 +++++++--
 .../pages/creatProcess/qbrk/step10.vue        |   4 +
 .../pages/creatProcess/qbrk/step11.vue        |   4 +
 .../pages/creatProcess/qbrk/step12.vue        |  45 ++-
 .../pages/creatProcess/qbrk/step2.vue         |   4 +
 .../pages/creatProcess/qbrk/step3.vue         |  17 +
 .../pages/creatProcess/qbrk/step4.vue         |   4 +
 .../pages/creatProcess/qbrk/step5.vue         |   4 +
 .../pages/creatProcess/qbrk/step6.vue         |  17 +
 .../pages/creatProcess/qbrk/step7.vue         |   4 +
 .../pages/creatProcess/qbrk/step8.vue         |   4 +
 .../pages/creatProcess/qbrk/step9.vue         |   4 +
 .../pages/creatProcess/qbrk/stepC3.vue        |  13 +
 .../pages/creatProcess/qbrk/stepC6.vue        |  13 +
 .../pages/creatProcess/qbrk/stepDetail.vue    |   4 +
 23 files changed, 696 insertions(+), 285 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
index 40b526665..2f846802e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
@@ -40,13 +40,6 @@
           <!--                                              placeholder="请输入标准年份"-->
           <!--                                              clearable></el-input>-->
           <!--                                </el-form-item>-->
-          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.putTime"
-                           :editable="false"
-                           placeholder="请选择企标实施日期"
-                           value-format="yyyy-MM-dd"
-            ></el-datePicker>
-          </el-form-item>
           <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
           <!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
           <!--                                                   :editable="false"-->
@@ -82,6 +75,13 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime"
+                           :editable="false"
+                           placeholder="请选择企标实施日期"
+                           value-format="yyyy-MM-dd"
+            ></el-datePicker>
+          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime"-->
           <!--                         :editable="false"-->
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 11262c1ae..6ba7e71be 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -1022,7 +1022,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -2651,9 +2651,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
-                                    _this: this
-                                }, res => {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
+                                    id: this.$route.query.bpnId || '',
+                                    createUser: this.$store.getters.userInfo.userId,
+                                    createUserName: this.$store.getters.userInfo.userName,
+                                    type: 'buss2',
+                                    json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText: this.commentText
+                                    })
+                                }, {}, res => {
                                     if (res.ok) {
                                         this.$http.post('lawss/activiti/completeTask', {
                                             taskIds: res.data,
@@ -2665,12 +2673,24 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 this.isSubmit = false
+                                                if (this.$route.query.bpnId !== '') {
+                                                    let taskId = {
+                                                        id: this.$route.query.bpnId
+                                                    }
+                                                    taskDel(taskId).then(res=>{
+                                                        return res
+                                                    })
+                                                }
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             }
                                         })
                                     }
                                 })
+                                // this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
+                                //     _this: this
+                                // }, res => {
+                                // })
                             }else {
                                 this.$message.warning('请检查人员信息表单是否填写完整')
                             }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 0cb23fd01..b2ca168f1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -68,24 +68,48 @@
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="70%"
+                                    min-width="35%"
                                     align="center">
                             </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见文件"
+                                    min-width="35%"
+                                    align="left">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                                            <!-- {{ value.name }} -->
+                                            {{value.name | ellipsis}}
+                                        </div>
+                                        <div v-else>
+                                            - -
+                                        </div>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="意见是否采纳"
+                                    min-width="15%"
+                                    align="center">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                            <el-option
+                                                    v-for="item in opinionsAdoptedOptions"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                            ></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
                         </el-table>
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsAdoptedOptions"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
                     </div>
                 </template>
                 <div>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index f1d38f49d..8b9b3e2bb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -6,7 +6,7 @@
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -19,44 +19,44 @@
         >
             <div style="flex: auto;" v-show="active === '1'">
                 <formEditList
-                    :key = "formKey"
-                    :formSub = "form"
-                    :FBGBUSSFileListSub = "FBGBUSSFileList"
-                    :LSBBBUSSFileListSub = "LSBBBUSSFileList"
-                    :BZSMBUSSFileListSub = "BZSMBUSSFileList"
-                    :QTWJBUSSFileListSub = "QTWJBUSSFileList"
-                    :GLWJBUSSFileListSub = "GLWJBUSSFileList"
-                    :disabledState = "disabledState"
-                    :verifySarStandard = "verifySarStandard"
-                    :fileMadelSub = "fileMadel"
-                    :fbgDown = "false"
-                    @formCancel="formCancel"
-                    @formSelectLawsCancel = "formSelectLawsCancel"
-                    @formChoiceZRRListCancel = "formChoiceZRRListCancel"
-                    @formChoiceQCDW = "formChoiceQCDW"
-            />
+                        :key = "formKey"
+                        :formSub = "form"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :fileMadelSub = "fileMadel"
+                        :fbgDown = "false"
+                        @formCancel="formCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceQCDW = "formChoiceQCDW"
+                />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
                 </ProcessTitle>
                 <template>
-                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                    <div class="prc-content-border" style="height: auto;position: relative;">
                         <el-table
                                 ref="selection"
                                 tooltip-effect="dark"
-                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
                                 :data="form.fileModelList"
                                 border
                                 default-expand-all>
-<!--                            <el-table-column-->
-<!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    {{scope.$index + 1}}-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
+                            <!--                            <el-table-column-->
+                            <!--                                    label="序号"-->
+                            <!--                                    min-width="15%"-->
+                            <!--                                    align="center">-->
+                            <!--                                <template slot-scope="scope">-->
+                            <!--                                    {{scope.$index + 1}}-->
+                            <!--                                </template>-->
+                            <!--                            </el-table-column>-->
                             <el-table-column
                                     prop="footFileName"
                                     label="编写文件名称"
@@ -91,6 +91,14 @@
                                         ref="formTongGuo"
                                         :model="formTongGuo"
                                         :rules="rules">
+                                    <!--                    <el-form-item-->
+                                    <!--                        prop="approvalOpinion"-->
+                                    <!--                    >-->
+                                    <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+                                    <!--                        <el-option label="驳回" value="1"></el-option>-->
+                                    <!--                        <el-option label="通过" value="0"></el-option>-->
+                                    <!--                      </el-select>-->
+                                    <!--                    </el-form-item>-->
                                     <el-form-item
                                             prop="commentText"
                                     >
@@ -108,85 +116,85 @@
                     </el-collapse>
                 </div>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
-<!--                <ProcessTitle>-->
-<!--                    <template slot="title">模块信息</template>-->
-<!--                </ProcessTitle>-->
-<!--                <template>-->
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-<!--                        <div class="action-bar">-->
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
-<!--                            </el-button>-->
-<!--                            <el-button-->
-<!--                                    type="primary"-->
-<!--                                    size="mini"-->
-<!--                                    class="common-button-primary add-button"-->
-<!--                                    @click="createRow"-->
-<!--                            >创建模块</el-button>-->
-<!--                        </div>-->
-<!--                        <el-table-->
-<!--                                ref="selection"-->
-<!--                                tooltip-effect="dark"-->
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
-<!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
-<!--                                @selection-change="handleSelectionChange"-->
-<!--                                row-key="id"-->
-<!--                                :data="form.modelData"-->
-<!--                                border-->
-<!--                                default-expand-all-->
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column-->
-<!--                                    prop="modelNum"-->
-<!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center"-->
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="名称"-->
-<!--                                    align="center"-->
-<!--                                    min-width="30%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="责任人"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <div @click.stop style="display: inline-block">-->
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
-<!--                                            <el-dropdown-menu slot="dropdown">-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
-<!--                                            </el-dropdown-menu>-->
-<!--                                        </el-dropdown>-->
-<!--                                    </div>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                        </el-table>-->
-<!--                    </div>-->
-<!--                </template>-->
-<!--            </div>-->
+            <!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <!--                <ProcessTitle>-->
+            <!--                    <template slot="title">模块信息</template>-->
+            <!--                </ProcessTitle>-->
+            <!--                <template>-->
+            <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+            <!--                        <div class="action-bar">-->
+            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+            <!--                                批量编辑-->
+            <!--                            </el-button>-->
+            <!--                            <el-button-->
+            <!--                                    type="primary"-->
+            <!--                                    size="mini"-->
+            <!--                                    class="common-button-primary add-button"-->
+            <!--                                    @click="createRow"-->
+            <!--                            >创建模块</el-button>-->
+            <!--                        </div>-->
+            <!--                        <el-table-->
+            <!--                                ref="selection"-->
+            <!--                                tooltip-effect="dark"-->
+            <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+            <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+            <!--                                        fontWeight: 'bold', height: '48px'}"-->
+            <!--                                @selection-change="handleSelectionChange"-->
+            <!--                                row-key="id"-->
+            <!--                                :data="form.modelData"-->
+            <!--                                border-->
+            <!--                                default-expand-all-->
+            <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+            <!--                            <el-table-column-->
+            <!--                                    prop="modelNum"-->
+            <!--                                    label="序号"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center"-->
+            <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="名称"-->
+            <!--                                    align="center"-->
+            <!--                                    min-width="30%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="责任人"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <div @click.stop style="display: inline-block">-->
+            <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                                            <i class="iconfont">&#xe61e;</i>-->
+            <!--                                            <el-dropdown-menu slot="dropdown">-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+            <!--                                            </el-dropdown-menu>-->
+            <!--                                        </el-dropdown>-->
+            <!--                                    </div>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                        </el-table>-->
+            <!--                    </div>-->
+            <!--                </template>-->
+            <!--            </div>-->
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
@@ -1642,8 +1650,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
-                this.nodeList.push(id)
+                this.nodeList2 = []
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true
@@ -1979,7 +1999,7 @@
                     const fileObj = {}
                     fileObj.id = file.response.data.id
                     fileObj.name = file.response.data.name
-                switch (this.fileType){
+                    switch (this.fileType){
                         case 'FBGBUSS':
                             this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
                             this.FBGBUSSFileList.push(fileObj)
@@ -2339,55 +2359,55 @@
                 // }
                 this.fileInfoHandle()
                 this.$refs['form'].validate((valid) => {
-                        if (valid) {
-                            this.$refs['formTongGuo'].validate((valid) => {
-                                if (valid) {
-                                    this.isSubmit = true
-                                    this.saveLoading = true
-                                    this.form.commentText = this.formTongGuo.commentText
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                    const json = JSON.stringify(this.form);
-                                    this.$http.post('lawss/activiti/completeTask', {
-                                        taskIds: this.taskIds,
-                                        userId : this.userId,
-                                        json: json
-                                    }, {
-                                        _this: this
-                                    }, res => {
-                                        if (res.success) {
-                                            this.$message.success(res.message)
-                                            // 流程提交之后，应该流转至待办任务页面
-                                            this.isSubmit = false
-                                            this.saveLoading = false
-                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            // if(this.formTongGuo.approvalOpinion === '1'){
-                                            //     this.$message.warning("驳回成功")
-                                            //     this.isSubmit = false
-                                            //     // 流程提交之后，应该流转至待办任务页面
-                                            //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            // }else{
-                                            //     this.processCreateLaws(json)
-                                            // }
-                                        }else {
-                                            this.$message.success(res.message)
-                                        }
-                                    })
-                                    // this.processModelHisOneCount(this.pId)
-                                    //     .then(res => {
-                                    //         if(res){
-                                    //             const editFileInfo = res
-                                    //             if(editFileInfo && editFileInfo.editStatus === '1'){
-                                    //             }else {
-                                    //                 this.$message.warning('请先在线编辑,再提交流程')
-                                    //             }
-                                    //
-                                    //         }
-                                    //     }).catch(e => {
-                                    //     console.log(e)
-                                    //     // this.$message.warning('文件不存在,预览失败')
-                                    // })
-                                }})
-                        }
+                    if (valid) {
+                        this.$refs['formTongGuo'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.saveLoading = true
+                                this.form.commentText = this.formTongGuo.commentText
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                const json = JSON.stringify(this.form);
+                                this.$http.post('lawss/activiti/completeTask', {
+                                    taskIds: this.taskIds,
+                                    userId : this.userId,
+                                    json: json
+                                }, {
+                                    _this: this
+                                }, res => {
+                                    if (res.success) {
+                                        this.$message.success(res.message)
+                                        // 流程提交之后，应该流转至待办任务页面
+                                        this.isSubmit = false
+                                        this.saveLoading = false
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
+                                        //     this.$message.warning("驳回成功")
+                                        //     this.isSubmit = false
+                                        //     // 流程提交之后，应该流转至待办任务页面
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // }else{
+                                        //     this.processCreateLaws(json)
+                                        // }
+                                    }else {
+                                        this.$message.success(res.message)
+                                    }
+                                })
+                                // this.processModelHisOneCount(this.pId)
+                                //     .then(res => {
+                                //         if(res){
+                                //             const editFileInfo = res
+                                //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                                //             }else {
+                                //                 this.$message.warning('请先在线编辑,再提交流程')
+                                //             }
+                                //
+                                //         }
+                                //     }).catch(e => {
+                                //     console.log(e)
+                                //     // this.$message.warning('文件不存在,预览失败')
+                                // })
+                            }})
+                    }
                 })
             },
             busVsFunc(){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index f3c896278..6a16ef192 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -39,11 +39,11 @@
                     <template slot="title">意见信息</template>
                 </ProcessTitle>
                 <template>
-                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                    <div class="prc-content-border" style="height: auto;position: relative;">
                         <el-table
                                 ref="selection"
                                 tooltip-effect="dark"
-                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
                                 @selection-change="handleSelectionChange"
@@ -68,24 +68,48 @@
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="70%"
+                                    min-width="35%"
                                     align="center">
                             </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见文件"
+                                    min-width="35%"
+                                    align="left">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                                            <!-- {{ value.name }} -->
+                                            {{value.name | ellipsis}}
+                                        </div>
+                                        <div v-else>
+                                            - -
+                                        </div>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="意见是否采纳"
+                                    min-width="15%"
+                                    align="center">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                            <el-option
+                                                    v-for="item in opinionsAdoptedOptions"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                            ></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
                         </el-table>
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsAdoptedOptions"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
                     </div>
                 </template>
                 <div>
@@ -1655,8 +1679,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
-                this.nodeList.push(id)
+                this.nodeList2 = []
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 27d379679..b749585a1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -330,33 +330,33 @@
                   @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
           >{{'手动查找'}}</el-button>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
           <el-input
-                  disabled
-                  style="display: none;"
-                  v-model="form.GLWJBUSSName"
+                  v-model="form.CYBZ"
+                  placeholder="请输入采用标准"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
-            <div style="width: 80%;">
-              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-                  <span style="width: 20%;margin-left: 15px;">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-                  </span>
-              </div>
-            </div>
-            <div style="width: 20%;">
-              <el-button
-                      type="primary"
-                      class="common-button-primary"
-                      size="mini"
-                      style="margin-left: 10px; margin-top: 11px; float: right;"
-                      @click="fileUpload('GLWJBUSS')">
-                <i class="el-icon-upload"></i>
-              </el-button>
-            </div>
-          </div>
+          <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  size="mini"
+                  style="position:absolute;top: 10px;right: 0;"
+                  @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
+          >{{'手动查找'}}</el-button>
+        </el-form-item>
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.YYBZ"
+                  placeholder="请输入引用标准"
+                  clearable
+          ></el-input>
+          <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  size="mini"
+                  style="position:absolute;top: 10px;right: 0;"
+                  @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+          >{{'手动查找'}}</el-button>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -382,6 +382,46 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select v-model="form.CBCD" filterable clearable
+                     placeholder="请先选择采标程度"
+          >
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.GLWJBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
+            </div>
+            <div style="width: 20%;">
+              <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="margin-left: 10px; margin-top: 11px; float: right;"
+                      @click="fileUpload('GLWJBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -680,6 +720,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 15358263a..1a31c7f96 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -174,7 +174,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
+          <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
         </el-form-item>
         <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
@@ -220,14 +220,17 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-            <!-- {{ value.name }} -->
-            {{value.name}}
-          </div>
-          <div v-else>
-            - -
-          </div>
+        <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.CYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.YYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -244,6 +247,25 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -498,6 +520,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
index 9d1c608b3..15bf0e45e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
@@ -226,14 +226,17 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-            <!-- {{ value.name }} -->
-            {{value.name}}
-          </div>
-          <div v-else>
-            - -
-          </div>
+        <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.CYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.YYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -250,6 +253,25 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -504,6 +526,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 8228ca254..5c138559b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -281,6 +281,7 @@
                                     <el-input
                                         v-model="form.QCRBUSS"
                                         placeholder="选择起草人"
+                                        :title="form.QCRBUSS"
                                         readonly="readonly"
                                         @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
                                     </el-input>
@@ -339,28 +340,33 @@
                                             @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
                                     >{{'手动查找'}}</el-button>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+                                <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
                                     <el-input
-                                            disabled
-                                            style="display: none;"
-                                            v-model="form.GLWJBUSSName"
+                                            v-model="form.CYBZ"
+                                            placeholder="请输入采用标准"
                                             clearable
                                     ></el-input>
-                                    <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
-                                            <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                        </div>
-                                        <div style="width: 20%;">
-                                            <el-button
-                                                    type="primary"
-                                                    class="common-button-primary"
-                                                    size="mini"
-                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
-                                                    @click="fileUpload('GLWJBUSS')">
-                                                <i class="el-icon-upload"></i>
-                                            </el-button>
-                                        </div>
-                                    </div>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
+                                    >{{'手动查找'}}</el-button>
+                                </el-form-item>
+                                <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.YYBZ"
+                                            placeholder="请输入引用标准"
+                                            clearable
+                                    ></el-input>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+                                    >{{'手动查找'}}</el-button>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -386,6 +392,41 @@
                                             :disabled="true"
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.CBCD" filterable clearable
+                                               placeholder="请先选择采标程度"
+                                    >
+                                        <el-option
+                                                v-for="item in cbcdOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.GLWJBUSSName"
+                                            clearable
+                                    ></el-input>
+                                    <div style="display: flex;justify-content: space-between">
+                                        <div style="width: 80%;">
+                                            <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        </div>
+                                        <div style="width: 20%;">
+                                            <el-button
+                                                    type="primary"
+                                                    class="common-button-primary"
+                                                    size="mini"
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                    @click="fileUpload('GLWJBUSS')">
+                                                <i class="el-icon-upload"></i>
+                                            </el-button>
+                                        </div>
+                                    </div>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -1038,7 +1079,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1055,6 +1096,15 @@
             TreeSelectNew,
             treeSelectModule
         },
+        filters: {
+            ellipsis (value) {
+                if (!value) return ''
+                if (value.length > 35) {
+                    return value.slice(0,35) + '...'
+                }
+                return value
+            }
+        },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
                 if(this.FBGBUSSFileList.length === 0){
@@ -1321,6 +1371,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1425,6 +1479,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1806,6 +1863,16 @@
                     XCSJBUSS: '',
                 } // 标准信息
             },
+            filterDate(data){
+                if(data === undefined || data === null || data === '' || data === 'null'){
+                    return ""
+                }else if (data.toString().indexOf(",") !== -1){
+                    data = data.toString().split(",")
+                }else {
+                    data = data.toString()
+                }
+                return data
+            },
             handleProcessStandardNext(status) {
                 switch (status) {
                     // 新增
@@ -1824,6 +1891,18 @@
                             this.form.planId = this.standardCheckedList[0].id
                             this.form.planStatus = this.standardCheckedList[0].planStatus
                             this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
+                            // 代替企标编号
+                            this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
+                            // 标准编号
+                            this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
+                            // 适用车型
+                            this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
+                            // 采标程度
+                            this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
+                            // 采用标准
+                            this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
+                            // 引用标准
+                            this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
                             this.standardDrawer = false
                             this.verifySarStandard = true
                             this.planDisabled = false
@@ -2220,10 +2299,10 @@
               // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'yybj'){
-                    this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'cbbh'){
-                    this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'CYBZ'){
+                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'YYBZ'){
+                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -2440,6 +2519,17 @@
                 this.form.QCDW = nameList
                 this.form.QCDWID = idList
 
+                if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                    this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                        _this: this,
+                    }, res=> {
+                        if(res){
+                            this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                            this.form.QCRBUSS = res.map(item => item.name).join(",")
+                        }
+                    })
+                }
+
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2698,9 +2788,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
-                                    _this: this
-                                }, res => {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
+                                    id: this.$route.query.bpnId || '',
+                                    createUser: this.$store.getters.userInfo.userId,
+                                    createUserName: this.$store.getters.userInfo.userName,
+                                    type: 'buss1',
+                                    json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText: this.commentText
+                                    })
+                                }, {}, res => {
                                     if (res.ok) {
                                         this.$http.post('lawss/activiti/completeTask', {
                                             taskIds: res.data,
@@ -2721,6 +2819,14 @@
                                                         if (res.data === '操作成功') {
                                                             this.submitLoading = false
                                                             this.isSubmit = false
+                                                            if (this.$route.query.bpnId !== '') {
+                                                                let taskId = {
+                                                                    id: this.$route.query.bpnId
+                                                                }
+                                                                taskDel(taskId).then(res=>{
+                                                                    return res
+                                                                })
+                                                            }
                                                             // 流程提交之后，应该流转至待办任务页面
                                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
                                                         }
@@ -2732,6 +2838,10 @@
                                         })
                                     }
                                 })
+                                // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
+                                //     _this: this
+                                // }, res => {
+                                // })
                             }else {
                                 this.$message.warning('请检查人员信息表单是否填写完整')
                             }
@@ -2797,6 +2907,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+                this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
                 this.setMap(this.standStateOptions)
             })
             this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index 718eec59d..8928c6900 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -853,6 +853,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index 69ac656cd..f1e508fcb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -852,6 +852,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 00571932a..704e7ff5e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -843,6 +843,10 @@
                     commentText:'',
                     prcName:'',
                     standType: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -2324,21 +2328,34 @@
                     })
                 }
             },
-
+            regDate(data){
+                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                    data = data + ' X'
+                }
+                return data
+            },
             getStandInfoByReviseStatus() {
-                this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, {
-                    _this: this
-                }, res => {
-                    const obj = res.data
-                    let standSn = (obj === null ||  obj.newStandSn === null) ? '001' : obj.newStandSn
-                    let date = new Date();
-                    let year = date.getFullYear();
-                    this.form.standSn = standSn
-                    this.form.standNumber = standSn
-                    this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准
-                    this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                }, e => {
-                })
+                let date = new Date();
+                let year = date.getFullYear();
+                if(this.form.reviseStatus === '2'){
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                }else {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
+                        _this: this
+                    }, res => {
+                        const obj = res.data
+                        let standSn = (obj === null ||  obj.newStandSn === null) ? '2280' : obj.newStandSn
+                        this.form.standSn = standSn
+                        this.form.standNumber = standSn
+                        this.form.standYear = year // 待带入立项标准
+                        this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                    }, e => {
+                    })
+                }
+
             },
             processTable () {
                 this.$nextTick(() => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 42d6217c9..031419dc9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -843,6 +843,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 9212dcda4..4c75ec4ce 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -909,6 +909,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1012,6 +1016,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1122,6 +1129,16 @@
                 })
                 this.form.QCDW = nameList
                 this.form.QCDWID = idList
+                if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                    this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                        _this: this,
+                    }, res=> {
+                        if(res){
+                            this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                            this.form.QCRBUSS = res.map(item => item.name).join(",")
+                        }
+                    })
+                }
                 this.formKey++
             },
             choiceQCDW(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index c2b374540..26d57c30a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -848,6 +848,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 6a017fa49..f1dfacc37 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -985,6 +985,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 276929263..d43660e1d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -983,6 +983,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1089,6 +1093,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1203,6 +1210,16 @@
                 })
                 this.form.QCDW = nameList
                 this.form.QCDWID = idList
+                if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                    this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                        _this: this,
+                    }, res=> {
+                        if(res){
+                            this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                            this.form.QCRBUSS = res.map(item => item.name).join(",")
+                        }
+                    })
+                }
                 this.formKey++
             },
             choiceQCDW(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index 36d2ec9f6..fa1eb901a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -971,6 +971,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index c5b961b73..f4bfd3ed6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -973,6 +973,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 24ecc51bc..12a584fbe 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -973,6 +973,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 84475bed7..cb10184d5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -1012,6 +1012,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1122,6 +1125,16 @@
                 })
                 this.form.QCDW = nameList
                 this.form.QCDWID = idList
+                if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                    this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                        _this: this,
+                    }, res=> {
+                        if(res){
+                            this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                            this.form.QCRBUSS = res.map(item => item.name).join(",")
+                        }
+                    })
+                }
                 this.formKey++
             },
             choiceQCDW(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 276d6dc4e..6861e4649 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -1089,6 +1089,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1203,6 +1206,16 @@
                 })
                 this.form.QCDW = nameList
                 this.form.QCDWID = idList
+                if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                    this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                        _this: this,
+                    }, res=> {
+                        if(res){
+                            this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                            this.form.QCRBUSS = res.map(item => item.name).join(",")
+                        }
+                    })
+                }
                 this.formKey++
             },
             choiceQCDW(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
index bee0f4cf8..b4f1c6de6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -834,6 +834,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,