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

# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'EAT8LJFSP6P4QMR6M8F4'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="'Q2AQMSUHKZDKLXJBHJEN'" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,7 +76,7 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="'PTH96GYZT6SQZE9H8XCF'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
                   <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

src/pages/config/pages/standLawsAttrManage/index.vue

@@ -53,10 +53,10 @@
           class="common-button-primary"
           size="mini"
           @click="showAddModel(1, null)"
-          v-btn-permission="'29YZ482LEHRJJXELWZGG'"
+          v-btn-permission="''"
           ><i class="iconfont">&#xe84e;</i>新增</el-button
         >
-        <el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission="T97J4LTH3TP36CREJ62A"
+        <el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission=""
           ><i class="iconfont">&#xe61b;</i>删除</el-button
         >
       </div>
@@ -124,13 +124,13 @@
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item
-                    v-btn-permission="'5B3QMLDMTJ4XPLKSFA8Q'"
+                    v-btn-permission="''"
                     :disabled="scope.row.enable === '0'"
                     :command="[scope.row, '编辑']"
                     >编辑</el-dropdown-item
                   >
                   <el-dropdown-item
-                    v-btn-permission="'T97J4LTH3TP36CREJ62A'"
+                    v-btn-permission="''"
                     :disabled="scope.row.enable === '0'"
                     :command="[scope.row, '删除']"
                     >删除</el-dropdown-item

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -12,6 +12,10 @@ export default {
                   label: '标准入库流程',
                   value: '1'
               },
