Merge branch 'develop' into FOTON

src/api/process.js

@@ -480,6 +480,30 @@ export function evaluationHisList (data) {
   })
 }
 
+export function evaluationHisListByOne (data) {
+  return axios({
+    url: '/api/lawss/activiti/evaluationHisListByOne',
+    method: 'get',
+    params: data
+  })
+}
+
+export function evaluationHisListRepSum (data) {
+  return axios({
+    url: '/api/lawss/activiti/evaluationHisListRepSum',
+    method: 'get',
+    params: data
+  })
+}
+
+export function evaluationHisListRep (data) {
+  return axios({
+    url: '/api/lawss/activiti/evaluationHisListRep',
+    method: 'get',
+    params: data
+  })
+}
+
 export function execTask (data) {
   return axios({
     url: '/api/lawss/activiti/execTask',

src/main.js

@@ -200,7 +200,7 @@ router.beforeEach(function (to, from, next) {
                     if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
                         extracted("xmpgStep1-2");
                     } else {
-                        extracted("xmpgStep1-7");
+                        extracted("bzpgStep8-1");
                     }
                 } else if (prcType === '6') {
                     //标准项目合规评估 项目维度

src/pages/home2/components/todoList/index.vue

@@ -120,6 +120,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){
+            this.$router.push({
+              name: 'bussLibraryC1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }else if (row.taskInfo === '标准化员初审'){
             this.$router.push({
               name: 'bussLibrary4',
@@ -186,7 +197,18 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '审核'){
+          }else if (row.taskInfo === '起草单位高级经理审核'){
+            this.$router.push({
+              name: 'bussLibrary8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '标准法规部高级经理审核'){
             this.$router.push({
               name: 'bussLibrary9',
               query: {

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

@@ -64,6 +64,7 @@
               icon="el-icon-s-promotion"
               @click="handleTransfer"
               :loading="submitLoading"
+              :disabled="disabledStatus"
               v-if="showTransfer"
       >转办</el-button>
       <el-button
@@ -72,9 +73,31 @@
               class="common-button-primary"
               icon="el-icon-check"
               @click="handleSubmit2"
+              :disabled="disabledStatus"
               :loading="submitLoading"
               v-if="showSubmit2"
       >通过</el-button>
+      <el-popover
+              v-if="showOver3"
+              class="common-button-danger"
+              style="margin-left: 10px;margin-right: 10px;"
+              placement="top"
+              width="250">
+        <p>选择驳回类型 质量问题、其他问题</p>
+        <div style="text-align: right; margin-top: 25px">
+          <el-button type="primary" size="mini" :loading="submitLoading" @click="handleOver3">其他问题</el-button>
+          <el-button type="primary" size="mini" :loading="submitLoading" @click="handleOver4">质量问题</el-button>
+        </div>
+        <el-button
+                type="danger"
+                size="small"
+                class="common-button-danger"
+                icon="el-icon-close"
+                slot="reference"
+                :loading="submitLoading"
+                v-if="showOver3"
+        >驳回</el-button>
+      </el-popover>
       <el-button
               type="danger"
               size="small"
@@ -89,6 +112,7 @@
         size="mini"
         class="common-button-primary"
         @click="handleSave"
+        :disabled="disabledStatus"
         :loading="saveLoading"
         v-if="showSave">
         <i class="iconfont">&#xe608;</i>
@@ -108,6 +132,7 @@
         size="small"
         class="common-button-primary"
         icon="el-icon-check"
+        :disabled="disabledStatus"
         @click="handleSubmit"
         :loading="submitLoading"
         v-if="showSubmit"
@@ -188,6 +213,14 @@ export default {
       type: Boolean,
       default: false
     },
+    showOver3: {
+      type: Boolean,
+      default: false
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
     // 是否显示保存按钮
     showSave: {
       type: Boolean,
@@ -248,6 +281,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 按钮disabled 是否可用
+    disabledStatus: {
+      type: Boolean,
+      default: false
+    },
     //转办按钮loading
     transferLoading: {
       type: Boolean,
@@ -329,6 +367,12 @@ export default {
     handleOver2() {
       this.$emit('over2')
     },
+    handleOver3() {
+      this.$emit('over3')
+    },
+    handleOver4() {
+      this.$emit('over4')
+    },
     handleSave() {
       this.$emit('save')
     },

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

@@ -86,7 +86,7 @@
           </el-button>
         </div>
       </div>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -97,7 +97,7 @@
       </el-tabs>
         <el-table
           ref="multipleTable"
-          :data="dataList"
+          :data="dataList.filter(item =>{return item.projectName === projectName})"
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
           height="100%"
           border
@@ -318,7 +318,8 @@ export default {
   data(){
     return {
       active: '1',
-      activeName: 'first',
+      projectName: '',
+      activeName: '',
       fileType: '', //条款文件类型
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
@@ -351,13 +352,7 @@ export default {
   },
   methods: {
     handleClick(tab) {
-      let projectData = this.dataList
-      this.dataList = []
-      projectData.forEach(item => {
-        if(item.projectName === tab.name){
-          this.dataList.push(item)
-        }
-      })
+      this.projectName = tab.name
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -377,6 +372,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.fileType = item.fileType
@@ -389,6 +385,7 @@ export default {
             this.projectTabName.push(item.projectName)
           }
         })
+        this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         this.listForm.resDats = []
         this.listForm.breakdownList = []
         this.dataList.distributePerson = item.dataList[0].distributePerson
@@ -533,6 +530,7 @@ export default {
       this.selectProject = data
     },
     choiceZRRS(row, type, index) {
+      localStorage.setItem('selectProject', JSON.stringify(this.selectProject))
       this.type = type;
       if (type === 1) {
         this.nodeList2 = [];
@@ -574,6 +572,7 @@ export default {
         projectList[this.lsIndex].implementer = nameList;
         this.dataList = projectList
       } else if (this.type === 2) {
+        this.selectProject = JSON.parse(localStorage.getItem('selectProject'))
         let projectList = JSON.parse(JSON.stringify(this.dataList))
         projectList.forEach(item => {
           this.selectProject.forEach(items => {
@@ -671,8 +670,8 @@ export default {
       }
     }
   }
-  /deep/.el-tabs__header{
-    margin: 0;
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
   }
   .demo-drawer-content {
     margin-top: 10px;

src/pages/processCenter/pages/creatProcess/bzpg/step7.vue

@@ -135,7 +135,7 @@
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -146,7 +146,7 @@
       </el-tabs>
       <el-table
         ref="multipleTable"
-        :data="dataList"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -396,7 +396,7 @@ export default {
   data() {
     return {
       //折叠的标志，true为折叠，false为不折叠
-      activeName: 'first',
+      activeName: '',
       foldFormFlag: false,
       projectTabName: [],
       comFlag: 0,
@@ -460,25 +460,19 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      newDataList: [],
       countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",
       user4: "",
       user5: "",
+      projectName: "",
       standMap: new Map()
     };
   },
   methods: {
     handleClick(tab) {
-      let projectData = this.dataList
-      this.dataList = []
-      projectData.forEach(item => {
-        if(item.projectName === tab.name){
-          this.dataList.push(item)
-        }
-      })
+      this.projectName = tab.name
     },
     //折叠/展开基础信息方法
     foldForm() {
@@ -604,13 +598,13 @@ export default {
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
-          this.newDataList = item.dataList
           this.dataList = item.dataList
           item.dataList.forEach(item => {
             if(!this.projectTabName.includes(item.projectName)){
               this.projectTabName.push(item.projectName)
             }
           })
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
@@ -621,7 +615,7 @@ export default {
 
     //提交事件
     handleSubmit() {
-      this.listForm.dataList = this.newDataList
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
@@ -754,6 +748,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
+  }
   /deep/.el-table th > .cell{
     font-size: 14px;
   }

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -0,0 +1,761 @@
+<!--标准合规评估  标准法规部部长审批-->
+<template>
+  <div class="bzpg-step8">
+    <ProcessHeader toggle>
+      <template slot="proName">标准合规评估流程</template>
+      <template slot="proNode">标准法规部部长审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-collapse-transition>
+          <el-form
+            v-if="foldFormFlag === false"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    class="input-jump"
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    class="input-jump"
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="--"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="--"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-collapse-transition>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+          v-if="foldFormFlag === true"
+          style="display: none"
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  readonly
+                  @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  readonly
+                  @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="请选择认证工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="--"
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="请选择质量工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="--"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="(item, index) in projectTabName"
+          :key="index"
+          :label="item"
+          :value="item"
+          :name="item">
+        </el-tab-pane>
+      </el-tabs>
+      <el-table
+        ref="multipleTable"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        @selection-change="selectStandChange"
+        height="100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectGroup"
+          label="项目群">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectNumber"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          min-width="300"
+          :show-overflow-tooltip="true"
+          align="center"
+          prop="projectName"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="itemsNum"
+          align="center"
+          width="200"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          width="200"
+          align="center"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
+              查看条款内容
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xcxssrq"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zccssrq"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="140"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          prop="implementer"
+          align="center"
+          width="180"
+          label="评估人"
+        />
+      </el-table>
+      <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>
+
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height:100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+<!--    <ProcessFooter-->
+<!--      show-submit-->
+<!--      show-transfer-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :approval="true"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @submit="handleSubmit"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <el-dialog
+      title="查看条款内容"
+      :visible.sync="itermsConditionsFlag"
+      size="800px">
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import Moment from 'moment';
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
+
+export default {
+  name: "bzpgStep8-1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      //折叠的标志，true为折叠，false为不折叠
+      activeName: '',
+      foldFormFlag: false,
+      projectTabName: [],
+      comFlag: 0,
+      nodeList:[],
+      drawerTitle:'',
+      fileType: '',
+      itermsConditionsTitle: '',
+      itermsConditionsFlag: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],//清单里的标准数据
+      active: "1",
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineerName: "", //认证工程师
+        qualityEngineerName: "", //质量工程师
+        dataList: [{
+          projectManager: "",
+          itemsName: "",
+          uname: "",
+          projectNumber: "",
+          implementer: "",
+          implementerId: "",
+          productLine: "",
+          itemNum: "",
+          distributePerson: "",
+          projectName: "",
+          distributePersonId: "",
+          complianceReasons: "", //在研合规原因
+          noCompliance: "", //在研不合规项目
+          countermeasures: "", //在研应对措施
+          completionTime: "", //在研完成时间
+          zcComplianceReasons: "", //在产的合规原因
+          zcNoCompliance: "", //在产不合规项目
+          zcCountermeasures: "", //在产的应对措施
+          zcCompletionTime: "" //在产的完成时间
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      projectName: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    handleClick(tab) {
+      this.projectName = tab.name
+    },
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    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)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    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 => {
+      });
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.$http.get('SarStandItems/sar-stand-items/findItemById',{
+        type:this.fileType,
+        ids: row.id
+      },{
+        _this: this
+      }, res => {
+        this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
+      })
+      this.itermsConditionsFlag = true
+    },
+    //点击查看详情
+    handlePreview(item){
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank")
+    },
+    //将时间戳转换为日期格式
+    getLocalTime(item) {
+      return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
+    },
+
+// 时间戳（毫秒）转化为标准时间格式
+    getFullTime(item) {
+      const stamp = new Date(item);
+      const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
+      return item = time
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        if (item.form === undefined) {
+          this.fileType = item.fileType
+          this.listForm.prcNum = this.prcNum
+          this.listForm.prcName = this.prcName
+          this.listForm['id'] = item.id
+          this.dataList = item.dataList
+          item.dataList.forEach(item => {
+            if(!this.projectTabName.includes(item.projectName)){
+              this.projectTabName.push(item.projectName)
+            }
+          })
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
+        } else {
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
+        }
+
+      });
+    },
+
+    //提交事件
+    handleSubmit() {
+      this.listForm.dataList = this.dataList
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
+      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.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = data;
+      // for (let i = 0; i < data.length; i++) {
+      //   this.selectList.push(data[i].id);
+      // }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzpg-step8 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+    .datePickLen {
+      /deep/ .el-icon-circle-close:before {
+        margin-left: -180px;
+      }
+    }
+    .input-jump {
+      /deep/.el-input__inner{
+        color: #409EFF;
+      }
+    }
+  }
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
+  }
+  /deep/.el-table th > .cell{
+    font-size: 14px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
+}
+</style>

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

@@ -135,7 +135,7 @@
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -146,7 +146,7 @@
       </el-tabs>
       <el-table
         ref="multipleTable"
-        :data="dataList"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -396,7 +396,7 @@ export default {
   data() {
     return {
       //折叠的标志，true为折叠，false为不折叠
-      activeName: 'first',
+      activeName: '',
       foldFormFlag: false,
       projectTabName: [],
       comFlag: 0,
@@ -460,9 +460,9 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      newDataList: [],
       countryOptions: [], //适用区域下拉框数据
       user1: "",
+      projectName: "",
       user2: "",
       user3: "",
       user4: "",
@@ -472,13 +472,7 @@ export default {
   },
   methods: {
     handleClick(tab) {
-      let projectData = this.dataList
-      this.dataList = []
-      projectData.forEach(item => {
-        if(item.projectName === tab.name){
-          this.dataList.push(item)
-        }
-      })
+      this.projectName = tab.name
     },
     //折叠/展开基础信息方法
     foldForm() {
@@ -604,13 +598,13 @@ export default {
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
-          this.newDataList = item.dataList
           this.dataList = item.dataList
           item.dataList.forEach(item => {
             if(!this.projectTabName.includes(item.projectName)){
               this.projectTabName.push(item.projectName)
             }
           })
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
@@ -621,7 +615,7 @@ export default {
 
     //提交事件
     handleSubmit() {
-      this.listForm.dataList = this.newDataList
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
@@ -754,6 +748,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
+  }
   /deep/.el-table th > .cell{
     font-size: 14px;
   }

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -17,11 +17,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
-          <template>
-            <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
-          </template>
-        </el-form-item>
         <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
           <el-input
                   v-model="form.standName"
@@ -29,12 +24,15 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-          <el-input
-                  v-model="form.standEnName"
-                  placeholder="请输入英文名称"
-                  clearable
-          ></el-input>
+        <el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+          <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                         :editable="false"
+          ></el-datePicker>
+        </el-form-item>
+        <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
+          <template>
+            <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+          </template>
         </el-form-item>
         <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
         <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
@@ -86,10 +84,12 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-          <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                         :editable="false"
-          ></el-datePicker>
+        <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standEnName"
+                  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"

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

@@ -592,22 +592,22 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-<!--                            <el-timeline-item timestamp="审核" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">-->
-<!--                                <el-card>-->
-<!--                                    <el-form-item prop="jsfzrUserName" style="margin-bottom: 0">-->
-<!--                                        <h4>起草单位高级经理/标准法规部高级经理</h4>-->
-<!--                                        <div style="margin-top: 10px;width: 300px;">-->
-<!--                                            <el-input v-model="roleForm.jsfzrUserName" readonly="readonly" placeholder="选择起草单位高级经理" @click.native="choiceZRR('jsfzrUserId', '选择起草单位高级经理', roleForm.jsfzrUserId)"></el-input>-->
-<!--                                        </div>-->
-<!--                                    </el-form-item>-->
-<!--                                </el-card>-->
-<!--                            </el-timeline-item>-->
+                            <el-timeline-item timestamp="审核" prop="jsfzrUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
+                                <el-card>
+                                    <el-form-item prop="jsfzrUserName" style="margin-bottom: 0">
+                                        <h4>起草单位高级经理</h4>
+                                        <div style="margin-top: 10px;width: 300px;">
+                                            <el-input v-model="roleForm.jsfzrUserName" readonly="readonly" placeholder="选择起草单位高级经理" @click.native="choiceZRR('jsfzrUserId', '选择起草单位高级经理', roleForm.jsfzrUserId)"></el-input>
+                                        </div>
+                                    </el-form-item>
+                                </el-card>
+                            </el-timeline-item>
                             <el-timeline-item timestamp="审核" prop="bzUserName" placement="top" :color="roleForm.bzUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bzUserName" style="margin-bottom: 0">
-                                        <h4>起草单位高级经理/标准法规部高级经理</h4>
+                                        <h4>标准法规部高级经理</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bzUserName" readonly="readonly" placeholder="选择起草单位高级经理/标准法规部高级经理" @click.native="choiceZRRList('bzUserId', '选择起草单位高级经理/标准法规部高级经理', roleForm.bzUserId)"></el-input>
+                                            <el-input v-model="roleForm.bzUserName" readonly="readonly" placeholder="选择标准法规部高级经理" @click.native="choiceZRR('bzUserId', '选择标准法规部高级经理', roleForm.bzUserId)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -1332,6 +1332,7 @@
               commentCycleDate:'',
               planDisabled:true,
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -1393,6 +1394,8 @@
                     standNum:'',
                 }, // 标准信息
                 roleForm:{
+                    cfqUserId: this.$store.getters.userInfo.userId,
+                    cfqUserName: this.$store.getters.userInfo.userName,
                     hzUserId: this.$store.getters.userInfo.userId,
                     hzUserName: this.$store.getters.userInfo.userName,
                     xdUserId: this.$store.getters.userInfo.userId,
@@ -1451,7 +1454,7 @@
                         { required: true, message: '选择起草单位高级经理', trigger: 'blur' },
                     ],
                     bzUserName: [
-                        { required: true, message: '选择标准法规部高级经理审核', trigger: 'blur' },
+                        { required: true, message: '选择标准法规部高级经理', trigger: 'blur' },
                     ],
                     fzrUserName: [
                         { required: true, message: '选择起草单位中心主任', trigger: 'blur' },

src/pages/processCenter/pages/creatProcess/qbrk/step10.vue

@@ -798,6 +798,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

src/pages/processCenter/pages/creatProcess/qbrk/step11.vue

@@ -798,6 +798,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

src/pages/processCenter/pages/creatProcess/qbrk/step12.vue

@@ -807,6 +807,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -587,7 +587,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -808,6 +808,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -2378,6 +2379,14 @@
                         this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
                             _this: this
                         }, res => {
+                            if (this.$route.query.bpnId !== '') {
+                                let taskId = {
+                                    id: this.$route.query.bpnId
+                                }
+                                taskDel(taskId).then(res=>{
+                                    return res
+                                })
+                            }
                             this.submitLoading = false
                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                         })

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

@@ -5,7 +5,9 @@
         <template slot="proNode">企标编写流程</template>
     </ProcessHeader>
     <div class="headerTabs">
-        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        <div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
+        <div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
+        <div class="headerTabsItem" v-show="form.fsRejectStatus !== 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
 <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
@@ -17,7 +19,130 @@
                 class="label-input-form"
                 label-width="210px"
         >
-            <div style="flex: auto;" v-show="active === '1'">
+            <div id="active1" style="flex: auto;position: relative;" v-show="form.fsRejectStatus === 2 && active === '1'">
+                <template style="width: 10%">
+                    <el-table
+                            :data="historyData"
+                            height="250"
+                            border
+                            :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                            style="width: 10%;float: left;margin-right: 20px;">
+                        <el-table-column
+                                prop="userName"
+                                align="center"
+                                label="质量评价人"
+                                min-width="100%">
+                            <template slot-scope="scope">
+                                <div @click="ccc(scope.row)">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </template>
+                <template style="width: 90%">
+                    <div style="position: absolute;z-index: 2;right: 67px;top: 5px;">
+                        <el-button type="primary" plain>计算质量评价总平均分</el-button>
+                        <span style="font-size: 20px;color: rgb(255, 153, 0);position: relative;top: 3px;margin-left: 15px;">
+                            {{calScope()}}  {{form.fsRejectStatus === 2 ? '质量问题' : ''}}
+                        </span>
+                    </div>
+                    <el-table
+                            :data="form.evaluationData"
+                            :summary-method="getSummaries"
+                            show-summary
+                            :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
+                            style="width: 88%">
+                        <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
+                            <el-table-column
+                                    label="标准类别"
+                            >
+                                <el-table-column
+                                        prop="oneIndexTitle"
+                                        align="center"
+                                        label="一级指标"
+                                        width = '120'
+                                >
+                                </el-table-column>
+                            </el-table-column>
+                            <el-table-column
+                                    :label="form.standSort"
+                            >
+                                <el-table-column
+                                        prop="twoIndexTitle"
+                                        align="center"
+                                        label="二级指标"
+                                        width = '120'
+                                >
+                                    <template slot-scope="scope">
+                                        {{form.fsRejectStatus === 2 ? filterTwoTitle(scope.row) : scope.row.twoIndexTitle}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="threeIndexTitle"
+                                        label="三级指标"
+                                        width="300"
+                                >
+                                </el-table-column>
+                            </el-table-column>
+                            <el-table-column
+                                    label="标准名称"
+                            >
+                                <el-table-column
+                                        prop="weight"
+                                        align="center"
+                                        label="指标权重 %"
+                                        width = '100'
+                                >
+                                    <template slot-scope="scope">
+                                        {{scope.row.valueType === 'number' ? scope.row.weight * 100 : '加分项（'+scope.row.weight+'分）'}}
+                                    </template>
+                                </el-table-column>
+                            </el-table-column>
+                            <el-table-column
+                                    :label="form.standName"
+                            >
+                                <el-table-column
+                                        prop="score"
+                                        align="center"
+                                        label="指标分值（10分制）优≥8分；合格6～8分；不合格＜6分"
+                                        width = '200'
+                                >
+                                    <template slot-scope="scope">
+                                        <el-form-item
+                                                :prop="'evaluationData.'+scope.$index + '.score'"
+                                                :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
+                                            <el-input disabled v-model.number="scope.row.score" placeholder="请填写分值" />
+                                        </el-form-item>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="scoreMin"
+                                        align="center"
+                                        label="分值小计"
+                                        width = '80'
+                                >
+                                    <template slot-scope="scope">
+                                        {{setScoreMin(scope.row)}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="reason"
+                                        align="center"
+                                        label="简述扣分理由（不合格＜6分，必填）"
+                                >
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
+                                        <el-form-item
+                                                :prop="'evaluationData.'+scope.$index + '.reason'"
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
+                                            <el-input disabled v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                        </el-form-item>
+                                    </template>
+                                </el-table-column>
+                            </el-table-column>
+                        </el-table-column>
+                    </el-table>
+                </template>
+            </div>
+            <div style="flex: auto;" v-show="form.fsRejectStatus === 2 ? active === '2' : active === '1'">
                 <formList
                         :form = "form"
                         :FBGBUSSFileList = "FBGBUSSFileList"
@@ -569,7 +694,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -648,6 +773,7 @@
                 prcNum: this.$route.query.prcNum,
                 prcName: this.$route.query.prcName,
                 detailData: [],
+                historyData: [],
                 fileList: [],
                 footFileList: [],
                 FBGBUSSFileList: [],
@@ -788,6 +914,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -1050,6 +1177,134 @@
             },
         },
         methods: {
+            ccc(row){
+                this.form.evaluationData = []
+                this.form.evaluationData = JSON.parse(row.mesg)
+            },
+            filterTwoTitle(row){
+                if(row.twoIndexTitle && row.twoIndexTitle.indexOf("%") === -1 && row.twoIndexTitle !== "创新性" && row.twoIndexTitle !== "经济效益" && row.twoIndexTitle !== "社会效益" ){
+                    return row.twoIndexTitle + '%'
+                }
+                return row.twoIndexTitle
+            },
+            calScope(){
+                if(this.evaluationMap){
+                    const hqSum = this.evaluationMap["会签征求意见"]
+                    const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
+                    const fsSum = this.evaluationMap["复审"]
+                    const shSum = this.evaluationMap["标准法规部高级经理审核"]
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+                    return parseFloat(aveCount).toFixed(1)
+                }
+                return 0
+            },
+            evaluationHisListRep() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListRep({
+                        pid: this.pId
+                    }).then(res => {
+                        this.historyData = res
+                        if(this.historyData && this.historyData.length > 0){
+                            this.form.evaluationData = JSON.parse(this.historyData[0].mesg)
+
+                        }
+                        this.$forceUpdate()
+                    }).catch(e => {
+                    })
+                })
+            },
+            evaluationHisListRepSum() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListRepSum({
+                        pid: this.pId
+                    }).then(res => {
+                        this.evaluationMap = res
+                        this.$forceUpdate()
+                    }).catch(e => {
+                    })
+                })
+            },
+            filterData2(){
+                let spanOneArr = []
+                let concatOne = 0
+                this.form.evaluationData.forEach((item,index)=>{//循环后端查询出来的数据(orderdata)
+                    if(index === 0){
+                        spanOneArr.push(1)
+                    }else{
+                        //name 修改
+                        if(item.twoIndexTitle === this.form.evaluationData[index - 1].twoIndexTitle){ //第一列需合并相同内容的字段
+                            spanOneArr[concatOne] += 1
+                            spanOneArr.push(0)
+                        }else{
+                            spanOneArr.push(1)
+                            concatOne = index
+                        }
+                    }
+                })
+                return {
+                    one: spanOneArr,
+                }
+            },
+            setScoreMin(row){
+                return row.scoreMin = ((row.score === undefined ||  row.score === '') ? '' : row.valueType === 'add' ? row.score : (row.score / 10).toFixed(1))
+
+            },
+            getSummaries(param) {
+                const { columns, data } = param;
+                const sums = [];
+                columns.forEach((column, index) => {
+                    if (index === 3) {
+                        sums[index] = '合计：';
+                        return;
+                    }else if(index === 6){
+                        sums[index] = '';
+                        return;
+                    }
+                    const values = data.map(item => Number(item[column.property]));
+                    if (!values.every(value => isNaN(value))) {
+                        sums[index] = values.reduce((prev, curr) => {
+                            const value = Number(curr);
+                            if (!isNaN(value)) {
+                                return prev + curr;
+                            } else {
+                                return prev;
+                            }
+                        }, 0);
+                        sums[index] += ' ';
+                    } else {
+                        sums[index] = '';
+                    }
+                    if(sums[index] !== '' && sums[index].indexOf(".") !== -1){
+                        sums[index] = parseFloat(sums[index]).toFixed(1);
+                    }
+                });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
+                return sums;
+            },
+            objectSpanMethod({ row, column, rowIndex, columnIndex },value) {
+                if (columnIndex === 0) {
+                    if (rowIndex === 0) {
+                        return {
+                            rowspan: value.length,
+                            colspan: 1
+                        };
+                    } else {
+                        return {
+                            rowspan: 0,
+                            colspan: 0
+                        };
+                    }
+                }else if(columnIndex === 1 ) {
+                    const _row = (this.filterData2(this.form.evaluationData).one)[rowIndex]
+                    const _col = _row > 0 ? 1 : 0
+                    return {
+                        rowspan: _row,
+                        colspan: _col
+                    }
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1252,6 +1507,7 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.fileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -2335,6 +2591,9 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form.evaluationData = []
+                    this.evaluationHisListRep()
+                    this.evaluationHisListRepSum()
                 })
             },
             assemble(ids,names){
@@ -2367,6 +2626,7 @@
                                 this.getFormFieldList(processForm)
                                 if(processForm.footFile !== undefined && processForm.footFile !== ""){
                                     this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
+                                    this.fileList=this.assemble(processForm.footFile,processForm.footFileName);
                                 }
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
@@ -2457,6 +2717,9 @@
     /deep/ .el-input__suffix{
         display: none !important;
     }
+    /deep/ #active1 .el-form-item__content{
+        margin-left: 0px !important;
+    }
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }

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

@@ -854,6 +854,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

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

@@ -795,6 +795,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

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

@@ -1058,6 +1058,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -1384,6 +1385,9 @@
                         sums[index] = parseFloat(sums[index]).toFixed(1);
                     }
                 });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
                 return sums;
             },
             objectSpanMethod({ row, column, rowIndex, columnIndex },value) {

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

@@ -1087,6 +1087,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     evaluationData:[],
                     planId:'',
                     planStatus:'',
@@ -1432,6 +1433,9 @@
                         sums[index] = parseFloat(sums[index]).toFixed(1);
                     }
                 });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
                 return sums;
             },
             objectSpanMethod({ row, column, rowIndex, columnIndex },value) {

src/pages/processCenter/pages/creatProcess/qbrk/step7.vue

@@ -82,7 +82,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -105,7 +105,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -677,7 +677,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -916,6 +916,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -1240,6 +1241,9 @@
                         sums[index] = parseFloat(sums[index]).toFixed(1);
                     }
                 });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
                 return sums;
             },
             objectSpanMethod({ row, column, rowIndex, columnIndex },value) {
@@ -2502,7 +2506,11 @@
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
                     this.form.evaluationData = []
-                    this.getEvaluation()
+                    if(this.form.fsRejectStatus === 1){
+                        this.evaluationHisListByOne()
+                    }else {
+                        this.getEvaluation()
+                    }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -2518,6 +2526,19 @@
 
                 return list;
             },
+            evaluationHisListByOne() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListByOne({
+                        pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审'
+                    }).then(res => {
+                        if (res) {
+                            this.form.evaluationData = JSON.parse(res.mesg)
+                            this.$forceUpdate()
+                        }
+                    }).catch(e => {
+                    })
+                })
+            },
             getEvaluation() {
                 return new Promise((resolve, reject) => {
                     getEvaluationIndex({

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

@@ -2,7 +2,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>
@@ -738,6 +738,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

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

@@ -2,7 +2,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>
@@ -18,8 +18,14 @@
                 class="label-input-form"
                 label-width="210px"
         >
-            <div style="flex: auto;" id="active1" v-show="active === '1'">
+            <div style="flex: auto;position: relative" id="active1" v-show="active === '1'">
                 <template>
+                    <div style="position: absolute;z-index: 2;right: 67px;top: 5px;">
+                        <el-button type="primary" plain @click="subFunc()">计算质量评价总平均分</el-button>
+                        <span style="font-size: 20px;color: rgb(255, 153, 0);position: relative;top: 3px;margin-left: 15px;">
+                            {{calScope()}}
+                        </span>
+                    </div>
                     <el-table
                             :data="form.evaluationData"
                             :summary-method="getSummaries"
@@ -47,6 +53,9 @@
                                         label="二级指标"
                                         width = '120'
                                 >
+                                    <template slot-scope="scope">
+                                        {{form.fsRejectStatus === 1 ? filterTwoTitle(scope.row) : scope.row.twoIndexTitle}}
+                                    </template>
                                 </el-table-column>
                                 <el-table-column
                                         prop="threeIndexTitle"
@@ -82,7 +91,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -105,7 +114,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -314,15 +323,17 @@
     <ProcessFooter
             v-show="verifySarStandard"
             show-save
-            show-over2
+            show-over3
             show-submit2
             show-transfer
             :submitLoading="isSubmit"
             :saveLoading="saveLoading"
+            :disabledStatus="calScope() < 60"
             @save="handleSave"
             @transfer="handleTransfer"
             @submit2="handle2"
-            @over2="handle1"
+            @over3="handle3"
+            @over4="handle4"
     >
     </ProcessFooter>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
@@ -677,7 +688,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -778,6 +789,7 @@
                 prcNum: this.$route.query.prcNum,
                 prcName: this.$route.query.prcName,
                 detailData: [],
+                evaluationMap: new Map(),
                 fileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
@@ -917,6 +929,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -1189,6 +1202,31 @@
             },
         },
         methods: {
+            filterTwoTitle(row){
+                if(row.twoIndexTitle && row.twoIndexTitle.indexOf("%") === -1 && row.twoIndexTitle !== "创新性" && row.twoIndexTitle !== "经济效益" && row.twoIndexTitle !== "社会效益" ){
+                    return row.twoIndexTitle + '%'
+                }
+                return row.twoIndexTitle
+            },
+            calScope(){
+                if(this.evaluationMap){
+                    const hqSum = this.evaluationMap["会签征求意见"]
+                    const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
+                    const fsSum = this.evaluationMap["复审"]
+                    const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+                    return parseFloat(aveCount).toFixed(1)
+                }
+                return 0
+            },
+            subFunc(){
+                this.form.fsRejectStatus = 2
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+
+                    }
+                })
+            },
             filterData2(){
                 let spanOneArr = []
                 let concatOne = 0
@@ -1243,6 +1281,9 @@
                         sums[index] = parseFloat(sums[index]).toFixed(1);
                     }
                 });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
                 return sums;
             },
             objectSpanMethod({ row, column, rowIndex, columnIndex },value) {
@@ -2404,13 +2445,29 @@
                 this.drawerModal = true
                 this.drawerTitle = '转办处理人'
             },
-            handle1(){
+            handle3(){
                 this.formTongGuo.approvalOpinion = 1
-                this.handleSubmit()
+                this.form.fsRejectStatus = 1
+                const json = JSON.stringify(this.form);
+                console.log(json)
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.handleSubmit()
+                    }
+                })
+            },
+            handle4(){
+                const json = JSON.stringify(this.form);
+                this.formTongGuo.approvalOpinion = 2
+                this.form.fsRejectStatus = 2
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.handleSubmit()
+                    }
+                })
             },
             handle2(){
                 const json = JSON.stringify(this.form);
-                console.log(json)
                 this.formTongGuo.approvalOpinion = 0
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
@@ -2500,10 +2557,15 @@
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
                     this.form.evaluationData = []
-                    this.getEvaluation()
+                    if(this.form.fsRejectStatus === 1){
+                        this.evaluationHisListByOne()
+                    }else {
+                        this.getEvaluation()
+                    }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.evaluationHisListRepSum()
                 })
             },
             assemble(ids,names){
@@ -2516,6 +2578,30 @@
 
                 return list;
             },
+            evaluationHisListRepSum() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListRepSum({
+                        pid: this.pId
+                    }).then(res => {
+                        this.evaluationMap = res
+                        this.$forceUpdate()
+                    }).catch(e => {
+                    })
+                })
+            },
+            evaluationHisListByOne() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListByOne({
+                        pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审'
+                    }).then(res => {
+                        if (res) {
+                            this.form.evaluationData = JSON.parse(res.mesg)
+                            this.$forceUpdate()
+                        }
+                    }).catch(e => {
+                    })
+                })
+            },
             getEvaluation() {
                 return new Promise((resolve, reject) => {
                     getEvaluationIndex({
@@ -2531,6 +2617,10 @@
                                 item.processNode = this.taskInfo
                                 evalList.push(item)
                             })
+
+                            if(evalList && evalList.length > 0){
+                                evalList[0].sum = ''
+                            }
                             this.form.evaluationData = evalList
                             this.$forceUpdate()
                         }

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -854,6 +854,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',

src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue

@@ -82,7 +82,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -105,7 +105,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -835,7 +835,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import {getEvaluationIndex} from "api/businessApi";
@@ -1087,6 +1087,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     evaluationData:[],
                     planId:'',
                     planStatus:'',
@@ -1432,6 +1433,9 @@
                         sums[index] = parseFloat(sums[index]).toFixed(1);
                     }
                 });
