Merge branch 'develop' into 'test'

Develop

See merge request !112

src/components/CustomFormComponents/InputForStandards.vue

@@ -106,9 +106,12 @@
           <template slot-scope="scope">{{ ['已发布', 'TBD', ''].includes(scope.row.issueTime) ? scope.row.issueTime : $moment(scope.row.issueTime).format('YYYY-MM-DD') }}</template>
         </el-table-column>
         <el-table-column
-          prop="standStateShow"
+          prop="textStatus"
-          label="标准状态"
+          label="文本状态"
           width="130">
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
         </el-table-column>
       </el-table>
       <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -168,6 +171,8 @@ export default {
   },
   data () {
     return {
+      textStatus:'',//文本状态
+      textStatusMap: {}, // 文本状态id与name对应
       replaceLawsNumModel: false,
       sarBussionessLawsEO: {
         replaceLawsNum: ''
@@ -203,7 +208,22 @@ export default {
       return !!this.config.isMust
     }
   },
+  mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
+  },
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
     handleChange (event) {
       // const value = event.target.value
       const value = event

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -0,0 +1,781 @@
+<!--项目清单确认流程--保存页面-->
+<template>
+  <div class="xmqdqr-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;">
+        <el-form
+          ref="qdqrForm"
+          :model="qdform"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <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="choiceProject">选择项目
+                  </el-button>
+                </el-form-item>
+                <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="qdform.projectNumber"
+                    placeholder="请输入项目编号"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="qdform.projectName"
+                    placeholder="请输入项目名称"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>
+                </el-form-item>
+                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="qdform.detailedListName"
+                    placeholder="请输入清单名称"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form myForm">
+            <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.confirmId ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="confirmName" style="margin-bottom: 0">
+                  <h4>确认人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.confirmName" placeholder="选择确认人"
+                              @click.native="choiceZRR('confirmId', '选择确认人', roleForm.confirmId)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <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
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @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=""
+                    @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="selectProjectChange"
+              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="uname"
+                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="cancelProject">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkProject">带入</el-button>
+      </div>
+    </el-drawer>
+    <!--   选择清单弹窗-->
+    <el-drawer
+      title="选择清单"
+      :visible.sync="detailedListModel"
+      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="sarSarAccessEOSearch" :inline="true" class="label-input-form">
+                <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
+                  <el-select
+                    v-model="sarSarAccessEOSearch.carType"
+                    placeholder="请选择"
+                    filterable
+                    size="small"
+                  >
+                    <el-option
+                      v-for="item in energyKindOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="清单名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="sarSarAccessEOSearch.detailedListName"
+                    placeholder="请输入清单名称"
+                  ></el-input>
+                </el-form-item>
+
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="searchSarAccess">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearSearchAccess">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%; padding: 0 3px"
+              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="carTypeShow"
+                label="车型类别"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+                width="260px"
+              >
+                <!--                <template slot-scope="scope">-->
+                <!--                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
+                <!--                </template>-->
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </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="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 { queryTaskFirst, saveTaskFirst} from "api/process";
+
+export default {
+  name: "xmqdqrStep1-1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1", //默认显示
+      commentText: "",
+      modalshowflag: false,
+      drawerTitle: "",
+      nodeList: [],
+      isSubmit: false,
+      saveLoading: false,
+      detailedListModel: false,
+      projectModel: false,
+      sarAccessListDatas: [],
+      ProjectDatas: [],
+      selectProject: [],
+      selectedList: [],
+      total: 0,
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      totalNo: 0,
+      pageNo: 1,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      energyKindOptions: [], //存放适用车型数据
+      // 查询相关参数
+      sarSarAccessEOSearch: {
+        carType: "",
+        detailedListName: ""
+      },
+      projectSearch: {
+        projectNumber: "",
+        projectName: ""
+
+      },
+      qdform: {
+        projectNumber: "",
+        projectName: "",
+        detailedListName: ""
+      },
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        confirmId: "",
+        confirmName: ""
+      },
+      //表单验证
+      formRules: {
+        projectName: [
+          { required: true, message: "请输入项目名称", trigger: "blur" }
+        ],
+        projectNumber: [
+          { type: "string", required: true, message: "请输入项目编号", trigger: "change" }
+        ],
+        detailedListName: [
+          { required: true, message: "请输入清单名称", trigger: "change" }
+        ]
+      },
+      // 角色验证
+      roleFormRules: {
+        confirmName: [
+          { required: true, message: "请选择确认人", trigger: "change" }
+        ]
+      }
+    };
+  },
+  methods: {
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        this.qdform = mes.form;
+        this.roleForm = mes.roleForm;
+        this.commentText = mes.commentText;
+      });
+    },
+    handleTabs(type) {
+      this.active = type;
+    },
+    //查询项目列表
+    getProjectData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectConfirm", {
+        PageSize: this.pageSize,
+        Page: this.page,
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        this.ProjectDatas = res.data.total.records;
+        this.total = res.data.total.total;
+        this.page = 1;
+      }, e => {
+
+      });
+    },
+    //清空查询列表
+    clearSearch() {
+      this.projectSearch = {
+        projectName: "",
+        projectNumber: ""
+      };
+      this.getProjectData();
+    },
+    //项目带入取消事件
+    cancelProject() {
+      this.projectModel = false;
+    },
+    //项目带入确定事件
+    OkProject() {
+      if (this.selectProject.length < 1) {
+        this.$message.warning("请至少选择一条数据进行带入");
+      } else if (this.selectProject.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else {
+        this.qdform.projectNumber = this.selectProject[0].projectNumber;
+        this.qdform.projectName = this.selectProject[0].projectName;
+        this.qdform.projectId = this.selectProject[0].id;
+        this.projectModel = false;
+      }
+
+    },
+    //查询清单列表
+    searchSarAccess() {
+      this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        page: this.pageNo,
+        pageSize: this.pageSizeNo,
+        ...this.sarSarAccessEOSearch,
+        sortKey: 2
+      }, {
+        _this: this
+      }, res => {
+        let arr = res.data.records;
+        arr.forEach(item => {
+          // 适用车型转换
+          if (item.carType !== null) {
+            let k = (item.carType || "").split(",");
+            for (let i in this.energyKindOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.energyKindOptions[i].value === k[m]) {
+                  k[m] = this.energyKindOptions[i].label;
+                }
+                item.carTypeShow = k.join(",");
+              }
+            }
+          }
+        });
+        this.sarAccessListDatas = arr;
+        this.tableLoading = false;
+        this.toatl = res.data.total;
+      }, e => {
+      });
+
+    },
+    //清空查询清单
+    clearSearchAccess() {
+      this.sarSarAccessEOSearch = {
+        carType: "",
+        detailedListName: ""
+      };
+      this.searchSarAccess();
+    },
+    //选择项目点击事件
+    choiceProject() {
+      this.projectModel = true;
+    },
+    //选择清单点击事件
+    choiceList() {
+      this.detailedListModel = true;
+    },
+    //清单带入取消事件
+    closeDrawer() {
+      this.detailedListModel = false;
+    },
+    //清单带入确定事件
+    OkDrawer() {
+      if (this.selectedList.length < 1) {
+        this.$message.warning("请至少选择一条数据进行带入");
+      } else if (this.selectedList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else {
+        this.qdform.detailedListName = this.selectedList[0].detailedListName;
+        this.qdform.detailedListId = this.selectedList[0].id;
+        this.qdform.detailedListVision = this.selectedList[0].detailedListVision;
+        this.detailedListModel = false;
+      }
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
+    },
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      if (this.type === "confirmId") {
+        this.roleForm.confirmId = data[0].id;
+        this.roleForm.confirmName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    //项目分页器
+    pageChange(page) {
+      this.page = page;
+      this.getProjectData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getProjectData();
+    },
+    //清单分页器
+    pageChangeNo(pageNo) {
+      this.pageNO = pageNo;
+      this.searchSarAccess();
+    },
+    pageSizeChangeNo(pageSizeNo) {
+      this.pageSizeNo = pageSizeNo;
+      this.searchSarAccess();
+    },
+    //清单勾选框数据
+    selectListChange(data) {
+      this.selectedList = data;
+    },
+    //项目勾选框数据
+    selectProjectChange(data) {
+      this.selectProject = data;
+    },
+    //提交事件
+    handleSubmit() {
+      this.qdform.commentText = this.commentText;
+      var json = Object.assign(this.qdform, this.roleForm);
+      this.$refs["qdqrForm"].validate((valid) => {
+        if (valid) {
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true;
+              this.$http.get("lawss/activiti/startProcess", { type: "10" }, {
+                _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");
+                    }
+                    this.isSubmit = false;
+                  });
+                }
+              });
+            } else {
+              return this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
+    },
+    //保存事件
+    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", "10");
+      _formData.append("json", JSON.stringify({
+        taskInfo: "确认人确认",
+        form: this.qdform,
+        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;
+      });
+    }
+  },
+  mounted() {
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        page: 1,
+        pageSize: this.pageSize,
+        ...this.sarSarAccessEOSearch,
+        sortKey: 2
+      }, {
+        _this: this
+      }, res => {
+        let arr = res.data.records;
+        arr.forEach(item => {
+          // 适用车型转换
+          if (item.carType !== null) {
+            let k = (item.carType || "").split(",");
+            for (let i in this.energyKindOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.energyKindOptions[i].value === k[m]) {
+                  k[m] = this.energyKindOptions[i].label;
+                }
+                item.carTypeShow = k.join(",");
+              }
+            }
+          }
+        });
+        this.sarAccessListDatas = arr;
+        this.tableLoading = false;
+        this.sarSarAccessEOSearch.page = 1;
+        this.totalNo = res.data.total;
+      }, e => {
+      });
+    }, e => {
+    });
+    this.getProjectData();
+    this.searchSarAccess();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step1 {
+  .myForm {
+    /deep/ .el-form-item__content {
+      line-height: 10px;
+    }
+  }
+
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  .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;
+      }
+    }
+  }
+}
+</style>
+

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue

