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

src/api/login/index.js

@@ -0,0 +1,11 @@
+import axios from '@/common/axiosV2'
+
+// 流程发起
+export function checkPage(params) {
+  return axios({
+    url: '/api/checkPage',
+    method: 'get',
+    params
+  })
+}
+

src/components/navMenu/index.vue

@@ -161,11 +161,11 @@
               //   path: '/dataStatisComments',
               //   menuId: ''
               // },
-              {
+              // {
-                title: '国内外政策',
+              //   title: '国内外政策',
-                path: '/foreignRegulationsDatabase',
+              //   path: '/foreignRegulationsDatabase',
-                menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
+              //   menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
-              },
+              // },
               // // // {
               // // //   title: '标准制修订管理',
               // // //   path: '/demo2One'
@@ -208,6 +208,34 @@
               // }
             ]
           },
+          {
+            title: '政策法规库',
+            path: '/policyRegulation',
+            'icon-class': 'el-icon-s-management',
+            menuId: 'asdzcfgk',
+            children: [
+              {
+                title: '问题项管控',
+                path: '/problemControl',
+                menuId: '50d7a0c0af4740c486100c257ae6068e'
+              },
+              {
+                title: '国内外政策',
+                path: '/nationalPolicy',
+                menuId: '6557e9c4ce672af71be5807052da126b'
+              },
+              {
+                title: '标准跟踪清单',
+                path: '/standardTrackingList',
+                menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
+              },
+              {
+                title: '政策工作组',
+                path: '/policyWorkGroup',
+                menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
+              }
+            ]
+          },
           {
             title: '工作中心',
             path: '/processCenter',

src/pages/details/otherStandardDetails/index.vue

@@ -258,7 +258,7 @@
 
 
 
-                      <p class="half" style="margin-left: -48px">
+                      <p class="half">
                         <label style=" margin-right: 150px;"
                                title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                         >文本状态</label>
@@ -4371,7 +4371,7 @@ export default {
 
       .basic-information-content {
         & > p {
-          min-height: 42px;
+          min-height: 43px;
           line-height: 43px;
           border-bottom: 1px solid #E5E5E5;
         }

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1508,8 +1508,8 @@ export default {
         }, res => {
           if (res.data) {
             this.batchDeleteItem()
-          } else if(this.selectedList != null && this.selectedList.length > 20){
+          } else if(this.selectedList != null){
-             this.$message.warning('单次最多删除20个条款')
+            this.$message.warning('请选择要删除的数据')
           } else {
             this.deleteItemsModal = true
           }

src/pages/login/checkPage.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="checkPage">
+
+  </div>
+</template>
+
+<script>
+import { mapMutations, mapActions } from 'vuex'
+import { checkPage } from '@/api/login'
+import { Loading } from 'element-ui';
+export default {
+  name: 'CheckPage',
+  data() {
+    return {
+      loading: ''
+    }
+  },
+  created() {
+    const data = {
+      lock: true,
+      text: 'Loading',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    }
+    this.loading = Loading.service(data)
+  },
+  mounted() {
+    let Base64 = require('js-base64').Base64
+    const str = Base64.encode(this.$route.query.username)
+    const params = {
+      username: this.$route.query.username
+    }
+    checkPage(params).then(res => {
+      if (res.ok) {
+        this.loginNew(res)
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+      } else if (res.respCode === 'r0012') {
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+        this.$router.go(-1)
+        this.$message.error(res.message)
+      } else {
+        this.$router.go(-1)
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+      }
+    }).catch(err => {
+      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+        this.loading.close();
+      });
+    })
+  },
+  methods: {
+    getMenu () {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sarUser/user/menu', {
+          userId: this.$store.getters.userInfo.userId,
+        }, {
+          _this: this,
+        }, res => {
+          if (res.ok) {
+            resolve(res.data)
+          }
+        }, e => {
+          reject(e)
+        })
+      })
+    },
+    loginNew (res) {
+      console.log(res)
+      if (res.data.orgId === null || res.data.orgId === '') {
+        this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
+        return
+      }
+      let Base64 = require('js-base64').Base64
+      let userInfoStr = Base64.decode(res.data)
+      let userInfo2 = decodeURIComponent(userInfoStr)
+      let userInfoObj = JSON.parse(userInfo2)
+      userInfoObj.userId = userInfoObj.usid
+      console.log(1)
+      window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+      this.setToken(userInfoObj.token) // vuex存储token
+      let userInfo = {}
+      for (let key in userInfoObj) {
+        if (key !== 'uname') {
+          userInfo[key] = userInfoObj[key]
+        } else {
+          userInfo.uName = userInfoObj[key]
+        }
+      }
+      this.setUserInfo(JSON.stringify((userInfo)))
+      // this.resetTime()
+      // 获取用户菜单
+      console.log(2)
+      window.sessionStorage.setItem('userInfo', userInfo); // del
+      console.log('寄')
+      this.getMenu().then((menuList) => {
+        let hasHomeMenu = false
+        menuList.map((menuItem) => {
+          if (menuItem.id === 'asdfadf') {
+            hasHomeMenu = true
+          }
+        })
+        console.log(3)
+        window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
+        window.sessionStorage.setItem('menuList', menuList); // del
+        if (hasHomeMenu) {
+          this.setMenu(JSON.stringify(menuList)).then(res => {
+            if (this.showIETips) {//判断是否IE浏览器
+              alert('为了最佳显示效果 请使用google chrome')
+            }
+            console.log(4)
+            this.$router.push('/home2')
+          }, e => {
+            this.$message.warning('未获取到菜单')
+          })
+        } else {
+          alert('无系统权限')
+          // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
+        }
+      })
+    },
+  ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
+  ...mapActions(['setMenu'])
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .checkPage {
+
+ }
+</style>

