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

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

@@ -122,17 +122,12 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                                    <tree-select
-                                    <tree-select-new
                                             :key="key"
-                                            :multiple=false
-                                            :lazy=false
-                                            :modalShowFlag="modalShowFlag1"
-                                            :drawerTitle="drawerTitle"
                                             width = "340"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
@@ -506,46 +501,28 @@
                                     </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编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
+                                    <tree-select
-                                    <tree-select-new
                                             width = "340"
                                             :key="key1"
-                                            :lazy=true
+                                            :data="busVppsOptions"
-                                            :multiple=false
-                                            :modalShowFlag="modalShowFlag2"
-                                            :drawerTitle="drawerTitle"
-                                            :url="url"
-                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
+                                    <tree-select
-                                    <tree-select-new
                                             width = "340"
                                             :key="key2"
-                                            :lazy=true
+                                            :data="busVppsOptions"
-                                            :multiple=false
-                                            :modalShowFlag="modalShowFlag3"
-                                            :drawerTitle="drawerTitle"
-                                            :url="url"
-                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
+                                    <tree-select
-                                    <tree-select-new
-                                            width = "340"
                                             :key="key3"
-                                            :lazy=true
+                                            width = "340"
-                                            :multiple=false
+                                            :data="modelOptions"
-                                            :modalShowFlag="modalShowFlag4"
-                                            :drawerTitle="drawerTitle"
-                                            :url="url"
-                                            :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input
@@ -728,20 +705,20 @@
                                             clearable
                                     ></el-input>
                                 </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-input-->
 <!--                                            v-model="form.chjl"-->
@@ -1127,17 +1104,9 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
-    import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
     export default {
         name: "bzrkStep1",
-        components: {
-            ProcessHeader,
-            ProcessFooter,
-            ProcessTitle,
-            TreeSelect,
-            TreeSelectNew
-        },
         data () {
             return {
               standardDrawer: false,
@@ -1222,12 +1191,6 @@
                 key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
-                modalShowFlag1: false, // drawer开关
-                modalShowFlag2: false, // drawer开关
-                modalShowFlag3: false, // drawer开关
-                modalShowFlag4: false, // drawer开关
-                url:'',
-                urlChild:'',
                 drawerTitle: '', //drawer标题
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
@@ -1367,9 +1330,7 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 busVppsOptions: [], // 车系体系架构
-                busVppsChildOptions: [], // 车系体系架构子集合
                 modelOptions: [], // 模块体系架构
-                modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
@@ -1437,6 +1398,12 @@
                 },
             },
         },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle,
