From 1ac7563d7098cc83188c7b34e94040ccc73b5d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 11:20:02 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-4.vue     | 537 ++++++++++++++++
 .../pages/creatProcess/xmpg/step1-2.vue       | 456 ++++++++++++++
 .../pages/creatProcess/xmpg/step1-4.vue       |  13 -
 .../pages/creatProcess/xmpg/step1-7.vue       | 581 ++++++++++++++++++
 .../pages/creatProcess/xmpg2/step1-12.vue     | 532 ++++++++++++++++
 .../{xmpg/step1-3.vue => xmpg2/step1-2.vue}   |   2 +-
 .../pages/creatProcess/xmpg2/step1.vue        |  26 +-
 .../pages/creatProcess/xmpg2/step2.vue        |  10 +-
 .../pages/creatProcess/xmpg2/step3.vue        |   2 +
 .../pages/creatProcess/xmpg2/step4.vue        |  80 ++-
 .../pages/processDetail/index.vue             |  10 +-
 .../pages/details.vue                         |   1 +
 src/router/index.js                           |  39 +-
 13 files changed, 2225 insertions(+), 64 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
 delete mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
 rename src/pages/processCenter/pages/creatProcess/{xmpg/step1-3.vue => xmpg2/step1-2.vue} (80%)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
new file mode 100644
index 000000000..358b5f851
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -0,0 +1,537 @@
+<!--标准法规清单发布 -  业务经理审批-->
+<template>
+  <div class="bzqdfb-step4">
+    <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="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.listName"
+                  placeholder="请输入清单名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="listForm.model">
+                  <p> {{ listForm.modelName }}
+                    <i
+                      title="下载"
+                      @click="downloadFile(listForm.model)"
+                      class="icon-download"
+                      v-btn-permission="''"
+                    />
+                    <i
+                      title="下载带水印"
+                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="64.6%"
+          style="width: 100%"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            prop="code"
+            width="180px"
+            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="标准名称"
+            width="260px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            sortable
+            label="发布日期">
+          </el-table-column>
+          <el-table-column
+            prop="XCXSSRQ"
+            sortable
+            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
+            show-overflow-tooltip
+            prop="ZCCSSRQ"
+            sortable
+            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
+            show-overflow-tooltip
+            prop="textStatus"
+            width="120px"
+            label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </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">
+        <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 } from "api/process";
+export default {
+  name: "bzqdfbStep1-4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],//清单里的标准数据
+      approvalOpinion: "", // 通过0/驳回1
+      active: "1",
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        listType: "", //区分是哪个清单
+        listName: "", //清单名称
+        descriptionList: "", //清单说明
+        enclosure: "", //附件
+        signFlag: "1",   //是否会签 1为会签 2为不会签
+        approvalOpinion: "", // 通过/驳回
+        dataList: [{
+          standNumber: "", //标准号
+          cnName: "", //中文名称
+          enName: "", //英文名称
+          isSubTime: "", //发布日期
+          newCarTime: "", //新车型实施日期
+          oldCarTime: "", //在产车实施日期
+          applyCar: "", //适用车型
+          textState: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      // countryOptions: [], //适用区域下拉框数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      signFlag: "1",   //是否会签 1为会签 2为不会签
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      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(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //保存事件
+    handleSave() {
+
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.listForm.applyUpdUserId = item.applyUpdUserId;
+        this.listForm.jlUserId = item.jlUserId;
+        this.listForm.zrUserId = item.zrUserId;
+      });
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+        this.$nextTick(() => {
+          res.data.map(item => {
+            this.listForm.modelName = item.oldFileName;
+            this.listForm.model = item.id;
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.approvalOpinion = "1";
+      this.handleSubmit();
+    },
+    //提交事件
+    handleSubmit() {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
+        this.isSubmit = true
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        });
+      }
+    },
+    //选择标准取消事件
+    closeDrawer() {
+      this.ListModel = false;
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  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.processTable();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzqdfb-step4 {
+  /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-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
new file mode 100644
index 000000000..18a0232bd
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
@@ -0,0 +1,456 @@
+<!--项目评估流程- 业务经理审批 -->
+<template>
+  <div class="xmpg-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="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  disabled
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  disabled
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="请选择认证工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="请选择质量工程师"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <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="productLine"
+            label="产品线">
+          </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="分发责任人">
+          </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: "xmpgStep1-2",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],//清单里的标准数据
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        passFlag: " ", //空为审批通过 1 为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        certifiedEngineerName: "", //认证工程师
+        qualityEngineerName: "", //质量工程师
+        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: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  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(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        console.log(item);
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.listForm.dataList = item.dataList
+        this.dataList = item.dataList
+        this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
+      })
+    },
+    //驳回事件
+    beforeBack () {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.passFlag = '1'
+        this.handleSubmit()
+      }
+    },
+    //提交事件
+    handleSubmit() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.commentText = this.commentText
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg-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>
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
deleted file mode 100644
index 8366e5eb4..000000000
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: "xmpgStep1-4"
-};
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
new file mode 100644
index 000000000..1984c73f1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -0,0 +1,581 @@
+<!--评估流程 - 标准法规部领导审批 -->
+<template>
+  <div class="xmpg-step7">
+    <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="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  disabled
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  disabled
+                ></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="请选择认证工程师"
+                  disabled
+                ></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="请选择质量工程师"
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            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"
+            width="200"
+            align="center"
+            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="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </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: "xmpgStep1-7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineerName: "", //认证工程师
+        qualityEngineerName: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  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(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.fenFlag = '2'
+        this.handleSubmit()
+      }
+    },
+    //提交事件
+    handleSubmit() {
+      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+        this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+        this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+        this.listForm.commentText = this.commentText;
+        this.listForm.standId = this.listForm.standId;
+        this.listForm.fenFlag = "1";
+        this.listForm.dataList = this.dataList
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+
+        });
+      }
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg-step7 {
+  /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/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
new file mode 100644
index 000000000..90f130c65
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="xmpg2-step12">
+    <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="listForm"
+          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="listForm.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="listForm.projectName"
+                  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"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :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="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
+          >
+            <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"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="200"
+            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"
+            width="200"
+            align="center"
+            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="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            label="责任人">
+          </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: "xmpg2Step1-12",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        dlFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    // 点击查看
+    handlePreview(item) {
+      console.log(item)
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.standId,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          if(item.attrInfoMap === null){
+            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "XCXSSRQ", '');
+          }else{
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
+        })
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
+    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;
+    },
+    //获取数据
+    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.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+    //提交事件
+    handleSubmit() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step12 {
+  /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-3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
similarity index 80%
rename from src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
rename to src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index 4caae637d..83bf7cf4c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  name: "xmpgStep1-3"
+  name: "step1-2"
 };
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 050aaba49..30d04e355 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -382,6 +382,7 @@ export default {
       projectModel: false,  //项目抽屉开关
       projectId: "", //项目id 用来查询标准
       standId: [], //标准id 用来条款
+      zrbmOptions: [],
       searching: false,
       //项目检索条件
       projectSearch: {
@@ -452,8 +453,21 @@ export default {
         _this: this
       }, res => {
         this.listForm.dataList = res.data.records;
-
         this.dataList = res.data.records;
+        this.listForm.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(',')
+              }
+            }
+          }
+        })
         let ids = [];
         this.dataList.forEach(item => {
           ids.push(item.standId);
@@ -518,6 +532,7 @@ export default {
             if (valid) {
               this.$refs['roleForm'].validate((valid) => {
                 if (valid) {
+                  this.isSubmit = true
                   this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
                     _this: this
                   }, res => {
@@ -533,6 +548,7 @@ export default {
                           this.$message.success(res.message);
                           this.$router.push("/processCenter");
                         }
+                        this.isSubmit = false
                       });
                     }
                   });
@@ -567,6 +583,14 @@ export default {
   },
   mounted() {
     this.getProjectData();
+    // 查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this,
+      loading: 'loading'
+    }, res => {
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+    }, e => {
+    })
   }
 };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index 6bdf02a5e..f05bd4925 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -80,22 +80,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -340,6 +340,7 @@ export default {
       if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
         this.$message.warning('审批意见不能为空')
       }else{
+        this.isSubmit = true
         this.listForm.BZFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -354,6 +355,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index af4c565bd..8a522f912 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -336,6 +336,7 @@ export default {
       if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
         this.$message.warning("请选择架构经理");
       } else {
+        this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -349,6 +350,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 808d861a7..dbd1b065f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -44,7 +44,7 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发负责人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
           </div>
         </div>
         <el-table
@@ -101,14 +101,13 @@
             align="center"
           >
           </el-table-column>
-          <el-table-column label="分发责任人" prop="liablePeople" align="center">
+          <el-table-column
+            label="责任人"
+            width="170"
+            align="center">
             <template slot-scope="scope">
-              <div v-if="scope.row.liablePeople == undefined">
-                {{ "请选择分发责任人" }}
-              </div>
-              <div v-else class="fileClass">
-                {{ scope.row.liablePeople || "-" }}
-              </div>
+              <el-input v-model="scope.row.liablePeopleId" style="display: none;"/>
+              <el-input v-model="scope.row.liablePeople" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -227,6 +226,8 @@ export default {
       modalshowflag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
+      zrIndex: '',
+      zrType: '',
       roleForm: {
         liablePeople: ""
       },
@@ -254,7 +255,6 @@ export default {
   methods: {
     // 点击查看
     handlePreview(item) {
-      console.log(item)
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -329,7 +329,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
         this.listForm.breakdownList = item.breakdownList;
       });
     },
@@ -366,14 +366,25 @@ export default {
         this.$message.warning('请选择分发负责人')
       }
     },
-    //批量操作按钮
-    batchOperation(id) {
-      if (this.selectList.length === 0) {
-        this.$message.warning("请至少选择一条数据进行批量分发");
-      } else {
-        this.nodeList = [];
-        this.nodeList.push(id);
-        this.modalshowflag = true;
+    choiceZRRS (row, type, index) {
+      this.type = type
+      if (type === 1) {
+        this.drawerTitle = '选择责任人'
+        this.nodeList = []
+        this.zrIndex = index
+        this.zrType = type
+        this.nodeList.push(row)
+        this.modalshowflag = true
+      } else if (type === 2) {
+        // 批量
+        if (this.selectList.length > 0) {
+          this.zrType = type
+          this.nodeList = []
+          this.modalshowflag = true
+          this.drawerTitle = '批量选择责任人'
+        } else {
+          this.$message.warning('请选择要分发的数据')
+        }
       }
     },
     //标准表格选择框改变
@@ -394,22 +405,23 @@ export default {
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
     },
-    checkedRole(data) {
-      // 选取负责人时的操作
-      let mis = [];
-      this.selectList.forEach(item => {
-        item.liablePeople = data[0].name;
-        item.liablePeopleId = data[0].id;
-        mis.push(item.standId);
-      });
-      this.dataList.forEach(item => {
-        if (!mis.includes(item.standId)) {
-          this.selectList.push(item);
-        }
-      });
-      this.dataList = this.selectList;
-      this.$refs.selection.clearSelection();
-      this.modalshowflag = false;
+    checkedRole (data) {
+      let roleId = data[0].id
+      let roleName = data[0].name
+      if (this.type === 1) {
+        this.dataList[this.zrIndex].liablePeopleId = roleId
+        this.dataList[this.zrIndex].liablePeople = roleName
+      } else if(this.type === 2) {
+        this.dataList.forEach( item => {
+          this.selectList.forEach( items => {
+            if (item.standId === items.standId) {
+              item.liablePeopleId = roleId
+              item.liablePeople = roleName
+            }
+          })
+        })
+      }
+      this.modalshowflag = false
     },
     cancleUserInfo() {
       this.modalshowflag = false;
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 120de5f7b..a5b265b96 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -203,20 +203,20 @@ export default {
           this.toProcessDetail('bzrkStep5',row)
         }else if(prcType === '4'){
           //标准清单发布流程数据
-          this.toProcessDetail('bzqdfbStep4',row)
+          this.toProcessDetail('bzqdfbStep1-4',row)
         }else if (prcType === '5'){
           //标准项目合规评估 标准维度
           if(row.taskInfo === '标准法规部领导审核'){
-            this.toProcessDetail('xmpgStep7',row)
+            this.toProcessDetail('xmpgStep1-7',row)
           }else{
-            this.toProcessDetail('xmpgStep2',row)
+            this.toProcessDetail('xmpgStep1-2',row)
           }
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
           if(row.taskInfo === '标准法规部领导审核'){
-            this.toProcessDetail('xmpg2Step12',row)
+            this.toProcessDetail('xmpg2Step1-12',row)
           }else{
-            this.toProcessDetail('xmpg2Step2',row)
+            this.toProcessDetail('xmpg2Step1-2',row)
           }
         }
       } else {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index c6b031fc6..bc11e32d1 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -676,6 +676,7 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
+        console.log(res.data)
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap,res.data.WBZTCLASS)
diff --git a/src/router/index.js b/src/router/index.js
index abb7f7bf3..40040f9a2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -294,6 +294,15 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
+      {
+        path: '/bzqdfbStep1-4',
+        name: 'bzqdfbStep1-4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -314,18 +323,18 @@ const routes = [
         }
       },
       {
-        path: '/xmpgStep1-3',
-        name: 'xmpgStep1-3',
-        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue'),
+        path: '/xmpgStep1-2',
+        name: 'xmpgStep1-2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue'),
         meta: {
           requireAuth: true,
           title: '项目合规评估流程'
         }
       },
       {
-        path: '/xmpgStep1-4',
-        name: 'xmpgStep1-4',
-        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue'),
+        path: '/xmpgStep1-7',
+        name: 'xmpgStep1-7',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue'),
         meta: {
           requireAuth: true,
           title: '项目合规评估流程'
@@ -403,6 +412,24 @@ const routes = [
           title: '项目合规评估流程-项目'
         }
       },
+      {
+        path: '/xmpg2Step1-2',
+        name: 'xmpg2Step1-2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step1-12',
+        name: 'xmpg2Step1-12',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
       {
         path: '/xmpg2Step2',
         name: 'xmpg2Step2',

From a341b2b20ebccdbb597afeeeeb43bcbac0882215 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 5 Aug 2021 11:26:42 +0800
Subject: [PATCH 02/17] commit

---
 .../pages/creatProcess/bzdy/step1.vue         | 16 +++++++++-
 .../pages/creatProcess/bzjd/step3.vue         | 29 +++++++++----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 4bed4251c..dab32ce04 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -169,6 +169,7 @@
     ></Role-tree>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
       <el-upload
+              class="upload-demo"
               multiple
               drag
               :action="fileUrl"
@@ -177,6 +178,7 @@
               accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
+              :on-progress="progressFile"
               :show-file-list="false"
       >
         <div style="padding: 20px 0">
@@ -184,6 +186,7 @@
           <p>点击或拖拽上传文件</p>
         </div>
       </el-upload>
+      <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>
     </el-dialog>
   </div>
 </template>
@@ -198,6 +201,8 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      progressType: false,
+      loadProgress: 0,
       commentText: '',
       nodeList: [],
       nodeList2: [],
@@ -310,6 +315,10 @@ export default {
       this.drawerTitle = title
       this.modalshowflag = true
     },
+    progressFile (event, file, fileList) {
+      let loadProgress = Math.floor(event.percent)
+      this.loadProgress = loadProgress
+    },
     // 导入按钮 上传之前的钩子
     beginImportFile (file) {
       var filename = file.name
@@ -318,11 +327,13 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
+      this.progressType = true
       if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
         this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        this.progressType = false
         return false
       }
       // 判断文件上传大小
@@ -331,6 +342,7 @@ export default {
         return true
       } else {
         this.$message.error('文件' + file.name + '大小不超过200M')
+        this.progressType = false
         return false
       }
       return true
@@ -339,6 +351,8 @@ export default {
     importFileSuccess (response, file) {
       if (response.ok) {
         this.fileMadel = false
+        this.loadProgress = 0
+        this.progressType = false
         this.form.model = response.data.id
         this.form.modelName = response.data.name
         this.$message({
@@ -412,7 +426,7 @@ export default {
       })
     }
   },
-  mounted () {}
+  mounted () {},
 }
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index ffb1fd8fe..162232581 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -102,12 +102,12 @@
                         width="100"
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="itemsTitle"
-                        label="条款内容"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                        prop="itemsTitle"-->
+<!--                        label="条款内容"-->
+<!--                        show-overflow-tooltip-->
+<!--                        align="center">-->
+<!--                </el-table-column>-->
                 <el-table-column
                         prop="technicalRequir"
                         width="150"
@@ -118,7 +118,6 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"
@@ -538,17 +537,17 @@
                         }
                         itemList.forEach(item => {
                             item.unitDeptName = this.$store.getters.userInfo.orgName
-                            item.onlineData = ''
-                            item.newData = ''
-                            item.complianceState = ''
-                            item.oldNumber = ''
-                            item.complianceRequir = '1'
-                            item.changePoint = ''
-                            item.technicalRequir = ''
+                            item.onlineData = item.onlineData || ''
+                            item.newData = item.newData || ''
+                            item.complianceState = item.complianceState || ''
+                            item.oldNumber = item.oldNumber || ''
+                            item.complianceRequir = item.complianceRequir || '1'
+                            item.changePoint = item.changePoint || ''
+                            item.technicalRequir = item.technicalRequir || ''
                             item.itemsTitle = item.itermsConditions
                         })
-                        console.log(2);
                         this.itemList = itemList
+                        console.log(this.itemList)
                         this.loading = false
                     }).catch(e => {
                     })

From bd4daea81bce111d345b244db015bbdd467efbb7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 5 Aug 2021 13:52:56 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index dd5c530aa..f92ea5f99 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -862,8 +862,13 @@
       },
         methods: {
           downloadFile (fileType) {
+            //文件id中出现了','字符,去除掉
             if(fileType === 'fbgbjbd'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+              if(this.fbgbjbdFileId.search(',')){
+                this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+                console.log(this.fbgbjbdFileId);
+              }
+               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
             }else if(fileType === 'xgd'){
               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
             }else if(fileType === 'bpg'){
@@ -964,6 +969,7 @@
                           this.caFileId = processForm.ca
                           this.zbjbdFileId = processForm.zbjbd
                           this.getFormFieldList(processForm)
+                          console.log(processForm);
                         }
                     }).catch(e => {
                     })

From bb287587cd854612095c084d73041f6692182bb5 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 5 Aug 2021 13:57:26 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++++
 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index e0b897644..26187ebbd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -836,6 +836,10 @@ export default {
   methods: {
     downloadFile (fileType) {
       if(fileType === 'fbgbjbd'){
+        if(this.fbgbjbdFileId.search(',')){
+          this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+          console.log(this.fbgbjbdFileId);
+        }
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
       }else if(fileType === 'xgd'){
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 2d414fb44..840e35e6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -815,6 +815,10 @@
         methods: {
           downloadFile (fileType) {
             if(fileType === 'fbgbjbd'){
+              if(this.fbgbjbdFileId.search(',')){
+                this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+                console.log(this.fbgbjbdFileId);
+              }
               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
             }else if(fileType === 'xgd'){
               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId

From 959725449d116407c6b4df6d6f3988a54cb13325 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 5 Aug 2021 14:15:14 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E7=AB=A0=E8=8A=82=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardForComments/pags/consultationDetails.vue             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 2af3b6084..4a37819e5 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -43,6 +43,7 @@
                 <el-table-column
                         prop="partCode"
                         label="章节编号"
+                        sortable
                         align="center"
                         width="180">
                 </el-table-column>

From 2d441e65ab69bdcd993f558bebc868c06199f3e5 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 5 Aug 2021 14:24:05 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzdy/step1.vue         | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index dab32ce04..45ccf0b85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -45,18 +45,23 @@
                           v-model="form.modelName"
                           clearable
                   ></el-input>
-                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">
-                    {{ form.modelName }}
-                  </div>
-                  <div v-else>
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            @click="fileUpload"
-                            size="mini">
-                      点击上传
+<!--                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">-->
+<!--                    {{ form.modelName }}-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            @click="fileUpload"-->
+<!--                            size="mini">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+
+                    <el-button type="primary" @click="fileUpload">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      {{isFileUploadStr}}
                     </el-button>
-                  </div>
+<!--                  </div>-->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -179,7 +184,7 @@
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :on-progress="progressFile"
-              :show-file-list="false"
+              :show-file-list="true"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -201,6 +206,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      isFileUploadStr:'点击上传',
       progressType: false,
       loadProgress: 0,
       commentText: '',
@@ -350,7 +356,8 @@ export default {
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
-        this.fileMadel = false
+        this.isFileUploadStr='点击查看已上传文件';
+        this.fileMadel = true;
         this.loadProgress = 0
         this.progressType = false
         this.form.model = response.data.id

From 07e9255e5f4699ec7e38235db32c3b69ac645400 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 5 Aug 2021 14:47:13 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=88=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=AE=A1=E6=89=B9=EF=BC=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E5=BA=94=E4=B8=8D=E5=BF=85=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=84=8F=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f92ea5f99..bdbc16be0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -890,11 +890,12 @@
             }
           },
           getRule(){
+
             if (this.formTongGuo.approvalOpinion === '0') {
-              this.rules.commentText.required = false
+              this.rules.commentText[0].required = false;
               this.$refs.formTongGuo.clearValidate('commentText')
-            } else {
-              this.rules.commentText.required = true
+            }else {
+              this.rules.commentText[0].required = true;
             }
           },
             popoverHide (checkedIds, checkedData) {

From 2cc5ca1632a62adacbb0ead1866a20156b0f2646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 14:53:15 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E5=B7=B2=E7=BB=B4=E6=8A=A4=E6=9C=AA=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step4.vue        |   10 +-
 .../localProductsOrProjectLibrary/index.vue   | 1583 +++++++++--------
 .../pages/details.vue                         |    9 +-
 3 files changed, 822 insertions(+), 780 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index dbd1b065f..b97ace1ac 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -406,17 +406,15 @@ export default {
       }
     },
     checkedRole (data) {
-      let roleId = data[0].id
-      let roleName = data[0].name
       if (this.type === 1) {
-        this.dataList[this.zrIndex].liablePeopleId = roleId
-        this.dataList[this.zrIndex].liablePeople = roleName
+        this.dataList[this.zrIndex].liablePeopleId = data[0].id
+        this.dataList[this.zrIndex].liablePeople = data[0].name
       } else if(this.type === 2) {
         this.dataList.forEach( item => {
           this.selectList.forEach( items => {
             if (item.standId === items.standId) {
-              item.liablePeopleId = roleId
-              item.liablePeople = roleName
+              item.liablePeopleId = data[0].id
+              item.liablePeople = data[0].name
             }
           })
         })
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 1b966f002..601dc8728 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -3,21 +3,22 @@
   <div class="local-products-or-project-library v-class">
     <div class="search-area">
       <div class="left">
-        <el-form inline :model="localProTableSearch" class="label-input-form" @keyup.enter.native="getLocalProductTableBtn">
+        <el-form inline :model="localProTableSearch" class="label-input-form"
+                 @keyup.enter.native="getLocalProductTableBtn">
           <el-form-item label="项目编号" class="search-item">
             <el-input
-                    v-model="localProTableSearch.projectNumber"
-                    placeholder="根据项目编号查找"
-                    :maxlength="100"
-                    clearable
+              v-model="localProTableSearch.projectNumber"
+              placeholder="根据项目编号查找"
+              :maxlength="100"
+              clearable
             ></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
             <el-input
-                v-model="projectLibrarySearch.projectName"
-                placeholder="根据项目名称查找"
-                :maxlength="100"
-                clearable
+              v-model="projectLibrarySearch.projectName"
+              placeholder="根据项目名称查找"
+              :maxlength="100"
+              clearable
             ></el-input>
           </el-form-item>
           <el-form-item label="项目分类" class="search-item">
@@ -30,7 +31,8 @@
                 :value="opt.label"
                 :key="opt.value"
                 :label="opt.label"
-              >{{ opt.label}}</el-option>
+              >{{ opt.label }}
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="项目状态" class="search-item search-item-last">
@@ -49,14 +51,16 @@
               class="common-button-primary"
               size="small"
               v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
-              @click="getLocalProductTableBtn">查询</el-button>
+              @click="getLocalProductTableBtn">查询
+            </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
               class="common-button-default"
               size="small"
               v-btn-permission="'10e3fdd2d816d64022f2928cd65b9bb1'"
-              @click="clearAllSearch">清空</el-button>
+              @click="clearAllSearch">清空
+            </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
@@ -65,7 +69,8 @@
               size="mini"
               v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
               @click="selectMoreBtn"
-            ><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
+            ><i class="iconfont">&#xe7a5;</i>高级查询
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -79,110 +84,110 @@
         </el-tabs>
       </div>
       <el-table
-              ref="multipleTable"
-              :data="localProTableList"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              :height="tableHeight"
-              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
+        ref="multipleTable"
+        :data="localProTableList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        :height="tableHeight"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
-              @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-                type="selection"
-                width="55"
-                align="center">
+          type="selection"
+          width="55"
+          align="center">
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectPlatfor"
-                align="center"
-                label="产品平台">
+          show-overflow-tooltip
+          prop="projectPlatfor"
+          align="center"
+          label="产品平台">
         </el-table-column>
         <el-table-column
-                prop="projectNumber"
-                align="center"
-                width="90"
-                label="项目编号">
+          prop="projectNumber"
+          align="center"
+          width="90"
+          label="项目编号">
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectName"
-                align="center"
-                label="项目名称">
+          show-overflow-tooltip
+          prop="projectName"
+          align="center"
+          label="项目名称">
           <template slot-scope="scope">
-           <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectClassification"
-                label="项目分类"
-                align="center"
-                min-width="120"
+          show-overflow-tooltip
+          prop="projectClassification"
+          label="项目分类"
+          align="center"
+          min-width="120"
         >
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectStatus"
-                label="项目状态"
-                align="center"
-                min-width="120"
+          show-overflow-tooltip
+          prop="projectStatus"
+          label="项目状态"
+          align="center"
+          min-width="120"
         >
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectGroup"
-                label="项目群"
-                min-width="120"
-                align="center"
+          show-overflow-tooltip
+          prop="projectGroup"
+          label="项目群"
+          min-width="120"
+          align="center"
         >
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="productLine"
-                label="产品线"
-                min-width="120"
-                align="center"
+          show-overflow-tooltip
+          prop="productLine"
+          label="产品线"
+          min-width="120"
+          align="center"
         >
         </el-table-column>
         <el-table-column
-                prop="projectStartDate"
-                label="项目计划开始日期"
-                :formatter="dateFormat"
-                min-width="120"
-                width="160"
-                align="center"
+          prop="projectStartDate"
+          label="项目计划开始日期"
+          :formatter="dateFormat"
+          min-width="120"
+          width="160"
+          align="center"
         >
-<!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
+          <!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
         </el-table-column>
         <el-table-column
-                prop="projectEndDate"
-                label="项目计划完成日期"
-                :formatter="dateFormat"
-                min-width="120"
-                width="160"
-                align="center"
+          prop="projectEndDate"
+          label="项目计划完成日期"
+          :formatter="dateFormat"
+          min-width="120"
+          width="160"
+          align="center"
         >
-<!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
+          <!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="currentNode"
-                align="center"
-                label="当前节点">
+          show-overflow-tooltip
+          prop="currentNode"
+          align="center"
+          label="当前节点">
         </el-table-column>
         <el-table-column
-                prop="projectLevel"
-                align="center"
-                label="项目级别">
-<!--          <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>-->
+          prop="projectLevel"
+          align="center"
+          label="项目级别">
+          <!--          <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>-->
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                prop="projectManager"
-                align="center"
-                label="项目经理">
+          show-overflow-tooltip
+          prop="projectManager"
+          align="center"
+          label="项目经理">
         </el-table-column>
         <el-table-column label="" fixed="right" width="50" :resizable="false">
           <template slot-scope="scope">
@@ -190,7 +195,9 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
+                    查看
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -198,18 +205,19 @@
         </el-table-column>
       </el-table>
       <pagination
-              :page="localProTableSearch.page"
-              :total="total"
-              @pageChange="pageChange"
-              @pageSizeChange="pageSizeChange"></pagination>
+        :page="localProTableSearch.page"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"></pagination>
       <loading :loading="loading">数据获取中</loading>
-<!--      高级搜索-->
+      <!--      高级搜索-->
       <table-tools-bar v-model="isAdvancedSearch" @search="getLocalProductTableBtn"
-                       @reset="clearAllSearch" >
+                       @reset="clearAllSearch">
         <div slot="content">
-          <el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+          <el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice"
+                   style="display: flex;flex-wrap: wrap">
             <!--            产品平台-->
-            <el-form-item label="产品平台"  class="serch-form-item">
+            <el-form-item label="产品平台" class="serch-form-item">
               <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"
                         @keyup.enter.native="getLocalProductTableBtn"></el-input>
             </el-form-item>
@@ -224,17 +232,21 @@
                         @keyup.enter.native="getLocalProductTableBtn"></el-input>
             </el-form-item>
             <!--            项目分类-->
-            <el-form-item label="项目分类"  class="serch-form-item">
+            <el-form-item label="项目分类" class="serch-form-item">
               <el-select v-model="projectLibrarySearch.projectClassification" placeholder="根据项目分类" clearable
                          @keyup.enter.native="getLocalProductTableBtn">
-                <el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label"
+                           :key="opt.label" :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            项目状态-->
-            <el-form-item label="项目状态"  class="serch-form-item">
+            <el-form-item label="项目状态" class="serch-form-item">
               <el-select v-model="projectLibrarySearch.projectStatus" placeholder="根据项目状态" clearable
                          @keyup.enter.native="getLocalProductTableBtn">
-                <el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            项目群-->
@@ -249,11 +261,13 @@
             </el-form-item>
             <!--            项目开始时间-->
             <el-form-item label="项目开始时间" class="serch-form-item">
-              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectStartDate" style="width: 100%;"></el-date-picker>
+              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectStartDate"
+                              style="width: 100%;"></el-date-picker>
             </el-form-item>
             <!--            项目完成时间-->
             <el-form-item label="项目完成时间" class="serch-form-item">
-              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectEndDate" style="width: 100%;"></el-date-picker>
+              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectEndDate"
+                              style="width: 100%;"></el-date-picker>
             </el-form-item>
             <!--            当前节点-->
             <el-form-item label="当前节点" class="serch-form-item">
@@ -278,107 +292,109 @@
 
 </template>
 <script>
-import DatePickerGroup from './components/DatePickerGroup'
-import OrgTree from '@/components/CustomFormComponents/OrgTree'
-import eventHub from '@/common/eventHub'
-import ProjectRelatedPersonnel from '@/components/CustomFormComponents/ProjectRelatedPersonnel'
-import {dateFormat} from '@/common/date/index'
-import moment from 'moment'
-function checkFD (rules, value, callback) {
-  this.value = value
-  let arr = []
+import DatePickerGroup from "./components/DatePickerGroup";
+import OrgTree from "@/components/CustomFormComponents/OrgTree";
+import eventHub from "@/common/eventHub";
+import ProjectRelatedPersonnel from "@/components/CustomFormComponents/ProjectRelatedPersonnel";
+import { dateFormat } from "@/common/date/index";
+import moment from "moment";
+
+function checkFD(rules, value, callback) {
+  this.value = value;
+  let arr = [];
   if (value.length > 0) { // 保证空字符串时是空数组
-    arr = this.value.split(',')
+    arr = this.value.split(",");
   }
   if (arr.length > 1) {
-    const dateNext = new Date(arr[arr.length - 1])
-    const datePrev = new Date(arr[arr.length - 2])
+    const dateNext = new Date(arr[arr.length - 1]);
+    const datePrev = new Date(arr[arr.length - 2]);
     if (dateNext < datePrev) {
       // eslint-disable-next-line standard/no-callback-literal
-      return callback('请选择一个在上个时间点后面的时间')
+      return callback("请选择一个在上个时间点后面的时间");
     }
   }
 
   if (arr.length !== 10) {
     // eslint-disable-next-line standard/no-callback-literal
-    return callback('请选择10个时间')
+    return callback("请选择10个时间");
   }
-  callback()
+  callback();
 }
+
 export default {
-  name: 'localProductsOrProjectLibrary',
+  name: "localProductsOrProjectLibrary",
   components: {
     ProjectRelatedPersonnel,
     OrgTree,
     DatePickerGroup
   },
-  data () {
+  data() {
     return {
       //默认返回已维护
-      ifMaintaince:"Maintenance",
+      ifMaintaince: "Maintenance",
 
       deptUser: [],
       localProEO: {
         // 项目相关人员
         userEOList: [],
         //  产品代码
-        produceCode: '',
+        produceCode: "",
         //  项目阶段
-        productStage: '',
+        productStage: "",
         //  整车项目编号
-        zhengcarNo: '',
+        zhengcarNo: "",
         // 整车SOP时间
-        zhengcarSopTime: '',
+        zhengcarSopTime: "",
         // 项目编号
-        productNo: '',
+        productNo: "",
         // 项目类型
-        productTypeCode: '',
+        productTypeCode: "",
         // 生产基地
-        producePlace: '',
+        producePlace: "",
         // 基础车型
-        baseCartype: '',
+        baseCartype: "",
         // 左驾右驾
-        leftRight: '',
+        leftRight: "",
         // 项目经理
-        productManager: '',
-        productManagerShow: '',
+        productManager: "",
+        productManagerShow: "",
         // 是否纳入开发
-        isDevelop: '',
-        energyKind: '',
+        isDevelop: "",
+        energyKind: "",
         // 平台
-        flatform: '',
+        flatform: "",
         // 项目名称
-        productName: '',
+        productName: "",
         // 车型系列
-        productSet: '',
+        productSet: "",
         // 项目类别
-        productType: '',
+        productType: "",
         // 项目状态
-        productBrand: '',
+        productBrand: "",
         // SOP时间
-        sopTime: '',
+        sopTime: "",
         // 阀点
         pointTime: [],
         // 计划通过时间
-        planPassTime: '',
+        planPassTime: "",
         // 实际通过时间
-        actualPassTime: '',
+        actualPassTime: "",
         // 目标市场
-        targetMarket: '',
+        targetMarket: "",
         // 公告车型号
-        carModel: '',
+        carModel: "",
         // 项目相关人员id
-        relatePerson: '',
+        relatePerson: "",
         // eop信息
-        eopTime: '',
+        eopTime: "",
         // 项目相关信息
-        saleMarket: '',
+        saleMarket: "",
         // 判断是国内还是海外
-        prodectCode: '',
+        prodectCode: "",
         // carModeFile: ''
         // carModeFileList: ''
         // 相关人员信息
-        relatePersonShow: ''
+        relatePersonShow: ""
         // 相关人员姓名
       },
       // 新增编辑弹窗里的数据
@@ -386,84 +402,84 @@ export default {
         // 项目相关人员
         userEOList: [],
         //  产品代码
-        produceCode: '',
+        produceCode: "",
         //  项目阶段
-        productStage: '',
+        productStage: "",
         //  整车项目编号
-        zhengcarNo: '',
+        zhengcarNo: "",
         // 整车SOP时间
-        zhengcarSopTime: '',
+        zhengcarSopTime: "",
         // 项目编号
-        productNo: '',
+        productNo: "",
         // 项目类型
-        productTypeCode: '',
+        productTypeCode: "",
         // 生产基地
-        producePlace: '',
+        producePlace: "",
         // 基础车型
-        baseCartype: '',
+        baseCartype: "",
         // 左驾右驾
-        leftRight: '',
+        leftRight: "",
         // 项目经理
-        productManager: '',
-        productManagerShow: '',
+        productManager: "",
+        productManagerShow: "",
         // 是否纳入开发
-        isDevelop: '',
-        energyKind: '',
+        isDevelop: "",
+        energyKind: "",
         // 平台
-        flatform: '',
+        flatform: "",
         // 项目名称
-        productName: '',
+        productName: "",
         // 车型系列
-        productSet: '',
+        productSet: "",
         // 项目类别
-        productType: '',
+        productType: "",
         // 项目状态
-        productBrand: '',
+        productBrand: "",
         // SOP时间
-        sopTime: '',
+        sopTime: "",
         // 阀点
         pointTime: [],
         // 计划通过时间
-        planPassTime: '',
+        planPassTime: "",
         // 实际通过时间
-        actualPassTime: '',
+        actualPassTime: "",
         // 目标市场
-        targetMarket: '',
+        targetMarket: "",
         // 公告车型号
-        carModel: '',
+        carModel: "",
         // 项目相关人员id
-        relatePerson: '',
+        relatePerson: "",
         // eop信息
-        eopTime: '',
+        eopTime: "",
         // 项目相关信息
-        saleMarket: '',
+        saleMarket: "",
         // 判断是国内还是海外
-        prodectCode: '',
+        prodectCode: "",
         // carModeFile: ''
         // carModeFileList: ''
         // 相关人员信息
-        relatePersonShow: ''
+        relatePersonShow: ""
         // 相关人员姓名
       },
       //查询3类
       projectLibrarySearch: {
         // 项目名称
-        projectName: '',
+        projectName: "",
         // 项目分类
-        projectClassification: '',
+        projectClassification: "",
         // 项目状态
-        projectStatus: '',
-        page:'',
+        projectStatus: "",
+        page: ""
       },
       //查询3类
       projectLibrarySearchDefault: {
         // 项目名称
-        projectName: '',
+        projectName: "",
         // 项目分类
-        projectClassification: '',
+        projectClassification: "",
         // 项目状态
-        projectStatus: '',
-        page:'',
+        projectStatus: "",
+        page: ""
       },
       // 查询条件
       localProTableSearch: {
@@ -471,31 +487,31 @@ export default {
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         // 项目编号
-        projectNumber:'',
-        productSet: '',
-        productName: '',
-        productBrand: '',
-        advanceSearchVOStr: '',
+        projectNumber: "",
+        productSet: "",
+        productName: "",
+        productBrand: "",
+        advanceSearchVOStr: "",
         // 查询类型
-        prodectCode:'',
+        prodectCode: "",
         // 产品平台
-        projectPlatfor:'',
+        projectPlatfor: "",
         // 产品线
-        productLine:'',
+        productLine: "",
         //  项目名称
-        projectName: '',
+        projectName: "",
         //  项目群
-        projectGroup: '',
+        projectGroup: "",
         //  项目开始日期
-        projectStartDate: '',
+        projectStartDate: "",
         //  项目完成日期
-        projectEndDate: '',
+        projectEndDate: "",
         //  当前节点
-        currentNode: '',
+        currentNode: "",
         //  项目级别
-        projectLevel: '',
+        projectLevel: "",
         //  项目经理
-        projectManager: '',
+        projectManager: ""
       },
       // 查询条件
       localProTableSearchDefault: {
@@ -503,31 +519,31 @@ export default {
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         // 项目编号
-        projectNumber:'',
-        productSet: '',
-        productName: '',
-        productBrand: '',
-        advanceSearchVOStr: '',
+        projectNumber: "",
+        productSet: "",
+        productName: "",
+        productBrand: "",
+        advanceSearchVOStr: "",
         // 查询类型
-        prodectCode:'',
+        prodectCode: "",
         // 产品平台
-        projectPlatfor:'',
+        projectPlatfor: "",
         // 产品线
-        productLine:'',
+        productLine: "",
         //  项目名称
-        projectName: '',
+        projectName: "",
         //  项目群
-        projectGroup: '',
+        projectGroup: "",
         //  项目开始日期
-        projectStartDate: '',
+        projectStartDate: "",
         //  项目完成日期
-        projectEndDate: '',
+        projectEndDate: "",
         //  当前节点
-        currentNode: '',
+        currentNode: "",
         //  项目级别
-        projectLevel: '',
+        projectLevel: "",
         //  项目经理
-        projectManager: '',
+        projectManager: ""
       },
       total: 0,
       // 列表数据
@@ -540,28 +556,28 @@ export default {
       scxxOptions: [],
       energyKindOptions: [],
       // 列表页tab页的当前页
-      activeName: 'INLAND',
-      insideTabsActiveName: 'LOCAL',
+      activeName: "INLAND",
+      insideTabsActiveName: "LOCAL",
       // 新增编辑弹窗的打开
       modalProductAddShowflag: false,
       // 新增编辑弹窗标题
-      title: '',
+      title: "",
       // 判断时新增还是编辑
-      flag: '',
+      flag: "",
       // field: {
       //   attrName: '阀点',
       //   attrField: 'pointTime'
       // },
       // 新增编辑弹窗里的数据
       // 左驾右驾
-      infoOptions:[
+      infoOptions: [
         {
-          label: '左驾',
-          value: '1'
+          label: "左驾",
+          value: "1"
         },
         {
-          label: '右驾',
-          value: '2'
+          label: "右驾",
+          value: "2"
         }
       ],
       // 项目类型
@@ -574,74 +590,74 @@ export default {
         // 项目相关人员
         userEOList: [],
         //  产品代码
-        produceCode: '',
+        produceCode: "",
         //  项目阶段
-        productStage: '',
+        productStage: "",
         //  整车项目编号
-        zhengcarNo: '',
+        zhengcarNo: "",
         // 整车SOP时间
-        zhengcarSopTime: '',
+        zhengcarSopTime: "",
         // 项目编号
-        productNo: '',
+        productNo: "",
         // 项目类型
-        productTypeCode: '',
+        productTypeCode: "",
         // 生产基地
-        producePlace: '',
+        producePlace: "",
         // 基础车型
-        baseCartype: '',
+        baseCartype: "",
         // 左驾右驾
-        leftRight: '',
+        leftRight: "",
         // 项目经理
-        productManager: '',
-        productManagerShow: '',
+        productManager: "",
+        productManagerShow: "",
         // 是否纳入开发
-        isDevelop: '',
-        energyKind: '',
+        isDevelop: "",
+        energyKind: "",
         // 平台
-        flatform: '',
+        flatform: "",
         // 项目名称
-        productName: '',
+        productName: "",
         // 车型系列
-        productSet: '',
+        productSet: "",
         // 项目类别
-        productType: '',
+        productType: "",
         // 项目状态
-        productBrand: '',
+        productBrand: "",
         // SOP时间
-        sopTime: '',
+        sopTime: "",
         // 阀点
         pointTime: [],
         // 计划通过时间
-        planPassTime: '',
+        planPassTime: "",
         // 实际通过时间
-        actualPassTime: '',
+        actualPassTime: "",
         // 目标市场
-        targetMarket: '',
+        targetMarket: "",
         // 公告车型号
-        carModel: '',
+        carModel: "",
         // 项目相关人员id
-        relatePerson: '',
+        relatePerson: "",
         // eop信息
-        eopTime: '',
+        eopTime: "",
         // 项目相关信息
-        saleMarket: '',
+        saleMarket: "",
         // 判断是国内还是海外
-        prodectCode: '',
+        prodectCode: "",
         // carModeFile: ''
         // carModeFileList: ''
         // 相关人员信息
-        relatePersonShow: ''
+        relatePersonShow: ""
         // 相关人员姓名
       },
 
       isDevelopOptions: [
         {
-          label: '纳入',
-          value: '0'
+          label: "纳入",
+          value: "0"
         },
         {
-          label: '推荐',
-          value: '1'
+          label: "推荐",
+          value: "1"
         }
       ],
       isSubmit: false,
@@ -656,9 +672,9 @@ export default {
         //   { type: 'string', max: 100, message: '产品系列长度不能超过100个字符', trigger: 'blur' }
         // ],
         productName: [
-          {required: true, message: '项目名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '项目名称长度不能超过100个字符', trigger: 'blur' },
-          {type: 'string', validator: this.verify.checkSpecialCharacterProduct, trigger: 'blur'}
+          { required: true, message: "项目名称不能为空", trigger: "blur" },
+          { type: "string", max: 100, message: "项目名称长度不能超过100个字符", trigger: "blur" },
+          { type: "string", validator: this.verify.checkSpecialCharacterProduct, trigger: "blur" }
         ],
         // carModel: [
         //   { type: 'string', max: 100, message: '公告车型号不能为空', trigger: 'blur' }
@@ -672,40 +688,40 @@ export default {
         //   // {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
         // ],
         // energyKind: [
-          // {required: true, type: 'array', message: '适用车辆类型不能为空', trigger: 'change'}
+        // {required: true, type: 'array', message: '适用车辆类型不能为空', trigger: 'change'}
         //   {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
         // ],
         flatform: [
-          { required: true, message: '平台不能为空', trigger: 'change' }
+          { required: true, message: "平台不能为空", trigger: "change" }
         ],
         // productType: [
         //   { required: false, message: '项目类别不能为空', trigger: 'change' }
         // ],
         productBrand: [
-          { required: true, message: '项目状态不能为空', trigger: 'change' }
+          { required: true, message: "项目状态不能为空", trigger: "change" }
         ],
         sopTime: [
-          { required: true, message: 'sop时间不能为空', trigger: 'change' }
+          { required: true, message: "sop时间不能为空", trigger: "change" }
         ],
         // productNo: [
         //   { required: false, validator:this.checkNum,  trigger: 'change' }
         // ],
         productTypeCode: [
-          { required: true, message: '项目类型不能为空', trigger: 'change' }
+          { required: true, message: "项目类型不能为空", trigger: "change" }
         ],
         productManager: [
-          { required: true, message: '项目经理不能为空', trigger: 'change' }
+          { required: true, message: "项目经理不能为空", trigger: "change" }
         ],
         // produceCode: [
         //   { required: true, message: '产品代码不能为空', trigger: 'change' }
         // ],
         relatePerson: [
-          { required: true, message: '项目相关成员不能为空', trigger: 'change' }
+          { required: true, message: "项目相关成员不能为空", trigger: "change" }
         ],
         // carModeFileList: []
         pointTime: [
           {
-            type: 'string', validator: checkFD, trigger: 'change'
+            type: "string", validator: checkFD, trigger: "change"
           }
         ]
       },
@@ -715,19 +731,19 @@ export default {
       // 关联弹窗里的条件查询
       relationTableSearch: {
         // 国内/ 国外
-        region: '',
+        region: "",
         // 国家/地区
-        country: '',
+        country: "",
         // 项目名称
-        productName: ''
+        productName: ""
       },
       relationTableSearchDefault: {
         // 国内/ 国外
-        region: '',
+        region: "",
         // 国家/地区
-        country: '',
+        country: "",
         // 项目名称
-        productName: ''
+        productName: ""
       },
       // 项目名称列表
       productNameList: [],
@@ -754,86 +770,86 @@ export default {
       reletionSelectNum: [],
       reletionloading: false,
       // 列表一行里的id
-      rowId: '',
+      rowId: "",
       // 关联的一行id
-      relateProductId: '',
+      relateProductId: "",
       // 关联选取的数据
       relectonSelectNum: [],
       // 导出弹窗是否打开
       exportTestItemNameFlag: false,
       // 导出名称
-      exportName: '',
+      exportName: "",
       // 导出的是全部还是部分
-      saveExportType: '',
+      saveExportType: "",
       // 导出全部时传的值
       sarAccessInfoList: {},
       // 公共车型号字段修改权限
-      hasPermissionEdit: '',
+      hasPermissionEdit: "",
       visibleOrgTable: false,
-      orgTableVal: '',
-      orgTableValName: '',
+      orgTableVal: "",
+      orgTableValName: "",
       // 高级检索
       isAdvancedSearch: false,
       targetMarketOptions: {},
       twoOptions: [
         {
-          label: '平台',
-          value: 'flatform',
-          type: 'INPUT',
+          label: "平台",
+          value: "flatform",
+          type: "INPUT",
           disabled: false
         },
         {
-          label: '项目编号',
-          value: 'product_no',
-          type: 'INPUT',
+          label: "项目编号",
+          value: "product_no",
+          type: "INPUT",
           disabled: false
         },
         {
-          label: '项目名称',
-          value: 'product_name',
-          type: 'INPUT',
+          label: "项目名称",
+          value: "product_name",
+          type: "INPUT",
           disabled: false
         },
         {
-          label: '项目类别',
-          value: 'product_type',
-          type: 'SEL_OPTION',
+          label: "项目类别",
+          value: "product_type",
+          type: "SEL_OPTION",
           disabled: false
         },
         {
-          label: '项目状态',
-          value: 'product_brand',
-          type: 'SEL_OPTION',
+          label: "项目状态",
+          value: "product_brand",
+          type: "SEL_OPTION",
           disabled: false
         },
         {
-          label: 'SOP时间',
-          value: 'sop_time',
-          type: 'DATE_PIC_OPTS',
+          label: "SOP时间",
+          value: "sop_time",
+          type: "DATE_PIC_OPTS",
           disabled: false
         },
         {
-          label: 'EOP信息',
-          value: 'eop_time',
-          type: 'DATE_PIC_OPTS',
+          label: "EOP信息",
+          value: "eop_time",
+          type: "DATE_PIC_OPTS",
           disabled: false
         },
         {
-          label: '目标市场',
-          value: 'target_market',
-          type: 'SEL_OPTION',
+          label: "目标市场",
+          value: "target_market",
+          type: "SEL_OPTION",
           disabled: false
         },
         {
-          label: '左驾右驾',
-          value: 'left_right',
-          type: 'SEL_OPTION',
+          label: "左驾右驾",
+          value: "left_right",
+          type: "SEL_OPTION",
           disabled: false
         }
       ],
-      threeOptions:[],
+      threeOptions: [],
       loading: false
-    }
+    };
   },
   methods: {
     /**
@@ -849,32 +865,32 @@ export default {
       }
       return moment(date).format("YYYY-MM-DD");
     },
-    selectMoreBtn () {
-      this.isAdvancedSearch = true
-      this.threeOptions = []
+    selectMoreBtn() {
+      this.isAdvancedSearch = true;
+      this.threeOptions = [];
     },
     // 获取标准类别List数据
-    getAllInforList () {
-      this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => {
-        this.xmztOptions = res.data.XMZT
-        this.scxxOptions = res.data.SCXX
-        this.countryList = res.data.COUNTRY
-        this.energyKindOptions = res.data.ENERGYTYPES
-        this.protypeOptions = res.data.PROTYPE
-        this.probaseOptions = res.data.PROBASE
-        this.productTypeOptions = res.data.XMLB
-        this.targetMarketOptions = res.data.SCXX
-      })
+    getAllInforList() {
+      this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
+        this.xmztOptions = res.data.XMZT;
+        this.scxxOptions = res.data.SCXX;
+        this.countryList = res.data.COUNTRY;
+        this.energyKindOptions = res.data.ENERGYTYPES;
+        this.protypeOptions = res.data.PROTYPE;
+        this.probaseOptions = res.data.PROBASE;
+        this.productTypeOptions = res.data.XMLB;
+        this.targetMarketOptions = res.data.SCXX;
+      });
     },
     // 更多
-    handleCommand (command) {
+    handleCommand(command) {
       switch (command[1]) {
-        case '删除':
-          this.handleDelete(command[0])
-          break
-        case '查看':
-          this.handlePreview(command[0])
-          break
+        case "删除":
+          this.handleDelete(command[0]);
+          break;
+        case "查看":
+          this.handlePreview(command[0]);
+          break;
       }
     },
     /**
@@ -882,408 +898,406 @@ export default {
      * 判断返回的数据是部门还是人员
      * item.isParent  false：人员   true：部门
      */
-    treeOnRoleCheck (treeOnCheck) {
-      let roleName = []
-      let roleId = []
+    treeOnRoleCheck(treeOnCheck) {
+      let roleName = [];
+      let roleId = [];
       treeOnCheck.map((item, index) => {
         if (!item.isParent) {
-          roleName.push(item.name)
-          roleId.push(item.id)
+          roleName.push(item.name);
+          roleId.push(item.id);
         }
-      })
-      this.localProEO.relatePerson = roleId.join()
-      this.localProEO.relatePersonShow = roleName.join()
+      });
+      this.localProEO.relatePerson = roleId.join();
+      this.localProEO.relatePersonShow = roleName.join();
     },
     // 切换tabs
-    handleClick (tab, event) {
-      this.localProEO.prodectCode = this.ifMaintaince
-      this.insideHandleClick()
+    handleClick(tab, event) {
+      this.localProEO.prodectCode = this.ifMaintaince;
+      this.insideHandleClick();
     },
-    insideHandleClick (tab, event) {
-      this.localProEO.dataType = this.insideTabsActiveName
-      this.getLocalProductTableBtn()
+    insideHandleClick(tab, event) {
+      this.localProEO.dataType = this.insideTabsActiveName;
+      this.getLocalProductTableBtn();
     },
     // 打开新曾弹窗
-    addProductModal (flag, row) {
-      this.localProEO.prodectCode = this.activeName
-      this.flag = flag
-      this.localProEO.dataType = this.insideTabsActiveName
+    addProductModal(flag, row) {
+      this.localProEO.prodectCode = this.activeName;
+      this.flag = flag;
+      this.localProEO.dataType = this.insideTabsActiveName;
       if (this.flag === 0) {
         this.localProEO = {
           ...this.localProEODefault,
           pointTime: [],
           prodectCode: this.activeName,
           dataType: this.insideTabsActiveName
-        }
-        this.title = '新增车型/项目库'
+        };
+        this.title = "新增车型/项目库";
         this.$nextTick(() => {
-          this.$refs['addLocalProductForm'].clearValidate()
-        }
-        )
+            this.$refs["addLocalProductForm"].clearValidate();
+          }
+        );
       } else {
-        this.title = '编辑车型/项目库'
-        row.targetMarket = row.targetMarket.split(',')
-        this.localProEO = { ...row }
+        this.title = "编辑车型/项目库";
+        row.targetMarket = row.targetMarket.split(",");
+        this.localProEO = { ...row };
         // this.localProEO.id = row.id
         if (this.localProEO.energyKind != null && !(this.localProEO.energyKind instanceof Array)) {
-          if (this.localProEO.energyKind === '') {
-            this.localProEO.energyKind = []
+          if (this.localProEO.energyKind === "") {
+            this.localProEO.energyKind = [];
           } else {
-            let a = this.localProEO.energyKind.split(',')
-            this.localProEO.energyKind = a // 能源种类
+            let a = this.localProEO.energyKind.split(",");
+            this.localProEO.energyKind = a; // 能源种类
           }
         }
         if (this.localProEO.productTypeCode != null && !(this.localProEO.productTypeCode instanceof Array)) {
-          let a = this.localProEO.productTypeCode.split(',')
-          this.localProEO.productTypeCode = a // 项目类型
+          let a = this.localProEO.productTypeCode.split(",");
+          this.localProEO.productTypeCode = a; // 项目类型
         }
         if (this.localProEO.producePlace != null && !(this.localProEO.producePlace instanceof Array)) {
-          if (this.localProEO.producePlace === '') {
-            this.localProEO.producePlace = []
+          if (this.localProEO.producePlace === "") {
+            this.localProEO.producePlace = [];
           } else {
-            let a = this.localProEO.producePlace.split(',')
-            this.localProEO.producePlace = a // 生产基地
+            let a = this.localProEO.producePlace.split(",");
+            this.localProEO.producePlace = a; // 生产基地
           }
         }
         if (this.localProEO.pointTime != null && !(this.localProEO.pointTime instanceof Array)) {
-          let a = this.localProEO.pointTime.split(',')
-          this.localProEO.pointTime = a // 阀点
+          let a = this.localProEO.pointTime.split(",");
+          this.localProEO.pointTime = a; // 阀点
         } else if (this.localProEO.pointTime === null) {
-          let a = Array(10).fill('', 0, 10)
-          this.localProEO.pointTime = a
+          let a = Array(10).fill("", 0, 10);
+          this.localProEO.pointTime = a;
         }
       }
-      this.modalProductAddShowflag = true
+      this.modalProductAddShowflag = true;
     },
     // 关闭弹窗
-    resetForm () {
-      this.modalProductAddShowflag = false
-      this.$refs['modalProductDrawer'].closeDrawer()
+    resetForm() {
+      this.modalProductAddShowflag = false;
+      this.$refs["modalProductDrawer"].closeDrawer();
       // this.localProEO = {...this.localProEODefault}
       // this.$refs['addLocalProductForm'].clearValidate()
       // this.$refs['addLocalProductForm'].resetFields()
     },
     // 关闭弹窗
-    closeProductAddDrawer () {
-      this.modalProductAddShowflag = false
-      this.$refs['modalProductDrawer'].closeDrawer()
+    closeProductAddDrawer() {
+      this.modalProductAddShowflag = false;
+      this.$refs["modalProductDrawer"].closeDrawer();
       // this.localProEO = {...this.localProEODefault}
       // this.$refs['addLocalProductForm'].clearValidate()
       // this.$refs['addLocalProductForm'].resetFields()
     },
     // 批量删除,页面按钮
-    deleteLocalProduct () {
+    deleteLocalProduct() {
       if (this.selectNum.length === 0) {
         this.$message({
-          message: '请至少选择一条数据',
-          type: 'warning'
-        })
+          message: "请至少选择一条数据",
+          type: "warning"
+        });
       } else {
-        this.$confirm('此操作将永久删除这些数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          confirmButtonClass: 'common-button-primary',
+        this.$confirm("此操作将永久删除这些数据, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          confirmButtonClass: "common-button-primary",
           roundButton: true,
-          type: 'warning'
+          type: "warning"
         }).then(() => {
-          const ids = []
+          const ids = [];
           this.selectNum.map((item) => {
-            ids.push(item.id)
-          })
-          this.$http.post('lawss/sarProductInfo/deleteLocalProducts',
+            ids.push(item.id);
+          });
+          this.$http.post("lawss/sarProductInfo/deleteLocalProducts",
             {
               ids: ids.toString()
             }, {
               _this: this
             }, res => {
               if (res.ok) {
-                this.getLocalProductTable()
+                this.getLocalProductTable();
               }
-            })
+            });
         }).catch(() => {
-        })
+        });
       }
     },
     // 标准涉及项目
-    standInvolveProject () {
-      this.$store.commit('setDetailMap', this.$route.path)
+    standInvolveProject() {
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'StandInvolveProject'
-      })
+        name: "StandInvolveProject"
+      });
     },
     // 导出项目标准关系
-    exportProductStand  () {
+    exportProductStand() {
       // 区别是选择导出还是全部导出
       if (this.selectNum.length > 0) {
-        this.saveExportType = 'apart'
-        this.exportName = ''
-        this.exportTestItemNameFlag = true
+        this.saveExportType = "apart";
+        this.exportName = "";
+        this.exportTestItemNameFlag = true;
       } else {
         // this.$message.warning('请选择需要导出的数据')
-        this.exportName = ''
-        this.saveExportType = 'all'
-        this.exportTestItemNameFlag = true
+        this.exportName = "";
+        this.saveExportType = "all";
+        this.exportTestItemNameFlag = true;
       }
     },
     // 导出确定功能
-    exportTestItem () {
-      if (this.exportName === '' || this.exportName === null || this.exportName === 'null') {
-        this.exportName = '车型项目库'
+    exportTestItem() {
+      if (this.exportName === "" || this.exportName === null || this.exportName === "null") {
+        this.exportName = "车型项目库";
       }
-      var exportNames = this.exportName
-      if (this.saveExportType === 'apart') {
+      var exportNames = this.exportName;
+      if (this.saveExportType === "apart") {
         if (this.selectNum.length) {
-          const exportList = []
+          const exportList = [];
           this.selectNum.map(item => {
-            exportList.push(item.id)
-          })
-          window.location.href = 'api/lawss/sarProductInfo/exportAllProducts?exportContent=' + exportList.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+            exportList.push(item.id);
+          });
+          window.location.href = "api/lawss/sarProductInfo/exportAllProducts?exportContent=" + exportList.join(",") + "&exportType=apart" + "&exportName=" + exportNames;
           setTimeout(() => {
-            this.selectNum = []
+            this.selectNum = [];
             // this.$refs.multipleTable.clearSelection()
-          })
+          });
         } else {
-          this.$message.warning('当前没有需要导出的数据')
+          this.$message.warning("当前没有需要导出的数据");
         }
       } else {
-        let exportList = []
-        exportList = JSON.stringify(this.SarExportSearchEo).replace(/""/g, null)
+        let exportList = [];
+        exportList = JSON.stringify(this.SarExportSearchEo).replace(/""/g, null);
         // if (exportList != null && exportList.length > 0) {
-        window.location.href = 'api/lawss/sarProductInfo/exportAllProducts?exportContent=' + exportList + '&exportType=all' + '&exportName=' + exportNames
+        window.location.href = "api/lawss/sarProductInfo/exportAllProducts?exportContent=" + exportList + "&exportType=all" + "&exportName=" + exportNames;
         // } else {
         //   this.$message.warning('当前没有需要导出的数据')
         // }
       }
-      this.getLocalProductTable()
-      this.exportTestItemNameFlag = false
+      this.getLocalProductTable();
+      this.exportTestItemNameFlag = false;
     },
     // 导出取消按钮关闭模态、置空
-    cancal () {
-      this.exportTestItemNameFlag = false
+    cancal() {
+      this.exportTestItemNameFlag = false;
     },
     // 清空条件查询
-    clearAllSearch () {
-      this.localProTableSearch = {...this.localProTableSearchDefault}
-      this.projectLibrarySearch = {...this.projectLibrarySearchDefault}
-      this.localProTableSearch.page = 1
-      this.isAdvancedSearch=false
-      this.getLocalProductTable()
+    clearAllSearch() {
+      this.localProTableSearch = { ...this.localProTableSearchDefault };
+      this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
+      this.localProTableSearch.page = 1;
+      this.isAdvancedSearch = false;
+      this.getLocalProductTable();
     },
-    resolveTime (data) {
-      const newData = {}
+    resolveTime(data) {
+      const newData = {};
       const arrayKeys = [
-        'userEOList'
-      ]
+        "userEOList"
+      ];
       const dateKeys = [
-        'firstPutTime',
+        "firstPutTime",
         // SOP时间
-        'sopTime',
+        "sopTime",
         // 计划通过时间
-        'planPassTime',
+        "planPassTime",
         // 实际通过时间
-        'actualPassTime',
+        "actualPassTime",
         // eop信息
-        'eopTime',
+        "eopTime",
         // 整车SOP时间
-        'zhengcarSopTime'
-      ]
+        "zhengcarSopTime"
+      ];
       const normalKeys = [
         //  产品代码
-        'produceCode',
+        "produceCode",
         //  项目阶段
-        'productStage',
+        "productStage",
         //  整车项目编号
-        'zhengcarNo',
+        "zhengcarNo",
         // 目标市场
-        'targetMarket',
+        "targetMarket",
         // 公告车型号
-        'carModel',
+        "carModel",
         // 项目相关人员信息
-        'relatePerson',
+        "relatePerson",
         // 是否纳入开发
-        'isDevelop',
-        'energyKind',
+        "isDevelop",
+        "energyKind",
         // 平台
-        'flatform',
+        "flatform",
         // 项目名称
-        'productName',
+        "productName",
         // 车型系列
-        'productSet',
+        "productSet",
         // 项目类别
-        'productType',
+        "productType",
         // 项目状态
-        'productBrand',
+        "productBrand",
         // 目标市场
-        'targetMarket',
+        "targetMarket",
         // 公告车型号
-        'carModel',
+        "carModel",
         // 项目相关人员信息
-        'relatePerson',
+        "relatePerson",
         // 项目相关信息
-        'saleMarket',
+        "saleMarket",
         // 判断国内国外
-        'prodectCode',
+        "prodectCode",
         // 判断是本地还是PDPM
-        'dataType',
+        "dataType",
         // 'pointTime'
         // 项目编号
-        'productNo',
+        "productNo",
         // 项目类型
-        'productTypeCode',
+        "productTypeCode",
         // 生产基地
-        'producePlace',
+        "producePlace",
         // 基础车型
-        'baseCartype',
+        "baseCartype",
         // 左驾右驾
-        'leftRight',
+        "leftRight",
         // 项目经理
-        'productManager'
-      ]
+        "productManager"
+      ];
       const idKeys = [
-        'id'
-      ]
+        "id"
+      ];
       const pointTimeKey = [
         // 阀点
-        'pointTime'
-      ]
+        "pointTime"
+      ];
       arrayKeys.forEach(key => {
-        newData[key] = data[key] ? data[key] : []
-      })
+        newData[key] = data[key] ? data[key] : [];
+      });
       normalKeys.forEach(key => {
-        newData[key] = data[key] ? data[key] : ''
-      })
+        newData[key] = data[key] ? data[key] : "";
+      });
       dateKeys.forEach(key => {
         // const date = data[key] && new Date(data[key])
         // newData[key] = date ? this.$dateFormat(date, 'yyyy-MM-dd hh:mm:ss') : ''
-        const date = data[key]
-        newData[key] = dateFormat(date, 'YYYY-MM-DD hh:mm:ss')
-      })
+        const date = data[key];
+        newData[key] = dateFormat(date, "YYYY-MM-DD hh:mm:ss");
+      });
       idKeys.forEach(key => {
-        newData[key] = this.flag === 0 ? '' : data[key]
-      })
+        newData[key] = this.flag === 0 ? "" : data[key];
+      });
       pointTimeKey.forEach(key => {
-        newData[key] = data[key].toString()
-      })
-      return newData
+        newData[key] = data[key].toString();
+      });
+      return newData;
     },
-    saveOrUpdateLocalPro () {
-      this.$refs['addLocalProductForm'].validate((valid, fields) => {
+    saveOrUpdateLocalPro() {
+      this.$refs["addLocalProductForm"].validate((valid, fields) => {
         if (valid) {
-          const formData = this.resolveTime(this.localProEO)
+          const formData = this.resolveTime(this.localProEO);
           if (formData.energyKind != null && (formData.energyKind instanceof Array)) {
-            formData.energyKind = formData.energyKind.join(',') // 能源种类
+            formData.energyKind = formData.energyKind.join(","); // 能源种类
           }
           if (formData.productTypeCode != null && (formData.productTypeCode instanceof Array)) {
-            formData.productTypeCode = formData.productTypeCode.join(',') // 项目类型
+            formData.productTypeCode = formData.productTypeCode.join(","); // 项目类型
           }
           if (formData.producePlace != null && (formData.producePlace instanceof Array)) {
-            formData.producePlace = formData.producePlace.join(',') // 生产基地
+            formData.producePlace = formData.producePlace.join(","); // 生产基地
           }
-          formData.targetMarket = formData.targetMarket.toString()
+          formData.targetMarket = formData.targetMarket.toString();
           // 新增
           if (this.flag === 0) {
-            this.$http.postData('lawss/sarProductInfo/addSarProductInfo', formData, {
+            this.$http.postData("lawss/sarProductInfo/addSarProductInfo", formData, {
               _this: this
             }, res => {
               if (res.ok) {
                 // this.modalProductAddShowflag = false
-                this.closeProductAddDrawer()
-                this.isSubmit = false
-                if (this.localProEO.prodectCode === 'INLAND') {
-                  this.activeName = 'INLAND'
-                  this.localProTableSearch.prodectCode = this.activeName
+                this.closeProductAddDrawer();
+                this.isSubmit = false;
+                if (this.localProEO.prodectCode === "INLAND") {
+                  this.activeName = "INLAND";
+                  this.localProTableSearch.prodectCode = this.activeName;
                   this.$nextTick(() => {
-                    this.getLocalProductTable()
-                  })
+                    this.getLocalProductTable();
+                  });
                 } else {
-                  this.activeName = 'FOREIGN'
-                  this.localProTableSearch.prodectCode = this.activeName
+                  this.activeName = "FOREIGN";
+                  this.localProTableSearch.prodectCode = this.activeName;
                   this.$nextTick(() => {
-                    this.getLocalProductTable()
-                  })
+                    this.getLocalProductTable();
+                  });
                 }
               }
             }, e => {
-            })
+            });
           } else {
             // 修改
-            this.$http.postData('lawss/sarProductInfo/updateSarProductInfo', formData, {
+            this.$http.postData("lawss/sarProductInfo/updateSarProductInfo", formData, {
               _this: this
             }, res => {
               if (res.ok) {
-                this.isSubmit = false
+                this.isSubmit = false;
                 // this.modalProductAddShowflag = false
-                this.closeProductAddDrawer()
-                if (this.localProEO.prodectCode === 'INLAND') {
-                  this.activeName = 'INLAND'
-                  this.localProTableSearch.prodectCode = this.activeName
-                  if (this.localProEO.dataType === 'LOCAL') {
-                    this.insideTabsActiveName = 'LOCAL'
-                    this.localProTableSearch.dataType = this.insideTabsActiveName
+                this.closeProductAddDrawer();
+                if (this.localProEO.prodectCode === "INLAND") {
+                  this.activeName = "INLAND";
+                  this.localProTableSearch.prodectCode = this.activeName;
+                  if (this.localProEO.dataType === "LOCAL") {
+                    this.insideTabsActiveName = "LOCAL";
+                    this.localProTableSearch.dataType = this.insideTabsActiveName;
                     this.$nextTick(() => {
-                      this.getLocalProductTable()
-                    })
+                      this.getLocalProductTable();
+                    });
                   } else {
-                    this.insideTabsActiveName = 'PDPM'
-                    this.localProTableSearch.dataType = this.insideTabsActiveName
+                    this.insideTabsActiveName = "PDPM";
+                    this.localProTableSearch.dataType = this.insideTabsActiveName;
                     this.$nextTick(() => {
-                      this.getLocalProductTable()
-                    })
+                      this.getLocalProductTable();
+                    });
                   }
                 } else {
-                  this.activeName = 'FOREIGN'
-                  this.localProTableSearch.prodectCode = this.activeName
-                  if (this.localProEO.dataType === 'LOCAL') {
-                    this.insideTabsActiveName = 'LOCAL'
-                    this.localProTableSearch.dataType = this.insideTabsActiveName
+                  this.activeName = "FOREIGN";
+                  this.localProTableSearch.prodectCode = this.activeName;
+                  if (this.localProEO.dataType === "LOCAL") {
+                    this.insideTabsActiveName = "LOCAL";
+                    this.localProTableSearch.dataType = this.insideTabsActiveName;
                     this.$nextTick(() => {
-                      this.getLocalProductTable()
-                    })
+                      this.getLocalProductTable();
+                    });
                   } else {
-                    this.insideTabsActiveName = 'PDPM'
-                    this.localProTableSearch.dataType = this.insideTabsActiveName
+                    this.insideTabsActiveName = "PDPM";
+                    this.localProTableSearch.dataType = this.insideTabsActiveName;
                     this.$nextTick(() => {
-                      this.getLocalProductTable()
-                    })
+                      this.getLocalProductTable();
+                    });
                   }
                 }
               }
             }, e => {
-            })
+            });
           }
         } else {
-          this.$message.error('请检查表单是否填写正确!')
+          this.$message.error("请检查表单是否填写正确!");
         }
-      })
+      });
     },
     // 条件分页查询
