Merge branch 'develop' into 'FOTON'

Develop

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

src/components/treeSelect/treeSelectStand.vue

@@ -167,7 +167,7 @@ export default {
   methods: {
     filterNode(value, data) {
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      return data.menuName.indexOf(value) !== -1;
     },
     loadNode(node, resolve) {
       const that = this;

src/pages/config/pages/mechanismManage/pages/mechanism.vue

@@ -450,7 +450,7 @@ export default {
         this.page = 1
       }
       this.peopleType = 2;
-      this.$http.post('SarInstitution/institution/user', {
+      this.$http.post('SarInstitution/institution/userUnderInstitution', {
         current: this.page,
         size: this.pageSize,
         uname: this.searchForm.uname,
@@ -475,7 +475,7 @@ export default {
     },
     getData() {
       this.peopleType = 1;
-      this.$http.post('SarInstitution/institution/user', {
+      this.$http.post('SarInstitution/institution/userUnderInstitution', {
         current: this.page,
         size: this.pageSize,
         institutionId: this.id,

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

@@ -312,11 +312,49 @@ export default {
     },
     //提交
      handleSubmit(){
-
+       this.listForm.commentText = this.commentText
+       this.listForm.stepFlag =  '0'
+       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 => {
+       });
      },
     //驳回
     beforeBack(){
-
+     if(!this.commentText){
+       this.$message.warning('请填写审批意见')
+     }else{
+       this.listForm.commentText = this.commentText
+       this.listForm.stepFlag =  '1'
+       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 => {
+       });
+     }
     },
     //确认转办
     checkedRole (data) {

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

@@ -1,13 +1,660 @@
+<!--标准合规评估 业务经理审批-->
 <template>
-
+  <div class="bzpg-step3">
+    <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"
+            :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>
+      </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+      <div class="tableTitle">
+        <div class="tableButton">
+          <el-button class="common-button-primary" plain size="mini" @click="addProject">添加
+          </el-button>
+          <el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
+          </el-button>
+        </div>
+      </div>
+      <el-table
+        :data="dataList"
+        border
+        ref="selection"
+        height="100%"
+        style="width: 100%;"
+        @selection-change="selectProjectGroup"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column
+          align="center"
+          prop="managementHostName"
+          label="管理主体"/>
+        <el-table-column
+          align="center"
+          prop="developmentHostName"
+          label="开发主体"/>
+        <el-table-column
+          align="center"
+          prop="categoryName"
+          label="项目细分类"/>
+        <el-table-column
+          align="center"
+          prop="projectStatus"
+          label="项目状态"/>
+        <el-table-column
+          align="center"
+          prop="projectNumber"
+          label="项目编号"/>
+        <el-table-column
+          align="center"
+          prop="projectName"
+          label="项目名称"/>
+        <el-table-column
+          align="center"
+          prop="projectManager"
+          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 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>
+    <!--    添加抽屉-->
+    <el-drawer
+      title="添加项目"
+      :visible.sync="ProjectModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="项目状态" class="search-item search-item-last">
+                  <el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" filterable clearable>
+                    <el-option
+                      v-for="(item, index) in projectStatus"
+                      :key="index"
+                      :value="item"
+                      :label="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <div style="height: calc(100% - 65px); overflow: auto">
+              <el-table
+                :data="productData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="projectTable"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                @selection-change="selectProject"
+              >
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  type="index"
+                  width="55"
+                  label="序号"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  prop="projectName"
+                  label="项目名称"/>
+                <el-table-column
+                  align="center"
+                  prop="projectStatus"
+                  label="项目状态"/>
+                <el-table-column
+                  align="center"
+                  prop="projectName"
+                  label="当前节点"/>
+                <el-table-column
+                  align="center"
+                  prop="projectGroup"
+                  label="项目群"/>
+                <el-table-column
+                  align="center"
+                  prop="projectManager"
+                  label="项目经理"/>
+              </el-table>
+            </div>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okProject">添加</el-button>
+      </div>
+    </el-drawer>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "process/components/ProcessHeader";
+import ProcessFooter from "process/components/ProcessFooter";
+import ProcessTitle from "process/components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
+
 export default {
-  name: "bzpgStep3"
+  name: "bzpgStep3",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      drawerModal: false,
+      loading: false,
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      ProjectModel: false,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      commentText: '',
+      drawerTitle: '',
+      projectGroup: '',  //用来查询项目
+      listForm: {},
+      dataList: [],
+      detailData: [],
+      nodeList: [],
+      selectProjectList: [],
+      selectProjectGroupList: [],
+      productData: [], //项目群下的项目
+      projectStatus: [], //项目状态下拉框
+      projectSearch: {
+        projectStatus: "", //项目状态
+      },
+    }
+  },
+  mounted() {
+    this.getData()
+    this.processTable()
+    this.getProductData()
+  },
+  methods: {
+    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) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.listForm.dataList = item.dataList
+        this.dataList = item.dataList
+        this.projectGroup = item.dataList[0].projectGroup
+        this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
+      })
+    },
+    //查询项目群下的项目
+    getProductData(){
+      this.$http.get('sarStandProjectLibrary/queryProjects',{
+        projectGroup: this.projectGroup,
+        current: this.pageNo,
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+         this.productData = res.data.records
+         this.totalNo = res.data.count
+      })
+    },
+    //查询项目按钮
+    getProductDataBtn(){
+      this.pageNo = 1
+      this.getProductData()
+    },
+    //清空按钮
+    clearProject(){
+      this.projectSearch = {
+        projectStatus: "",
+      }
+     this.getProductData()
+    },
+    selectProjectGroup(data){
+      this.selectProjectGroupList = data
+    },
+    //添加项目
+    addProject(){
+      this.projectModel= true
+    },
+    //批量删除
+    deleteList(){
+    if(!this.selectProjectGroupList.length){
+       this.$message.warning('请至少选择一条数据进行删除')
+    }else{
+      this.$confirm("您确认删除这些数据？", "提示", {
+        confirmButtonText: "确认",
+        confirmButtonClass: "common-button-primary",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+
+      }).catch(() => {
+      });
+    }
+    },
+    cancelStand(){
+      this.projectModel = false
+    },
+    okProject(){
+     if(this.selectProjectList.length){
+
+     }else{
+       this.$message.warning('请至少选择一条数据进行添加')
+     }
+    },
+    selectProject(data){
+      this.selectProjectList = data
+    },
+    pageChangeNo(page){
+      this.pageNo = page
+      this.getProductData()
+    },
+    pageSizeChangeNo(pageSize){
+      this.pageSizeNo = pageSize
+      this.getProductData()
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //提交
+    handleSubmit(){
+
+    },
+    //驳回
+    beforeBack(){
+
+    },
+    //确认转办
+    checkedRole (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 => {})
+    },
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.bzpg-step3 {
+  /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%;
+      }
+    }
+    .input-jump {
+      /deep/.el-input__inner{
+        color: #409EFF;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>

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

@@ -1505,6 +1505,7 @@ export default {
       fileType: '',
       countryArr: '',
       form: {
+        standId: '',
         // 基础信息
         country: '',
         textStatus: '', // 文本状态
@@ -2156,6 +2157,7 @@ export default {
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                 this.form = JSON.parse(JSON.stringify(json))
                 this.getListTree(bringData)
+                this.form.standId = bringData.id
                 this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
                 this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
                 this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
@@ -2280,17 +2282,20 @@ export default {
           }, {}, reson => {
             if (reson.ok) {
               let treeList = ''
+              let treeListId = ''
               reson.data.forEach(item=>{
                 this.treeCheckedKeys.push(item.menuId)
-                if (item.menuId.length > 0) {
+                if (treeList.length > 0) {
                   treeList += ','
+                  treeListId += ','
                 }
-                treeList = item.menuName
+                treeList += item.menuName
-                this.treeListName = treeList
+                treeListId += item.menuId
               })
+              this.form.treeListName = treeList
+              this.form.treeListId = treeListId
             }
           })
-          this.form.treeListId = this.treeCheckedKeys.join(',')
         }
       })
     },

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

@@ -2323,10 +2323,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1908,10 +1908,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1875,10 +1875,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1966,10 +1966,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1875,10 +1875,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1966,10 +1966,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -2371,10 +2371,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1861,10 +1861,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1862,10 +1862,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1912,10 +1912,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -2253,10 +2253,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -1912,10 +1912,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -2253,10 +2253,10 @@
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
-                    name: 'OtherLawsStandDetails',
+                    name: 'OtherBussStandardDetails',
                     params: {
                         id: item.id,
-                        pageType: 'LAWS_STAND'
+                        pageType: 'BUSINESS_STAND'
                     }
                 })
                 window.open(routeUrl.href, '_blank')

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

@@ -876,11 +876,11 @@ export default {
             })
           }
           break
-        //项目合规评估流程
+        //标准合规评估
         case '5' :
-          if(row.taskInfo === '标准法规部业务经理审批'){
+          if(row.taskInfo === '审核(标准法规业务经理)'){
             this.$router.push({
-              name: 'xmpgStep2',
+              name: 'bzpgStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -889,9 +889,9 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准评估任务下发'){
+          }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){
             this.$router.push({
-              name: 'xmpgStep3',
+              name: 'bzpgStep3',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,