+            TreeSelect
+        },
         methods: {
             clearFormData(data){
                 this.form = {
@@ -1661,6 +1628,7 @@
                         this.zrUserIds.push(data)
                     }
 
+                    console.log(this.zrUserIds)
                 }else {
                     var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
                     if(getlist.length == 1) {
@@ -1678,38 +1646,6 @@
                 this.drawerTitle = title
                 this.modalShowFlag = true
             },
-            choiceZRR1 (type, title, id) {
-                this.drawerTitle = title
-                this.modalShowFlag1 = true
-                this.key++
-            },
-            choiceZRR2 (type, title, id) {
-                this.drawerTitle = title
-                this.modalShowFlag2 = true
-                this.url = ''
-                this.urlChild = ''
-                this.url="sarVppsTree/list"
-                this.urlChild="sarVppsTree/childByList"
-                this.key1++
-            },
-            choiceZRR3 (type, title, id) {
-                this.drawerTitle = title
-                this.modalShowFlag3 = true
-                this.url = ''
-                this.urlChild = ''
-                this.url="sarVppsTree/list"
-                this.urlChild="sarVppsTree/childByList"
-                this.key2++
-            },
-            choiceZRR4 (type, title, id) {
-                this.drawerTitle = title
-                this.modalShowFlag4 = true
-                this.url = ''
-                this.urlChild = ''
-                this.url="sarModelTree/list"
-                this.urlChild="sarModelTree/childByList"
-                this.key3++
-            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
                     this.treeData = res.data
@@ -1953,51 +1889,29 @@
                 this.fileMadel = true
                 this.fileType = type;
             },
-            popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+            popoverHide (checkedIds, checkedData) {
                 if(checkedData) {
-                    if(checkedData.length > 0){
+                    this.form.standSystem = checkedData.id
-                        this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+                    this.form.standSystemName = checkedData.menuName
-                    }else {
-                        this.form.standSystem = checkedData.menuName
-                    }
                 }
-                this.modalShowFlag1 = false
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+            popoverHideBusVs (checkedIds, checkedData) {
-                if(checkedData) {
+                if(checkedData){
-                    if(checkedData.length > 0){
+                    this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                    this.form.cycvppscn = checkedData.chineseName
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
-                    }
                 }
-                this.modalShowFlag2 = false
             },
-            popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+            popoverHideCarVs (checkedIds, checkedData) {
-                if(checkedData) {
+                if(checkedData){
-                    if(checkedData.length > 0){
+                    this.form.kccvppsbm = checkedData.code
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                    this.form.kccvppscn = checkedData.chineseName
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.kccvppsbm = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
-                    }
                 }
-                this.modalShowFlag3 = false
             },
-            popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+            popoverHideModel (checkedIds, checkedData) {
-                if(checkedData) {
+                if(checkedData){
-                    if(checkedData.length > 0){
+                    this.form.dybxh = checkedData.model
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    this.form.dymc = checkedData.name
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
-                    }else {
-                        this.form.dybxh = checkedData.model
-                        this.form.dymc = checkedData.name
-                    }
                 }
-                this.modalShowFlag4 = false
             },
             closeDrawer() {
                 this.ListModel = false
@@ -2092,14 +2006,6 @@
                     this.busVppsOptions = res.data
                 })
             },
-            busVsChildFunc(id){
-                this.$http.get('sarVppsTree/childByList', {id:id}, {
-                    _this: this
-                }, res => {
-                    this.busVppsChildOptions = []
-                    this.busVppsChildOptions = res.data
-                })
-            },
             modelFunc(){
                 this.$http.get('sarModelTree/list', '', {
                     _this: this

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

@@ -413,36 +413,6 @@ export default {
           zcCompletionTime: "" //在产的完成时间
         }]
       },
-      // listForm: {
-      //   standNumber: "", //标准编号
-      //   standName: "",//标准名称
-      //   certifiedEngineer: "", //认证工程师
-      //   qualityEngineer: "", //质量工程师
-      //   dataList: [{
-      //     certifiedEngineer: '',
-      //     projectManager: '',
-      //     standNumber: '',
-      //     itemsName: '',
-      //     uname: '',
-      //     projectNumber: '',
-      //     implementer: '',
-      //     implementerId: '',
-      //     productLine: '',
-      //     itemNum:'',
-      //     qualityEngineer: '',
-      //     distributePerson:'',
-      //     projectName:'',
-      //     standName:'',
-      //     distributePersonId:'',
-      //     complianceReasons:'', //在研合规原因
-      //     noCompliance:'', //在研不合规项目
-      //     countermeasures:'', //在研应对措施
-      //     completionTime:'', //在研完成时间
-      //     zcComplianceReasons: '', //在产的合规原因
-      //     zcCountermeasures:'', //在产的应对措施
-      //     zcCompletionTime:'', //在产的完成时间
-      //   }]
-      // },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
       user1: "",
@@ -477,7 +447,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -492,11 +461,18 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(item.fenFlag);
         if (item.fenFlag === undefined ) {
+          item.step3DTOS.forEach(item => {
+            item.implementerId = this.$store.getters.userInfo.userId
+            item.implementer = this.$store.getters.userInfo.userName
+          })
           this.dataList = item.step3DTOS;
         } else {
           this.dataList = item.dataList;
+          this.dataList.forEach(item => {
+            item.implementerId = this.$store.getters.userInfo.userId
+            item.implementer = this.$store.getters.userInfo.userName
+          })
         }
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
@@ -524,6 +500,7 @@ export default {
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -0,0 +1,368 @@
+<!--项目合规评估流程-项目维度-->
+<template>
+  <div class="xmpg2-step1">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程 - 项目</template>
+      <template slot="proNode">申请人发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          :rules="formRules"
+          ref="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
+              </el-form-item>
+              <el-form-item label="项目编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          @selection-change="selectStandChange"
+          :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>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="SSRQ"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="XCXSSRQGJ"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="ZCCSSRQGJ"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="ZRBM"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="KCCVPPSBM"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="KCCVPPSCN"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="CYCVPPSBM"
+            width="180px"
+            align="center"
+            label="乘车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="CYCVPPSBM"
+            width="180px"
+            align="center"
+            label="乘车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>流程发起人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择标准法规业务经理" placement="top" :color="roleForm.serviceManager ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="serviceManagerName" style="margin-bottom: 0">
+                  <h4>审批责任人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.serviceManager" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"@click.native="choiceZRR('serviceManager', '选择业务经理', roleForm.serviceManager)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择工程经理进行转办" placement="top" :color="roleForm.engineeringManager ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="engineeringManagerName" style="margin-bottom: 0">
+                  <h4>工程经理</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.engineeringManager" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.engineeringManagerName" placeholder="选择工程经理" @click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="标准法规部部长审批" placement="top" :color="roleForm.statuteMinister ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="statuteMinisterName" style="margin-bottom: 0">
+                  <h4>标准法规部部长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长" @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+      <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="modalshowflag"
+        @checkedRole="checkedRole"
+        :nodeList="nodeList"
+      ></Role-tree>
+    </div>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst } from "api/process";
+export default {
+  name: "xmpg2Step1",
+  components: {
+    ProcessFooter,
+    ProcessHeader,
+    ProcessTitle,
+  },
+ data(){
+    return {
+      active: '1',  //当前选中的type
+      //表单的数据
+      listForm: {
+        projectNumber:'',  //项目编号
+        projectName:'',   //项目名称
+      },
+      dataList:[], //下面标准的数据
+      //表单的验证
+      formRules: {
+        projectNumber: [
+          { required: true, message: "请填写项目编号", trigger: "change" }
+        ],
+        projectName: [
+          { required: true, message: "请填写项目名称", trigger: "change" }
+        ],
+      },
+      //选人的验证
+      roleFormRules:{
+        serviceManagerName:[
+          {required: true, message:"请选择业务经理", trigger:"change"}
+        ],
+        engineeringManagerName: [
+          {required: true, message:"请选择工程经理", trigger:"change"}
+        ],
+        statuteMinisterName: [
+          {required: true, message:"请选择法规部部长", trigger:"cahnge"}
+        ],
+      },
+      //选择人的数据
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        serviceManager:'', //业务经理
+        serviceManagerName:'',
+        engineeringManager:'', //工程经理
+        engineeringManagerName:'',
+        statuteMinister:'', //标准法规部部长
+        statuteMinisterName:'',
+      },
+      modalshowflag: false, // drawer开关
+      drawerTitle: '', //drawer标题
+      nodeList: [],
+    }
+ },
+  methods: {
+    //tab发生变化
+    handleTabs(type){
+      this.active = type
+    },
+    //点击选择项目事件
+    choiceShow(){
+
+    },
+    //标准的多选框改变
+    selectStandChange(){
+
+    },
+    choiceZRR (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.modalshowflag = true
+    },
+    checkedRole (data) {
+      if (this.type === 'serviceManager') {
+        this.roleForm.serviceManager = data[0].id
+        this.roleForm.serviceManagerName = data[0].name
+      } else if (this.type === 'engineeringManager') {
+        this.roleForm.engineeringManager = data[0].id
+        this.roleForm.engineeringManagerName = data[0].name
+      } else if (this.type === 'statuteMinister') {
+        this.roleForm.statuteMinister = data[0].id
+        this.roleForm.statuteMinisterName = data[0].name
+      }
+    },
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step1 {
+  /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%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>

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

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "xmpg2Step2"
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -10,7 +10,8 @@
 <!--        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
 <!--        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
-        <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
+        <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程-标准</div>
+        <div class="process-name" @click="handleCreateProcess('10')">项目合规评估流程-项目</div>
         <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
         <div class="process-name" @click="handleCreateProcess('9')">标准解读流程</div>
       </div>
@@ -87,11 +88,17 @@ export default {
           })
           break
         case '7':
-          //项目评估流程
+          //项目评估流程 - 标准
           this.$router.push({
             name: 'xmpgStep1'
           })
           break
+        case '10':
+          //项目评估流程- 项目
+          this.$router.push({
+            name: 'xmpg2Step1'
+          })
+          break
         case '8':
           //未符合项整改流程
           this.$router.push({

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -764,13 +764,13 @@
               <el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
                   <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
-                             @keyup.enter.native="searchConfiguraStand" clearable>
+                             @keyup.enter.native="searchConfiguraStand(true)" clearable>
                     <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
                 <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand"
+                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">

src/router/index.js

@@ -339,6 +339,24 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/xmpg2Step1',
+        name: 'xmpg2Step1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step2',
+        name: 'xmpg2Step2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
       {
         path: '/wfhxzgStep1',
         name: 'wfhxzgStep1',