-    getLocalProductTableBtn () {
-      this.projectLibrarySearch.page = 1
-      this.isAdvancedSearch=false
-      this.getLocalProductTable()
+    getLocalProductTableBtn() {
+      this.projectLibrarySearch.page = 1;
+      this.isAdvancedSearch = false;
+      this.getLocalProductTable();
     },
     // 查询本地产品
-    getLocalProductTable () {
-      this.localProTableSearch.prodectCode = this.ifMaintaince
-      this.localProTableSearch.dataType = this.insideTabsActiveName
-      this.SarExportSearchEo = this.localProTableSearch
-      this.$http.get('sarStandProjectLibrary/queryProject',{
+    getLocalProductTable() {
+      this.localProTableSearch.prodectCode = this.ifMaintaince;
+      this.localProTableSearch.dataType = this.insideTabsActiveName;
+      this.SarExportSearchEo = this.localProTableSearch;
+      this.$http.get("sarStandProjectLibrary/queryProject", {
         // projectName: this.projectLibrarySearch.projectName,
         // projectClassification: this.projectLibrarySearch.projectSort,
         // projectStatus: this.projectLibrarySearch.projectStatus
         ...this.localProTableSearch,
-        ...this.projectLibrarySearch,
-      },{
-        _this: this, loading: 'loading'
+        ...this.projectLibrarySearch
+      }, {
+        _this: this, loading: "loading"
       }, res => {
-        if (this.localProTableSearch.prodectCode === 'Maintenance') {
-          this.localProTableList = res.data.Maintenance.records
-          this.total = res.data.Maintenance.total
-        }
-        else if (this.localProTableSearch.prodectCode === 'notMaintenance')
-        {
-          this.localProTableList = res.data.notMaintenance.records
-          this.total = res.data.notMaintenance.total
+        if (this.localProTableSearch.prodectCode === "Maintenance") {
+          this.localProTableList = res.data.Maintenance.records;
+          this.total = res.data.Maintenance.total;
+        } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
+          this.localProTableList = res.data.notMaintenance.records;
+          this.total = res.data.notMaintenance.total;
 
         }
         // this.localProTableList.map((item) => {
@@ -1307,93 +1321,96 @@ export default {
         //   this.pageChange(1)
         // }
       }, e => {
-      })
+      });
       // this.$refs.selection.selectAll(false)
     },
     // 查询关联列表
-    getRelectiontTable () {
-      this.localProTableSearch.prodectCode = this.activeName
-      this.localProTableSearch.dataType = 'LOCAL'
-      this.SarExportSearchEo = this.localProTableSearch
-      this.$http.get('lawss/sarProductInfo/getProductInfoPage', this.localProTableSearch, {
-        _this: this, loading: 'loading'
+    getRelectiontTable() {
+      this.localProTableSearch.prodectCode = this.activeName;
+      this.localProTableSearch.dataType = "LOCAL";
+      this.SarExportSearchEo = this.localProTableSearch;
+      this.$http.get("lawss/sarProductInfo/getProductInfoPage", this.localProTableSearch, {
+        _this: this, loading: "loading"
       }, res => {
-        this.relationTableList = res.data.list
-        this.relationTotal = res.data.count
+        this.relationTableList = res.data.list;
+        this.relationTotal = res.data.count;
         this.localProTableList.map((item) => {
           this.xmztOptions.map((opr) => {
             if (item.productBrand === opr.value) {
-              item.productBrand = opr.label
+              item.productBrand = opr.label;
             }
-          })
+          });
           this.scxxOptions.map((xmItem) => {
             if (item.saleMarket === xmItem.value) {
-              item.saleMarket = xmItem.label
+              item.saleMarket = xmItem.label;
             }
-          })
+          });
           this.scxxOptions.map((xmItem) => {
             if (item.targetMarket === xmItem.value) {
-              item.targetMarket = xmItem.label
+              item.targetMarket = xmItem.label;
             }
-          })
-        })
+          });
+        });
         // if ((this.localProTableList.length === 0 || this.localProTableList === []) && this.localProTableSearch.page !== 1) {
         //   this.pageChange(1)
         // }
       }, e => {
-      })
+      });
       // this.$refs.selection.selectAll(false)
     },
     // 列表多选变化
