Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!305

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

@@ -158,25 +158,26 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="productLine"
           align="center"
-          width="200"
+          min-width="180"
-          label="产品线">
+          prop="projectGroup"
+          label="项目群">
         </el-table-column>
         <el-table-column
-          prop="projectNumber"
           align="center"
-          width="200"
+          min-width="180"
+          prop="projectNumber"
           label="项目编号">
         </el-table-column>
         <el-table-column
-          prop="projectName"
+          min-width="300"
+          :show-overflow-tooltip="true"
           align="center"
-          width="200"
+          prop="projectName"
           label="项目名称">
         </el-table-column>
         <el-table-column
-          prop="itemNum"
+          prop="itemsNum"
           align="center"
           width="200"
           label="条款号">
@@ -187,6 +188,17 @@
           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"
@@ -200,13 +212,13 @@
           label="基于上一版本差异">
         </el-table-column>
         <el-table-column
-          prop="xCXSSRQ"
+          prop="xcxssrq"
           width="200"
           align="center"
           label="新车型实施日期">
         </el-table-column>
         <el-table-column
-          prop="zCCSSRQ"
+          prop="zccssrq"
           width="200"
           align="center"
           label="在产车实施日期">
@@ -420,6 +432,15 @@
       @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>
     <!--    批量编辑弹窗-->
     <el-drawer
       title="批量填写"