+            {
+              label:'标准清单发布流程',
+              value: '3'
+            },
           ],
           formDisableFlag: false,
           pickerOptions: {

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

@@ -1,13 +1,469 @@
-<!--标准-->
+<!--标准清单发布流程step2  -->
 <template>
+  <div class="bzqdfb-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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-if="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="orgName" class="add-form-item form-item-disabled">-->
+              <!--                <el-radio-group v-model="listType" @change="selectionList">-->
+              <!--                  <el-radio label="country">国家/地区清单</el-radio>-->
+              <!--                  <el-radio label="project">项目清单</el-radio>-->
+              <!--                  <el-radio label="other">其他清单</el-radio>-->
+              <!--                </el-radio-group>-->
+              <!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
+              <!--              </el-form-item>-->
+              <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="applyRegion" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.applyRegion"
+                  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="enclosure" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.enclosure"
+                  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
+          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="standNumber"
+            label="标准号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="cnName"
+            label="中文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="enName"
+            label="英文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="isSubTime"
+            label="发布日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="newCarTime"
+            label="新车型实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="oldCarTime"
+            label="在产车实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="applyCar"
+            label="适用车型"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="textState"
+            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-if="active == '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user1" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>责任人</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user2" placeholder="请输入">
+
+                </el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user3" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>业务经理</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user5" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-submit
+      :submitLoading="isSubmit"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </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: "bzqdfbStep2"
+  name: "bzqdfbStep2",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      dataList: [
+        {
+          standNumber: 123,
+          cnName: "中国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl119a61sgmzk47d918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "日本",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk417d98pw15",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "韩国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "没过",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d2331918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "德国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk472344dt1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }
+
+
+      ], //清单里的标准数据
+      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: {
+        listType: "", //区分是哪个清单
+        listName: "", //清单名称
+        applyRegion: "", //适用区域
+        descriptionList: "", //清单说明
+        enclosure: "", //附件
+        dataList: [{
+          standNumber: "", //标准号
+          cnName: "", //中文名称
+          enName: "", //英文名称
+          isSubTime: "", //发布日期
+          newCarTime: "", //新车型实施日期
+          oldCarTime: "", //在产车实施日期
+          applyCar: "", //适用车型
+          textState: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    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
+      })
+    },
+
+
+    //保存事件
+    handleSave() {
+
+    },
+    //提交事件
+    handleSubmit() {
+      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.approvalOpinion = "";
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.signFlag = "";
+      const json = JSON.stringify(this.listForm);
+      this.$http.postData('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')
+        }
+      });
+    },
+    //选择标准取消事件
+    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();
+    }
+  },
+  computed: {},
+  mounted() {
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.bzqdfb-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+

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

@@ -0,0 +1,565 @@
+<!--标准清单发布/更新流程step3 - 根据会签意见修订-->
+<template>
+  <div class="bzqdfb-step3">
+    <ProcessHeader toggle>
+      <template slot="proName">标准清单发布/更新流程</template>
+      <template slot="proNode">根据会签意见修订</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-if="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="orgName" class="add-form-item form-item-disabled">-->
+<!--                <el-radio-group v-model="listType" @change="selectionList">-->
+<!--                  <el-radio label="country">国家/地区清单</el-radio>-->
+<!--                  <el-radio label="project">项目清单</el-radio>-->
+<!--                  <el-radio label="other">其他清单</el-radio>-->
+<!--                </el-radio-group>-->
+<!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
+<!--              </el-form-item>-->
+              <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="applyRegion" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.applyRegion"
+                  placeholder="请输入适用区域"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.enclosure"
+                  placeholder="暂无数据"
+
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          height="61.6%"
+          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="standNumber"
+            label="标准号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="cnName"
+            label="中文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="enName"
+            label="英文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="isSubTime"
+            label="发布日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="newCarTime"
+            label="新车型实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="oldCarTime"
+            label="在产车实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="applyCar"
+            label="适用车型"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="textState"
+            label="文本状态"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-if="active == '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user1" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>责任人</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user2" placeholder="请输入">
+
+                </el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user3" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>业务经理</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user5" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <el-table
+        :data="standardData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="selectThree"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="content"
+          label="标准号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="中文名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="英文名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="发布日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="新车型实施日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="在产车实施日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="适用车型"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="文本状态"
+        >
+        </el-table-column>
+      </el-table>
+    </el-drawer>
+
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "bzqdfbStep3",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      dataList: [
+        {
+          standNumber: 123,
+          cnName: "中国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl119a61sgmzk47d918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "日本",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk417d98pw15",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "韩国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "没过",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d2331918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "德国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk472344dt1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }
+
+
+      ], //清单里的标准数据
+      standardData: [], //添加标准数据
+      standModel: false, // 选择标准抽屉状态
+      active: "1",
+      signFlag: "1",   //是否会签 1为会签 2为不会签
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        listName: "", //清单名称
+        applyRegion: "", //适用区域
+        descriptionList: "", //清单说明
+        enclosure: "", //附件
+        signFlag: "1",   //是否会签 1为会签 2为不会签
+        dataList: [{
+          standNumber: "", //标准号
+          cnName: "", //中文名称
+          enName: "", //英文名称
+          isSubTime: "", //发布日期
+          newCarTime: "", //新车型实施日期
+          oldCarTime: "", //在产车实施日期
+          applyCar: "", //适用车型
+          textState: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    //点击新增事件
+    addList() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+      }, e => {
+      });
+      this.standModel = true;
+    },
+    // 点击批量删除事件
+    deleteList() {
+      if (this.selectList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.selectList.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.id = item;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
+    },
+    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
+      })
+    },
+    //保存事件
+    handleSave() {
+      let _formData = new FormData()
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', this.$route.query.type)
+      saveTaskFirst(_formData).then(res => {
+        this.$message.success('保存成功')
+      }).catch(e => {
+      })
+
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.commentText = this.commentText;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.approvalOpinion = "";
+      this.listForm.standId = this.listForm.standId;
+      const json = JSON.stringify(this.listForm);
+      this.$http.postData('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')
+        }
+      });
+    },
+    //标准表格选择框改变
+    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: {},
+  mounted() {
+    this.getData()
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzqdfb-step3 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+

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

@@ -0,0 +1,476 @@
+<!--标准法规清单发布 -  业务经理审批-->
+<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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-if="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="orgName" class="add-form-item form-item-disabled">-->
+              <!--                <el-radio-group v-model="listType" @change="selectionList">-->
+              <!--                  <el-radio label="country">国家/地区清单</el-radio>-->
+              <!--                  <el-radio label="project">项目清单</el-radio>-->
+              <!--                  <el-radio label="other">其他清单</el-radio>-->
+              <!--                </el-radio-group>-->
+              <!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
+              <!--              </el-form-item>-->
+              <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.listName"
+                  placeholder="请输入清单名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.applyRegion"
+                  placeholder="请输入适用区域"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.enclosure"
+                  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
+          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="standNumber"
+            label="标准号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="cnName"
+            label="中文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="enName"
+            label="英文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="isSubTime"
+            label="发布日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="newCarTime"
+            label="新车型实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="oldCarTime"
+            label="在产车实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="applyCar"
+            label="适用车型"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="textState"
+            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-if="active == '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user1" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>责任人</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user2" placeholder="请输入">
+
+                </el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>标准/政策法规工程师</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user3" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
+            <el-card>
+              <h4>业务经理</h4>
+              <div style="margin-top: 10px;">
+                <el-input v-model="user5" placeholder="请输入"></el-input>
+              </div>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </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: "bzqdfbStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      dataList: [
+        {
+          standNumber: 123,
+          cnName: "中国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl119a61sgmzk47d918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "日本",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk417d98pw15",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "韩国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }, {
+          standNumber: 123,
+          cnName: "没过",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk47d2331918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        },
+        {
+          standNumber: 123,
+          cnName: "德国",
+          enName: "CN",
+          isSubTime: "2021-06-25T00:00:00.000+00:00",
+          newCarTime: "2021-06-25T00:00:00.000+00:00",
+          oldCarTime: "2021-06-25T00:00:00.000+00:00",
+          id: "2hl9a61sgmzk472344dt1918pw5",
+          applyRegion: null,
+          textState: "已发布"
+        }
+
+
+      ], //清单里的标准数据
+      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: "", //清单名称
+        applyRegion: "", //适用区域
+        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()
+    };
+  },
+  methods: {
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    //保存事件
+    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
+      })
+    },
+    //驳回事件
+    beforeBack () {
+      this.listForm.approvalOpinion = '1'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      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.commentText = this.commentText;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.signflag = "";
+      this.listForm.standId = this.listForm.standId;
+      const json = JSON.stringify(this.listForm);
+      this.$http.postData('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')
+        }
+      });
+    },
+    //选择标准取消事件
+    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();
+    }
+  },
+  computed: {},
+  mounted() {
+    this.getData()
+  },
+};
+</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>
+

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

