From e19628dca131a80024d30c6edcd3ba78a7f0913b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 30 Jul 2021 13:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     |   6 +-
 .../pages/creatProcess/bzqdfb/step1.vue       |   6 +-
 .../pages/creatProcess/xmpg/step1-1.vue       | 949 ++++++++++++++++++
 .../pages/creatProcess/xmpg/step1.vue         |  66 +-
 .../pages/creatProcess/xmpg/step2.vue         |   3 +-
 .../pages/creatProcess/xmpg/step3.vue         |   1 +
 .../pages/creatProcess/xmpg2/step1-1.vue      | 657 ++++++++++++
 .../tabComponents/taskDraft/index.vue         |  20 +
 src/router/index.js                           |  18 +
 9 files changed, 1686 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index e1c72c47a..fdee3c148 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1269,10 +1269,10 @@ export default {
           { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
             _this: this
           }, res => {
-            if (res.data == null) {
-              res.data = [];
+            if (res.data.records == null) {
+              res.data.records = [];
             }
-            this.dataList = res.data;
+            this.dataList = res.data.records;
             this.dataList.forEach(item => {
               if (item.xcxssrqgj === null){
                 this.$set(item, "XCXSSRQ", '');
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 09c935c54..5b66cb677 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1243,10 +1243,10 @@ export default {
           { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
             _this: this
           }, res => {
-            if (res.data == null) {
-              res.data = [];
+            if (res.data.records == null) {
+              res.data.records = [];
             }
-            this.dataList = res.data;
+            this.dataList = res.data.records;
             this.dataList.forEach(item => {
               if (item.xcxssrqgj === null){
                 this.$set(item, "XCXSSRQ", '');
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
new file mode 100644
index 000000000..48849b845
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -0,0 +1,949 @@
+<!--项目合规评估流程 xmpgStep1-->
+<template>
+  <div class="xmpg-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
+                  disabled
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="请选择认证工程师"
+                  clearable
+                  @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="请选择质量工程师"
+                  clearable
+                  @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="49%"
+          style="width: 100%;"
+          @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="productLine"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="uname"
+            label="产品线责任人">
+          </el-table-column>
+          <el-table-column
+            prop="distributePerson"
+            label="分发责任人">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.distributePerson"
+                placeholder="请选择分发负责人"
+                readonly
+                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
+                v-if="!scope.row.distributePerson"></el-input>
+              <span v-else>{{ scope.row.distributePerson }}</span>
+            </template>
+            <!--            <template slot-scope="scope,text" v-if="showColumn">-->
+            <!--              <div>-->
+            <!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
+            <!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
+            <!--                  }}-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--            </template>-->
+          </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="roleForm"
+            :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.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准法法规业务经理</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择业务经理"
+                              @click.native="choiceZRR(null,'dockUser', '选择业务经理', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                  <h4>标准法规部领导</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="请选择标准法规部领导"
+                              @click.native="choiceZRR(null,'ministerUser', '选择标准法规部领导', roleForm.ministerUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!-- 选择已拆分标准抽屉-->
+    <el-drawer
+      title="选择已拆分标准"
+      :visible.sync="ListModel"
+      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="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standName"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                label="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="xcxssrqgj"
+                label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrqgj"
+                label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+    <!--    添加抽屉-->
+    <el-drawer
+      title="添加产品线"
+      :visible.sync="standModel"
+      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">
+            <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="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="productLine"
+                label="产品线">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="uname"
+                label="产品线责任人">
+              </el-table-column>
+            </el-table>
+          </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="okStand">添加</el-button>
+      </div>
+    </el-drawer>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    选择责任人-->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst, queryTaskFirst } from "api/process";
+
+export default {
+  name: "xmpgStep1-1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      standModel: false,
+      sarAccessListDatas: [],
+      productData: [], //添加抽屉的数据
+      standList: [], //新添加的标准
+      modalshowflag: false, // drawer开关
+      drawerTitle: "", //drawer标题
+      // 查询相关参数
+      searching: false,
+      standardSearch: {
+        standType: "",
+        standName: ""
+      },
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        qualityEngineer: "",
+        certifiedEngineer: "",
+        qualityEngineerName: "",
+        certifiedEngineerName: "",
+        distributePerson: "",
+        dockUser: "",
+        ministerUser: "",
+        dockUserName: "",
+        ministerUserName: ""
+      },
+      formRules: {
+        standName: [
+          { required: true, message: "请填写标准名称", trigger: "change" }
+        ],
+        standNumber: [
+          { required: true, message: "请填写标准编号", trigger: "change" }
+        ],
+        qualityEngineer: [
+          { required: true, message: "请选择质量工程师", trigger: "change" }
+        ],
+        certifiedEngineer: [
+          { required: true, message: "请选择认证工程师", trigger: "change" }
+        ]
+      },
+      roleFormRules: {
+        dockUserName: [
+          { required: true, message: "请选择业务经理", trigger: "change" }
+        ],
+        ministerUserName: [
+          { required: true, message: "请选择标准法规部领导", trigger: "change" }
+        ]
+      },
+      ListModel: false, //选择拆分标准抽屉状态
+      treeData: [], // 人员数据
+      selectList: [], //选择标准的选择框
+      currentIndex: -1, // 当前操作行索引
+      isSubmit: false,
+      saveLoading: false,
+      selectedList: [],  //拆分标准的选择框
+      dataList: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      product: new Map(),
+      listForm: {
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          projectManager: "",// 产品线责任人id
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      showColumn: true,
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  methods: {
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        this.listForm = mes.form;
+        this.dataList = mes.form.dataList;
+        this.roleForm = mes.roleForm;
+        this.commentText = mes.commentText;
+      });
+    },
+    checkedRole(data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = data[0].id;
+        this.roleForm.dockUserName = data[0].name;
+      } else if (this.type === "ministerUser") {
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName = data[0].name;
+      } else if (this.type === "qualityEngineer") {
+        this.roleForm.qualityEngineer = data[0].id;
+        this.roleForm.qualityEngineerName = data[0].name;
+        this.listForm.qualityEngineer = data[0].id;
+        this.listForm.qualityEngineerName = data[0].name;
+      } else if (this.type === "certifiedEngineer") {
+        this.roleForm.certifiedEngineer = data[0].id;
+        this.roleForm.certifiedEngineerName = data[0].name;
+        this.listForm.certifiedEngineer = data[0].id;
+        this.listForm.certifiedEngineerName = data[0].name;
+      } else if (this.type === "distributePerson") {
+        // 如果有勾选,则视为批量选择责任人
+        if (this.selectList.length) {
+          this.dataList.forEach((item, index) => {
+            if (this.selectList.includes(item.productLine)) {
+              const newItem = JSON.parse(JSON.stringify(item))
+              newItem.distributePersonId = data[0].id
+              newItem.distributePerson = data[0].name
+              this.$set(this.dataList, index, newItem)
+            }
+          })
+        } else {
+          const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
+          newItem.distributePersonId = data[0].id
+          newItem.distributePerson = data[0].name
+          this.$set(this.dataList, this.currentIndex, newItem)
+          this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
+          this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
+          this.currentIndex = -1
+        }
+      }
+      this.modalshowflag = false;
+    },
+    cancelUserInfo() {
+      this.modalshowflag = false;
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    drawerCheck(data) {
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+        this.roleRow = getlist[0];
+      } else {
+        this.$refs.tree.setCheckedKeys([data.id]);
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+      }
+    },
+    //导入功能
+    leading() {
+
+    },
+    //点击添加事件
+    addList() {
+      this.standModel = true;
+      this.$nextTick(() => {
+        this.$refs.projectTable.clearSelection();
+      })
+    },
+    // 点击批量删除事件
+    deleteList() {
+      if (this.selectList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据？", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.selectList.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.productLine = item;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
+    },
+    //取消添加事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    //确认添加事件
+    okStand() {
+      let proData = [];
+      if (this.dataList.length >= 1) {
+        this.dataList.forEach(item => {
+          if (proData.length === 0) {
+            proData.push(item.productLine);
+          } else if (!proData.includes(item.productLine)) {
+            proData.push(item.productLine);
+          }
+        });
+        this.standList.forEach(items => {
+          if (!proData.includes(items.productLine)) {
+            this.dataList.push(items);
+          }
+        });
+        this.standModel = false;
+      } else {
+        if (this.standList.length >= 1) {
+          this.dataList = this.standList;
+          this.roleForm.directorUser = this.dataList[0].uname;
+          this.listForm.dataList = this.standList;
+          this.standModel = false;
+        } else {
+          this.$message.warning("请选择一条数据进行添加");
+        }
+      }
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.uName);
+      _formData.append("prcType", "5");
+      _formData.append("json", JSON.stringify({
+        prcForm: this.prcForm,
+        sarAccessInfoList: this.sarAccessInfoList,
+        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+        bzqdForm: this.bzqdForm,
+        listInfo: this.listInfo,
+        id: this.id
+      }));
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      if (this.dataList.length < 1) {
+        this.$message.warning("请添加产品线信息");
+      }
+      this.dataList.forEach(item => {
+        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+          this.$message.warning("请选择分发责任人");
+        } else {
+          var json = Object.assign(this.listForm, this.roleForm);
+          console.log(json);
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
+        }
+      });
+
+    },
+    //选择拆分标准取消事件
+    closeDrawer() {
+      this.ListModel = false;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+
+    //选择拆分标准确定事件
+    OkDrawer() {
+      if (this.selectedList.length == 1) {
+        this.listForm.standNumber = this.selectedList[0].standNumber;
+        this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.id = this.selectedList[0].id;
+        this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+          ids: this.listForm.id,
+          type: "FBGBJBD"
+        }, {
+          _this: this
+        }, res => {
+          this.listForm.breakdownList = res.data;
+          this.ListModel = false;
+        }, e => {
+          this.$message.error("添加失败");
+        });
+      } else if (this.selectedList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else {
+        this.$message.warning("请选择一条数据带入");
+      }
+    },
+    //选择拆分标准选择框改变
+    selectListChange(data) {
+      this.selectedList = data;
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].productLine);
+      }
+    },
+    //添加产品线select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
+        this.currentIndex = scope.$index;
+      }
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.getStandData();
+    },
+    pageChangeNo(page) {
+      this.pageNO = page;
+      this.getProductData();
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getProductData();
+    },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+        current: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.productData = res.data.records;
+        this.totalNo = res.data.total;
+      }, e => {
+
+      });
+    },
+    //获取标准数据
+    getStandData() {
+      this.$http.post("SarStandItems/sar-stand-items/findStand", {
+        page: this.page,
+        size: this.pageSize,
+        ...this.standardSearch
+      }, {
+        _this: this
+      }, res => {
+        this.sarAccessListDatas = res.records;
+        this.total = res.total;
+      }, e => {
+
+      });
+    },
+    clearSearch() {
+      this.standardSearch = {
+        standName: "",
+        standType: ""
+      };
+      this.getStandData();
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+  },
+  computed: {},
+  watch: {
+    dataList: {
+      deep: true,
+      handler (val) {
+        console.log('dataList update', val)
+      }
+    }
+  },
+  mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
+    this.getData();
+    this.getTree();
+    this.getProductData();
+    this.getStandData();
+  }
+
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg-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>
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 41331f01f..52482ca58 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -94,22 +94,9 @@
             prop="distributePerson"
             label="分发责任人">
             <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.distributePerson"