@@ -534,6 +555,9 @@ export default {
       comFlag: 0,
       nodeList:[],
       drawerTitle:'',
+      fileType: '',
+      itermsConditionsTitle: '',
+      itermsConditionsFlag: false,
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -673,6 +697,20 @@ export default {
     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({
@@ -722,44 +760,14 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
-          if (item.fenFlag === undefined) {
+          this.fileType = item.fileType
-            item.step3DTOS.forEach(item => {
+          this.listForm.prcNum = this.prcNum
-              item.implementerId = this.$store.getters.userInfo.userId;
+          this.listForm.prcName = this.prcName
-              item.implementer = this.$store.getters.userInfo.userName;
+          this.listForm['id'] = item.id
-            });
+          this.dataList = item.dataList
-            // this.commentText = ''
-            this.dataList = item.step3DTOS;
-            this.dataList.forEach(item => {
-              this.$set(item,'complianceReasons', '')
-              this.$set(item,'noCompliance', '')
-              this.$set(item,'countermeasures', '')
-              this.$set(item,'completionTime', '')
-            })
-          } else {
-            this.dataList = item.dataList;
-            // this.commentText = ''
-            this.dataList.forEach(item => {
-              item.implementerId = this.$store.getters.userInfo.userId;
-              item.implementer = this.$store.getters.userInfo.userName;
-            });
-          }
-          // this.getLocalTime()
-          this.listForm.prcNum = this.prcNum;
-          this.listForm.prcName = this.prcName;
-          this.listForm["id"] = item.id;
-          this.listForm.standName = item.step3DTOS[0].standName;
-          this.listForm.standNumber = item.step3DTOS[0].standNumber;
-          this.listForm.id = item.step3DTOS[0].id;
-          this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
-          this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
-          this.listForm.itemsName = item.step3DTOS[0].itemsName;
-          this.listForm.itemNum = item.step3DTOS[0].itemNum;
-          this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
-          this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
@@ -827,27 +835,32 @@ export default {
           this.$message.warning('请填写完整的不符合项信息')
           this.comFlag = 0
         }else{
-          this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+          this.$confirm("请确认表单数据是否填写完整", "提示", {
-          this.listForm.commentText = this.commentText;
+            confirmButtonText: "确认",
-          this.listForm.approvalOpinion = "";
+            confirmButtonClass: "common-button-primary",
-          this.listForm.signFlag = "";
+            cancelButtonText: "取消",
-          this.listForm.dataList = this.dataList;
+            type: "warning"
-          const json = JSON.stringify(this.listForm);
+          }).then(() => {
-          this.isSubmit = true
+            this.listForm.commentText = this.commentText;
-          this.$http.post("lawss/activiti/completeTask", {
+            this.listForm.dataList = this.dataList;
-            taskIds: this.taskIds,
+            const json = JSON.stringify(this.listForm);
-            userId: this.userId,
+            this.isSubmit = true
-            json: json
+            this.$http.post("lawss/activiti/completeTask", {
-          }, {
+              taskIds: this.taskIds,
-            _this: this
+              userId: this.userId,
-          }, res => {
+              json: json
-            if (res.success) {
+            }, {
-              this.$message.success(res.message);
+              _this: this
-              this.$router.push("/processCenter");
+            }, res => {
-            }
+              if (res.success) {
-            this.isSubmit = false;
+                this.$message.success(res.message);
-          }, e => {
+                this.$router.push("/processCenter");
+              }
+              this.isSubmit = false;
+            }, e => {
 
+            });
+          }).catch(() => {
           });
         }
       }
@@ -872,7 +885,7 @@ export default {
     saveBatchEditForm() {
       this.dataList.forEach(item => {
         this.selectList.forEach(items => {
-          if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
+          if (item.itemsNum === items.itemsNum && item.projectName === items.projectName) {
             item.complianceReasons = this.batchEditForm.complianceReasons;
             //不合规
             item.noCompliance = this.batchEditForm.noCompliance;
@@ -904,7 +917,7 @@ export default {
       this.searchData();
     },
     pageSizeChange(pageSize) {
-      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.pageSize = pageSize;
       this.searchData();
     }
   },

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

@@ -1,13 +1,766 @@
+<!--标准合规评估 责任人评估-->
 <template>
+  <div class="bzpg-step6">
+    <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-table
+        ref="multipleTable"
+        :data="dataList"
+        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-back
+      show-submit
+      show-transfer
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :transfer-loading="isTransfer"
+      :approval="true"
+      @back="beforeBack"
+      @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: "step6"
+  name: "xmpgStep6",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      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: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    //折叠/展开基础信息方法
+    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
+        } else {
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
+        }
+
+      });
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dataList = this.dataList
+        this.listForm.passFlag = '1'
+        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 => {
+        });
+      }
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.dataList = this.dataList
+      this.listForm.passFlag = '0'
+      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 scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.bzpg-step6 {
+  /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-table th > .cell{
+    font-size: 14px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
+}
 </style>

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

@@ -1,13 +1,737 @@
+<!--标准合规评估 项目负责人审核-->
 <template>
+  <div class="bzpg-step7">
+    <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-table
+        ref="multipleTable"
+        :data="dataList"
+        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: "step7"
+  name: "xmpgStep7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      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: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    //折叠/展开基础信息方法
+    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
+        } 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 scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.bzpg-step7 {
+  /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-table th > .cell{
+    font-size: 14px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
+}
 </style>

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

@@ -1,13 +1,737 @@
+<!--标准合规评估 标准法规部部长审批-->
 <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-table
+        ref="multipleTable"
+        :data="dataList"
+        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: "step8"
+  name: "xmpgStep8",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      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: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    //折叠/展开基础信息方法
+    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
+        } 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 scoped>
+<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-table th > .cell{
+    font-size: 14px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
+}
 </style>

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

@@ -2274,7 +2274,8 @@ export default {
     getListTree(bringData) {
       this.$http.get('sarResource/ts-resource/getListStand', {
         sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
-        userId: this.$store.getters.userInfo.userId
+        userId: this.$store.getters.userInfo.userId,
+        isFlow: 'flow'
       }, {}, res => {
         if (res.ok) {
           this.treeListOptions = res.data

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

@@ -2597,7 +2597,8 @@ export default {
     getListTree(bringData) {
       this.$http.get('sarResource/ts-resource/getListStand', {
         sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
-        userId: this.$store.getters.userInfo.userId
+        userId: this.$store.getters.userInfo.userId,
+        isFlow: 'flow'
       }, {}, res => {
         if (res.ok) {
           this.treeListOptions = res.data

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

@@ -101,6 +101,7 @@
                             _this: this
                         }, res => {
                             if (res.respCode === '200') {
+                                // 储存变量监听刷新页面
                                 localStorage.setItem('freshClueNum', new Date().getTime())
                                 this.isSubmit = false
                                 this.opinionContent.partCode = ''