+                if(this.form.evaluationData && this.form.evaluationData.length > 0){
+                    this.form.evaluationData[0].sum = sums[4]
+                }
                 return sums;
             },
             objectSpanMethod({ row, column, rowIndex, columnIndex },value) {
@@ -2848,8 +2852,13 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
+                    console.log(this.form)
                     this.form.evaluationData = []
-                    this.getEvaluation()
+                    if(this.form.fsRejectStatus === 1){
+                        this.evaluationHisListByOne()
+                    }else {
+                        this.getEvaluation()
+                    }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -2889,6 +2898,19 @@
                     })
                 })
             },
+            evaluationHisListByOne() {
+                return new Promise((resolve, reject) => {
+                    evaluationHisListByOne({
+                        pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审'
+                    }).then(res => {
+                        if (res) {
+                            this.form.evaluationData = JSON.parse(res.mesg)
+                            this.$forceUpdate()
+                        }
+                    }).catch(e => {
+                    })
+                })
+            },
             getData() {
                 if(this.taskIds && this.pId){
                     return new Promise((resolve, reject) => {

src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue

@@ -782,6 +782,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    fsRejectStatus:'',
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],

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

@@ -50,7 +50,7 @@
             </el-form-item>
             <el-form-item class="add-form-item">
               <div style="margin-top: 10px;margin-bottom: 10px">
-                <el-button type="primary" size="small" @click="addQblx">新增</el-button>
+                <el-button type="primary" size="small" @click="addQblx('add','企标制修订立项计划')">新增</el-button>
                 <el-button type="plain" size="small" @click="uploadQblx">上传</el-button>
                 <el-button type="success" size="small" @click="qblxTemplate">模板下载</el-button>
                 <el-button type="danger" size="small" @click="delQblx">删除</el-button>
@@ -65,14 +65,19 @@
                 @selection-change="selectedDelete"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"/>
-                <el-table-column type="index" label="序号" align="center" width="50"/>
-                <el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
-                <el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
+                <el-table-column type="selection" fixed="left" width="55"/>
+                <el-table-column type="index" label="序号" fixed="left" align="center" width="50"/>
+                <el-table-column prop="esName" label="企标名称" fixed="left" align="center" width="300" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="dutyUnit" label="责任单位" width="200" align="center"></el-table-column>
+                <el-table-column prop="dutyPeople" label="责任人" width="150" align="center"></el-table-column>
                 <el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
                 <el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
                 <el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
+                <el-table-column label="操作" align="center" width="100" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -98,7 +103,6 @@
           <el-form
             ref="roleForm"
             :model="roleForm"
-            :rules="roleFormRules"
             class="label-input-form">
             <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
@@ -117,7 +121,7 @@
                   <h4>责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准责任人', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserName" placeholder="责任人" disabled>
                     </el-input>
                   </div>
                 </el-form-item>
@@ -130,18 +134,53 @@
 
     <!-- 新增/编辑弹框 -->
     <el-drawer
-      title="企标制修订立项计划"
+      :title="qblxTitle"
       :visible.sync="qblxModel"
       size="600px"
+      :wrapper-closable="false"
       custom-class="demo-drawer"
     >
       <el-form class="label-input-form" ref="addQblxData" style="height: 100%" :model="addQblxData" :rules="addRule">
-        <el-form-item class="add-form-item" label="企标名称"></el-form-item>
-        <el-form-item class="add-form-item" label="责任单位"></el-form-item>
-        <el-form-item class="add-form-item" label="责任人"></el-form-item>
-        <el-form-item class="add-form-item" label="初稿完成日期"></el-form-item>
-        <el-form-item class="add-form-item" label="计划完成日期"></el-form-item>
-        <el-form-item class="add-form-item" label="截止日期"></el-form-item>
+        <el-form-item class="add-form-item" label="企标名称">
+          <el-input style="width: 90%"  v-model="addQblxData.esName" placeholder="请输入企标名称"></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="责任单位">
+          <el-input style="width: 90%" v-model="addQblxData.dutyUnit" placeholder="请填写责任单位"></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="责任人" prop="dutyPeople">
+          <el-input v-model="addQblxData.dutyPeopleId" style="display: none"/>
+          <el-input style="width: 90%" v-model="addQblxData.dutyPeople" placeholder="请选择责任人" @click.native="choiceZRR"/>
+        </el-form-item>
+        <el-form-item class="picker_style" label="初稿完成日期">
+          <el-date-picker
+            v-model="addQblxData.firstDraftTime"
+            type="datetime"
+            :picker-options="datePicker"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择初稿完成日期"
+            align="right">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item class="picker_style" label="计划完成日期">
+          <el-date-picker
+            v-model="addQblxData.planTime"
+            type="datetime"
+            :picker-options="datePicker"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择计划完成日期"
+            align="right">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item class="picker_style" label="截止日期">
+          <el-date-picker
+            v-model="addQblxData.endTime"
+            type="datetime"
+            :picker-options="datePicker"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择截止日期"
+            align="right">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div class="demo-drawer-footer">
         <el-button size="mini" @click="closeDrawer">取消</el-button>
@@ -172,7 +211,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst } from '@/api/process.js'
+import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst} from '@/api/process.js'
 
 export default {
   components: {
@@ -193,8 +232,8 @@ export default {
       qblxRule: {},
 
       roleForm: {
-        startUser: '',
-        startUserName: '',
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
         dockUser: '',
         dockUserName: '',
       },
@@ -205,16 +244,21 @@ export default {
       fillFileList: [],
 
       // 新增弹框
+      qblxTitle: '',
+      btnType: '',
       qblxModel: false,
       addQblxData: {
         esName: '',
         dutyUnit: '',
+        dutyPeopleId: '',
         dutyPeople: '',
         firstDraftTime: '',
         planTime: '',
         endTime: '',
       },
-      addRule: {},
+      addRule: {
+        dutyPeople: [{required: true, message: '请选择责任人', trigger: ['blur', 'change']}]
+      },
 
       isSubmit: false,
       saveLoading: false,
@@ -225,6 +269,15 @@ export default {
 
       taskID: '',
       bpnId: '',
+
+      // 表格勾选数据储存
+      deleteDataList: [],
+      // 设置当前日期之前不可选择
+      datePicker: {
+        disabledDate(date) {
+          return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
+        }
+      }
     }
   },
 
@@ -315,7 +368,8 @@ export default {
     },
 
     // 表格勾选事件
-    selectedDelete() {
+    selectedDelete(val) {
+      this.deleteDataList = val
     },
 
     // 流程阶段负责人选择
@@ -323,24 +377,90 @@ export default {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
-      this.drawerTitle = title
       this.modalshowflag = true
     },
     // 选人组件确认
     drawerCheck(data) {
-      this.roleForm.dockUser = data[0].id
-      this.roleForm.dockUserName = data[0].name
+      this.addQblxData.dutyPeopleId = data[0].id
+      this.addQblxData.dutyPeople = data[0].name
       this.modalshowflag = false
     },
 
     /** 新增按钮 */
-    addQblx() {
+    addQblx(type,title) {
+      this.btnType = type
+      this.qblxTitle = title
       this.qblxModel = true
     },
     // 抽屉确认按钮
-    OkDrawer() {},
+    OkDrawer() {
+      this.$refs['addQblxData'].validate((valid) => {
+        if (valid) {
+          if (this.btnType === 'add') {
+            this.qblx_pageData.qblxData.push(this.addQblxData)
+          }
+          this.addQblxData = {}
+          this.qblxModel = false
+        }
+      })
+    },
     // 抽屉取消按钮
-    closeDrawer() {},
+    closeDrawer() {
+      if (this.btnType === 'edit') {
+        let Items = JSON.parse(localStorage.getItem('obj'))
+        this.addQblxData.esName = Items.esName
+        this.addQblxData.dutyUnit = Items.dutyUnit
+        this.addQblxData.dutyPeopleId = Items.dutyPeopleId
+        this.addQblxData.dutyPeople = Items.dutyPeople
+        this.addQblxData.firstDraftTime = Items.firstDraftTime
+        this.addQblxData.planTime = Items.planTime
+        this.addQblxData.endTime = Items.endTime
+      } else {
+        this.addQblxData = {}
+      }
+      this.qblxModel = false
+    },
+
+    editRow(type,title,val) {
+      this.btnType = type
+      this.qblxTitle = title
+      localStorage.setItem('obj', JSON.stringify(val))
+      this.addQblxData = val
+      this.qblxModel = true
+    },
+    /** 删除按钮*/
+    delQblx() {
+      if (this.deleteDataList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.deleteDataList.map(item => {
+            let index;
+            index = this.qblx_pageData.qblxData.findIndex(items => {
+              return items === item;
+            });
+            if (index > -1) {
+              this.qblx_pageData.qblxData.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.deleteDataList = [];
+        }).catch(() => {
+        });
+      }
+    },
+
+    /** 数据上传到列表 */
+    uploadQblx() {},
+
+    /** 模板下载 */
+    qblxTemplate() {},
     // 保存按钮
     handleSave() {
       this.saveLoading = true
@@ -368,7 +488,6 @@ export default {
       let json = {
         prcCreateUser: this.$store.getters.userInfo.userId,
         prcCreateUserName: this.$store.getters.userInfo.userName,
-        roleForm: this.roleForm,
         qblx_pageData: this.qblx_pageData,
         commentText: this.commentText
       }
@@ -386,23 +505,37 @@ export default {
               processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
-                params.set('json', JSON.stringify(json))
-                params.set('userId', this.$store.getters.userInfo.userId)
-                params.set('taskId', this.taskID)
-                completeTask(params).then(res => {
-                  if (res.success === true) {
-                    this.$message.success('提交成功')
-                    if (this.bpnId !== '') {
-                      let taskId = {
-                        id: this.bpnId
-                      }
-                      taskDel(taskId).then(res => {
-                        return res
-                      })
-                    }
-                    this.$router.push("/processCenter");
+                this.qblx_pageData.qblxData.forEach((item, index) => {
+                  let newJson = {
+                    prcCreateUser: this.$store.getters.userInfo.userId,
+                    prcCreateUserName: this.$store.getters.userInfo.userName,
+                    qblx_pageData: {
+                      projectTarget: this.qblx_pageData.projectTarget,
+                      qblxFile: this.qblx_pageData.qblxFile,
+                      qblxData: item,
+                    },
+                    commentText: this.commentText
                   }
-                  this.isSubmit = false
+                  params.set('json', JSON.stringify(newJson))
+                  params.set('userId', this.$store.getters.userInfo.userId)
+                  params.set('taskId', this.taskID)
+                  completeTask(params).then(res => {
+                    if (res.success === true) {
+                      if (index === this.qblx_pageData.qblxData.length) {
+                        this.$message.success('提交成功')
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res => {
+                            return res
+                          })
+                        }
+                        this.$router.push("/processCenter");
+                      }
+                    }
+                    this.isSubmit = false
+                  })
                 })
               })
             } else {
@@ -425,10 +558,11 @@ export default {
   position: relative;
   height: 100%;
 
-  /deep/.el-upload-list__item-name {
+  /deep/ .el-upload-list__item-name {
     margin-left: 48px;
   }
-  /deep/.el-upload-list {
+
+  /deep/ .el-upload-list {
     width: 50%;
     margin-bottom: 10px;
   }
@@ -500,10 +634,23 @@ export default {
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }
   }
+
+  .picker_style {
+    margin-left: 10px;
+    margin-bottom: 0;
+    min-height: 50px;
+    line-height: 50px;
+    border-bottom: 1px dashed #e5e5e5;
+    /deep/.el-input__inner{
+      border: 0;
+    }
+  }
+
 }
 
 </style>

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

@@ -1,12 +1,12 @@
 <template>
-  <div class="qbzxdlxStep1">
+  <div class="qbzxdlxStep2">
     <ProcessHeader toggle>
       <template slot="proName">企标制修订立项计划流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -18,7 +18,7 @@
             <el-form-item label="项目目标:" class="add-form-item">
               <el-input
                 style="width: 90%"
-                clearable
+                readonly
                 v-model="qblx_pageData.projectTarget"
                 placeholder="请输入项目目标"/>
             </el-form-item>
@@ -39,25 +39,40 @@
                 ></el-button>
               </div>
             </el-form-item>
-            <el-form-item class="add-form-item">
-              <el-table
-                :data="qblx_pageData.qblxData"
-                border
-                ref="entryTable"
-                height="49%"
-                style="width: 100%"
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '20px'}">
-                <el-table-column type="selection" width="55"/>
-                <el-table-column type="index" label="序号" align="center" width="50"/>
-                <el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
-                <el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
-                <el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
-                <el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
-                <el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
-              </el-table>
-            </el-form-item>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="企标名称">
+                  <!--<a>{{ qblx_pageData.qblxData.esName || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="责任单位:">
+                  <!--<a>{{ qblx_pageData.qblxData.dutyUnit || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="责任人:">
+                  <!--<a>{{ qblx_pageData.qblxData.dutyPeople || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="初稿完成日期:">
+                  <!--<a>{{ qblx_pageData.qblxData.firstDraftTime || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="计划完成日期:">
+                  <!--<a>{{ qblx_pageData.qblxData.planTime || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="add-form-item" label="截止时间:">
+                  <!--<a>{{ qblx_pageData.qblxData.endTime || '-' }}</a>-->
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
       </div>
@@ -75,6 +90,73 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+    <div class="content" v-show="active === '2'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
 
     <ProcessFooter
       show-submit
@@ -118,6 +200,10 @@ export default {
       modalshowflag: false,
       nodeList: [],
       infoSourcesLength: '',
+      detailData: [],
+      loading: false,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
 
@@ -131,6 +217,9 @@ export default {
     this.getData()
   },
   methods: {
+    handleTabs(name) {
+      this.active = name
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -158,7 +247,6 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.qblx_pageData = JSON.parse(JSON.stringify(item)).qblx_pageData
-        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.qblx_pageData.qblxFile.length
       })
     },
@@ -226,6 +314,96 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxdlxStep2 {
+  position: relative;
+  height: 100%;
+
+  /deep/ .el-upload-list__item-name {
+    margin-left: 48px;
+  }
+
+  /deep/ .el-upload-list {
+    width: 50%;
+    margin-bottom: 10px;
+  }
+
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+
+  .content_form {
+    padding-top: 15px;
+
+    .el-divider--horizontal {
+      margin-top: 0px;
+    }
+
+    /deep/ .el-table__body-wrapper {
+      height: auto !important;
+    }
+
+    /deep/ .el-textarea__inner {
+      font-family: inherit;
+    }
+
+    /deep/ .el-table th {
+      padding: 0px;
+    }
+  }
+
+
+}
 
 </style>

src/pages/processCenter/pages/processAcceptDetail/index.vue

@@ -231,12 +231,8 @@ export default {
           //标准清单发布流程数据
           this.toProcessDetail('bzqdfbStep1-4',row)
         }else if (prcType === '5'){
-          //标准项目合规评估 标准维度
-          if(row.taskInfo === '标准法规部领导审核'){
-            this.toProcessDetail('xmpgStep1-7',row)
-          }else{
-            this.toProcessDetail('xmpgStep1-2',row)
-          }
+          //标准项目合规评估
+            this.toProcessDetail('bzpgStep8-1',row)
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
           if(row.taskInfo === '标准法规部部长审批'){

src/pages/processCenter/pages/processDetail/index.vue

@@ -240,12 +240,8 @@ export default {
           //标准清单发布流程数据
           this.toProcessDetail('bzqdfbStep1-4',row)
         }else if (prcType === '5'){
-          //标准项目合规评估 标准维度
-          if(row.taskInfo === '标准法规部领导审核'){
-            this.toProcessDetail('xmpgStep1-7',row)
-          }else{
-            this.toProcessDetail('xmpgStep1-2',row)
-          }
+          //标准项目合规评估
+            this.toProcessDetail('bzpgStep8-1',row)
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
           if(row.taskInfo === '标准法规部部长审批'){

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

@@ -341,6 +341,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){
+            this.$router.push({
+              name: 'bussLibraryC1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }else if (row.taskInfo === '标准化员初审'){
             this.$router.push({
               name: 'bussLibrary4',
@@ -407,7 +418,18 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '审核'){
+          }else if (row.taskInfo === '起草单位高级经理审核'){
+            this.$router.push({
+              name: 'bussLibrary8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '标准法规部高级经理审核'){
             this.$router.push({
               name: 'bussLibrary9',
               query: {

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

@@ -301,6 +301,16 @@ export default {
                         verifySarStandard: true,
                     }
                 })
+            }else if (mes.taskInfo === '重新发起企标制修订-技术标准流程'){
+                this.$router.push({
+                    name: 'bussLibraryC1',
+                    query: {
+                        type: 'buss1',
+                        processName: mes.taskInfo,
+                        bpnId: id,
+                        verifySarStandard: true,
+                    }
+                })
             }else if (mes.taskInfo === '企标编写汇总修订'){
               this.$router.push({
                 name: 'bussLibrary3',
@@ -377,7 +387,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '审核'){
+            }else if (mes.taskInfo === '起草单位高级经理审核'){
               this.$router.push({
                 name: 'bussLibrary8',
                 query: {
@@ -388,7 +398,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '审核'){
+            }else if (mes.taskInfo === '标准法规部高级经理审核'){
               this.$router.push({
                 name: 'bussLibrary9',
                 query: {

src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue

@@ -33,9 +33,9 @@
                     <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
                         <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
                     </el-form-item>
-                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
-                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
-                    </el-form-item>
+<!--                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+<!--                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+<!--                    </el-form-item>-->
                 </el-form>
             </div>
             <div class="demo-drawer-footer">
@@ -59,7 +59,7 @@
                     newText: '',
                     reason: '',
                     chapterName: '',
-                    cause: '',
+                    // cause: '',
                 },
                 opinionContentRules: {
                     partCode: [
@@ -91,7 +91,7 @@
                             reason: this.opinionContent.reason,
                             partCode: this.opinionContent.partCode,
                             chapterName: this.opinionContent.chapterName,
-                            cause: this.opinionContent.cause,
+                            // cause: this.opinionContent.cause,
                             userId: this.$route.query.userId || '',
                             userName: this.$route.query.userName || '',
                             deptName: this.$route.query.institutionName || '',
@@ -109,7 +109,7 @@
                                 this.opinionContent.reason = ''
                                 this.opinionContent.oldText = ''
                                 this.opinionContent.newText = ''
-                                this.opinionContent.cause = ''
+                                // this.opinionContent.cause = ''
                                 this.opinionContent.chapterName = ''
                             }
                         })

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -141,13 +141,6 @@
           >
           </el-table-column>
         </el-table-column>
-        <el-table-column
-                prop="cause"
-                align="center"
-                label="原因"
-                width="170"
-        >
-        </el-table-column>
         <el-table-column
                 prop="deptName"
                 align="center"
@@ -162,6 +155,21 @@
                 label="提出人"
         >
         </el-table-column>
+        <el-table-column
+                prop="state"
+                align="center"
+                label="处理意见">
+          <template slot-scope="scope">
+            <div>{{ stateText(scope.row.state) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="cause"
+                align="center"
+                label="原因"
+                width="170"
+        >
+        </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
@@ -219,9 +227,9 @@
             <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
               <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
             </el-form-item>
-            <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
-              <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+<!--              <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+<!--            </el-form-item>-->
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -272,7 +280,7 @@
           newText: '',
           reason: '',
           chapterName: '',
-          cause: '',
+          // cause: '',
         },
         opinionContentRules: {
           partCode: [
@@ -302,6 +310,15 @@
       }
     },
     methods: {
+      stateText(row) {
+        if (row === '1') {
+          return '上报'
+        } else if (row === '2') {
+          return '处理后上报'
+        } else {
+          return '不上报'
+        }
+      },
       itermsConditionsClose () {
         this.itermsConditionsFlag = false
       },
@@ -355,6 +372,7 @@
           _this: this
         }, res => {
           this.standinfoList = res.data.records
+          console.log(res.data.records);
           this.total = res.data.total
           this.spinShow = false
         }, e => {
@@ -485,7 +503,7 @@
               reason: this.opinionContent.reason,
               partCode: this.opinionContent.partCode,
               chapterName: this.opinionContent.chapterName,
-              cause: this.opinionContent.cause,
+              // cause: this.opinionContent.cause,
               userId: this.$store.getters.userInfo.userId || '',
               userName: this.$store.getters.userInfo.userName || '',
               deptName: this.$store.getters.userInfo.institutionName || '',
@@ -512,7 +530,7 @@
                   this.opinionContent.reason = ''
                   this.opinionContent.oldText = ''
                   this.opinionContent.newText = ''
-                  this.opinionContent.cause = ''
+                  // this.opinionContent.cause = ''
                 }
               }
             })

src/router/index.js

@@ -592,6 +592,15 @@ const routes = [
           title: '标准合规评估流程'
         }
       },
+      {
+        path: '/bzpgStep8-1',
+        name: 'bzpgStep8-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -1033,6 +1042,14 @@ const routes = [
           requireAuth: true,
           title: '企标制修订流程及企业标准库流程'
         }
+      }, {
+        path: '/bussLibraryC1',
+        name: 'bussLibraryC1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订流程及企业标准库流程'
+        }
       },
         {
             path: '/bussLibrary2',