src/pages/login/index.vue

@@ -148,53 +148,53 @@
                 })
             },
             loginNew (res) {
-                if (res.data.orgId === null || res.data.orgId === '') {
+            if (res.data.orgId === null || res.data.orgId === '') {
-                    this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
+              this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
-                    return
+              return
+            }
+            let Base64 = require('js-base64').Base64
+            let userInfoStr = Base64.decode(res.data)
+            let userInfo2 = decodeURIComponent(userInfoStr)
+            let userInfoObj = JSON.parse(userInfo2)
+            userInfoObj.userId = userInfoObj.usid
+            window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+            this.setToken(userInfoObj.token) // vuex存储token
+            let userInfo = {}
+            for (let key in userInfoObj) {
+              if (key !== 'uname') {
+                userInfo[key] = userInfoObj[key]
+              } else {
+                userInfo.uName = userInfoObj[key]
+              }
+            }
+            this.setUserInfo(JSON.stringify((userInfo)))
+            // this.resetTime()
+            // 获取用户菜单
+            window.sessionStorage.setItem('userInfo', userInfo); // del
+            this.getMenu().then((menuList) => {
+              let hasHomeMenu = false
+              menuList.map((menuItem) => {
+                if (menuItem.id === 'asdfadf') {
+                  hasHomeMenu = true
                 }
-                let Base64 = require('js-base64').Base64
+              })
-                let userInfoStr = Base64.decode(res.data)
+              window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
-                let userInfo2 = decodeURIComponent(userInfoStr)
+              window.sessionStorage.setItem('menuList', menuList); // del
-                let userInfoObj = JSON.parse(userInfo2)
+              if (hasHomeMenu) {
-                userInfoObj.userId = userInfoObj.usid
+                this.setMenu(JSON.stringify(menuList)).then(res => {
-                window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+                  if (this.showIETips) {//判断是否IE浏览器
-                this.setToken(userInfoObj.token) // vuex存储token
+                    alert('为了最佳显示效果 请使用google chrome')
-                let userInfo = {}
+                  }
-                for (let key in userInfoObj) {
+                  this.$router.push('/home2')
-                    if (key !== 'uname') {
+                }, e => {
-                        userInfo[key] = userInfoObj[key]
+                  this.$message.warning('未获取到菜单')
-                    } else {
-                        userInfo.uName = userInfoObj[key]
-                    }
-                }
-                this.setUserInfo(JSON.stringify((userInfo)))
-                // this.resetTime()
-                // 获取用户菜单
-                window.sessionStorage.setItem('userInfo', userInfo); // del
-                this.getMenu().then((menuList) => {
-                    let hasHomeMenu = false
-                    menuList.map((menuItem) => {
-                        if (menuItem.id === 'asdfadf') {
-                            hasHomeMenu = true
-                        }
-                    })
-                    window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
-                    window.sessionStorage.setItem('menuList', menuList); // del
-                    if (hasHomeMenu) {
-                        this.setMenu(JSON.stringify(menuList)).then(res => {
-                            if (this.showIETips) {//判断是否IE浏览器
-                                alert('为了最佳显示效果 请使用google chrome')
-                            }
-                            this.$router.push('/home2')
-                        }, e => {
-                            this.$message.warning('未获取到菜单')
-                        })
-                    } else {
-                        alert('无系统权限')
-                        // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
-                    }
                 })
-            },
+              } else {
+                alert('无系统权限')
+                // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
+              }
+            })
+          },
             ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
             ...mapActions(['setMenu'])
         },

src/pages/policyRegulation/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="policyRegulation">
+    <router-view />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PolicyRegulation',
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .policyRegulation{
+    height: 100%;
+  }
+</style>

src/pages/policyRegulation/nationalPolicy/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="nationalPolicy">
+    <foreignRegulationsDatabase></foreignRegulationsDatabase>
+  </div>
+</template>
+
+<script>
+  import foreignRegulationsDatabase from '@/pages/regulatoryRepository/foreignRegulationsDatabase/index'
+export default {
+  name: 'NationalPolicy',
+  components: {
+    foreignRegulationsDatabase
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .nationalPolicy{
+   height: 100%;
+ }
+</style>

src/pages/policyRegulation/policyWorkGroup/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <div class="policyWorkGroup">
+    <el-tabs
+      v-model="activeName"
+      class="home-tabs"
+    >
+<!--      <el-tab-pane name="workingGroup1">-->
+<!--        <span slot="label"><i class="el-icon-s-order"></i> 标准法规工作组</span>-->
+<!--        <workingGroup1 v-if="activeName === 'workingGroup1'"></workingGroup1>-->
+<!--      </el-tab-pane>-->
+      <el-tab-pane name="workingGroup2">
+        <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>
+        <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
+      </el-tab-pane>
+    </el-tabs>
+    <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
+  </div>
+</template>
+
+<script>
+import workingGroup1 from '@/pages/regulatoryRepository/workingGroup/components/workingGroup1'
+import workingGroup2 from '@/pages/regulatoryRepository/workingGroup/components/workingGroup2'
+export default {
+  name: 'PolicyWorkGroup',
+  components: {
+    workingGroup1,
+    workingGroup2
+  },
+  data() {
+    return {
+      activeName: 'workingGroup2',
+    }
+  },
+  methods: {
+    statisticsBtn(){
+      this.$router.push({
+        name: 'dataStatisComments'
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .policyWorkGroup{
+    position: relative;
+    height: 100%;
+    .statistics{
+      position: absolute;
+      top: 0;
+      right: 0;
+      margin: 5px;
+    }
+    .home-tabs {
+      height: 100%;
+      /deep/.el-tabs__content {
+        height: calc(~'100% - 55px');
+        margin: 0 10px;
+      }
+      ::v-deep.el-tabs__header{
+        margin: 0 10px 15px 10px;
+        border-bottom: 1px solid #F4F4F4;
+      }
+      ::v-deep {
+        .el-tabs__item {
+          font-size: 16px;
+          font-weight: 600;
+        }
+      }
+      .el-tab-pane {
+        height: 100%;
+      }
+    }
+  }
+</style>

src/pages/policyRegulation/problemControl/index.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="problemControl">
+    <div class="non-content">
+      <el-tabs v-model="tabValue" @tab-click="handleClick" style="height: 100%">
+<!--        <el-tab-pane label="未符合项整改数据库" name="database" v-if="database">-->
+<!--          <rectification-database></rectification-database>-->
+<!--        </el-tab-pane>-->
+        <el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
+          <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues";
+import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase";
+export default {
+  name: 'ProblemControl',
+  components: {
+    keyIssues,
+    rectificationDatabase,
+  },
+  data() {
+    return {
+      keynote: false,
+      database: false,
+      menuName: ["未符合项整改数据库", "重点问题项管控"],
+      tabValue: 'keynote',
+      keynoteActiveName: 'cause'
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+    },
+    // getActiveName() {
+    //   if (this.$route.query.activeName) {
+    //     this.activeName = this.$route.query.activeName
+    //   }
+    //   if (this.$route.query.keynoteActiveName) {
+    //     this.keynoteActiveName = this.$route.query.keynoteActiveName
+    //   }
+    //   console.log('35', this.keynoteActiveName)
+    // }
+  },
+  created() {
+    // this.getActiveName()
+  },
+  mounted () {
+    var list = [];
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["ff7bc984c8115204bba04090f350b19c", "e02897e9ab6b1a72f49c47c07b5be9a5"];
+    this.menuName.forEach(item => {
+      for (let i = 0; i < menuList.length; i++) {
+        let entity = menuList[i];
+        if (item !== entity.menuName) continue;
+        if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) === -1) {
+          menuData.push(entity.id);
+          if (entity.id === "ff7bc984c8115204bba04090f350b19c") {
+            this.database = true
+          } else if (entity.id === "e02897e9ab6b1a72f49c47c07b5be9a5") {
+            this.keynote = true
+          }
+        }
+      }
+    });
+    // this.tabValue = this.database ? 'database' : (this.keynote ? 'keynote' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : ''))))
+  },
+  watch: {},
+}
+</script>
+<style lang="less" scoped>
+  .problemControl {
+    height: inherit;
+    display: flex;
+    flex-direction: column;
+    background-color: #FFFFFF;
+    .non-content {
+      padding: 0 10px;
+      height: 100%;
+      /deep/  .el-tabs {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        .el-tabs__content {
+          flex: 1;
+          overflow: hidden;
+          .el-tab-pane {
+            height: 100%;
+          }
+        }
+      }
+    }
+    .el-tabs__nav {
+      margin-left:20px;
+    }
+  }
+</style>

src/pages/policyRegulation/standardTrackingList/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="standardTrackingList">
+    <listTracking></listTracking>
+  </div>
+</template>
+
+<script>
+import listTracking from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking";
+export default {
+  name: 'StandardTrackingList',
+  components: {
+    listTracking
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .standardTrackingList {
+   height: 100%;
+ }
+</style>

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

@@ -661,13 +661,14 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
+        console.log(mes);
         this.bpnId = this.$route.query.bpnId
         if (mes.form.endTime) {
           mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
         } else {
           mes.form.endTime = ''
         }
-        this.addFjList = mes.filesId
+        this.addFjList = mes.filesId || mes.form.filesId || ''
         this.form.fjListName = mes.filesName
         this.form = mes.form
         this.roleForm = mes.roleForm
@@ -878,6 +879,7 @@ export default {
     handleSave () {
       this.saveLoading = true
       let _formData = new FormData()
+      this.form.filesId = this.addFjList
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -169,19 +169,6 @@
           </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>
     <div class="content" v-show="active === '2'">
       <el-table

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

@@ -205,6 +205,7 @@ export default {
   data() {
     return {
       commentText2: '',
+      onlyKey: '',
       drawerModal: false,
       histortData: [],
       commentText: "",
@@ -329,6 +330,7 @@ export default {
     handleSave() {
       this.saveLoading = true;
       let _formData = new FormData();
+      this.form.onlyKey = this.onlyKey
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "3");
       _formData.append("taskIds", this.taskIds);
@@ -349,9 +351,12 @@ export default {
         if (valid) {
           this.isSubmit = true;
           var json = this.json;
+          json.onlyKey = this.onlyKey
           json.commentText = this.commentText2;
           json.responUserList = this.form.responUserList;
           json.responUserListName = this.form.responUserListName;
+          json.presidentUser = this.form.presidentUser
+          json.presidentUserName = this.form.presidentUserName
           json.introduce = false;
           this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
@@ -376,6 +381,7 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
+          this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
           this.commentText2 = data.commentText2 || ''
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName

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

@@ -349,6 +349,7 @@ export default {
   data() {
     return {
       standId: '',
+      onlyKey: '',
       modaltitle2: '',
       addType: '',
       commentText4: '',
@@ -623,6 +624,7 @@ export default {
       let _formData = new FormData();
       let json = this.json
       json.info = this.data
+      json.onlyKey = this.onlyKey
       json.spId = this.form.spId
       json.spName = this.form.spName
       _formData.append("id", this.bpnId || "");
@@ -630,8 +632,9 @@ export default {
       _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
         form: json,
-        commentText: this.commentText4
+        commentText4: this.commentText4
       }));
+      console.log(json);
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false;
         this.$message.success("保存成功");
@@ -649,6 +652,7 @@ export default {
           json.commentText = this.commentText4
           json.spId = this.form.spId
           json.info = this.data
+          json.onlyKey = this.onlyKey
           json.spName = this.form.spName
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
@@ -702,7 +706,12 @@ export default {
             this.acceptShow = false
             this.submitShow = true
           }
-          this.commentText4 = data.commentText || data.commentText4 || ''
+          this.commentText4 =  data.commentText4 || ''
+          if(data.onlyKey){
+            this.onlyKey = data.onlyKey
+          }else{
+            this.onlyKey = data.form.onlyKey
+          }
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -351,6 +351,7 @@
       return {
         clickFlag: false,
         commentText5: '',
+        onlyKey: '',
         options: [],
         itemId: '',
         modalshowflag2: false,
@@ -557,6 +558,7 @@
           let _formData = new FormData();
           let json = this.form;
           json.data = this.data;
+          json.onlyKey = this.onlyKey
           _formData.append("id", this.bpnId || "");
           _formData.append("prcType", "3");
           _formData.append("taskIds", this.taskIds);
@@ -593,6 +595,7 @@
           this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
+          json.onlyKey = this.onlyKey
           json.commentText = this.commentText5;
           json.introduce = true;
           this.$http.post("lawss/activiti/completeTask", {
@@ -617,8 +620,8 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText5 = data.commentText5 || ''
+            this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
             this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
             this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

@@ -16,7 +16,7 @@
         <el-table
           :data="dataList"
           border
-          height="80%"
+          height="95%"
           style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
@@ -394,7 +394,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 53px');
     overflow: auto;
   }
 }

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -10,12 +10,12 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-if="active === '1'">
-      <div style="flex: auto; overflow: auto;">
+      <div style="flex: auto; ">
         <el-form
           ref="qbkwForm"
           :model="form"
           class="label-input-form"
-          label-width="180px"
+          label-width="100px"
         >
           <ProcessTitle>
             <template slot="title">基础信息</template>
@@ -27,14 +27,7 @@
                 <el-radio label="1">海外标准入库</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+            <van-field label="标准编号" v-model="form.standNumber" readonly />
-              <el-input
-                disabled
-                v-model="form.standNumber"
-                placeholder="请输入标准编号"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                 <el-option
@@ -46,7 +39,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-
             <el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
               <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                 <el-option
@@ -58,37 +50,15 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+            <van-field label="标准年份" v-model="form.standYear" readonly />
-              <el-input
+            <van-field label="标准中文名称" v-model="form.standName" readonly />
-                disabled
+            <van-field label="标准英文名称" v-model="form.standEnName" readonly placeholder="请输入标准英文名称" />
-                v-model.number="form.standYear"
-                placeholder="请输入标准标准年份"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="form.standName"
-                placeholder="请输入标准中文名称"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="form.standEnName"
-                placeholder="请输入标准英文名称"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
               <el-radio-group v-model="form.signFlag" disabled>
                 <el-radio label="1">是</el-radio>
                 <el-radio label="2">否</el-radio>
               </el-radio-group>
             </el-form-item>
-
             <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
               <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
                 <el-option
@@ -100,17 +70,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+            <van-field label="文本状态" v-model="textStatusMap[form.textStatus]" readonly />
-              <el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
-                <el-option
-                  v-for="item in standStateOptions"
-                  placeholder="请选择"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
               <el-date-picker
                 disabled
@@ -129,14 +89,7 @@
             <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
               <el-input v-model="form.standSystem" disabled></el-input>
             </el-form-item>
-            <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
+            <van-field label="标签" v-model="form.gxhbq" readonly placeholder="请输入标签" />
-              <el-input
-                disabled
-                v-model="form.gxhbq"
-                placeholder="请输入标签"
-                clearable
-              ></el-input>
-            </el-form-item>
           </div>
           <ProcessTitle>
             <template slot="title">实施日期</template>
@@ -277,36 +230,12 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" label-width="190px" class="add-form-item form-item-disabled">
+            <van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly   placeholder="请输入乘用车VPPS编码"/>
-              <el-input v-model="form.cycvppsbm" disabled></el-input>
+            <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
-            </el-form-item>
+            <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
-            <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
+            <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="请输入卡车vpps中文名称" readonly />
-              <el-input v-model="form.kccvppsbm" disabled></el-input>
+            <van-field label="模块结构单元变型号" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
-            </el-form-item>
+            <van-field label="模块结构单元名称" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
-            <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" label-width="210px" class="add-form-item form-item-disabled">
-              <el-input
-                v-model="form.cycvppscn"
-                disabled
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" label-width="210px" class="add-form-item form-item-disabled">
-              <el-input
-                v-model="form.kccvppscn"
-                disabled
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-              <el-input v-model="form.dybxh" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
-              <el-input
-                v-model="form.dymc"
-                disabled
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -367,18 +296,7 @@
                  ></el-option>
                </el-select>
              </el-form-item>-->
-            <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
+            <van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly  placeholder="请选择我司署名人"/>
-              <span>{{ form.wssmr }}</span>
-              <!--<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                <el-option
-                  v-for="item in wssmrOptions"
-                  placeholder="请选择"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>-->
-            </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
               <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
                 <el-option
@@ -395,14 +313,7 @@
             <template slot="title">关联信息</template>
           </ProcessTitle>
           <div class="prc-content-border">
-            <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+            <van-field label="代替标准号" v-model="form.dtbjh" readonly placeholder="请输入代替标准号"/>
-              <el-input
-                disabled
-                v-model="form.dtbjh"
-                placeholder="请输入代替标准号"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
               <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
                 <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -412,34 +323,13 @@
               <div v-if="glwjFileMap.length>0" v-for="(value,index)  in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
                 {{ value.name }}
               </div>
-              <div v-else>
+              <div v-else style="color: #323233">
                 - -
               </div>
             </el-form-item>
-            <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+            <van-field label="部分代替标准号" v-model="form.bfbdtbzh" readonly placeholder="请输入部分代替标准号"/>
-              <el-input
+            <van-field v-if="form.standInData === '0'" label="采标编号" v-model="form.cbbh" readonly placeholder="请输入采标编号"/>
-                disabled
+            <van-field label="引用标准" v-model="form.yybj" readonly placeholder="请输入引用标准"/>
-                v-model="form.bfbdtbzh"
-                placeholder="请输入部分代替标准号"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="form.cbbh"
-                placeholder="请输入采标编号"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="form.yybj"
-                placeholder="请输入引用标准"
-                clearable
-              ></el-input>
-            </el-form-item>
           </div>
         </el-form>
       </div>
@@ -516,6 +406,7 @@ export default {
   name: "phoneBzrkStep2",
   data() {
     return {
+      textStatusMap: {}, // 文本状态id与name对应
       xgdFileMap: [],
       fbgbjbdFileMap: [],
       bpgFileMap: [],
@@ -701,6 +592,13 @@ export default {
     TreeSelect
   },
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+
+    },
     checkedRole(data) {
       this.assigneeNewLoading = true
       changeAssigneeNew({
@@ -1013,6 +911,7 @@ export default {
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态
+      this.setMap(this.standStateOptions)
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
       this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
@@ -1041,11 +940,9 @@ export default {
   /deep/.el-select .el-input .el-select__caret {
     font-size: 0;
   }
-  /deep/.prc-content-border {
-    width: 600px;
-  }
   /deep/ .el-drawer__container {
     .prc-content-border {
+      overflow: auto;
       border: none;
       padding: 0 20px 0;
     }

src/pages/processCenter/pages/phone/bzzqyj/step2.vue

@@ -253,51 +253,59 @@
                     this.saveLoading = false;
                 });
             },
-            handleSubmit() {
+          handleSubmit() {
-                this.$refs["bzzqyjForm"].validate((valid) => {
+            this.$refs["bzzqyjForm"].validate((valid) => {
-                    if (valid) {
+              if (valid) {
-                        this.isSubmit = true;
+                this.isSubmit = true;
-                        var json = this.json;
+                var json = this.json;
-                        json.commentText = this.commentText2;
+                json.onlyKey = this.onlyKey
-                        json.responUserList = this.form.responUserList;
+                json.commentText = this.commentText2;
-                        json.responUserListName = this.form.responUserListName;
+                json.responUserList = this.form.responUserList;
-                        json.introduce = false;
+                json.responUserListName = this.form.responUserListName;
-                        this.$http.post("lawss/activiti/completeTask", {
+                json.presidentUser = this.form.presidentUser
-                            json: JSON.stringify(json),
+                json.presidentUserName = this.form.presidentUserName
-                            taskId: this.taskIds,
+                json.introduce = false;
-                            userId: this.$store.getters.userInfo.account
+                this.$http.post("lawss/activiti/completeTask", {
-                        }, {}, res => {
+                  json: JSON.stringify(json),
-                            if (res.success) {
+                  taskId: this.taskIds,
-                                this.$message.success("提交成功");
+                  userId: this.$store.getters.userInfo.account
-                                this.$router.push("/processCenter");
+                }, {}, res => {
-                            }
+                  if (res.success) {
-                            this.isSubmit = false;
+                    this.$message.success("提交成功");
-                        });
+                    this.$router.push("/processCenter");
-                    } else {
+                  }
-                        return this.$message.warning("请完善基础信息");
+                  this.isSubmit = false;
-                    }
                 });
-            },
+              } else {
-            getData() {
+                return this.$message.warning("请完善基础信息");
-                return new Promise((resolve, reject) => {
+              }
-                    inboundLiaisonDetail({
+            });
-                        taskIds: this.taskIds,
+          },
-                        pId: this.pId
+          getData() {
-                    }).then(res => {
+            return new Promise((resolve, reject) => {
-                        let data = JSON.parse(res.mesg)
+              inboundLiaisonDetail({
-                        this.commentText2 = data.commentText2 || ''
+                taskIds: this.taskIds,
-                        this.form.cid = data.form ? data.form.cid : data.cid
+                pId: this.pId
-                        this.form.endTime = data.form ? data.form.endTime : data.endTime
+              }).then(res => {
-                        this.form.fjList = data.form ? data.form.fjList : data.fjList
+                let data = JSON.parse(res.mesg)
-                        this.form.textType = data.form ? data.form.textType : data.textType
+                this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
-                        this.form.modelList = data.form ? data.form.modelList : data.modelList
+                this.commentText2 = data.commentText2 || ''
-                        this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName :  '')
+                this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
-                        this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList :  '')
+                this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
-                        this.json = data
+                this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
-                    }).catch(e => {
+                this.form.startUser = data.form ? data.form.startUser : data.startUser
-                    });
+                this.form.cid = data.form ? data.form.cid : data.cid
-                });
+                this.form.endTime = data.form ? data.form.endTime : data.endTime
-            }
+                this.form.fjList = data.form ? data.form.fjList : data.fjList
+                this.form.textType = data.form ? data.form.textType : data.textType
+                this.form.modelList = data.form ? data.form.modelList : data.modelList
+                this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName :  '')
+                this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList :  '')
+                this.json = data
+              }).catch(e => {
+              });
+            });
+          }
         },
         mounted() {
             this.getHistoryData();

src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue

@@ -314,34 +314,34 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSubmit() {
+          handleSubmit() {
-                this.$refs['bzzqyjForm'].validate((valid) => {
+            this.$refs['bzzqyjForm'].validate((valid) => {
-                    if (valid) {
+              if (valid) {
-                        this.isSubmit = true
+                this.isSubmit = true
-                        var json = this.json
+                let json = this.json
-                        json.commentText = this.commentText41
+                json.info = this.data
-                        json.bzfgId = this.form.bzfgId
+                json.commentText = this.commentText41
-                        json.bzfgName = this.form.bzfgName
+                json.bzfgId = this.form.bzfgId
-                        json.spFlag = '0'
+                json.bzfgName = this.form.bzfgName
-                        this.$http.post('lawss/activiti/completeTask', {
+                json.spFlag = '0'
-                            json: JSON.stringify(json),
+                this.$http.post('lawss/activiti/completeTask', {
-                            taskId: this.taskIds,
+                  json: JSON.stringify(json),
-                            userId: this.$store.getters.userInfo.account
+                  taskId: this.taskIds,
-                        }, {}, res => {
+                  userId: this.$store.getters.userInfo.account
-                            if (res.success) {
+                }, {}, res => {
-                                this.$message.success('提交成功')
+                  if (res.success) {
-                                this.$router.push('/processCenter')
+                    this.$message.success('提交成功')
-                            }
+                    this.$router.push('/processCenter')
-                            this.isSubmit = false
+                  }
-                        })
+                  this.isSubmit = false
-                    } else {
-                        this.$message.warning('请选择标准法规工程师分线管理员')
-                    }
                 })
-            },
+              } else {
+                this.$message.warning('请选择标准法规工程师分线管理员')
+              }
+            })
+          },
           handleSubmitNo() {
             if (this.commentText41) {
-              this.isSubmit = true
               var json = this.json
               json.spFlag = '1'
               json.commentText = this.commentText41
@@ -353,7 +353,6 @@
                 if (res.success) {
                   this.$message.success('提交成功')
                   this.$router.push('/processCenter')
-                  this.isSubmit = false
                 }
               })
             } else {

src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue

@@ -305,70 +305,66 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSubmit() {
+          handleSubmit() {
-                this.isSubmit = true
+            this.isSubmit = true
-                var json = this.json
+            let json = this.json
-                json.commentText = this.commentText42
+            json.info = this.data
-                json.bzFlag = '0'
+            json.commentText = this.commentText42
-                this.$http.post('lawss/activiti/completeTask', {
+            json.bzFlag = '0'
-                    json: JSON.stringify(json),
+            this.$http.post('lawss/activiti/completeTask', {
-                    taskId: this.taskIds,
+              json: JSON.stringify(json),
-                    userId: this.$store.getters.userInfo.account
+              taskId: this.taskIds,
-                }, {}, res => {
+              userId: this.$store.getters.userInfo.account
-                    if (res.success) {
+            }, {}, res => {
-                        this.$message.success('提交成功')
+              if (res.success) {
-                        this.$router.push('/processCenter')
+                this.$message.success('提交成功')
-                    }
+                this.$router.push('/processCenter')
-                    this.isSubmit = false
+              }
-                })
+              this.isSubmit = false
-            },
+            })
-            handleSubmitNo() {
+          },
-                if (this.commentText42) {
+          handleSubmitNo() {
-                    var json = this.json
+            if (this.commentText42) {
-                    json.bzFlag = '1'
+              var json = this.json
-                    json.commentText = this.commentText42
+              json.bzFlag = '1'
-                    this.$http.post('lawss/activiti/completeTask', {
+              json.commentText = this.commentText42
-                        json: JSON.stringify(json),
+              this.$http.post('lawss/activiti/completeTask', {
-                        taskId: this.taskIds,
+                json: JSON.stringify(json),
-                        userId: this.$store.getters.userInfo.account
+                taskId: this.taskIds,
-                    }, {}, res => {
+                userId: this.$store.getters.userInfo.account
-                        if (res.success) {
+              }, {}, res => {
-                            this.$message.success('提交成功')
+                if (res.success) {
-                            this.$router.push('/processCenter')
+                  this.$message.success('提交成功')
-                        }
+                  this.$router.push('/processCenter')
-                    })
-                } else {
-                    this.$message.warning('请输入反馈意见')
                 }
+              })
+            } else {
+              this.$message.warning('请输入反馈意见')
+            }
 
-            },
+          },
-            getData() {
+          getData() {
-                return new Promise((resolve, reject) => {
+            return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
+              inboundLiaisonDetail({
-                        taskIds: this.taskIds,
+                taskIds: this.taskIds,
-                        pId: this.pId
+                pId: this.pId
-                    }).then(res => {
+              }).then(res => {
-                        let data = JSON.parse(res.mesg)
+                let data = JSON.parse(res.mesg)
-                        this.form.fjList = data.fjList || data.form.fjList
+                this.form.fjList = data.fjList || data.form.fjList
-                        if (data.fjListId === '') {
+                this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
-                            this.form.fjListId = ''
+                this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
-                        } else {
+                this.commentText42 = data.commentText42 || ''
-                            this.form.fjListId =  data.form.fjListId || data.fjListId
+                this.form.cid = data.cid || data.form.cid
-                        }
+                this.form.endTime = data.endTime || data.form.endTime
-                        this.commentText42 = data.commentText42 || ''
+                this.form.textType = data.textType || data.form.textType
-                        this.form.cid = data.cid || data.form.cid
+                this.form.modelList = data.modelList || data.form.modelList
-                        this.form.endTime = data.endTime || data.form.endTime
+                this.form.bzfgId = data.bzfgId || ''
-                        this.form.cname = data.cname || data.form.cname
+                this.json = data
-                        this.form.textType = data.textType || data.form.textType
+                this.data = data.info || data.data
-                        this.form.modelList = data.modelList || data.form.modelList
+              }).catch(e => {
-                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
+              })
-                        this.form.bzfgId = data.bzfgId || ''
+            })
-                        this.json = data
+          },
-                        this.data = data.info || data.data
-                    }).catch(e => {
-                    })
-                })
-            },
         },
         mounted() {
             this.getHistoryData()

src/pages/processCenter/pages/phone/wfhxzg/step2.vue

@@ -89,6 +89,7 @@
     <ProcessFooter
       show-save
       show-submit
+      show-back
       show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -96,6 +97,7 @@
       @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
+      @back="beforeBack"
     >
     </ProcessFooter>
     <phone-role
@@ -263,6 +265,50 @@ export default {
         this.saveLoading = false
       })
     },
+    //驳回按钮
+    beforeBack(){
+      if(!this.commentInfo){
+        this.$message.warning('请填写审批意见')
+      }else{
+        let zqa = new Map();
+        for (let lastDataListElement of this.dataList) {
+          let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+          if( a == null){
+            a = {
+              id: lastDataListElement.dutyPeopleInfoId,
+              name: lastDataListElement.dutyPeopleInfo,
+              standardInfoList: []
+            }
+          }
+          a.standardInfoList.push(lastDataListElement);
+          zqa.set(a.id, a);
+        }
+        let list = [];
+        for(let item of zqa) {
+          list.push(item[1])
+        }
+        let json = {
+          dockUserList: list,
+          passInfo: this.passInfo,
+          passFlag: '1',
+          commentText: this.commentInfo
+        }
+        const params = new FormData();
+        params.set('json', JSON.stringify(json))
+        params.set('userId', this.$store.getters.userInfo.account)
+        params.set('taskIds', this.taskIds)
+        completeTask(params).then(res => {
+          if(res.success === true) {
+            this.$message.success('提交成功')
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }).catch(e => {
+          this.isSubmit = false
+        })
+      }
+
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -8,9 +8,9 @@
       <el-tab-pane label="车型类别清单" name="listProject" v-if="project">
         <list-project></list-project>
       </el-tab-pane>
-      <el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
+<!--      <el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">-->
-        <list-tracking></list-tracking>
+<!--        <list-tracking></list-tracking>-->
-      </el-tab-pane>
+<!--      </el-tab-pane>-->
       <el-tab-pane label="其他清单" name="listOther" v-if="other">
         <list-other></list-other>
       </el-tab-pane>

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

@@ -32,7 +32,7 @@
               class="common-button-primary"
               size="small"
               v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-              @click="searchSarAccess">
+              @click="searchSarAccessPage1">
               查询
             </el-button>
           </el-form-item>
@@ -263,8 +263,8 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         sortKey: 1,
-        page: 1,
+        page: this.sarSarAccessEOSearch.page,
-        pageSize: 10,
+        pageSize: this.sarSarAccessEOSearch.pageSize,
         ...this.sarSarAccessEOSearch
       }, {
         _this: this
@@ -286,7 +286,7 @@ export default {
         });
         this.tableLoading = false;
         this.sarAccessListDatas = arr;
-        this.sarSarAccessEOSearch.page = 1;
+        // this.sarSarAccessEOSearch.page = 1;
         this.sarAccessListTotal = res.data.total;
       }, e => {
 
@@ -300,6 +300,10 @@ export default {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
       this.searchSarAccess();
     },
+    searchSarAccessPage1() {
+      this.sarSarAccessEOSearch.page = 1
+      this.searchSarAccess();
+    },
     clearSearch() {
       this.sarSarAccessEOSearch.countryArea = "";
       this.sarSarAccessEOSearch.detailedListName = "";

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

@@ -748,6 +748,7 @@ export default {
   },
   data() {
     return {
+      seniorQueryFlag: false,
       textStatusMap: {},
       countryAreaMap: {},
       // 编辑抽屉状态
@@ -1036,7 +1037,9 @@ export default {
         // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
       }*/
       this.sarAccessInfo = formData
+      this.sarAccessInfo.page = 1
       this.showQueryMore = false
+      this.seniorQueryFlag = true
       this.selectLawsStands(1)
     },
 
@@ -1100,6 +1103,7 @@ export default {
     },
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
+      this.seniorQueryFlag = false
       this.showTableFlag = false
       this.sarAccessInfo.page = 1
       this.selectLawsStands()
@@ -1640,12 +1644,21 @@ export default {
     drawerPageChange(page) {
       this.drawerPage = page
       this.sarAccessInfo.page = this.drawerPage
-      this.selectLawsStands()
+      if (this.seniorQueryFlag) {
+        this.selectLawsStands(1)
+      } else {
+        this.selectLawsStands()
+      }
+
     },
     // 数据搜索table分页条数改变回调
     drawerPageSizeChange() {
       this.sarAccessInfo.pageSize = this.$store.getters.userInfo.configContent
-      this.selectLawsStands()
+      if (this.seniorQueryFlag) {
+        this.selectLawsStands(1)
+      } else {
+        this.selectLawsStands()
+      }
     },
     // 点击 导出、全部导出按钮事件
     exportAccessInfo(type) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -162,7 +162,6 @@
           </el-table-column>
           <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -170,14 +169,12 @@
           <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrqgj"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -801,6 +801,7 @@ export default {
       orgTableValName: "",
       // 高级检索
       isAdvancedSearch: false,
+      isAdvancedSearchFlag: false,
       targetMarketOptions: {},
       twoOptions: [
         {
@@ -1206,7 +1207,7 @@ export default {
     getLocalProductTableBtn() {
       this.page = 1
       this.projectLibrarySearch.page = 1;
-      this.isAdvancedSearch = true;
+      this.isAdvancedSearchFlag = true;
       this.getLocalProductTable();
     },
     // 查询本地产品
@@ -1418,7 +1419,7 @@ export default {
     // 分页点击后方法
     pageChange(page) {
       this.page = page;
-      if (this.isAdvancedSearch === true) {
+      if (this.isAdvancedSearchFlag === true) {
         this.getLocalProductTable()
       } else {
         this.getLocalProductTables()
@@ -1427,7 +1428,7 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
-      if (this.isAdvancedSearch === true) {
+      if (this.isAdvancedSearchFlag === true) {
         this.getLocalProductTable()
       } else {
         this.getLocalProductTables()

src/pages/regulatoryRepository/nonConfomity/index.vue

@@ -6,9 +6,9 @@
         <el-tab-pane label="未符合项整改数据库" name="database" v-if="database">
           <rectification-database></rectification-database>
         </el-tab-pane>
-        <el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
+<!--        <el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">-->
-          <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
+<!--          <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>-->
-        </el-tab-pane>
+<!--        </el-tab-pane>-->
       </el-tabs>
     </div>
   </div>

src/pages/regulatoryRepository/workingGroup/index.vue

@@ -9,10 +9,10 @@
                 <span slot="label"><i class="el-icon-s-order"></i> 标准法规工作组</span>
                 <workingGroup1 v-if="activeName === 'workingGroup1'"></workingGroup1>
             </el-tab-pane>
-            <el-tab-pane name="workingGroup2">
+<!--            <el-tab-pane name="workingGroup2">-->
-                <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>
+<!--                <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>-->
-                <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
+<!--                <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>-->
-            </el-tab-pane>
+<!--            </el-tab-pane>-->
         </el-tabs>
       <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
     </div>

src/router/index.js

@@ -36,6 +36,17 @@ const routes = [
     path: '*',
     redirect: '/loginVerify'
   },
+  // 单点登录跳转页面
+  {
+    path: '/checkPage',
+    name: 'CheckPage',
+    component: resolve => require(['@/pages/login/checkPage.vue'], resolve),
+    meta: {
+      requireAuth: true,
+      isBoolean: true,
+      title: '跳转'
+    }
+  },
   // 登录页
   {
     path: '/login',
@@ -3531,6 +3542,67 @@ const routes = [
       }
     ]
   },
+  // 政策法规库
+  {
+    path: '/policyRegulation',
+    name: 'PolicyRegulation',
+    redirect: () => {
+      return 'problemControl'
+    },
+    component: () =>
+      import('@/pages/policyRegulation/index'),
+    meta: {
+      requireAuth: true,
+      title: '政策法规库',
+      menuId: 'asdzcfgk'
+    },
+    children: [
+      {
+        path: '/problemControl',
+        name: 'ProblemControl',
+        component: () =>
+          import('@/pages/policyRegulation/problemControl/index'),
+        meta: {
+          requireAuth: true,
+          title: '问题项管控',
+          menuId: '50d7a0c0af4740c486100c257ae6068e'
+        }
+      },
+      {
+        path: '/nationalPolicy',
+        name: 'NationalPolicy',
+        component: () =>
+          import('@/pages/policyRegulation/nationalPolicy'),
+        meta: {
+          requireAuth: true,
+          title: '国内外政策',
+          menuId: '6557e9c4ce672af71be5807052da126b'
+        }
+      },
+      {
+        path: '/standardTrackingList',
+        name: 'StandardTrackingList',
+        component: () =>
+          import('@/pages/policyRegulation/standardTrackingList'),
+        meta: {
+          requireAuth: true,
+          title: '标准跟踪清单',
+          menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
+        }
+      },
+      {
+        path: '/policyWorkGroup',
+        name: 'PolicyWorkGroup',
+        component: () =>
+          import('@/pages/policyRegulation/policyWorkGroup'),
+        meta: {
+          requireAuth: true,
+          title: '政策工作组',
+          menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
+        }
+      }
+    ]
+  },
   // 配置管理
   {
     path: '/config',