@@ -0,0 +1,575 @@
+<template>
+  <div class="xmqdqr-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目清单确认流程</template>
+      <template slot="proNode">确认人确认</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="qdform"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailedListName"
+                  placeholder="请输入清单名称"
+                  disabled
+                  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="65%"
+          @selection-change="selectStandChange"
+          style="width: 100%; border:1px solid #ccc"
+          :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
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </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="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).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>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmqdqrStep1-2",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      projectId: "",
+      detailedId: "",
+      standSortOptions: [],
+      standList: [],
+      projectStand:[],
+      standardData: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //查询清单下标准数据
+      standCommonlySearch: {
+        standSort: "",
+        standNumber: "",
+        standType: "",
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
+      //表单的数据
+      qdform: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.standId,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.qdform = JSON.parse(JSON.stringify(item));
+        this.qdform.prcNum = this.prcNum;
+        this.qdform.prcName = this.prcName;
+        this.qdform["id"] = item.id;
+        this.projectId = item.projectId;
+        this.detailedId = item.detailedListId;
+        this.getStandData();
+        this.getStand();
+      });
+    },
+    //查询清单下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+        _this: this
+      }, res => {
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "") {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+      });
+    },
+    //添加标准勾选框数据
+    selectStand(data) {
+      this.standList = data;
+    },
+    selectStandChange(data){
+      this.projectStand = data
+    },
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准带入事件
+    okStand() {
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.standList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.standId === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+
+        this.standModel = false
+      }
+
+    },
+    //添加标准的查询按钮
+    search() {
+      this.getStand();
+    },
+    clearSearch() {
+      this.standCommonlySearch = {
+        standSort: "",
+        standNumber: "",
+        standType: ""
+      };
+      this.getStand();
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStand();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStand();
+    },
+    getStand(data) {
+      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        id: this.detailedId,
+        page: this.page,
+        Size: this.pageSize,
+        ...this.standCommonlySearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.standardData = "";
+          this.totalDo = "";
+        }
+        this.standardData = res.data.records;
+        this.standardData.forEach(item => {
+          if (item.zccssrqgj === "-") {
+            item.zccssrqgj = "";
+          }
+          if (item.xcxssrqgj === "-") {
+            item.xcxssrq = "";
+          }
+        });
+        this.total = res.data.total;
+      });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.setMap(this.standStateOptions);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+

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

