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

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -87,7 +87,7 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: '150px'
+      default: '210px'
     }
   },
   components: {},

src/components/treeSelect/treeSelectStand.vue

@@ -0,0 +1,308 @@
+<template>
+  <el-drawer
+    class="org-tree"
+    :title="drawerTitle"
+    :visible.sync="modalShowFlag"
+    :size="width"
+    :append-to-body=true
+    :before-close="cancelUserInfo"
+    :show-checkbox="showCheckBox"
+  >
+    <el-input
+      style="border-bottom: 1px #e5e5e5 solid"
+      placeholder="输入关键字进行过滤"
+      v-model="filterText">
+    </el-input>
+    <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
+             :load="loadNode"
+             :lazy="lazy"
+             :show-checkbox="multiple"
+             :node-key="nodeKey"
+             :check-strictly="checkStrictly"
+             :expand-on-click-node="false"
+             :filter-node-method="filterNode"
+             :default-checked-keys="defaultCheckedKeys"
+             :highlight-current="true"
+             @node-click="handleNodeClick"
+             @check-change="handleCheckChange">
+    </el-tree>
+    <div id="roleFormButton" class="demo-drawer-footer">
+      <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+      <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+export default {
+  name: "treeSelectStand",
+  props: {
+    // 树结构数据
+    data: {
+      type: Array,
+      default () {
+        return [];
+      }
+    },
+    url: {
+      type: String,
+      default () {
+        return "";
+      }
+    },
+    type: {
+      type: String,
+      default () {
+        return "";
+      }
+    },
+    urlChild: {
+      type: String,
+      default () {
+        return "";
+      }
+    },
+    params: {
+      type: Object,
+      default () {
+        return {};
+      }
+    },
+    defaultProps: {
+      type: Object,
+      default () {
+        return {};
+      }
+    },
+    // 配置是否可多选
+    multiple: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
+    lazy: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
+    nodeKey: {
+      type: String,
+      default () {
+        return 'id';
+      }
+    },
+    // 显示复选框情况下，是否严格遵循父子不互相关联
+    checkStrictly: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
+    disabled: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
+    // 默认选中的节点key数组
+    checkedKeys: {
+      type: Array,
+      default () {
+        return [];
+      }
+    },
+    width: {
+      type: String,
+      default () {
+        return "";
+      }
+    },
+    drawerTitle:{
+      type: String,
+      default () {
+        return '';
+      }
+    },
+    showCheckBox:{
+      type: Boolean,
+      default () {
+        return true;
+      }
+    },
+    // 配置是否展开
+    modalShowFlag: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
+  },
+  data () {
+    return {
+      filterText: '',
+      nodeList: [],
+      defaultCheckedKeys: [],
+      isShowSelect: false, // 是否显示树状选择器
+      options: [],
+      selectedData: [], // 选中的节点
+      style: 'width:' + this.width + 'px;' + 'height: 100%;',
+      selectStyle: 'width:100%;',
+    };
+  },
+  created(){
+  },
+  mounted () {
+    if (this.checkedKeys.length > 0) {
+      if (this.multiple) {
+        this.defaultCheckedKeys = this.checkedKeys;
+        this.getChildByIDSList(this.defaultCheckedKeys);
+      } else {
+        const item = this.checkedKeys[0];
+        this.getChildByIDSList(item);
+      }
+    }
+  },
+  methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.menuName.indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const that = this;
+
+      if (node.level === 0) {
+        that.loadTreeData(resolve);
+      }
+
+      if (node.level >= 1) {
+        setTimeout(() => {
+          this.getChildByList(node.data.level,node.data.id, resolve);
+        }, 500);
+        return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
+      }
+
+
+    },
+    getChildByIDSList( _parentID) {     // 获取子节点请求
+      let params = {ids : _parentID};
+      this.$http.get(this.urlChild, params, {
+        _this: this
+      }, res => {
+        if(res.data){
+          this.$emit('popoverHide', this.checkedIds, res.data,false);
+        }
+      })
+    },
+    getChildByList( level,id,resolve) {     // 获取子节点请求
+      let params = {level : level,id :id,type : this.type};
+      this.$http.get(this.urlChild, params, {
+        _this: this
+      }, res => {
+        if(res.data){
+          resolve(res.data);
+        }else {
+          return false;
+        }
+      })
+    },
+    loadTreeData(resolve) {
+      // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+      this.$http.get(this.url,  {type : this.type}, {
+        _this: this
+      }, res => {
+        if(res.data){
+          resolve(res.data)
+        }else {
+          return false;
+        }
+      })
+    },
+    popoverHide () {
+
+    },
+    // 节点被点击时的回调,返回被点击的节点数据
+    handleNodeClick (data, node) {
+      if (!this.multiple) {
+        let tmpMap = {};
+        tmpMap.value = node.key;
+        tmpMap.label = node.label;
+        this.options = [];
+        this.options.push(tmpMap);
+        this.selectedData = node.label;
+        this.isShowSelect = !this.isShowSelect;
+      }
+    },
+    // 递归
+    getTreeData(data) {
+      // 循环遍历json数据
+      for (let i = 0; i < data.length; i++) {
+        if (data[i].children.length < 1) {
+          // children若为空数组，则将children设为undefined
+          delete data[i].children
+        } else {
+          // children若不为空数组，则继续 递归调用 本方法
+          this.getTreeData(data[i].children)
+        }
+      }
+      return data
+    },
+    // 节点选中状态发生变化时的回调
+    handleCheckChange () {
+      var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+      this.options = checkedKeys.map((item) => {
+        var node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
+        let tmpMap = {};
+        tmpMap.value = node.key;
+        tmpMap.label = node.label;
+        return tmpMap;
+      });
+      this.selectedData = this.options.map((item) => {
+        return item.label;
+      });
+    },
+    saveUserInfo () {
+      if (this.multiple) {
+        this.checkedIds = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+        this.checkedData = this.$refs.tree.getCheckedNodes(); // 所有被选中的节点所组成的数组数据
+      } else {
+        this.checkedIds = this.$refs.tree.getCurrentKey();
+        this.checkedData = this.$refs.tree.getCurrentNode();
+      }
+      this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
+    },
+    cancelUserInfo () {
+      this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
+    },
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .expanded{
+  background-image: none !important;
+  background-size:100% 100%;
+}
+.el-drawer__body{
+ /* & > div:first-child{
+    display: flex;
+    flex: auto;
+    flex-direction: column;
+  }*/
+}
+::v-deep .el-drawer__header{
+  &>span:first-child{
+    outline: none!important;
+  }
+}
+::v-deep .el-drawer{
+  outline: none!important;
+}
+
+</style>

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