-    handleSelectionChange (val) {
-      this.selectNum = val
+    handleSelectionChange(val) {
+      this.selectNum = val;
     },
     // 查看
-    handlePreview (row) {
-      this.$store.commit('setDetailMap', this.$route.path)
-      this.$store.commit('setLocalProData', JSON.stringify(row))
-        // if (!this.$hasPermission('XTR2AJYDAN4J7GALXDW9')){
-        //     this.$message({
-        //         message: '无权访问',
-        //         type: 'warning'
-        //     })
-        //     return
-        // }
-        this.$http.get('sarStandProjectLibrary/queryById', {
-          id: row.id
-        }, {
-            _this: this, loading: 'loading'
-        }, res => {
-            if (res.data) {
-                this.$router.push({
-                    name: 'LocalProductDetail'
-                })
-            }else{
-                this.$message({
-                    message: '无权访问',
-                    type: 'warning'
-                })
+    handlePreview(row) {
+      this.$store.commit("setDetailMap", this.$route.path);
+      this.$store.commit("setLocalProData", JSON.stringify(row));
+      // if (!this.$hasPermission('XTR2AJYDAN4J7GALXDW9')){
+      //     this.$message({
+      //         message: '无权访问',
+      //         type: 'warning'
+      //     })
+      //     return
+      // }
+      this.$http.get("sarStandProjectLibrary/queryById", {
+        id: row.id
+      }, {
+        _this: this, loading: "loading"
+      }, res => {
+        if (res.data) {
+          this.$router.push({
+            name: "LocalProductDetail",
+            query: {
+              tabName: this.ifMaintaince
             }
-        })
+          });
+        } else {
+          this.$message({
+            message: "无权访问",
+            type: "warning"
+          });
+        }
+      });
     },
     // 关联
-    handleRelation (row) {
-      this.row = row
-      this.rowId = this.row.id
-      this.getSearchInforList()
-      this.getRelectiontTable()
-      this.showModelRelation = true
+    handleRelation(row) {
+      this.row = row;
+      this.rowId = this.row.id;
+      this.getSearchInforList();
+      this.getRelectiontTable();
+      this.showModelRelation = true;
       this.$nextTick(() => {
-        this.relationTableHeight = $('.demo-drawer-content').height() - 52 - 60
-        window.onresize = function () {
-          this.relationTableHeight = $('.demo-drawer-content').height() - 52 - 60
-        }.bind(this)
-      })
+        this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60;
+        window.onresize = function() {
+          this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60;
+        }.bind(this);
+      });
     },
     // 关联里面条件查询的下拉列表数据获取
-    getSearchInforList () {
-      this.$http.get('lawss/sarProductInfo/getSelList', this.copyTableSearchForData, {
-        _this: this, loading: 'loading'
+    getSearchInforList() {
+      this.$http.get("lawss/sarProductInfo/getSelList", this.copyTableSearchForData, {
+        _this: this, loading: "loading"
       }, res => {
         // const arr2 = []
         // for (let key in res.data.projectName) {
@@ -1402,290 +1419,312 @@ export default {
         //   obj.value = res.data.projectName[key]
         //   arr2.push(obj)
         // }
-        this.productNameList = res.data.projectName
-      })
+        this.productNameList = res.data.projectName;
+      });
     },
     // 关联弹窗里的多选
-    handleRelationSelectionChange (val) {
-      this.relectonSelectNum = val
+    handleRelationSelectionChange(val) {
+      this.relectonSelectNum = val;
       if (this.reletionSelectNum.length > 1) {
         this.$message({
-          message: '只能选择一条数据',
-          type: 'warning'
-        })
-        this.$refs.RelectionMultipleTable.clearSelection()
-        this.reletionSelectNum = []
+          message: "只能选择一条数据",
+          type: "warning"
+        });
+        this.$refs.RelectionMultipleTable.clearSelection();
+        this.reletionSelectNum = [];
       } else {
-        this.relateProductId = this.relectonSelectNum[0].id
+        this.relateProductId = this.relectonSelectNum[0].id;
       }
     },
     // 关联弹窗里的分页查询
-    reletionPageChange (page) {
-      this.relationPage = page
-      this.getLocalProductTable()
+    reletionPageChange(page) {
+      this.relationPage = page;
+      this.getLocalProductTable();
     },
-    reletionPageSizeChange (pageSize) {
-      this.reletionPageSize = pageSize
-      this.getLocalProductTable()
+    reletionPageSizeChange(pageSize) {
+      this.reletionPageSize = pageSize;
+      this.getLocalProductTable();
     },
     // 关联弹窗的保存
-    saveOrUpdateReletion () {
+    saveOrUpdateReletion() {
       if (this.relectonSelectNum.length === 0) {
         this.$message({
-          message: '请选择一条数据',
-          type: 'warning'
-        })
+          message: "请选择一条数据",
+          type: "warning"
+        });
       } else {
-        this.$confirm('关联项目下的标准将覆盖原有标准, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          confirmButtonClass: 'common-button-primary',
+        this.$confirm("关联项目下的标准将覆盖原有标准, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          confirmButtonClass: "common-button-primary",
           roundButton: true,
-          type: 'warning'
+          type: "warning"
         }).then(() => {
-          this.$http.post('lawss/sarProductInfo/relateProductStands', {id: this.rowId, relateProductId: this.relateProductId}, {
+          this.$http.post("lawss/sarProductInfo/relateProductStands", {
+            id: this.rowId,
+            relateProductId: this.relateProductId
+          }, {
             _this: this
           }, res => {
             if (res.ok) {
-              this.showModelRelation = false
+              this.showModelRelation = false;
             }
-          })
-        })
+          });
+        });
       }
     },
     // 取消或者关闭弹窗
-    resetReletionForm () {
-      this.relationTableSearch = {...this.relationTableSearchDefault}
+    resetReletionForm() {
+      this.relationTableSearch = { ...this.relationTableSearchDefault };
       // this.$refs['processForm'].clearValidate()
-      this.$refs.RelectionMultipleTable.clearSelection()
-      this.reletionSelectNum = []
-      this.showModelRelation = false
+      this.$refs.RelectionMultipleTable.clearSelection();
+      this.reletionSelectNum = [];
+      this.showModelRelation = false;
     },
     // 分页点击后方法
-    pageChange (page) {
-      this.localProTableSearch.page = page
-      this.getLocalProductTable()
+    pageChange(page) {
+      this.localProTableSearch.page = page;
+      this.getLocalProductTable();
     },
     // 分页每页显示数改变后方法
-    pageSizeChange (pageSize) {
-      this.localProTableSearch.pageSize = pageSize
-      this.getLocalProductTable()
+    pageSizeChange(pageSize) {
+      this.localProTableSearch.pageSize = pageSize;
+      this.getLocalProductTable();
       // 此处需要调用接口，修改个人配置
     },
-      /**
-       * @Description: 项目编号验重
-       * @author zmf
-       * @date 2021/3/19
-      */
-      checkNum(rule, value, callback){
-        if (!value) {
-          // return callback(new Error('项目编号不能为空'));
-          return callback()
-        }else{
-          this.$http.get('lawss/sarProductInfo/isOver', {
-            productNo: this.localProEO.productNo,
-            id: this.localProEO.id
-          }, { _this: this},res=>{
-            if (res.data){
-              callback(new Error('项目编号不能重复'));
-            }else{
-              callback();
-            }
-          }, err => {
-            // console.error(err)
-          })
-        }
+    /**
+     * @Description: 项目编号验重
+     * @author zmf
+     * @date 2021/3/19
+     */
+    checkNum(rule, value, callback) {
+      if (!value) {
+        // return callback(new Error('项目编号不能为空'));
+        return callback();
+      } else {
+        this.$http.get("lawss/sarProductInfo/isOver", {
+          productNo: this.localProEO.productNo,
+          id: this.localProEO.id
+        }, { _this: this }, res => {
+          if (res.data) {
+            callback(new Error("项目编号不能重复"));
+          } else {
+            callback();
+          }
+        }, err => {
+          // console.error(err)
+        });
+      }
 
 
-      },
+    },
     /**
      * @description: 获取组织到部门
      * @author: chenxiaoxi
      * @date: 2018/10/11 16:29:37
      */
-    getDept () {
+    getDept() {
       // this.loading.treeLoading = true
       return new Promise((resolve, reject) => {
-        let url = 'sys/org/getTree'
+        let url = "sys/org/getTree";
         this.$http.get(url, {}, {
           _this: this
         }, res => {
           if (res.ok) {
-            let zNodesDept = []
+            let zNodesDept = [];
             res.data.map((item, i) => {
-              let zObj = {}
+              let zObj = {};
               // 该节点为机构
-              zObj.name = item.orgName
-              zObj.icon = 'static/images/dept.png'
+              zObj.name = item.orgName;
+              zObj.icon = "static/images/dept.png";
               // zObj.isParent = true
-              zObj.shotName = item.shotName
-              zObj.remarks = item.remarks
-              zObj.id = item.id
-              zObj.pId = item.pId
-              zNodesDept[i] = zObj
-            })
-            resolve(res.data)
+              zObj.shotName = item.shotName;
+              zObj.remarks = item.remarks;
+              zObj.id = item.id;
+              zObj.pId = item.pId;
+              zNodesDept[i] = zObj;
+            });
+            resolve(res.data);
           }
         }, e => {
-          reject(e)
-        })
-      })
+          reject(e);
+        });
+      });
     },
     /**
      * @description: 获取所有人员
      * @author: chenxiaoxi
      * @date: 2018/10/11 16:57:33
      */