-                placeholder="请选择分发负责人"
-                readonly
-                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
-                v-if="!scope.row.distributePerson"></el-input>
-              <span v-else>{{ scope.row.distributePerson }}</span>
+              <el-input v-model="scope.row.distributePersonId" style="display: none;"/>
+              <el-input v-model="scope.row.distributePerson" placeholder="请选择责任人" @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"/>
             </template>
-<!--            <template slot-scope="scope,text" v-if="showColumn">-->
-<!--              <div>-->
-<!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
-<!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
-<!--                  }}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -250,10 +237,10 @@
               >
               </el-table-column>
               <el-table-column
-                prop="putTime"
+                prop="issueTime"
                 label="发布日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -275,6 +262,9 @@
                 show-overflow-tooltip
                 prop="textStatus"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -500,7 +490,8 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      showColumn: true
+      showColumn: true,
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -642,16 +633,14 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.uName);
       _formData.append("prcType", "5");
       _formData.append("json", JSON.stringify({
-        prcForm: this.prcForm,
-        sarAccessInfoList: this.sarAccessInfoList,
-        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-        bzqdForm: this.bzqdForm,
-        listInfo: this.listInfo,
-        id: this.id
+        form: this.listForm,
+        roleForm: this.roleForm,
+        commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false;
         this.$message.success("保存成功");
+        this.$router.push("/processCenter");
       }).catch(e => {
         this.saveLoading = false;
       });
@@ -666,7 +655,6 @@ export default {
           this.$message.warning("请选择分发责任人");
         } else {
           var json = Object.assign(this.listForm, this.roleForm);
-          console.log(json);
           this.$refs["listForm"].validate((valid) => {
             if (valid) {
               this.$refs["roleForm"].validate((valid) => {
@@ -821,18 +809,32 @@ export default {
         standType: ""
       };
       this.getStandData();
-    }
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
   },
   computed: {},
   watch: {
-    dataList: {
-      deep: true,
-      handler (val) {
-        console.log('dataList update', val)
-      }
-    }
+    // dataList: {
+    //   deep: true,
+    //   handler (val) {
+    //     console.log('dataList update', val)
+    //   }
+    // }
   },
   mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
     this.getTree();
     this.getProductData();
     this.getStandData();
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 3acb8e4a7..688712f47 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -314,6 +314,7 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
+        console.log(item);
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
@@ -352,10 +353,8 @@ export default {
             this.$router.push('/processCenter')
           }
         }, e => {
-
         });
       }
-
     },
     //标准表格选择框改变
     selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 439803ab4..283e74541 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -346,6 +346,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
new file mode 100644
index 000000000..74b4b3417
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -0,0 +1,657 @@
+<!--项目合规评估流程-项目维度-->
+<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="projectNumber" 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="projectName" 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="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrqgj"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </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="cycvppscn"
+            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="roleForm"
+            :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>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 选择项目抽屉-->
+    <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-input
+                    v-model="projectSearch.projectNumber"
+                    placeholder="请输入项目编号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="项目名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.projectName"
+                    placeholder="请输入项目名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getProjectData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="ProjectDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center" />
+              <el-table-column
+                prop="projectNumber"
+                align="center"
+                label="项目编号"
+              />
+              <el-table-column
+                prop="projectName"
+                align="center"
+                label="项目名称"
+              />
+              <el-table-column
+                prop="projectClassification"
+                align="center"
+                label="项目分类"
+              />
+              <el-table-column
+                prop="projectManager"
+                align="center"
+                label="项目经理"
+              />
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst, queryTaskFirst } from "api/process";
+
+export default {
+  name: "xmpg2Step1-1",
+  components: {
+    ProcessFooter,
+    ProcessHeader,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",  //当前选中的type
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [], //标准下的分解单数据
+      },
+      dataList: [], //下面标准的数据
+      breakdownList: [], //标准下的条款数据
+      //表单的验证
+      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: [],
+      projectModel: false,  //项目抽屉开关
+      projectId: "", //项目id 用来查询标准
+      standId: [], //标准id 用来条款
+      searching: false,
+      //项目检索条件
+      projectSearch: {
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        projectNumber: "",
+        projectName: ""
+      },
+      //项目数据
+      ProjectDatas: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //存放被勾选的项目的数据
+      selectedList: []
+    };
+  },
+  methods: {
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        console.log(res.mes);
+        let mes = JSON.parse(res.mes);
+        this.listForm = mes.form;
+        this.dataList = mes.form.dataList;
+        this.roleForm = mes.roleForm;
+        this.commentText = mes.commentText;
+      });
+    },
+    //tab发生变化
+    handleTabs(type) {
+      this.active = type;
+    },
+    //点击选择项目事件
+    choiceShow() {
+      this.projectModel = true;
+    },
+    //获取项目数据
+    getProjectData() {
+      this.$http.get("sarStandProjectLibrary/queryProject", {
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        this.ProjectDatas = res.data.Maintenance.records;
+      });
+
+    },
+    //点击清空按钮事件
+    clearSearch() {
+      this.projectSearch = {
+        projectName: "",
+        projectNumber: ""
+      };
+      this.getProjectData();
+    },
+    //带入项目确定事件
+    OkDrawer() {
+      if (this.selectedList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else if (this.selectedList.length === 0) {
+        this.$message.warning("请选择一条数据进行带入");
+      } else {
+        this.projectId = this.selectedList[0].id;
+        this.listForm.projectNumber = this.selectedList[0].projectNumber;
+        this.listForm.projectName = this.selectedList[0].projectName;
+        this.getStandData();
+        this.projectModel = false;
+      }
+    },
+    //带入项目取消事件
+    closeDrawer() {
+      this.projectModel = false;
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+        _this: this
+      }, res => {
+        this.listForm.dataList = res.data.records;
+        this.dataList = res.data.records;
+        let ids = [];
+        this.dataList.forEach(item => {
+          ids.push(item.standId);
+        });
+        this.standId = ids.join(",");
+        this.getClauseData();
+      });
+    },
+    //查询标准下的条款
+    getClauseData() {
+      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+          ids: this.standId,
+          type: "FBGBJBD"
+        },
+        {
+          _this: this
+        }, res => {
+          this.listForm.breakdownList = res.data
+        });
+    },
+    //标准的多选框改变
+    selectStandChange(data) {
+    },
+    //项目的多选框改变
+    selectListChange(data) {
+      this.selectedList = data;
+    },
+    pageChange(page) {
+
+    },
+    pageSizeChange(pageSize) {
+
+    },
+    //流程保存事件
+    handleSave(){
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '6')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
+    //流程提交事件
+    handleSubmit(){
+      var json = Object.assign(this.listForm, this.roleForm)
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      json.prcCreateUserName = this.$store.getters.userInfo.uName;
+      json.standId = this.listForm.standId;
+      this.$refs['listForm'].validate((valid) => {
+        if (valid) {
+          this.$refs['roleForm'].validate((valid) => {
+            if (valid) {
+              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.$http.post("lawss/activiti/completeTask", {
+                    taskIds: res.data,
+                    userId: this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json)
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message);
+                      this.$router.push("/processCenter");
+                    }
+                  });
+                }
+              });
+            } else {
+              return this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
+    },
+    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;
+      }
+    }
+  },
+  mounted() {
+    this.getData();
+    this.getProjectData();
+  }
+};
+</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>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index f42b51d7a..fd95d9787 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -271,6 +271,26 @@ export default {
             }
           })
           break
+        case '5':
+          this.$router.push({
+            name: 'xmpgStep1-1',
+            query: {
+              type: '5',
+              processName: '项目合规评估流程-标准',
+              bpnId: id
+            }
+          })
+          break
+        case '6':
+          this.$router.push({
+            name: 'xmpg2Step1-1',
+            query: {
+              type: '6',
+              processName: '项目合规评估流程-项目',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index d46cfc24f..b437ec15b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -294,6 +294,15 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/xmpgStep1-1',
+        name: 'xmpgStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程'
+        }
+      },
       {
         path: '/xmpgStep2',
         name: 'xmpgStep2',
@@ -357,6 +366,15 @@ const routes = [
           title: '项目合规评估流程-项目'
         }
       },
+      {
+        path: '/xmpg2Step1-1',
+        name: 'xmpg2Step1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
       {
         path: '/xmpg2Step2',
         name: 'xmpg2Step2',