@@ -190,7 +190,6 @@ export default {
         loading: 'loading',
         _this: this
       }, res => {
-        console.log(res)
         this.processList = res.list || []
         this.total = res.count
       }, e => {

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

@@ -265,6 +265,44 @@ export default {
               }
             })
           }
+          break;
+          case'3' : {
+            if (row.taskInfo === '进行会签，填写意见') {
+              this.$router.push({
+                name: 'bzqdfbStep2',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if (row.taskInfo === '根据会签意见修订') {
+              this.$router.push({
+                name: 'bzqdfbStep3',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            }else if (row.taskInfo === '业务经理审批') {
+              this.$router.push({
+                name: 'bzqdfbStep4',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            }
+          }
+          break;
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -21,113 +21,128 @@
 </template>
 
 <script>
-  import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
+import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
-  import listProject from "../accessStandardsAndRegulations/page/listProject";
+import listProject from "../accessStandardsAndRegulations/page/listProject";
-  import listTracking from "../accessStandardsAndRegulations/page/listTracking";
+import listTracking from "../accessStandardsAndRegulations/page/listTracking";
-  import listOther from "../accessStandardsAndRegulations/page/listOther";
+import listOther from "../accessStandardsAndRegulations/page/listOther";
-  export default {
+
-    name: "AccessStandardsAndRegulations",
+export default {
-    data() {
+  name: "AccessStandardsAndRegulations",
-      return {
+  data() {
-        list: [],
+    return {
-        tabValue: ''
+      list: [],
-      };
+      tabValue: "",
-    },
+      menuName: ["国家/地区清单", "项目类清单", "重点标准跟踪清单", "其他清单"]
-    methods: {},
+    };
-    components: {
+  },
-      listOfCountries,
+  methods: {},
-      listProject,
+  components: {
-      listTracking,
+    listOfCountries,
-      listOther
+    listProject,
-    },
+    listTracking,
-    props: {},
+    listOther
-    computed: {},
+  },
-    watch: {},
+  props: {},
-    mounted() {
+  computed: {},
-      var list = []
+  watch: {},
-      const menuList = this.$store.getters.getMenuList
+  mounted() {
-      menuList.forEach(item => {
+    var list = [];
-        if (item.id === 'b05b562950cb6d0aef539fad30b7386a') {
+    const menuList = this.$store.getters.getMenuList;
-          list.push({
+    let menuData = [];
-            label: '国家/地区清单',
+    let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "418123d180abf67bd2c46d5a694baaa5", "5a75523729b04102a565167004d640e9"];
-            name: 'listOfCountries'
+    this.menuName.forEach(item => {
-          })
+      for (let i = 0; i < menuList.length; i++) {
-        } else if (item.id === '63e05705d0c8013162caa34f9fe52865') {
+        let entity = menuList[i];
-          list.push({
+        if (item != entity.menuName) continue;
-            label: '项目类清单',
+        if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
-            name: 'listProject'
+          menuData.push(entity.id);
-          })
+          if (entity.id === "b05b562950cb6d0aef539fad30b7386a") {
-        } else if (item.id === '418123d180abf67bd2c46d5a694baaa5') {
+            list.push({
-          list.push({
+              label: "国家/地区清单",
-            label: '重点标准跟踪清单',
+              name: "listOfCountries"
-            name: 'listTracking'
+            });
-          })
+            continue;
-        } else if (item.id === '5a75523729b04102a565167004d640e9') {
+          } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
-          list.push({
+            list.push({
-            label: '其他清单',
+              label: "项目类清单",
-            name: 'listOther'
+              name: "listProject"
-          })
+            });
+            continue;
+          } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+            list.push({
+              label: "重点标准跟踪清单",
+              name: "listTracking"
+            });
+            continue;
+          } else if (entity.id === "5a75523729b04102a565167004d640e9") {
+            list.push({
+              label: "其他清单",
+              name: "listOther"
+            });
+            continue;
+          }
         }
-      })
-      this.list = list
-      this.tabValue = this.list[0].name
-    },
-    beforeRouteLeave(to, from, next) {
-      const toName = ['ListOfStandardsAndRegulationsDetails', 'Details', 'ProjectAddEit', 'OtherAddEit']
-      // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
-      if (toName.includes(to.name)) {
-        this.$store.commit('SET_ACCESS_STANDARD_REG_TABS', this.tabValue)
-      } else {
-        this.$store.commit('SET_ACCESS_STANDARD_REG_TABS')
       }
-      setTimeout(() => {
+    });
-        next()
+    this.list = list;
-      }, 100)
+    this.tabValue = this.list[0].name;
-    },
+  },
-    beforeRouteEnter(to, from, next) {
+  beforeRouteLeave(to, from, next) {
-      next(vm => {
+    const toName = ["ListOfStandardsAndRegulationsDetails", "Details", "ProjectAddEit", "OtherAddEit"];
-        if (vm.$store.state.accessStandRegTabName !== '') {
+    // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
-          vm.tabValue = vm.$store.state.accessStandRegTabName
+    if (toName.includes(to.name)) {
-        }
+      this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);
-      })
+    } else {
+      this.$store.commit("SET_ACCESS_STANDARD_REG_TABS");
     }
-  };
+    setTimeout(() => {
+      next();
+    }, 100);
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      if (vm.$store.state.accessStandRegTabName !== "") {
+        vm.tabValue = vm.$store.state.accessStandRegTabName;
+      }
+    });
+  }
+};
 </script>
 
 <style lang="less" scoped>
-  @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-  @import '~@/assets/styles/mixins';
+@import '~@/assets/styles/mixins';
 
-  #accessStandardsAndRegulations {
+#accessStandardsAndRegulations {
-    height: 100%;
+  height: 100%;
-    padding: 0 10px;
+  padding: 0 10px;
-    background: #fff;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+
+  /deep/ .el-tabs {
+    flex: auto;
     display: flex;
     flex-direction: column;
 
-    /deep/ .el-tabs {
+    /deep/ .el-tabs__header {
+      margin: 0 !important;
+    }
+
+    .el-tabs__content {
+      height: 100% !important;
       flex: auto;
+      position: relative;
       display: flex;
       flex-direction: column;
 
-      /deep/ .el-tabs__header {
+      .el-tab-pane {
-        margin: 0 !important;
+        height: 100%;
-      }
-
-      .el-tabs__content {
-        height: 100% !important;
         flex: auto;
-        position: relative;
         display: flex;
         flex-direction: column;
-
-        .el-tab-pane {
-          height: 100%;
-          flex: auto;
-          display: flex;
-          flex-direction: column;
-        }
       }
     }
   }
+}
 </style>

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -42,7 +42,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'ae7419baca1564175bf96d94e827ef8b'"
+        v-btn-permission="''"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -16,6 +16,7 @@
               placeholder="请输入清单名称"
             ></el-input>
           </el-form-item>
+
           <el-form-item class="search-item btn-box">
             <el-button
               :loading="searching"

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -28,6 +28,24 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+              <el-select
+                v-model="sarAccessEO.applicationScope"
+                multiple
+                placeholder="请选择"
+                filterable
+                :disabled="disabledFlag"
+                class="wx-resolve"
+              >
+                <el-option
+                  v-for="item in applyOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -222,21 +240,18 @@
           </el-table-column>
           <el-table-column
             prop="newPutTime"
-            width="150px"
             sortable
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="prodPutTime"
-            width="150px"
             sortable
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZRBMName"
-            width="150px"
             label="责任部门">
           </el-table-column>
           <el-table-column
@@ -366,34 +381,29 @@
         </el-table-column>
         <el-table-column
           prop="newPutTime"
-          width="190px"
           label="发布日期"
           sortable
         >
         </el-table-column>
         <el-table-column
           prop="newPutTime"
-          width="190px"
           label="新车型实施日期"
           sortable
         >
         </el-table-column>
         <el-table-column
           prop="prodPutTime"
-          width="190px"
           label="在产车实施日期"
           sortable
         >
         </el-table-column>
         <el-table-column
           prop="applyArcticId"
-          width="120px"
           show-overflow-tooltip
           label="适用车型">
         </el-table-column>
         <el-table-column
           prop="applyArcticId"
-          width="120px"
           show-overflow-tooltip
           label="文本状态">
         </el-table-column>
@@ -505,7 +515,8 @@ export default {
         energyKind: '',
         type: '',
         relateFile: '',
-        remark: '' // 清单说明
+        remark: '', // 清单说明
+        applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -525,6 +536,7 @@ export default {
       disabledFlag: false,
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
+      applyOptions: [], //基础信息适用领域list
       applyArcticOptions: [], // 基础车型 适用车型list
       energyKindOptions: [], // 能源种类list
       accessSarTypeOptions: [], // 要求类型list
@@ -545,6 +557,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
+        applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -1453,6 +1466,7 @@ export default {
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           sarAccessEO.adminInfoList = JSON.stringify(rowList2)
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1500,7 +1514,6 @@ export default {
     // 查询数据搜索 table 数据
     selectLawsStands () {
       if (this.isListType) {
-        console.log('1505');
         this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, {
           _this: this,
           loading: 'dataLoading'
@@ -1514,6 +1527,7 @@ export default {
           _this: this,
           loading: 'dataLoading'
         }, res => {
+          console.log(res.data);
           res.data.list[0].list.map(item => {
             item.newPutTextTime = null
             item.prodPutTextTime = null
@@ -2214,6 +2228,7 @@ export default {
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+      this.applyOptions = res.data.COUNTRY
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
       this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
@@ -2228,9 +2243,11 @@ export default {
     // 判断是否是编辑
     if (this.$route.query.id) {
       const accessRow = this.getAccessStandardRegRow
+      console.log('是否是编辑', accessRow);
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -13,6 +13,24 @@
             <el-form-item label="清单类别" prop="detailedList" class="search-item">
               <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
+            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+              <el-select
+                v-model="sarAccessEO.applicationScope"
+                multiple
+                placeholder="请选择"
+                filterable
+                :disabled="disabledFlag"
+                class="wx-resolve"
+              >
+                <el-option
+                  v-for="item in applyOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -292,11 +310,11 @@
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
-          v-btn-permission="'98c9556f5ae1590b4c2eb7d8ae2526dd'"
+          v-btn-permission="''"
         ><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button
           class="common-button-default delete-button"
-          v-btn-permission="'c998c341816ecade73493fca3051cb1e'"
+          v-btn-permission="''"
           size="mini" @click="deleteSelectSarAccessInfo"
           v-if="!disabledFlag"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
@@ -490,8 +508,10 @@ export default {
         energyKind: '',
         type: '',
         relateFile: '',
-        remark: '' // 清单说明
+        remark: '' ,// 清单说明
+        applicationScope: '' , //适用领域
       },
+      applyOptions: [], //适用领域list
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
       // 新增、编辑 基础信息验证条件
@@ -2185,6 +2205,7 @@ export default {
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+      this.applyOptions = res.data.COUNTRY //适用领域 list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
       this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -13,6 +13,24 @@
             <el-form-item label="项目名称" prop="projectName" class="search-item">
               <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
+            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+              <el-select
+                v-model="sarAccessEO.applicationScope"
+                multiple
+                placeholder="请选择"
+                filterable
+                :disabled="disabledFlag"
+                class="wx-resolve"
+              >
+                <el-option
+                  v-for="item in applyOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -490,9 +508,11 @@ export default {
         energyKind: '',
         type: '',
         relateFile: '',
-        remark: '' // 清单说明
+        remark: '' ,// 清单说明
+        applicationScope: '', //适用领域
       },
       fileInfoList: [], // 上传的附件
+      applyOptions:[], //适用领域
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
@@ -2185,7 +2205,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
-      this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+      this.applyOptions = res.data.COUNTRY // 国家、地区list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
       this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别

src/router/index.js

@@ -258,6 +258,24 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
+      {
+        path: '/bzqdfbStep3',
+        name: 'bzqdfbStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
+      {
+        path: '/bzqdfbStep4',
+        name: 'bzqdfbStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
       {
         path: '/bzrkStep1',
         name: 'bzrkStep1',

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.53'
+const devIp = '192.168.10.247'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'