-    getUser (treeNodeList) {
+    getUser(treeNodeList) {
       return new Promise((resolve, reject) => {
-        this.$http.get('sys/user', {
+        this.$http.get("sys/user", {
           pageNo: 1,
-          processFlag: '1'
+          processFlag: "1"
         }, {
           _this: this
         }, res => {
           if (res.ok) {
             for (let i = 0; i < res.data.list.length; i++) {
-              let obj = {}
+              let obj = {};
               for (let key in res.data.list[i]) {
-                if (key === 'usid') {
-                  obj.id = res.data.list[i][key]
-                } else if (key === 'orgId') {
-                  obj.pId = res.data.list[i][key]
+                if (key === "usid") {
+                  obj.id = res.data.list[i][key];
+                } else if (key === "orgId") {
+                  obj.pId = res.data.list[i][key];
                 } else {
-                  obj[key] = res.data.list[i][key]
+                  obj[key] = res.data.list[i][key];
                 }
               }
-              treeNodeList.push(obj)
+              treeNodeList.push(obj);
             }
             // 获取组织与人员完毕，开始组装树结构
-            let zNodes = []
+            let zNodes = [];
             for (let i = 0; i < treeNodeList.length; i++) {
-              let zObj = {}
-              zObj.id = treeNodeList[i].id
-              zObj.pId = treeNodeList[i].pId
+              let zObj = {};
+              zObj.id = treeNodeList[i].id;
+              zObj.pId = treeNodeList[i].pId;
               // 该节点为人员
               if (treeNodeList[i].uname !== undefined) {
-                zObj.name = treeNodeList[i].uname
-                zObj.icon = 'static/images/user.png'
-                zObj.isParent = false
-                zObj.orgName = treeNodeList[i].orgName
+                zObj.name = treeNodeList[i].uname;
+                zObj.icon = "static/images/user.png";
+                zObj.isParent = false;
+                zObj.orgName = treeNodeList[i].orgName;
               } else {
                 // 该节点为机构
-                zObj.name = treeNodeList[i].orgName
-                zObj.icon = 'static/images/dept.png'
-                zObj.isParent = true
+                zObj.name = treeNodeList[i].orgName;
+                zObj.icon = "static/images/dept.png";
+                zObj.isParent = true;
               }
-              zObj.shotName = treeNodeList[i].shotName
-              zObj.remarks = treeNodeList[i].remarks
+              zObj.shotName = treeNodeList[i].shotName;
+              zObj.remarks = treeNodeList[i].remarks;
               if (zObj.pId === null && !zObj.isParent) {
-                zObj.pId = ''
-                zObj.orgName = '未分配人员'
+                zObj.pId = "";
+                zObj.orgName = "未分配人员";
               }
-              zNodes[i] = zObj
+              zNodes[i] = zObj;
             }
             zNodes.push({
-              id: '',
+              id: "",
               pId: null,
-              name: '未分配人员',
+              name: "未分配人员",
               isParent: true,
-              icon: 'static/images/dept.png'
-            })
-            this.deptUser = zNodes
+              icon: "static/images/dept.png"
+            });
+            this.deptUser = zNodes;
           }
-          resolve()
+          resolve();
         }, e => {
-          reject(e)
-        })
-      })
+          reject(e);
+        });
+      });
     },
     // 打开选择人员
     handleOpenRoleUserTree() {
-      this.visibleOrgTable = true
-      this.orgTableVal = this.localProEO.productManager || ''
-      this.orgTableValName = this.localProEO.productManagerShow || ''
+      this.visibleOrgTable = true;
+      this.orgTableVal = this.localProEO.productManager || "";
+      this.orgTableValName = this.localProEO.productManagerShow || "";
     },
     // 选择项目经理确定事件
     handleOrgTableConfirm(checkedList) {
-      let userIdList = []
-      let userNameList = []
+      let userIdList = [];
+      let userNameList = [];
       checkedList.map(item => {
-        userIdList.push(item.userId)
-        userNameList.push(item.userName)
-      })
-      this.localProEO.productManager = userIdList.join(',')
-      this.localProEO.productManagerShow = userNameList.join(',')
+        userIdList.push(item.userId);
+        userNameList.push(item.userName);
+      });
+      this.localProEO.productManager = userIdList.join(",");
+      this.localProEO.productManagerShow = userNameList.join(",");
     }
   },