@@ -0,0 +1,500 @@
+<!--标准合规评估 业务经理审批-->
+<template>
+<div class="bzpg-step2">
+  <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>
+    <el-table
+      :data="dataList"
+      border
+      ref="selection"
+      height="100%"
+      style="width: 100%;"
+      :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="projectGroup"
+        label="项目群"/>
+      <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="projectGroupPeople"
+        label="项目群责任人">
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="distributePerson"
+        label="分发责任人">
+      </el-table-column>
+    </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>
+  <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: "bzpgStep2",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      drawerModal: false,
+      loading: false,
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      commentText: '',
+      drawerTitle: '',
+      listForm: {},
+      dataList: [],
+      detailData: [],
+      nodeList: [],
+    }
+  },
+  mounted() {
+    this.getData()
+    this.processTable()
+  },
+  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.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
+      })
+    },
+    //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(){
+       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) {
+      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 lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzpg-step2 {
+  /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/bzpg/step3.vue

@@ -0,0 +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",
+  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 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

@@ -160,19 +160,31 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <!--<el-form-item label="归档位置">
+                <el-form-item v-if="verifySarStandard" label="归档位置" class="add-form-item form-item-disabled">
                   <el-input
                     style="display: none"
                     v-model="form.treeListId"
-                    placeholder="请"
-                    readonly
                   ></el-input>
-                  <el-input
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
-                    v-model="form.treeListName"
+                    <el-input
-                    placeholder="请输入标准英文名称"
+                      v-model="form.treeListName"
-                    readonly
+                      clearable
-                  ></el-input>
+                      placeholder="选择归档位置"
-                </el-form-item>-->
+                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
+                    </el-input>
+                  </el-tooltip>
+                  <tree-select-stand
+                    :key="key"
+                    :multiple=true
+                    :lazy=false
+                    :checkStrictly=true
+                    :modalShowFlag="modalShowTree"
+                    :drawerTitle="drawerTitle"
+                    width="800"
+                    :data="treeListOptions"
+                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
+                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -566,33 +578,6 @@
                     v-model="form['nylx']"
                   ></custom-select-array>
                 </template>
-                <!--                                <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">-->
-                <!--                                  <custom-select-array-->
-                <!--                                      :key="applyArcticOptions.value"-->
-                <!--                                      :config="applyArcticOptions.label"-->
-                <!--                                      v-model="applyArcticOptions"-->
-                <!--                                  ></custom-select-array>-->
-                <!--                                    <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>-->
-                <!--                                        <el-option-->
-                <!--                                                v-for="item in applyArcticOptions"-->
-                <!--                                                placeholder="请选择"-->
-                <!--                                                :key="item.value"-->
-                <!--                                                :value="item.value"-->
-                <!--                                                :label="item.label"-->
-                <!--                                        ></el-option>-->
-                <!--                                    </el-select>-->
-                <!--                                </el-form-item>-->
-                <!--                                <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">-->
-                <!--                                    <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>-->
-                <!--                                        <el-option-->
-                <!--                                                v-for="item in categoryOptions"-->
-                <!--                                                placeholder="请选择"-->
-                <!--                                                :key="item.value"-->
-                <!--                                                :value="item.value"-->
-                <!--                                                :label="item.label"-->
-                <!--                                        ></el-option>-->
-                <!--                                    </el-select>-->
-                <!--                                </el-form-item>-->
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" clearable @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
                   <tree-select-new
@@ -920,27 +905,27 @@
                   >{{ '手动查找' }}
                   </el-button>
                 </el-form-item>
-                <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
+                <!--<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
-                <!--                                    <el-input-->
+                                                    <el-input
-                <!--                                            v-model="form.byybj"-->
+                                                            v-model="form.byybj"
-                <!--                                            placeholder="请输入被引用标准"-->
+                                                            placeholder="请输入被引用标准"
-                <!--                                            clearable-->
+                                                            clearable
-                <!--                                    ></el-input>-->
+                                                    ></el-input>
-                <!--                                    <el-button-->
+                                                    <el-button
-                <!--                                            type="primary"-->
+                                                            type="primary"
-                <!--                                            class="common-button-primary"-->
+                                                            class="common-button-primary"
-                <!--                                            size="mini"-->
+                                                            size="mini"
-                <!--                                            style="position:absolute;top: 10px;right: 0;"-->
+                                                            style="position:absolute;top: 10px;right: 0;"
-                <!--                                            @click="selectLaws('byybj'),config.attrName = '被引用标准'"-->
+                                                            @click="selectLaws('byybj'),config.attrName = '被引用标准'"
-                <!--                                    >{{'手动查找'}}</el-button>-->
+                                                    >{{'手动查找'}}</el-button>
-                <!--                                </el-form-item>-->
+                                                </el-form-item>
-                <!--                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
+                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
-                <!--                                    <el-input-->
+                                                    <el-input
-                <!--                                            v-model="form.chjl"-->
+                                                            v-model="form.chjl"
-                <!--                                            placeholder="请输入参会记录"-->
+                                                            placeholder="请输入参会记录"
-                <!--                                            clearable-->
+                                                            clearable
-                <!--                                    ></el-input>-->
+                                                    ></el-input>
-                <!--                                </el-form-item>-->
+                                                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
@@ -1179,38 +1164,6 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
-<!--            <el-drawer
-                    :title="drawerTitle"
-                    :visible.sync="modalShowFlag"
-                    :wrapperClosable="false"
-                    size="800px">
-              <el-input
-                  style="width:70%;padding: 10px"
-                  placeholder="请输入姓名"
-                  v-model="filterText">
-              </el-input>
-                <el-tree
-                        :filter-node-method="filterNode"
-                        v-if="modalShowFlag"
-                        node-key="id"
-                        style="height: 100%; overflow: auto;"
-                        class="filter-tree"
-                        :data="treeData"
-                        :props="defaultUserProps"
-                        :default-checked-keys="nodeList"
-                        highlight-current
-                        check-strictly
-                        @check="drawerCheck"
-                        default-expand-all
-                        :expand-on-click-node="false"
-                        show-checkbox
-                        ref="tree">
-                </el-tree>
-                <div id="roleFormButton" class="demo-drawer-footer">
-                    <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                    <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
-                </div>
-            </el-drawer>-->
     <!-- 选择标准的弹框 -->
     <el-drawer
       ref="standard"
@@ -1380,17 +1333,19 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
-import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, taskDel, processBack} from "api/process";
+import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, taskDel} from "api/process";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
 import CusTomDataPickerGroup
   from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
 
 export default {
   name: "bzrkStep1",
   components: {
+    TreeSelectStand,
     CusTomDataPickerGroup,
     CustomDatePickGroup,
     TreeSelectModule,
@@ -1529,6 +1484,7 @@ export default {
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
       modalShowRoleFlag5: false,
+      modalShowTree: false, // 归档位置drawer开关
       url: '',
       urlChild: '',
       drawerTitle: '', //drawer标题
@@ -1540,11 +1496,16 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+
+      // 归档位置所选
+      treeCheckedKeys: [],
+
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       fileType: '',
       countryArr: '',
       form: {
+        standId: '',
         // 基础信息
         country: '',
         textStatus: '', // 文本状态
@@ -1560,6 +1521,9 @@ export default {
         isRelateAccess: '', // 是否纳入认证清单
         standSystem: '',// 标准体系
         standSystemName: '',// 标准体系名称
+
+        treeListId: '', // 归档位置Id
+        treeListName: '', // 归档位置名称
         gxhbq: '', // 标签
         // 实施日期
         ssrq: '', // 实施日期(标准文本)
@@ -1682,6 +1646,8 @@ export default {
       busVppsChildOptions: [], // 车系体系架构子集合
       modelOptions: [], // 模块体系架构
       modelChildOptions: [], // 模块体系架构子集合
+
+      treeListOptions: [],//归档位置数据储存
       applyArcticOptions: {
         attrName: '适用车型',
         options: []
@@ -1738,7 +1704,6 @@ export default {
     },
     'form' : {
       handler: function () {
-        console.log(this.form.standInData)
         if(this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
           this.rules.standName[0].required = false
@@ -1897,7 +1862,6 @@ export default {
     // 标准来源改变事件
     standInChange(val) {
       this.verifySarStandard = false
-
       /** val === '1' (国外) val  === '0'（ 国内 ）*/
       // 国内英文名称不必填 国外必填 ，标准性质国内不体现
       if (val === '1') {
@@ -2071,6 +2035,7 @@ export default {
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
+        this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
@@ -2189,10 +2154,10 @@ export default {
                 const bringData = res.data
                 bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
                 bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
-
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                 this.form = JSON.parse(JSON.stringify(json))
-                console.log(this.form)
+                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 : ''
@@ -2211,9 +2176,6 @@ export default {
                 this.key3++
                 this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                 this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
-                // this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
-                // this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
-                // this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
                 this.form.prcNum = this.prcNum
                 this.form.prcName = this.prcName
                 this.form['id'] = bringData.id
@@ -2229,7 +2191,6 @@ export default {
                   this.initializeFileList(p, this.form[p]);
                 }
               }
-              console.log("res", res);
             })
 
           } else if (this.standardCheckedList.length > 1) {
@@ -2307,6 +2268,37 @@ export default {
       }, e => {
       })
     },
+
+    /** 归档位置树结构查询 */
+    getListTree(bringData) {
+      this.$http.get('sarResource/ts-resource/getListStand', {
+        sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
+        userId: this.$store.getters.userInfo.userId
+      }, {}, res => {
+        if (res.ok) {
+          this.treeListOptions = res.data
+          this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
+            standId: bringData.id,
+          }, {}, reson => {
+            if (reson.ok) {
+              let treeList = ''
+              let treeListId = ''
+              reson.data.forEach(item=>{
+                this.treeCheckedKeys.push(item.menuId)
+                if (treeList.length > 0) {
+                  treeList += ','
+                  treeListId += ','
+                }
+                treeList += item.menuName
+                treeListId += item.menuId
+              })
+              this.form.treeListName = treeList
+              this.form.treeListId = treeListId
+            }
+          })
+        }
+      })
+    },
     handleStandardPageChange(page) {
       this.standardSearchForm.page = page
       this.handleSearchStandard()
@@ -2464,6 +2456,13 @@ export default {
       this.urlChild = "sarModelTree/childByList"
       this.key3++
     },
+
+    choiceTree(type, title, id) {
+      this.drawerTitle = title
+      this.getListTree(this.form)
+      this.modalShowTree = true
+      this.key++
+    },
     getTree() {
       this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res => {
 
@@ -2925,6 +2924,23 @@ export default {
     popoverHideCancel() {
       this.modalShowFlag1 = false
     },
+
+    treeHide(checkedIds, checkedData) {
+      if (checkedData) {
+        if (checkedData.length > 0 && checkedData.length != 0) {
+          this.form.treeListName = checkedData.map(item => item.menuName).join(",")
+          this.form.treeListId = checkedData.map(item => item.id).join(",")
+        } else {
+          this.form.treeListName = checkedData.menuName
+          this.form.treeListId = checkedData.id
+        }
+        this.modalShowTree = false
+      }
+
+    },
+    treeHideCancel() {
+      this.modalShowTree = false
+    },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0 && checkedData.length != 0) {

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

@@ -142,6 +142,20 @@
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item  label="归档位置" class="add-form-item form-item-disabled">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                  ></el-input>
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-model="form.treeListName"
+                      clearable
+                      placeholder="选择归档位置"
+                      readonly>
+                    </el-input>
+                  </el-tooltip>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -158,7 +172,6 @@
                     :disabled="true"
                 ></custom-date-pick-group>
                 <custom-date-pick-group
-                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.zccssrq"
@@ -185,7 +198,6 @@
               </el-col>
               <el-col :span="12">
                 <custom-date-pick-group
-                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.xcxssrq"

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

@@ -147,6 +147,31 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="归档位置" class="add-form-item form-item-disabled">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                  ></el-input>
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-model="form.treeListName"
+                      clearable
+                      placeholder="选择归档位置"
+                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
+                    </el-input>
+                  </el-tooltip>
+                  <tree-select-stand
+                    :key="key"
+                    :multiple=true
+                    :lazy=false
+                    :checkStrictly=true
+                    :modalShowFlag="modalShowTree"
+                    :drawerTitle="drawerTitle"
+                    width="800"
+                    :data="treeListOptions"
+                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
+                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -1452,10 +1477,11 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 import CusTomDataPickerGroup
   from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
-
+import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
 export default {
   name: "bzrkStep4",
   components: {
+    TreeSelectStand,
     CusTomDataPickerGroup,
     TreeSelectModule,
     ProcessHeader,
@@ -1520,10 +1546,13 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      treeCheckedKeys: [],
+      treeListOptions: [],
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowTree: false, // 归档位置drawer开关
       url: '',
       urlChild: '',
       drawerTitle: '', //drawer标题
@@ -1610,6 +1639,8 @@ export default {
         standSystem: '',// 标准体系
         standSystemName: '',// 标准体系
         gxhbq: '', // 标签
+        treeListName: '',
+        treeListId: '',
         // 实施日期
         ssrq: '', // 实施日期(标准文本)
         xcxssrq: '', // 新车型实施日期(标准文本)
@@ -1884,6 +1915,12 @@ export default {
       this.key3++
     },
 
+    choiceTree(type, title, id) {
+      this.drawerTitle = title
+      this.getListTree(this.form)
+      this.modalShowTree = true
+      this.key++
+    },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this
@@ -2370,6 +2407,22 @@ export default {
     popoverHideCancel() {
       this.modalShowFlag1 = false
     },
+    treeHide(checkedIds, checkedData) {
+      if (checkedData) {
+        if (checkedData.length > 0 && checkedData.length != 0) {
+          this.form.treeListName = checkedData.map(item => item.menuName).join(",")
+          this.form.treeListId = checkedData.map(item => item.id).join(",")
+        } else {
+          this.form.treeListName = checkedData.menuName
+          this.form.treeListId = checkedData.id
+        }
+        this.modalShowTree = false
+      }
+
+    },
+    treeHideCancel() {
+      this.modalShowTree = false
+    },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0 && checkedData.length != 0) {
@@ -2462,6 +2515,7 @@ export default {
         this.defaultCheckedKeys1 = [this.form.cycvppsbm];
         this.defaultCheckedKeys2 = [this.form.kccvppsbm];
         this.defaultCheckedKeys3 = [this.form.dybxh];
+        this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         this.form.prcNum = this.prcNum
@@ -2538,6 +2592,17 @@ export default {
       }, e => {
       })
     },
+    /** 归档位置树结构查询 */
+    getListTree(bringData) {
+      this.$http.get('sarResource/ts-resource/getListStand', {
+        sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
+        userId: this.$store.getters.userInfo.userId
+      }, {}, res => {
+        if (res.ok) {
+          this.treeListOptions = res.data
+        }
+      })
+    },
     closeDrawer() {
       this.ListModel = false
     },

src/pages/processCenter/pages/newProcess/index.vue

@@ -467,9 +467,9 @@
             })
             break
           case '7':
-            //项目评估流程 - 标准
+            //标准合规评估流程
             this.$router.push({
-              name: 'xmpgStep1'
+              name: 'bzpgStep1'
             })
             break
           case '8':

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

@@ -467,9 +467,9 @@ export default {
           })
           break
         case '7':
-          //项目评估流程 - 标准
+          //标准合规评估
           this.$router.push({
-            name: 'xmpgStep1'
+            name: 'bzpgStep1'
           })
           break
         case '8':

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,

src/router/index.js

@@ -520,6 +520,33 @@ const routes = [
           title: '重点认证标准/政策合规性项目审查流程'
         }
       },
+      {
+        path: '/bzpgStep1',
+        name: 'bzpgStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
+      {
+        path: '/bzpgStep2',
+        name: 'bzpgStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
+      {
+        path: '/bzpgStep3',
+        name: 'bzpgStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',