@@ -232,11 +232,20 @@
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
-                <el-form-item label="车型类别" class="search-item search-item-last">
+                <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
-                  <el-input
+                  <el-select
                     v-model="sarSarAccessEOSearch.carType"
-                    placeholder="请输入车型类别"
+                    placeholder="请选择"
-                  ></el-input>
+                    filterable
+                    size="small"
+                  >
+                    <el-option
+                      v-for="item in energyKindOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    />
+                  </el-select>
                 </el-form-item>
                 <el-form-item label="清单名称" class="search-item search-item-last">
                   <el-input
@@ -418,7 +427,7 @@ export default {
       },
       // 角色验证
       roleFormRules: {
-        confirmId: [
+        confirmName: [
           { required: true, message: "请选择确认人", trigger: "change" }
         ]
       }
@@ -439,6 +448,7 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
+        this.page = 1;
       }, e => {
 
       });
@@ -530,6 +540,7 @@ export default {
       } else {
         this.qdform.detailedListName = this.selectedList[0].detailedListName;
         this.qdform.detailedListId = this.selectedList[0].id;
+        this.qdform.detailedListVision = this.selectedList[0].detailedListVision;
         this.detailedListModel = false;
       }
     },
@@ -578,14 +589,14 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.qdform.commentText = this.commentText
+      this.qdform.commentText = this.commentText;
       var json = Object.assign(this.qdform, this.roleForm);
       this.$refs["qdqrForm"].validate((valid) => {
         if (valid) {
           this.$refs["Form"].validate((valid) => {
             if (valid) {
-              this.isSubmit = true
+              this.isSubmit = true;
-              this.$http.get("lawss/activiti/startProcess", {type: "10"}, {
+              this.$http.get("lawss/activiti/startProcess", { type: "10" }, {
                 _this: this
               }, res => {
                 if (res.ok) {
@@ -600,7 +611,7 @@ export default {
                       this.$message.success(res.message);
                       this.$router.push("/processCenter");
                     }
-                    this.isSubmit = false
+                    this.isSubmit = false;
                   });
                 }
               });
@@ -622,7 +633,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "10");
       _formData.append("json", JSON.stringify({
-        taskInfo: '确认人确认',
+        taskInfo: "确认人确认",
         form: this.qdform,
         roleForm: this.roleForm,
         commentText: this.commentText
@@ -634,7 +645,7 @@ export default {
       }).catch(e => {
         this.saveLoading = false;
       });
-    },
+    }
   },
   mounted() {
     // 查询各下拉框数据

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

@@ -499,34 +499,34 @@ export default {
         this.qdform.prcNum = this.prcNum;
         this.qdform.prcName = this.prcName;
         this.qdform["id"] = item.id;
-        this.projectId = item.projectId;
+        // this.projectId = item.projectId;
         this.detailedId = item.detailedListId;
-        this.getStandData();
+        // this.getStandData();
         this.getStand();
       });
     },
     //查询清单下的标准
-    getStandData() {
+    // getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-        _this: this
+    //     _this: this
-      }, res => {
+    //   }, res => {
-        this.dataList = res.data.records;
+    //     this.dataList = res.data.records;
-        this.dataList.forEach(item => {
+    //     this.dataList.forEach(item => {
-          // 责任部门转换
+    //       // 责任部门转换
-          if (item.zrbm !== null || item.zrbm !== "") {
+    //       if (item.zrbm !== null || item.zrbm !== "") {
-            let k = (item.zrbm || "").split(",");
+    //         let k = (item.zrbm || "").split(",");
-            for (let i in this.zrbmOptions) {
+    //         for (let i in this.zrbmOptions) {
-              for (let m = 0; m < k.length; m++) {
+    //           for (let m = 0; m < k.length; m++) {
-                if (this.zrbmOptions[i].value === k[m]) {
+    //             if (this.zrbmOptions[i].value === k[m]) {
-                  k[m] = this.zrbmOptions[i].label;
+    //               k[m] = this.zrbmOptions[i].label;
-                }
+    //             }
-                item.zrbm = k.join(",");
+    //             item.zrbm = k.join(",");
-              }
+    //           }
-            }
+    //         }
-          }
+    //       }
-        });
+    //     });
-      });
+    //   });
-    },
+    // },
     //提交事件
     handleSubmit() {
       this.isSubmit = true;

src/pages/processCenter/pages/processDetail/index.vue

@@ -228,6 +228,9 @@ export default {
         }else if(prcType === '3'){
           //标准征求意见
           this.toProcessDetail('bzzqyjStep1-9',row)
+        }else if(prcType === '10'){
+          //项目清单确认
+          this.toProcessDetail('xmqdqrStep1-2',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

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

@@ -345,6 +345,16 @@ export default {
             }
           })
           break
+        case '10':
+          this.$router.push({
+            name: 'xmqdqrStep1-1',
+            query: {
+              type: '10',
+              processName: '项目清单确认流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

src/router/index.js

@@ -547,6 +547,24 @@ const routes = [
           title: '项目清单确认流程'
         }
       },
+      {
+        path: '/xmqdqrStep1-1',
+        name: 'xmqdqrStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
+      {
+        path: '/xmqdqrStep1-2',
+        name: 'xmqdqrStep1-2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
       {
         path: '/wfhxzgStep1',
         name: 'wfhxzgStep1',