-  created () {
+  created() {
     this.getDept().then(res => {
-      this.getUser(res)
-    }, e => {})
+      this.getUser(res);
+    }, e => {
+    });
   },
-  mounted () {
-    this.hasPermissionEdit = this.$hasPermission('UQGGFJTBSGQB2UQH7375')
+  mounted() {
+    this.hasPermissionEdit = this.$hasPermission("UQGGFJTBSGQB2UQH7375");
     // 加载下拉框数据
-    this.getAllInforList()
+    this.getAllInforList();
     // 加载分页列表
-    this.getLocalProductTable()
+    this.getLocalProductTable();
     this.$nextTick(() => {
-      this.tableHeight = $('.regulatory-repository').height() - 110
+      this.tableHeight = $(".regulatory-repository").height() - 110;
       window.onresize = () => {
-        this.tableHeight = $('.container').height() - 110
+        this.tableHeight = $(".container").height() - 110;
+      };
+      if (!this.$route.query.tabName) {
+        this.ifMaintaince = "Maintenance";
+      } else {
+        this.ifMaintaince = this.$route.query.tabName;
+        if(this.ifMaintaince === "notMaintenance"){
+          this.localProTableSearch.prodectCode = this.ifMaintaince;
+        }
       }
-    })
+    });
   },
   beforeDestroy() {
-    window.onresize = null
+    window.onresize = null;
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
-  .local-products-or-project-library {
-    //position: relative;
-    height: 100%;
-    .container {
-      height: calc(~'100% - 55px');
+
+.local-products-or-project-library {
+  //position: relative;
+  height: 100%;
+
+  .container {
+    height: calc(~'100% - 55px');
+  }
+
+  .el-drawer-form {
+    padding-left: 25px;
+  }
+
+  /deep/ .pagination {
+    position: relative;
+  }
+
+  .row-col-box {
+    /deep/ label.el-form-item__label {
+      width: 70px !important;
     }
-    .el-drawer-form{
-      padding-left: 25px;
-    }
-    /deep/.pagination{
-      position: relative;
-    }
-    .row-col-box{
-      /deep/label.el-form-item__label{
-        width: 70px !important;
-      }
-      /deep/.el-form-item__content{
-        margin-left: 70px !important;
-      }
+
+    /deep/ .el-form-item__content {
+      margin-left: 70px !important;
     }
   }
-  ::v-deep .el-drawer__header{
-    &>span:first-child{
-      outline: none!important;
-    }
-  }
-  ::v-deep .el-drawer{
-      outline: none!important;
+}
+
+::v-deep .el-drawer__header {
+  & > span:first-child {
+    outline: none !important;
   }
+}
+
+::v-deep .el-drawer {
+  outline: none !important;
+}
+
 .label-input-form {
-  &.table-lattice{
-    /deep/.el-form-item__label {
-      width:100px;
-      height:30px;
+  &.table-lattice {
+    /deep/ .el-form-item__label {
+      width: 100px;
+      height: 30px;
       border: 1px solid #DCDFE6;
       border-right: none;
-      line-height:30px;
+      line-height: 30px;
       text-align: center;
       margin-top: 7px;
       background: #F9F9F9;
     }
-    /deep/.el-input__inner {
+
+    /deep/ .el-input__inner {
       height: 30px;
       line-height: 30px;
       border-radius: 0 !important;
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index bc11e32d1..086136d41 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -546,7 +546,13 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     back () {
-      this.$router.push(this.$store.state.detailMap)
+      console.log(this.$route.query.tabName);
+      this.$router.push({
+        path: this.$store.state.detailMap,
+        query: {
+          tabName: this.$route.query.tabName
+        }
+      })
       this.$store.commit('setDetailMap', '')
     },
     showLocalProductData (item) {
@@ -676,7 +682,6 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
-        console.log(res.data)
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap,res.data.WBZTCLASS)

From ef67138e57db2f7a500a1f1cda4a7f00138b9b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 15:16:21 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=A1=86=20=20=E5=8E=BB=E6=8E=89=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=AE=A1=E6=89=B9=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step1-1.vue      |  17 +++
 .../pages/creatProcess/xmpg2/step1.vue        | 121 ++++++++++--------
 .../pages/creatProcess/xmpg2/step10.vue       |   4 -
 .../pages/creatProcess/xmpg2/step11.vue       |  29 -----
 .../pages/creatProcess/xmpg2/step12.vue       |   4 -
 .../pages/creatProcess/xmpg2/step2.vue        |   4 -
 .../pages/creatProcess/xmpg2/step3.vue        |  19 ++-
 .../pages/creatProcess/xmpg2/step4.vue        |  15 +++
 .../pages/creatProcess/xmpg2/step5.vue        |  15 +++
 .../pages/creatProcess/xmpg2/step6.vue        |  15 +++
 .../pages/creatProcess/xmpg2/step7.vue        |   4 -
 .../pages/creatProcess/xmpg2/step8.vue        |   4 -
 .../pages/creatProcess/xmpg2/step9.vue        |   4 -
 13 files changed, 146 insertions(+), 109 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index ad751c081..db6b832e9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -140,6 +140,21 @@
           </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 === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -337,6 +352,7 @@ export default {
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
+      commentText: '',
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -522,6 +538,7 @@ export default {
     },
     //流程提交事件
     handleSubmit(){
+      this.listForm.commentText = this.commentText;
       var json = Object.assign(this.listForm, this.roleForm)
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.uName;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 30d04e355..2539b5689 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -140,6 +140,21 @@
           </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 === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -340,7 +355,7 @@ export default {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
-        breakdownList: [], //标准下的分解单数据
+        breakdownList: [] //标准下的分解单数据
       },
       dataList: [], //下面标准的数据
       breakdownList: [], //标准下的条款数据
@@ -379,6 +394,7 @@ export default {
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
       nodeList: [],
+      commentText: "",
       projectModel: false,  //项目抽屉开关
       projectId: "", //项目id 用来查询标准
       standId: [], //标准id 用来条款
@@ -457,17 +473,17 @@ export default {
         this.listForm.dataList.forEach(item => {
           // 责任部门转换
           if (item.zrbm !== null || item.zrbm !== "") {
-            let k = (item.zrbm || "").split(',')
+            let k = (item.zrbm || "").split(",");
             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]) {
-                  k[m]  = this.zrbmOptions[i].label
+                  k[m] = this.zrbmOptions[i].label;
                 }
-                item.zrbm = k.join(',')
+                item.zrbm = k.join(",");
               }
             }
           }
-        })
+        });
         let ids = [];
         this.dataList.forEach(item => {
           ids.push(item.standId);
@@ -485,7 +501,7 @@ export default {
         {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -502,64 +518,65 @@ export default {
 
     },
     //流程保存事件
-    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({
+    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
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
-      })
+        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) => {
+    handleSubmit() {
+      this.listForm.commentText = this.commentText;
+      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.$refs['roleForm'].validate((valid) => {
-                if (valid) {
-                  this.isSubmit = true
-                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+              this.isSubmit = true;
+              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.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
-                      });
+                    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("请完善基础信息");
+              return this.$message.warning("请完善人员信息");
             }
           });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];
@@ -584,13 +601,13 @@ export default {
   mounted() {
     this.getProjectData();
     // 查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
       _this: this,
-      loading: 'loading'
+      loading: "loading"
     }, res => {
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
     }, e => {
-    })
+    });
   }
 };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index dc5411ced..516268297 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -451,7 +448,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index d94aab4b9..f9f964ad9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -275,12 +275,10 @@
       </div>
     </div>
     <ProcessFooter
-      show-back
       show-submit
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -407,34 +405,8 @@ export default {
         this.listForm.breakdownList = item.breakdownList;
       });
     },
-    //驳回事件
-    beforeBack() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-        this.$message.warning('请填写审批意见')
-      } else {
-        this.listForm.bzFlag = "2";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-      }
-    },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -451,7 +423,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 246dab1e3..7daf927fe 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.dlFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index f05bd4925..aa6eded29 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -337,9 +337,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('审批意见不能为空')
-      }else{
         this.isSubmit = true
         this.listForm.BZFlag = "1";
         this.listForm.commentText = this.commentText;
@@ -359,7 +356,6 @@ export default {
         }, e => {
         });
       }
-      }
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 8a522f912..3975526c7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -106,6 +106,21 @@
           </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%">
@@ -333,9 +348,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
-        this.$message.warning("请选择架构经理");
-      } else {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -353,7 +365,6 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
     },
     choiceZRR(scope, type, title, id) {
       if (scope != null) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index b97ace1ac..1b6c15777 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -112,6 +112,21 @@
           </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%">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index f192017ae..abc4b4732 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -98,6 +98,21 @@
           </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%">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 7b034e7d7..8baf4cbd6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -236,6 +236,21 @@
           </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%">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index be6930e03..877d12c52 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -432,9 +432,6 @@
             },
             //提交事件
             handleSubmit() {
-                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-                    this.$message.warning('请填写审批意见')
-                } else {
                     this.listForm.ffFlag = "1";
                     this.listForm.commentText = this.commentText;
                     const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@
                             this.$router.push("/processCenter");
                         }
                     });
-                }
             },
         },
         computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 58a19121c..663a26e34 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.jgFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 358573f9d..57dad97d2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.gcFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {

From 54ee848af063cb7ae9013105d1c7b349a3100442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 15:32:37 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=A2=9E=E5=8A=A0=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=A1=86=20=E5=8E=BB=E6=8E=89=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=A1=AB=E5=86=99=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue       | 17 +++++++++++++++++
 .../pages/creatProcess/bzqdfb/step1-3.vue       | 17 +++++++++++++++++
 .../pages/creatProcess/bzqdfb/step1-4.vue       | 12 ++++++------
 .../pages/creatProcess/bzqdfb/step1.vue         | 17 +++++++++++++++++
 .../pages/creatProcess/bzqdfb/step2.vue         |  4 ----
 .../pages/creatProcess/bzqdfb/step3.vue         | 17 +++++++++++++++++
 .../pages/creatProcess/bzqdfb/step4.vue         |  4 ----
 7 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 0aaef349e..f307e3bb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -155,6 +155,21 @@
           </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 === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -735,6 +750,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1052,6 +1068,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index ade22d84d..1060f42c4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -134,6 +134,21 @@
           </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">
@@ -421,6 +436,7 @@ export default {
       totalNo: 0,
       prcNum: '',
       pageSizeNo: this.$store.getters.userInfo.configContent,
+      commentText:'',
       listForm: {
         listName: "", //清单名称
         // applyRegion: "", //适用区域
@@ -677,6 +693,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
index 358b5f851..bb2722e67 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -384,14 +384,15 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.approvalOpinion = "1";
-      this.handleSubmit();
-    },
-    //提交事件
-    handleSubmit() {
       if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
         this.$message.warning("请填写审批意见");
       } else {
+        this.listForm.approvalOpinion = "1";
+        this.handleSubmit();
+      }
+    },
+    //提交事件
+    handleSubmit() {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -408,7 +409,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 24ecd52e3..1ab67aba8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -158,6 +158,21 @@
           </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 === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -712,6 +727,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1024,6 +1040,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index f651fe48e..0fea2918a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -387,9 +387,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写会签意见");
-      }else{
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         this.listForm.approvalOpinion = "";
@@ -410,7 +407,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 8c29d742e..3761e3f62 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -149,6 +149,21 @@
           </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">
@@ -392,6 +407,7 @@ export default {
       // 当前流程类型(1待办/2已办)
       processType: 1,
       searching: false,
+      commentText:'',
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -711,6 +727,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 0d8cf9310..cec4dac2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -401,9 +401,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写审批意见");
-      } else {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -420,7 +417,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

From 43ef950c0369a57ce64b7452605940e4eccad33e Mon Sep 17 00:00:00 2001
From: song2048 <2639528268@qq.com>
Date: Thu, 5 Aug 2021 16:08:58 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=A1=86=20=20=E5=8E=BB=E9=99=A4=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standardRecognition/index.vue   |  2 +-
 .../pages/creatProcess/xmpg/step1-1.vue       | 15 ++++++++
 .../pages/creatProcess/xmpg/step1.vue         | 16 ++++++++
 .../pages/creatProcess/xmpg/step2.vue         | 12 +-----
 .../pages/creatProcess/xmpg/step3.vue         | 15 ++++++++
 .../pages/creatProcess/xmpg/step4.vue         | 38 ++++++++-----------
 .../pages/creatProcess/xmpg/step5.vue         | 19 ++--------
 .../pages/creatProcess/xmpg/step6.vue         | 13 +------
 .../pages/creatProcess/xmpg/step7.vue         |  4 --
 9 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index 9504629bc..c99d5509d 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -216,7 +216,7 @@
           :loading="isSubmit"
           >{{ btnName }}</el-button
         >
-        <!--          <el-button  @click="uploadSave" type="primary">转换</Button>-->
+        <!--<el-button  @click="uploadSave" type="primary">转换</Button>-->
       </div>
     </el-dialog>
   </div>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 2e84bd32f..5842ea30e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -114,6 +114,21 @@
         </el-table>
       </div>
     </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 class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 58f52cd16..5c28d466d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -101,6 +101,21 @@
         </el-table>
       </div>
     </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 class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
@@ -658,6 +673,7 @@ export default {
           this.$message.warning("请选择分发责任人");
         } else {
           this.isSubmit = true
+          this.listForm.commentText = this.commentText;
           var json = Object.assign(this.listForm, this.roleForm);
           this.$refs["listForm"].validate((valid) => {
             if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 696a2f8e8..856ce6777 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -336,9 +336,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.commentText = this.commentText
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -459,9 +456,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
-
+  .dem
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 29c37d98e..49726090c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -126,6 +126,21 @@
             </template>
           </el-table-column>
         </el-table>
+        <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>
         <!--    选择责任人-->
         <Role-tree
           check-box
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 548f3e639..e35a1145f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -246,21 +246,21 @@
           </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>
+        <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'">
@@ -611,10 +611,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
-
-
+  .demo-draw
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index b350287cb..684e338b6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -447,9 +447,6 @@ export default {
     },
     //驳回事件
     beforeBack () {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
           }
         }, e => {
         });
-      }
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
-        this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
         this.listForm.fenFlag = '2'
+       this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
         this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -598,10 +591,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
-
-
+  .demo-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index e74199aa4..95cf31713 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -452,9 +452,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.isSubmit = true
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
         }, e => {
 
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -583,10 +580,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
-
-
+  .demo-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 40b79891e..3f5518210 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -451,9 +451,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //标准表格选择框改变
     selectStandChange(data) {

From 18aed9b6926befe75c9b9113d820b7f811dfcefb Mon Sep 17 00:00:00 2001
From: song2048 <2639528268@qq.com>
Date: Thu, 5 Aug 2021 16:27:21 +0800
Subject: [PATCH 12/17] no message

---
 src/sysConfig/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d2960cf5d..18d7b7c7a 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = '192.168.0.104'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'

From 526bc169e036aa02543f56392433b3346e55078e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 5 Aug 2021 16:49:31 +0800
Subject: [PATCH 13/17] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=20es=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchCenter/pages/advancedSearch.vue     | 272 +++++++-----------
 1 file changed, 99 insertions(+), 173 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index 4611f40a4..ffcef1be5 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -27,10 +27,8 @@
               {{ $t("m.clearQuery") }}
             </el-button>
           </div>
-          <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE
-;border-color:#3391CE
-;">{{ $t("m.export") }}
-          </el-button>
+<!--          <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE;border-color:#3391CE;">{{ $t("m.export") }}-->
+<!--          </el-button>-->
         </div>
         <div class="search-condition showWidth" v-if="kindtext">
           <div class="search-content">
@@ -932,65 +930,41 @@
                   align="center"
                   :label="$t('m.action')"
                   width="200">
-                  <template slot-scope="scope">
-                    <div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
-                      <div v-if="scope.row.collectId">
-                        <el-button class="opera-btn" type="primary" size="mini"
-                                   @click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
-                        </el-button>
-                        <el-dropdown trigger="click" @command="handleCommand">
-                          <el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
-                            {{ $t("m.more") }}
-                          </el-button>
-                          <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item :command="beforeHandleCommand('a',scope.row)"
-                                              v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.cancelCollection") }}
-                            </el-dropdown-item>
-                            <el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
-                                              v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
-                            </el-dropdown-item>
-                            <!--                           <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
-                          </el-dropdown-menu>
-                        </el-dropdown>
-                      </div>
-                      <div v-else>
-                        <el-button class="opera-btn" type="primary" size="mini"
-                                   @click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
-                        </el-button>
-                        <el-dropdown trigger="click" @command="handleCommand">
-                          <el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
-                            {{ $t("m.more") }}
-                          </el-button>
-                          <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item :command="beforeHandleCommand('d',scope.row)"
-                                              v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
-                            </el-dropdown-item>
-                            <el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
-                                              v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
-                            </el-dropdown-item>
-                            <!--                           <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
-                          </el-dropdown-menu>
-                        </el-dropdown>
-                      </div>
-                    </div>
-                    <div v-else-if="selectIndex === 'items'">
-                      <!--                     <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
-                      <el-button class="opera-btn" size="mini" @click="itemsDetails(scope.row)">{{ $t("m.see") }}
-                      </el-button>
-                    </div>
-                    <div v-else class="celect-btn-box">
-                      <el-button class="opera-btn" size="mini" type="primary" v-if="scope.row.collectId"
-                                 @click="clickCollection(scope.row)" v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">
-                        {{ $t("m.cancelCollection") }}
-                      </el-button>
-                      <el-button class="opera-btn" size="mini" type="primary" v-else @click="clickCollection(scope.row)"
-                                 v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
-                      </el-button>
-                      <el-button class="opera-btn" sizi="mini" @click="clickShare(scope.row)"
-                                 v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
-                      </el-button>
-                    </div>
-                  </template>
+                    <template slot-scope="scope">
+                        <div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
+                            <div v-if="scope.row.collectId">
+                                <el-dropdown trigger="click" @command="handleCommand">
+                                    <i class="iconfont">&#xe61e;</i>
+                                    <el-dropdown-menu slot="dropdown">
+                                        <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
+                                        <el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
+                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </el-dropdown>
+
+                            </div>
+                            <div v-else>
+                                <el-dropdown trigger="click" @command="handleCommand">
+                                    <i class="iconfont">&#xe61e;</i>
+                                    <el-dropdown-menu slot="dropdown">
+                                        <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
+                                        <el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
+<!--                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
+                                    </el-dropdown-menu>
+                                </el-dropdown>
+
+                            </div>
+                        </div>
+                        <div v-else-if="selectIndex === 'items'">
+                            <!--                     <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
+                            <el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
+                        </div>
+                        <div v-else>
+                            <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
+                            <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
+                            <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>
+                        </div>
+                    </template>
                 </el-table-column>
               </el-table>
             </div>
@@ -1315,10 +1289,29 @@ export default {
       dropdownItemsCollect: [{ "val": "取消收藏" }, { "val": "分享" }, { "val": "流程" }],
       judgeRoleFlag: false,
       judgeRoleMessage: "",
-      exportSearchInfo: {}
+      exportSearchInfo: {},
+      twoOptions: [],
+      formFieldListStandData: []
     };
   },
   methods: {
+      getAddFormFieldList (isEdit) {
+          this.$http.get('lawss/sarStandAttrDetails/list', {}, {
+                  _this: this
+              },
+              res => {
+                  if (res.ok) {
+                      const { data = {} } = res
+                      // 国内外标准
+                      const inlandList = data['INLAND_STAND'] || []
+                      const foreignList = data['FOREIGN_STAND'] || []
+                      const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
+                      console.log(foreignFilterList)
+                      this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
+                      console.log(this.formFieldListStandData,'-----------------------------------1')
+                  }
+              }, e => {})
+      },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -1497,22 +1490,22 @@ export default {
         }
       }
     }, // 点击收藏/取消收藏事件
-    handleCommand(command) {
-      switch (command.command) {
-        case "d":
-          this.judgeRolePermiOnSar(command.item, 2); // 收藏
-          break;
-        case "a":
-          this.judgeRolePermiOnSar(command.item, 3); // 取消收藏
-          break;
-        case "b":
-          this.judgeRolePermiOnSar(command.item, 4); // 分享
-          break;
-        case "c":
-          this.judgeRolePermiOnSar(command.item, 6); // 流程
-          break;
-      }
-    }, // 下拉菜单点击事件
+    handleCommand (command) {
+          switch (command.command) {
+              case 'd':
+                  this.judgeRolePermiOnSar(command.item, 2) // 收藏
+                  break
+              case 'a':
+                  this.judgeRolePermiOnSar(command.item, 3) // 取消收藏
+                  break
+              case 'b':
+                  this.judgeRolePermiOnSar(command.item, 4) // 分享
+                  break
+              case 'l':
+                  this.judgeRolePermiOnSar(command.item, 1) // 查看
+                  break
+          }
+      }, // 下拉菜单点击事件
     beforeHandleCommand(command, item) {
       return {
         "item": item,
@@ -1658,37 +1651,19 @@ export default {
             pagetype = "BUSINESS_STAND";
           }
         }
-        this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
-          sarId: item.id,
-          sarType: pagetype
-        }, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.judgeRoleFlag = true;
-            if (type === 1) {
+          if (type === 1) {
               this.detailsStandardLaws(item);
-            } else if (type === 2) {
+          } else if (type === 2) {
               this.collectStandard(item);
-            } else if (type === 3) {
+          } else if (type === 3) {
               this.cancelCollectStandard(item);
-            } else if (type === 4) {
+          } else if (type === 4) {
               this.shareSarInfo(item);
-            } else if (type === 5) {
+          } else if (type === 5) {
               this.showRecommendDetials(item);
-            } else if (type === 6) {
+          } else if (type === 6) {
               this.goProcess(item);
-            }
-          } else {
-            this.judgeRoleFlag = false;
-            this.$message({
-              message: res.message,
-              type: "error"
-            });
           }
-        }, e => {
-          this.judgeRoleFlag = false;
-        });
       }
     },
     showDetailsByRole(item) {
@@ -1722,64 +1697,20 @@ export default {
       this.standForm.page = this.page;
       this.standForm.pageSize = this.$store.getters.userInfo.configContent;
       let nowStandForm = JSON.parse(JSON.stringify(this.standForm));
-      if (this.standForm.issueTime != null && this.standForm.issueTime !== "") {
-        nowStandForm.issueTime = this.$dateFormat(this.standForm.issueTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.issueTimeSt != null && this.standForm.issueTimeSt !== "") {
-        nowStandForm.issueTimeSt = this.$dateFormat(this.standForm.issueTimeSt, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.issueTimeEd != null && this.standForm.issueTimeEd !== "") {
-        nowStandForm.issueTimeEd = this.$dateFormat(this.standForm.issueTimeEd, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putTime != null && this.standForm.putTime !== "") {
-        nowStandForm.putTime = this.$dateFormat(this.standForm.putTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putTimeSt != null && this.standForm.putTimeSt !== "") {
-        nowStandForm.putTimeSt = this.$dateFormat(this.standForm.putTimeSt, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putTimeEd != null && this.standForm.putTimeEd !== "") {
-        nowStandForm.putTimeEd = this.$dateFormat(this.standForm.putTimeEd, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.newproductPutTime != null && this.standForm.newproductPutTime !== "") {
-        nowStandForm.newproductPutTime = this.$dateFormat(this.standForm.newproductPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.registerPutTime != null && this.standForm.registerPutTime !== "") {
-        nowStandForm.registerPutTime = this.$dateFormat(this.standForm.registerPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.productPutTime != null && this.standForm.productPutTime !== "") {
-        nowStandForm.productPutTime = this.$dateFormat(this.standForm.productPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.productPutTimeSt != null && this.standForm.productPutTimeSt !== "") {
-        nowStandForm.productPutTimeSt = this.$dateFormat(this.standForm.productPutTimeSt, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.productPutTimeSt = "";
-      }
-      if (this.standForm.productPutTimeEd != null && this.standForm.productPutTimeEd !== "") {
-        nowStandForm.productPutTimeEd = this.$dateFormat(this.standForm.productPutTimeEd, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.productPutTimeEd = "";
-      }
-      if (this.standForm.newcarPutTime != null && this.standForm.newcarPutTime !== "") {
-        nowStandForm.newcarPutTime = this.$dateFormat(this.standForm.newcarPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.newcarPutTimeSt != null && this.standForm.newcarPutTimeSt !== "") {
-        nowStandForm.newcarPutTimeSt = this.$dateFormat(this.standForm.newcarPutTimeSt, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.newcarPutTimeSt = "";
-      }
-      if (this.standForm.newcarPutTimeEd != null && this.standForm.newcarPutTimeEd !== "") {
-        nowStandForm.newcarPutTimeEd = this.$dateFormat(this.standForm.newcarPutTimeEd, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.newcarPutTimeEd = "";
-      }
-      if (this.standForm.firstPutTime != null && this.standForm.firstPutTime !== "") {
-        nowStandForm.firstPutTime = this.$dateFormat(this.standForm.firstPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putYear != null && this.standForm.putYear !== "") {
-        nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy");
-      }
+      // 处理动态表单的时间和下拉框格式
+      const formFieldList = this.formFieldListStandData
+      const sarStandAttrObj = {}
+      formFieldList.forEach((item) => {
+         const attrField = item.attrField.toLowerCase();
+         const value = nowStandForm[attrField]
+          // 时间格式处理
+          if (item.attrType === 'DATE_PICKER' && value) {
+            nowStandForm[item.attrField] = this.standForm[attrField]
+          }
+            sarStandAttrObj[item.attrField] = nowStandForm[attrField]
+        })
+      nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
       this.exportSearchInfo = nowStandForm;
-      nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'")
       this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, {
         _this: this,
         loading: "resultLoading"
@@ -1920,20 +1851,13 @@ export default {
       let routername = "";
       let pagetype = "";
       if (item.type === "stand") {
-        if (this.$hasPermission("CFEZ3VP7EA95CTRBH3JB") || this.$hasPermission("R5DNG6EZC66CNFC4RHPH")) {
-          if (item.stand_type === "INLAND") {
-            routername = "OtherStandardDetails";
-            pagetype = "INLAND_STAND";
+          if (item.standType === "INLAND") {
+              routername = "OtherStandardDetails";
+              pagetype = "INLAND_STAND";
           } else {
-            routername = "OtherForeignDetails";
-            pagetype = "FOREIGN_STAND";
+              routername = "OtherForeignDetails";
+              pagetype = "FOREIGN_STAND";
           }
-        } else {
-          this.$message({
-            message: "无权访问",
-            type: "warning"
-          });
-        }
       } else if (item.type === "laws") {
         if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
           routername = "OtherLawsDetails";
@@ -2349,6 +2273,7 @@ export default {
   computed: {
     // 条件按钮提示
     toggleConditionTips() {
+        this.standForm.selectValue = ''
       return this.kindtext ? "收起条件" : "展开条件";
     }
   },
@@ -2408,6 +2333,7 @@ export default {
     // 加载表格
     this.searchSarBykey();
     this.showBuyRole();
+    this.getAddFormFieldList();
     // 组织结构
     this.getOrgTreeSource();
     // this.selectBussRoleMsg();

From a2af7ad00729df73e1d8f377575e0b9a1475c9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 16:56:29 +0800
Subject: [PATCH 14/17] =?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/xmpg2/step1-1.vue              | 11 ++++++-----
 .../processCenter/pages/creatProcess/xmpg2/step1.vue  |  2 +-
 .../processCenter/pages/creatProcess/xmpg2/step12.vue |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index db6b832e9..19a55d780 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -87,22 +87,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -422,7 +422,6 @@ export default {
       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;
@@ -547,6 +546,7 @@ export default {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
                 _this: this
               }, res => {
@@ -562,6 +562,7 @@ export default {
                       this.$message.success(res.message);
                       this.$router.push("/processCenter");
                     }
+                    this.isSubmit = false
                   });
                 }
               });
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 2539b5689..1f8280f2b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -526,7 +526,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "6");
       _formData.append("json", JSON.stringify({
-        form: this.form,
+        form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
       }));
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 7daf927fe..f2e01646f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -2,7 +2,7 @@
   <div class="xmpg2-step12">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
-      <template slot="proNode">责任人审核</template>
+      <template slot="proNode">标准法规部部长审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

From 050a3a30a592d0efc2acad914727cc157b793002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 5 Aug 2021 17:22:06 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 04ef5ace5..b4d0b82af 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -212,7 +212,7 @@ export default {
     //查询选项
     queryOptions() {
       let _this = this;
-      this.$http.post("search/searchCenter/getMenu", {}, {
+      this.$http.post("search/getMenu", {}, {
         _this: this
       }, res => {
         _this.searchData = [

From 2e3232ade284d01078e955f7718bd2fe8ce9f57f Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 5 Aug 2021 17:31:47 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=EF=BC=8C=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessFooter.vue        |  7 +++-
 .../pages/creatProcess/wfhxzg/step1.vue       | 15 +++----
 .../pages/creatProcess/wfhxzg/step2.vue       |  4 +-
 .../pages/creatProcess/wfhxzg/step3.vue       |  4 +-
 .../pages/creatProcess/wfhxzg/step4.vue       | 39 +++++++++++--------
 .../pages/creatProcess/wfhxzg/step5.vue       | 10 +++--
 .../pages/addEdit.vue                         |  9 +++++
 .../pages/otherAddEit.vue                     |  9 +++++
 .../pages/projectAddEit.vue                   |  9 +++++
 9 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 7afe67ada..266344463 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -53,7 +53,7 @@
         size="small"
         class="common-button-danger"
         @click="beforeBack"
-        :loading="isSubmit"
+        :loading="isSubmitBack"
         v-if="showBack">
         <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
         {{ backBTNText }}</el-button>
@@ -151,6 +151,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 保存按钮loading
+    isSubmitBack: {
+      type: Boolean,
+      default: false
+    },
     // 是否默认委托事件
     defaultEntrust: {
       type: Boolean,
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index b15859b09..de2138c64 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -31,7 +31,7 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
               <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
               </template>
             </el-table-column>
             <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -102,7 +102,7 @@
                   <h4>确认+选择责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -114,7 +114,7 @@
                   <h4>负责人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="负责人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -126,7 +126,7 @@
                   <h4>分发负责人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -148,7 +148,7 @@
           <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input
-                v-model="queryUnqualidiedData.standSerialNumber"
+                v-model="queryUnqualidiedData.standId"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
           @selection-change="selectedChange"
         >
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+        <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
           <template slot-scope="scope">
-            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
           </template>
         </el-table-column>
         <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -291,6 +291,7 @@ export default {
         pageSize: 10,
         total: 0,
         closeState: '1',
+        standId: '',
         standSerialNumber: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 34d9c9a60..b52339f31 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -97,9 +97,9 @@
           :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 prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index e8a67fc9b..5716eb580 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -99,9 +99,9 @@
           :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 prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index a684c38a4..71d89ca6a 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -87,9 +87,9 @@
           :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 prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -118,6 +118,7 @@
                   accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                   :before-upload="handleBeforeUpload"
                   :before-remove="handleBeforeRemove"
+                  :on-remove="handleONRemove"
                   :on-success="handleOnsuccess"
                 >
                 <el-button
@@ -314,12 +315,7 @@ export default {
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
-            item.fileText.forEach(item1 => {
-              this.fileTextList.push({
-                id: item1.id,
-                name: item1.name
-              })
-            })
+            this.fileTextList = item.fileText
           }
         })
       })
@@ -335,10 +331,18 @@ export default {
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        this.newDataList.push({
-          id: res.data.attId,
-          name: res.data.standName
-        })
+        if (this.fileTextList !== null) {
+          this.newDataList = this.fileTextList
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        }
         this.fileListData.fileText = this.newDataList
         this.$message({
           showClose: true,
@@ -377,14 +381,17 @@ export default {
     },
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
+      this.fileListData.fileText = fileList
       this.fileTextList = fileList
-      this.newDataList.forEach((item, index) => {
+/*      this.newDataList.forEach((item, index) => {
         if (file.name === item.name || file.id === item.id) {
           this.newDataList.splice(index, 1)
-        }
-      })
-    },
+          console.log(this.dataList)
 
+        }
+      })*/
+    },
+    handleONRemove() {},
     /************ ********* *****************/
     // 点击查看
     handlePreview (item) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index ab8c6df90..865a6a96e 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -87,9 +87,9 @@
           :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 prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -201,7 +201,7 @@
       approval
       @back="handleSubmitNo"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :isSubmitBack="backLoading"
       @submit="handleSubmit"
       submitBTNText="同意"
     >
@@ -357,6 +357,7 @@ export default {
       })
     },
     handleSubmitNo() {
+      this.backLoading = true
       if (this.commentText) {
         var json = {
           responUserInfo: {
@@ -372,12 +373,13 @@ export default {
         }, {}, res => {
           if (res.success) {
             this.$message.success('驳回成功')
-            this.fileTextList = []
             this.$router.push('/processCenter')
+            this.backLoading = false
           }
         })
       } else {
         this.$message.warning('请输入反馈意见')
+        this.backLoading = false
       }
     },
     //未整改项抽屉中的查询按钮
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 4a89f62c4..883ef6927 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -185,6 +185,9 @@
               prop="standName"
               label="标准名称"
           >
+            <template slot-scope="scope">
+              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               prop="issueTime"
@@ -273,12 +276,18 @@
             label="标准名称"
             width="260px"
         >
+          <template slot-scope="scope">
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 76a9f2f86..42cb7de2a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -170,6 +170,9 @@
             prop="standName"
             label="标准名称"
           >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -257,12 +260,18 @@
           label="标准名称"
           width="260px"
         >
+          <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"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 1d4fe3bc6..3d1e7def0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -170,6 +170,9 @@
             prop="standName"
             label="标准名称"
           >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -257,12 +260,18 @@
           label="标准名称"
           width="260px"
         >
+          <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"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"

From 3c7f9e05e18ea7a4fe56edf700bededab518afac Mon Sep 17 00:00:00 2001
From: song2048 <2639528268@qq.com>
Date: Thu, 5 Aug 2021 17:33:04 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=9B=B4=E6=94=B97=E6=AD=A5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8Fstyle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1-1.vue          |  1 +
 .../pages/creatProcess/xmpg/step1.vue            |  1 +
 .../pages/creatProcess/xmpg/step2.vue            |  6 +++++-
 .../pages/creatProcess/xmpg/step3.vue            | 16 +---------------
 .../pages/creatProcess/xmpg/step4.vue            |  6 +++++-
 .../pages/creatProcess/xmpg/step5.vue            |  6 +++++-
 .../pages/creatProcess/xmpg/step6.vue            |  6 +++++-
 .../pages/creatProcess/xmpg/step7.vue            |  1 -
 8 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 5842ea30e..e01298782 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -405,6 +405,7 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
+      commentText:'',
       standardSearch: {
         standType: "",
         standName: ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 5c28d466d..93b96686c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -389,6 +389,7 @@ export default {
       productData: [], //添加抽屉的数据
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
+      commentText: '',
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 856ce6777..91cc0a018 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -456,4 +456,8 @@ export default {
     }
   }
 
-  .dem
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 49726090c..aafe0469e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -126,21 +126,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <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>
+
         <!--    选择责任人-->
         <Role-tree
           check-box
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index e35a1145f..06ec3df9c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -611,4 +611,8 @@ export default {
     }
   }
 
-  .demo-draw
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 684e338b6..9bf3d7814 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -591,4 +591,8 @@ export default {
     }
   }
 
-  .demo-
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 95cf31713..da7a853ea 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -580,4 +580,8 @@ export default {
     }
   }
 
-  .demo-
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 3f5518210..d12fc2bc4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -510,7 +510,6 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
-
 .xmpg-step7 {
   /deep/ .el-drawer__container {
     .prc-content-border {