Merge branch 'develop' into FOTON

src/components/CustomFormComponents/InputForAllStandards.vue

@@ -283,7 +283,7 @@ export default {
       }
       if (this.selectedListRep.length + textArr.length > 20) {
         return this.$message({
-          message: '代替标准号最多选择20项',
+          message: '标准号最多选择20项',
           type: 'warning'
         })
       }

src/components/mechanismTree/index.vue

@@ -8,6 +8,7 @@
       @close="handleTreeDrawerCancel"
       size="400px">
       <el-form
+        @submit.native.prevent
         ref="attributeEO"
         class="label-input-form"
         :inline="true"

src/components/navMenu/index.vue

@@ -124,7 +124,7 @@
               {
                 title: '企标计划',
                 path: '/enterpriseStandardPlan',
-                // menuId: '8a9c87fe06244fb9d55e78fb281f625b'
+                menuId: 'b07296765085f06eb3c158147f3a7312'
               },
               {
                 title: '法规清单',
@@ -139,6 +139,7 @@
               {
                 title: '工作组',
                 path: '/workingGroup',
+                menuId: 'b64240325f0e01ec4a318ee0cfedd82e'
               },
               {
                 title: '征求意见',
@@ -323,7 +324,7 @@
               {
                 title: '操作日志',
                 path: '/OperationLog',
-                menuId: ''
+                menuId: 'eb1565c40ca7506f89655f79f7a1ca65'
               },
               //     {
               //       title: '资料中心管理',

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

@@ -2,7 +2,7 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" v-btn-permission="'bbef9712ff6ffdf1c63697720cc3d4bd'" type="primary" @click="showAddModel">新增</el-button>
+      <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" v-btn-permission="'264c235efd8aae1eaff42fbea4efe0f8'" type="primary" @click="showAddModel">新增</el-button>
       <el-button class="common-button-default" size="small" v-btn-permission="'ee838a0ff0d332cac850fd553e81048d'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'1e8a5e0eb6127b2d440b84a19e522e95'">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'074bc85966e5ca7153f4620a76c5897b'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -205,7 +205,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'692d7f644dd96941c64a8b5946a4e651'" >新增</el-button>
+        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'16d1a83a89ad4781d34163a45c04e3cb'" >新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -236,8 +236,8 @@
               <el-dropdown trigger="click" @command="handleCommand2">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'b282a53b0c1c4aca76b29197b15ed931'" >修改</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'aa33df0f6f1890e3381aa4f1ed6aebec'" >删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'c87d81feecb75a364f7969f8df8f8eb9'" >修改</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'0cbf713be29e63b6c6eff5d1aec59c64'" >删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

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

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" type="primary" v-btn-permission="'fe7880ecf38dc55c02d9013f72b6242a'" @click="showAddModel">新增</el-button>
-      <el-button class="common-button-default" size="small" @click="showDisplayLocationDialog" v-btn-permission="'85b2b303cce28234fafa1f5ab12ba61d'">展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" type="primary" v-btn-permission="'fa21906587bacdcaf0a72f995db4e40d'" @click="showAddModel">新增</el-button>
+      <el-button class="common-button-default" size="small" v-btn-permission="'85b2b303cce28234fafa1f5ab12ba61d'" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'8040f3cbceb668f7791c2182e620a051'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'1954a5c1fbef6722037b8e12b035d13f'">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'2ede47a179e37347b7aacfd9d139085f'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'b12bdf78f2f6cff502bf5e520832d8ea'">新增</el-button>
+        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'1468f4d8f5b784512a8942db2da1a13b'">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -230,8 +230,8 @@
               <el-dropdown trigger="click" @command="handleCommand2">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'7c7a446f6dd661bce1e0bb9319b38753'">修改</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'681bb0153c74b070b76e63ce020b8477'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'d1ed6ed77afa8395d2fd9ee6351bb78d'">修改</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'dcddb2abd19e51067fef994736057b8c'">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/pages/config/pages/attributeCustom/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="wx-custom-tab">
     <el-tabs v-model="tabValue" style="height: 100%;">
-      <el-tab-pane label="国内外标准法规" name="stand">
+      <el-tab-pane label="国内外标准法规" name="stand"  v-if="regulations" >
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <stand v-if="tabValue === 'stand'" v-btn-permission="'ad3ef2b8b8487229e52a7fe93416c437'"></stand>
+          <stand v-if="tabValue === 'stand'"></stand>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="国内外政策" name="laws" >
+      <el-tab-pane label="国内外政策" name="laws"  v-if="policy">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <laws v-if="tabValue === 'laws'" v-btn-permission="'efcbe65f90d3a23f0be5df5ad60d1dac'"></laws >
+          <laws v-if="tabValue === 'laws'" ></laws >
         </div>
       </el-tab-pane>
-      <el-tab-pane label="企业标准库" name="buss">
+      <el-tab-pane label="企业标准库" name="buss"  v-if="library">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <buss v-if="tabValue === 'buss'" v-btn-permission="'7feeb73929c25a6f1fd67952704ec02b'"></buss>
+          <buss v-if="tabValue === 'buss'" ></buss>
         </div>
       </el-tab-pane>
 <!--      <el-tab-pane label="其他" name="other">
@@ -40,7 +40,42 @@ export default {
   },
   data () {
     return {
-      tabValue: 'stand'
+      tabValue: 'stand',
+      regulations: false,
+      policy: false,
+      library: false,
+      menuName: [ "国内外标准法规", "国内外政策", "企业标准库"]
+    }
+  },
+  mounted() {
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["ad3ef2b8b8487229e52a7fe93416c437", "efcbe65f90d3a23f0be5df5ad60d1dac", "7feeb73929c25a6f1fd67952704ec02b"];
+    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 === "ad3ef2b8b8487229e52a7fe93416c437") {
+            this.regulations = true
+          } else if (entity.id === "efcbe65f90d3a23f0be5df5ad60d1dac") {
+            this.policy = true
+          } else if (entity.id === "7feeb73929c25a6f1fd67952704ec02b") {
+            this.library = true
+          }
+        }
+      }
+    });
+    if (this.regulations === true) {
+      this.activeName = "stand"
+      return;
+    } else if (this.skill === true) {
+      this.policy = "laws"
+      return;
+    }else if (this.skill === true) {
+      this.library = "buss"
+      return;
     }
   }
 }

src/pages/config/pages/linkManage/index.vue

@@ -2,11 +2,11 @@
 <template>
   <div class="data-link">
     <el-tabs v-model="activeName">
-      <el-tab-pane label="第一行链接" name="firstLink">
-        <first-link v-if="activeName === 'firstLink'"></first-link>
+      <el-tab-pane label="第一行链接" name="firstLink" v-if="project">
+        <first-link v-if="activeName === 'firstLink'" ></first-link>
       </el-tab-pane>
-      <el-tab-pane label="第二行链接" name="secondLink">
-        <second-link v-if="activeName === 'secondLink'"></second-link>
+      <el-tab-pane label="第二行链接" name="secondLink" v-if="skill">
+        <second-link v-if="activeName === 'secondLink'" ></second-link>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -23,11 +23,41 @@ export default {
   },
   data() {
     return {
+      skill: false,
+      project: false,
       activeName: 'firstLink',
+      menuName: [ "第一行链接", "第二行链接"]
     }
   },
   methods: {
+
   },
+  mounted() {
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["c8355290d8ece5202db506405c7df6fd", "b22bdd0959e5a445fd90a9e0e7a8f607"];
+    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 === "c8355290d8ece5202db506405c7df6fd") {
+            this.project = true
+          } else if (entity.id === "b22bdd0959e5a445fd90a9e0e7a8f607") {
+            this.skill = true
+          }
+        }
+      }
+    });
+    if (this.project === true) {
+      this.activeName = "firstLink"
+      return;
+    } else if (this.skill === true) {
+      this.activeName = "secondLink"
+      return;
+    }
+  }
 }
 </script>
 

src/pages/config/pages/linkManage/linkType/firstLink.vue

@@ -6,8 +6,8 @@
       <el-button
         type="primary"
         class="common-button-primary add-button"
-        @click="addLink"
         v-btn-permission="'a87f58f50bed49452ee2a9147254b16b'"
+        @click="addLink"
         size="mini">新增
       </el-button>
       <!--      <el-button
@@ -21,7 +21,7 @@
         type="danger"
         class="common-button-primary add-button"
         @click="deleteAllLink"
-        v-btn-permission="'cd639217443270d5c858fc593b439f79'"
+        v-btn-permission="'436653a7e2e55c427dda1f1d0faa4fca'"
         size="mini">删除
       </el-button>
     </div>
@@ -65,10 +65,10 @@
           show-overflow-tooltip
           label="链接">
           <template slot-scope="scope">
-            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'7ce85b4b537f2a78db0c468beec5c08f'">
               {{ scope.row.url }}
             </span>
-            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline"  v-btn-permission="'7ce85b4b537f2a78db0c468beec5c08f'">
               {{ 'http://' + scope.row.url }}
             </span>
           </template>

src/pages/config/pages/linkManage/linkType/secondLink.vue

@@ -21,7 +21,7 @@
         type="danger"
         class="common-button-primary add-button"
         @click="deleteAllLink"
-        v-btn-permission="'74725d0f8bf0df73bc9c297358803588'"
+        v-btn-permission="'20ddefa1588cbebeee5372d7f5389693'"
         size="mini">删除
       </el-button>
     </div>
@@ -65,10 +65,10 @@
           show-overflow-tooltip
           label="链接">
           <template slot-scope="scope">
-            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'ce8bfa18d70a122aa96b945a766cf290'">
               {{ scope.row.url }}
             </span>
-            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'ce8bfa18d70a122aa96b945a766cf290'">
               {{ 'http://' + scope.row.url }}
             </span>
           </template>

src/pages/config/pages/operationLog/index.vue

@@ -61,6 +61,7 @@
                                 type="primary"
                                 size="mini"
                                 @click="searchBtn"
+                                v-btn-permission="'ef2d8c0d8ab743e8b344c8a0f5c330cf'"
                         >搜索</el-button>
                     </el-form-item>
                     <el-form-item label="" class="search-item btn-box">
@@ -68,6 +69,7 @@
                                 class="common-button-default"
                                 @click="resetSelect"
                                 size="mini"
+                                v-btn-permission="'c8605037fd040fd480b052d6e9dd8d13'"
                         >清空</el-button>
                     </el-form-item>
                 </el-form>

src/pages/config/pages/postManage/index.vue

@@ -244,7 +244,8 @@
                 this.submitLoading = true
                 this.$http.postData('sarPosition/position/role', {
                     positionId: this.selectList[0].id,
-                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys())
+                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()),
+                    operator: this.$store.getters.userInfo.account,
                 }, {}, res=> {
                     if (res.ok) {
                         this.$message.success('配置成功')
@@ -336,7 +337,8 @@
                         } else {
                             this.$http.put('sarPosition/position', {
                                 id: this.editId,
-                                name: this.sarStandardsInfoEO.name
+                                name: this.sarStandardsInfoEO.name,
+                                operator : this.$store.getters.userInfo.account
                             }, {
                                 _this: this,
                                 loading: 'Loading'

src/pages/config/pages/roleManage/index.vue

@@ -183,7 +183,7 @@
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消
         </el-button>
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="confirmDialogData">
           确定
         </el-button>
       </div>
@@ -214,7 +214,7 @@
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
         </el-button>
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" :loading="btnLoading" type="primary" @click="confirmDialogData2">
           确定
         </el-button>
       </div>
@@ -311,7 +311,7 @@
             title="查看人员"
             :visible.sync="RoleModel"
             @close="RoleCancle"
-            size="1100px"
+            size="900px"
             class="not-footer-drawer"
     >
       <div class="demo-drawer-content">
@@ -358,6 +358,11 @@
                   height="100%"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+            <el-table-column
+              align="center"
+              prop="institutionName"
+              label="所属部门">
+            </el-table-column>
             <el-table-column
                     align="center"
                     prop="uname"
@@ -438,6 +443,7 @@ export default {
         label: 'menuName'
       },
       nodeList2: [],
+      btnLoading: false,
       nodeList4: [],
       modalflag: false,
       modalflag2: false,
@@ -683,6 +689,7 @@ export default {
       })
     },
     confirmDialogData() {
+      this.btnLoading = true
       this.$http.postData('sarRole/role/resource', {
         resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
         roleId: this.id
@@ -691,10 +698,12 @@ export default {
           this.$message.success('设置权限成功')
           this.modalflag = false
         }
+        this.btnLoading = false
       })
     },
     //配置数据确定按钮
     confirmDialogData2(){
+      this.btnLoading = true
       let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
       this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
         menuIds: menuIds,
@@ -706,6 +715,7 @@ export default {
         }else{
           this.$message.warning(res.message)
         }
+        this.btnLoading = false
       })
     },
     closeDialogData() {

src/pages/details/otherBussStandardDetails/index.vue

@@ -351,81 +351,83 @@
               <template v-if = "item.label === '基础信息'">
                 <div class="details-content-modular basic-information" style="margin-bottom: 0">
                   <div class="basic-information-content">
-                    <p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
+                    <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
                       <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                        <label style=" margin-right: 172px;">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
-<!--                          单个文件-->
-                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
+                        <label style="float: left;">{{ child.attrName }}</label>
+                        <div style="margin-left: 220px;">
+                          <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="line-height: 50px;">
+                            <!--                          单个文件-->
+                            <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
                             <i
-                                title="下载"
-                                @click="downloadFile(file.id)"
-                                class="icon-download"
-                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                    title="下载"
+                                    @click="downloadFile(file.id)"
+                                    class="icon-download"
+                                    v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
-                                title="下载带水印"
-                                v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
-                                @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                class="icon-download2"
-                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                                    title="下载带水印"
+                                    v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
+                                    @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                    class="icon-download2"
+                                    v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                             />
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
-<!--                          多个文件-->
-                         <div v-else-if="child.value && child.value.length > 0">
-                            <span style="margin-left: 19%">
+                            <!--                          多个文件-->
+                            <div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
+                            <span>
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                                 :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                               <i
-                                title="下载"
-                                @click="downloadFile(file.id)"
-                                class="icon-download"
-                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                      title="下载"
+                                      @click="downloadFile(file.id)"
+                                      class="icon-download"
+                                      v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
-                                title="下载带水印"
-                                @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                class="icon-download2"
-                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                                      title="下载带水印"
+                                      @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                      class="icon-download2"
+                                      v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
-                        <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                      </div>
-                          <!--                        <el-button-->
-                          <!--                                v-if="child.attrField === itemNam "-->
-                          <!--                                v-for="(itemNam,index) in itemExistList"-->
-                          <!--                                :key="index"-->
-                          <!--                                @click="showItemsModel(child.attrField)"-->
-                          <!--                                class="decomposition-btn"-->
-                          <!--                                style="right:62px"-->
-                          <!--                                icon="icon-separate"-->
-                          <!--                        >标准分解单-->
-                          <!--                        </el-button>-->
-<!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-<!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
-                        </template>
+                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                            </div>
+                            <!--                        <el-button-->
+                            <!--                                v-if="child.attrField === itemNam "-->
+                            <!--                                v-for="(itemNam,index) in itemExistList"-->
+                            <!--                                :key="index"-->
+                            <!--                                @click="showItemsModel(child.attrField)"-->
+                            <!--                                class="decomposition-btn"-->
+                            <!--                                style="right:62px"-->
+                            <!--                                icon="icon-separate"-->
+                            <!--                        >标准分解单-->
+                            <!--                        </el-button>-->
+                            <!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
+                            <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
+                          </div>
+                        </div>
                         <template v-if="child.value === null" >-</template>
                       </div>
                     </template>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-                    <p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+                    <p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                     <p class="half">
                       <label style=" margin-right: 156px;"
                              title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span>
+                      >文本状态</label><span>{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span>
                     </p>
                     <p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-                    <p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+                    <p class="half" style=""><label style=" margin-right: 122px;">企标实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
                     <template
                         v-for="(child, childIndex) in item.child"
                         v-if="child.isShowImp === '0'"
                     >
                       <p class="half">
-                        <label style=" margin-right: 157px;" :title="child.attrName">{{child.attrName}}</label>
+                        <label style=" margin-right: 150px;" :title="child.attrName">{{child.attrName}}</label>
                         <span :title="child.value || '-'">
                           <template v-if="child.value">
                           {{ child.value }}
@@ -519,17 +521,18 @@
                   >
                 {{ child.value || '-' }}
               </span>
-                  <div v-else class="modular-content-p-flies">
+                  <div v-else :class="(child.value === null || child.value.length === 0) ? 'file2' : 'modular-content-p-flies'">
                     <p
                         class="files-title"
                         v-for="(file, fileIndex) in child.value"
                         :key="fileIndex"
                     >
-                      <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                      <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName | ellipsis50}}</a>
                       <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
                       <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
                       <!--                  <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                     </p>
+                    <template v-if="child.value === null || child.value.length === 0" >-</template>
                     <!--                <el-button-->
                     <!--                  @click="showItemsModel(child.attrField)"-->
                     <!--                  class="decomposition-btn"-->
@@ -1321,6 +1324,13 @@ export default {
         return value.slice(0,12) + '...'
       }
       return value
+    },
+    ellipsis50 (value) {
+      if (!value) return ''
+      if (value.length > 50) {
+        return value.slice(0,50) + '...'
+      }
+      return value
     }
   },
   data () {
@@ -2275,7 +2285,7 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
-          if (this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+          if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
             this.QFTP = true
           }
           // this.textOptions.forEach(item => {
@@ -3226,6 +3236,18 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+/deep/ .file2 {
+  display: inline-block;
+  width: calc(100% - 225px);
+  min-height: 50px;
+  line-height: 50px;
+  font-size: 16px;
+  color: #333333;
+  word-break: break-all;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 /deep/ .el-collapse{
   border: none;
 }
@@ -3404,11 +3426,11 @@ export default {
             min-height: 50px;
             line-height: 50px;
             font-size: 16px;
-            color: #999999;
+            color: #333333;
             word-break: break-all;
-            //overflow: hidden;
-            //white-space: nowrap;
-            //text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
           }
           .modular-content-p-flies{
             position: relative;

src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue

@@ -48,6 +48,7 @@
           tooltip-effect="dark"
           style="width: 100%;"
           height="100%"
+          @selection-change="handleSelectionChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           row-key="id"
@@ -115,6 +116,7 @@ export default {
     return {
       tableDataLoading: false,
       total: 0,
+      handleList: [],
       selectRoleId: '',
       searchForm: {
         standardKey: '',
@@ -170,6 +172,10 @@ export default {
       // this.resetSearchForm()
       this.queryTablePage()
     },
+    handleSelectionChange(data){
+      this.handleList = data
+      this.$emit('func',this.handleList)
+    },
 
     pageChange (page) {
       this.pageNo = page
@@ -183,7 +189,6 @@ export default {
     resetPageNo() {
       this.pageNo = 1
     },
-
     // 查询、加载表格
     queryTablePage () {
       const formData = {

src/pages/details/otherStandardDetails/index.vue

@@ -66,34 +66,35 @@
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
                       <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
-                        <label style="margin-right: 164px;">{{ child.attrName }}</label>
+                        <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                          <div v-for="(file, fileIndex) in child1Func(child.value)" style="position: relative;display: flex;">
+                          <div style="position: relative;margin-left: 214px;">
+                            <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
-                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                :title="file.oldFileName">{{ file.oldFileName }}</a>
+                               @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                               :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             <i
-                                  title="下载"
-                                  @click="downloadFile(file.id)"
-                                  class="icon-download"
-                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                            />
                             <i
-                                  title="下载带水印"
-                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                  class="icon-download2"
-                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                            />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
-                          <!--                          多个文件时-->
-                          <div v-else-if="child.value && child.value.length > 0">
-                            <span style="margin-left: 19%;display: flex; align-items: center;">
+                              <!--                          多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
+                            <span style="display: flex; align-items: center;">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                                 :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                               <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -107,16 +108,15 @@
                                 v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                               />
                             </span>
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </div>
-                          <el-button
-                              v-if="child.attrField === itemNam"
-                              v-for="(itemNam,index) in itemExistList"
-                              :key="index"
+                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              </div>
+                            </div>
+                            <el-button
+                              v-if="child.attrField === 'FBGBJBD'"
                               @click="showItemsModel(child.attrField)"
                               class="decomposition-btn"
                             >标准分解单
-                          </el-button>
+                            </el-button>
                           </div>
                           <!--                          <el-button v-if="child.value && child.value.length > 1"-->
                           <!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
@@ -1734,6 +1734,7 @@
     >
       <div class="demo-drawer-content">
         <related-terms-select
+          @func="handleChangeList"
           ref="relatedTermsSelect"
           :fileType="fileType"
           :stand-id="standId"
@@ -1783,10 +1784,18 @@ export default {
         return value.slice(0, 12) + '...'
       }
       return value
+    },
+    ellipsis50 (value) {
+      if (!value) return ''
+      if (value.length > 50) {
+        return value.slice(0,50) + '...'
+      }
+      return value
     }
   },
   data() {
     return {
+      handleList: [],
       CycxOptions: [],
       activeNames: ['基础信息', '过程稿件', '实施日期'],
       activeState: true,
@@ -2112,6 +2121,9 @@ export default {
   props: {},
   watch: {},
   methods: {
+    handleChangeList(data){
+      this.handleList = data
+    },
     child1Func(child1) {
       const list = []
       if (child1 && child1.length > 1) {
@@ -3647,17 +3659,22 @@ export default {
       this.$refs['relatedTermsSelect'].handleCancel()
 
     },
+    //关联成功的提示
     handleRelatedTermsDrawerSubmit() {
-
       this.btnLoading = true
-      this.$refs['relatedTermsSelect'].handleSubmit(() => {
-        this.selectSarStandItems()
+      if(this.handleList.length){
+        this.$refs['relatedTermsSelect'].handleSubmit(() => {
+          this.selectSarStandItems()
+          this.btnLoading = false
+          this.$message({
+            message: '关联成功',
+            type: 'success'
+          });
+        })
+      }else{
+        this.$message.warning('请至少勾选一条条款进行关联')
         this.btnLoading = false
-        this.$message({
-          message: '关联成功',
-          type: 'success'
-        });
-      })
+      }
     },
     closeRelatedTermsDrawer() {
       this.$refs['relatedTermsDrawer'].closeDrawer()

src/pages/home2/components/todoList/index.vue

@@ -205,7 +205,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '批准'){
+          }else if (row.taskInfo === '起草单位高级经理审核'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {
@@ -238,7 +238,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '培训'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary11',
               query: {

src/pages/localTool/standAutoSplit/index.vue

@@ -993,19 +993,24 @@ export default {
       }, {
         _this: this, loading: 'loading'
       }, res => {
-        res.data.list.map((item, index) => {
-          if (item.collectId != null && item.collectId !== '') {
-            item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
-            item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
-            item.collectBtn = false
-          } else {
-            item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
-            item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
-            item.collectBtn = true
-          }
-        })
-        this.standInfoList = res.data.list
-        this.total = res.data.count
+        if(res.data.list.length){
+          res.data.list.map((item, index) => {
+            if (item.collectId != null && item.collectId !== '') {
+              item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+              item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
+              item.collectBtn = false
+            } else {
+              item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+              item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
+              item.collectBtn = true
+            }
+          })
+          this.standInfoList = res.data.list
+          this.total = res.data.count
+        }else{
+          this.splitInfoPage = 1
+          this.getSarFileSplitInfoEOPage()
+        }
       }, e => {
       })
     },

src/pages/localTool/standContrast/pages/contrastDetails.vue

@@ -22,7 +22,7 @@
                     @click="getSarFileSplitInfoEOPage">
                     搜索
                   </el-button>
-                  <el-button size="mini"  v-btn-permission="'c77d866909a907aff3afa2b6d2ac2204'" class="common-button-default" @click="clearSearchStand">清1空</el-button>
+                  <el-button size="mini"  v-btn-permission="'c77d866909a907aff3afa2b6d2ac2204'" class="common-button-default" @click="clearSearchStand">清空</el-button>
                 </el-formItem>
               </el-form>
             </div>

src/pages/personal/pages/my-collection/components/CollectionLaws.vue

@@ -15,7 +15,7 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 :loading="searching"
-                v-btn-permission="'1044adc0569438df582585db349f2cde'"
+                v-btn-permission="'6b287f97264d39c234a6abd45ba1e508'"
                 type="primary"
                 class="common-button-primary"
                 @click="selectLawsBtn">
@@ -23,7 +23,7 @@
               </el-button>
               <el-button
                 class="common-button-default"
-                v-btn-permission="'3b4223ab22aa24b8332c3d27f1e7fe32'"
+                v-btn-permission="'4c0d359d32e9639ba16eefd649496259'"
                 @click="resetSelect">清空</el-button>
 <!--              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
             </el-form-item>

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -18,14 +18,14 @@
                 type="primary"
                 class="common-button-primary"
                 size="mini"
-                v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'"
+                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
                 @click="selectStandardBtn">
                 查询
               </el-button>
               <el-button
                 class="common-button-default"
                 size="mini"
-                v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'"
+                v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
                 @click="resetSelect">清空</el-button>
 <!--              <el-button-->
 <!--                      class="common-button-default"-->
@@ -63,7 +63,7 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+                <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>

src/pages/personal/pages/my-collection/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="my-collection v-class">
     <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
-    <panel-content class="panel-content-box">
+    <transition enter-active-class="" leave-active-class="">
       <components :is="active"></components>
-    </panel-content>
+    </transition>
   </div>
 </template>
 
@@ -17,10 +17,15 @@ export default {
   data () {
     return {
       active: 'CollectionStandard',
-      tabsList: [
+    }
+  },
+  computed: {
+    tabsList() {
+      const list = [
         {
           title: '已收藏的标准法规',
-          name: 'CollectionStandard'
+          name: 'CollectionStandard',
+          permission:'f3686f4736acca57b1c0a97a990f96fc'
         },
         // {
         //   title: '已收藏的动态&资料 ',
@@ -28,18 +33,30 @@ export default {
         // },
         {
           title: '已收藏的政策',
-          name: 'CollectionLaws'
+          name: 'CollectionLaws',
+          permission:'200212748ffc5fd3d93179789446535a'
         },
         // {
         //   title: '已收藏的标准拆分',
         //   name: 'CollectionBreak'
         // }
       ]
+
+      return list.filter(item => {
+        if (item.permission) {
+          return this.$hasPermission(item.permission)
+        } else {
+          return false
+        }
+      })
     }
   },
   methods: {
-    showComponent (name) {
-      this.active = name
+    showComponent(name) {
+      if (this.active !== name) {
+        this.active = name
+        const location = this.$router.replace({ query: { tabsName: name } })
+      }
     }
     // getCookie (name) {
     //   // 获取指定名称的cookie值

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

@@ -101,17 +101,17 @@ export default {
           value: "22"
         },
         {
-          label: "企标复审流程",
-          value: "23"
-        },
-        {
-          label: '企标废止流程',
+          label: "企标废止流程",
           value: "24"
         },
         {
-          label: '企标制修订计划管控',
+          label: "企标制修订计划管控",
           value: "25"
         },
+        {
+          label: "企标制修订立项",
+          value: "26"
+        }
       ],
       formDisableFlag: false,
       pickerOptions: {

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

@@ -428,59 +428,61 @@
             <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
             <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
           </div>
-          <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
-            <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
-              <el-input
-                      type="textarea"
-                      v-model="plForm.technicalRequir"
-                      placeholder="请输入核心技术要求"
-                      maxlength="500"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
-              <el-input
-                      type="textarea"
-                      v-model="plForm.changePoint"
-                      placeholder="请输入国内标准的差异点"
-                      maxlength="500"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
-              <el-input
-                      type="textarea"
-                      :autosize="{ minRows: 4, maxRows: 14}"
-                      v-model="plForm.changePoint"
-                      placeholder="请输入上一版本差异点"
-                      maxlength="500"
-              ></el-input>
-            </el-form-item>
-            <custom-date-pick-group
-                    class="myDataPick"
-                    :config="{attrName: '新车型实施日期'}"
-                    v-model="plForm.newData"
-            ></custom-date-pick-group>
-            <custom-date-pick-group
-                    class="myDataPick"
-                    :config="{attrName: '在产车实施日期'}"
-                    v-model="plForm.onlineData"
-            ></custom-date-pick-group>
-            <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
-              <el-select multiple  v-model="plForm.applyArctic">
-                <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
-              <el-input
-                      style="display: none;"
-                      v-model="plForm.zrUserId"
-              ></el-input>
-              <el-input
-                      @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
-                      placeholder="请选择责任人"
-                      v-model="plForm.zrUserName"
-              ></el-input>
-            </el-form-item>
-          </el-form>
+          <div style="width: 80%">
+            <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
+              <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
+                <el-input
+                  type="textarea"
+                  v-model="plForm.technicalRequir"
+                  placeholder="请输入核心技术要求"
+                  maxlength="500"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+                <el-input
+                  type="textarea"
+                  v-model="plForm.changePoint"
+                  placeholder="请输入国内标准的差异点"
+                  maxlength="500"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+                <el-input
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 14}"
+                  v-model="plForm.changePoint"
+                  placeholder="请输入上一版本差异点"
+                  maxlength="500"
+                ></el-input>
+              </el-form-item>
+              <custom-date-pick-group
+                class="myDataPick"
+                :config="{attrName: '新车型实施日期'}"
+                v-model="plForm.newData"
+              ></custom-date-pick-group>
+              <custom-date-pick-group
+                class="myDataPick"
+                :config="{attrName: '在产车实施日期'}"
+                v-model="plForm.onlineData"
+              ></custom-date-pick-group>
+              <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                <el-select multiple  v-model="plForm.applyArctic">
+                  <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
+                <el-input
+                  style="display: none;"
+                  v-model="plForm.zrUserId"
+                ></el-input>
+                <el-input
+                  @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
+                  placeholder="请选择责任人"
+                  v-model="plForm.zrUserName"
+                ></el-input>
+              </el-form-item>
+            </el-form>
+          </div>
         </div>
       </div>
       <div id="roleFormButton2" class="demo-drawer-footer">

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

@@ -80,6 +80,7 @@
                 </el-form-item>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                    :picker-options="pickerOptions"
                     v-model="listForm.endTime"
                     type="date"
                     placeholder="请选择截止日期"
@@ -508,6 +509,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       submitFlag: '',
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框

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

@@ -638,25 +638,36 @@ export default {
       } else if(this.dataList.length > 5) {
          this.$message.warning('您最多只能选择五条数据')
       }else{
-        this.listForm.dataList = this.dataList;
-        this.listForm.breakdownList = this.breakdownList
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.isSubmit = true;
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
+        let subFlag = true
+        this.dataList.forEach(item => {
+          if(!item.unameId){
+            subFlag = false
+            return
           }
-          this.isSubmit = false;
-        }, e => {
-        });
+        })
+        if(subFlag){
+          this.listForm.dataList = this.dataList;
+          this.listForm.breakdownList = this.breakdownList
+          this.listForm.commentText = this.commentText;
+          const json = JSON.stringify(this.listForm);
+          this.isSubmit = true;
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: this.taskIds,
+            userId: this.userId,
+            json: json
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }else{
+          this.$message.warning('请选择项目经理')
+        }
       }
 
     },

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

@@ -2456,6 +2456,7 @@ export default {
       if (this.form.standType === '') {
         this.$message.warning('请选择标准来源')
       } else {
+        this.standardSearchForm.page = 1
         this.standardDrawer = true
         this.$nextTick(() => {
           // 动态设置表格高度

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

@@ -1259,6 +1259,7 @@ export default {
         this.form.zrgcs = "";
       }
       this.form.menuIds = this.form.treeListId;
+      this.form.BBFDTBZ = this.form.bfbdtbzh
       const json = JSON.stringify(this.form);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,

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

@@ -831,7 +831,7 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
-                id: this.bpnId || '',
+                id: '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '3',

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"
@@ -82,12 +82,12 @@
                     style="display: none;"
                     clearable
                   ></el-input>
-                  <el-button type="primary" @click="choiceZRR">选择责任人</el-button>
+                  <el-button type="primary" @click="choiceZRR" style="padding-left: 10px">选择责任人</el-button>
                   <div @click="choiceZRR">
                     <div v-if="form.responUserListName" style="color: #666;">
                       {{ form.responUserListName }}
                     </div>
-                    <div v-else style="color: #ccc;">
+                    <div v-else style="color: #ccc;padding-left: 10px;" >
                       请选择责任人
                     </div>
                   </div>

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

@@ -62,7 +62,7 @@
                                 </el-form-item>
                                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                                             <span @click="fileLook(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -143,19 +143,19 @@
         </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>
+<!--        <el-collapse accordion>-->
+<!--          <el-collapse-item title="审批意见">-->
+<!--            <div style="margin: 10px 0;">-->
+<!--              <el-input-->
+<!--                type="textarea"-->
+<!--                :rows="3"-->
+<!--                resize="none"-->
+<!--                placeholder="请输入意见"-->
+<!--                v-model="commentText">-->
+<!--              </el-input>-->
+<!--            </div>-->
+<!--          </el-collapse-item>-->
+<!--        </el-collapse>-->
       </div>
     </div>
     <div class="content" v-show="active === '3'">
@@ -277,9 +277,6 @@ export default {
         nextStatus: ""
       },
       formRules: {
-        nextStatus: [
-          { required: true, message: "请选择下一步状态", trigger: "change" }
-        ]
       },
       associationOptions: [{
         value: "修订",

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

@@ -543,7 +543,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

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

@@ -570,7 +570,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/creatProcess/qbfz/step6.vue

@@ -570,7 +570,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

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

@@ -1195,11 +1195,11 @@
             },
             calScope(){
                 if(this.evaluationMap){
-                    const hqSum = this.evaluationMap["会签征求意见"]
-                    const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
-                    const fsSum = this.evaluationMap["复审"]
+                    const hqSum = this.evaluationMap["征求意见"]
+                    const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
+                    const fsSum = this.evaluationMap["标准化复审"]
                     const shSum = this.evaluationMap["标准法规部高级经理审核"]
-                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
                     return parseFloat(aveCount).toFixed(1)
                 }
                 return 0

src/pages/processCenter/pages/creatProcess/qbrk/step9.vue

@@ -1218,9 +1218,9 @@
                 if(this.evaluationMap){
                     const hqSum = this.evaluationMap["征求意见"]
                     const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
-                    const fsSum = this.evaluationMap["标准化复审"]
+                    const fsSum = this.evaluationMap["标准化复审"] ? this.evaluationMap["标准化复审"] : 0
                     const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
-                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
                     return parseFloat(aveCount).toFixed(1)
                 }
                 return 0

src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue

@@ -1222,7 +1222,7 @@
                     const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
                     const fsSum = this.evaluationMap["标准化复审"]
                     const shSum = this.evaluationMap["标准法规部高级经理审核"]
-                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
                     return parseFloat(aveCount).toFixed(1)
                 }
                 return 0

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -42,11 +42,23 @@
             </el-form-item>
             <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
-                <el-option label="制定完成" value="制定完成"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
-                <el-option label="未制定" value="未制定"></el-option>
+                <el-option label="制定" value="制定"></el-option>
+                <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -204,13 +216,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请输入代替企标编号"
-                    :maxlength="500"/>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -380,9 +385,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -46,6 +46,19 @@
                <el-option label="修订" value="2"></el-option>
              </el-select>
            </el-form-item>
+           <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-input
+               style="display: none;"
+               v-model="qbfsForm.rqbJson">
+             </el-input>
+             <el-input
+               clearable
+               v-model="qbfsForm.rqbName"
+               placeholder="请选择代替企标编号"
+               readonly
+               @click.native="choiceQYBZ">
+             </el-input>
+           </el-form-item>
            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                          class="add-form-item form-item-disabled">
              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -219,13 +232,6 @@
                    <el-option label="修订" value="修订"></el-option>
                  </el-select>
                </el-form-item>
-               <el-form-item v-if="qbfsForm.reviseStatus === '修订'"  label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                 <el-input
-                   disabled
-                   v-model="qbfsForm.rqbName"
-                   placeholder="请输入代替企标编号"
-                   :maxlength="500"/>
-               </el-form-item>
                <el-form-item class="search-item btn-box">
                  <el-button
                    type="primary"
@@ -401,9 +407,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -139,7 +139,7 @@
         <custom-input-for-all-standards2
           class="classDisplay"
           :config="{attrName: '采用标准'}"
-          :labelWidth="'180px'"
+          :labelWidth="'150px'"
           v-model="qbfsForm.esStandRelations"
         ></custom-input-for-all-standards2>
       </template>
@@ -160,7 +160,7 @@
           :enterpriseStandard="true"
           :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
           :config="{attrName: '引用标准'}"
-          :labelWidth="'180px'"
+          :labelWidth="'150px'"
           v-model="qbfsForm.esMatingRelations"
         ></custom-input-for-all-standards2>
       </template>
@@ -206,7 +206,7 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
-                  @click="QYBZget">查询
+                  @click="QYBZgetBtn">查询
                 </el-button>
                 <el-button
                   class="common-button-default"
@@ -223,7 +223,7 @@
                 :data="QYBZList"
                 tooltip-effect="dark"
                 style="width: 100%;padding:0 0 20px 0;"
-                height="100%"
+                class="table-height"
                 border
                 @selection-change="handleSelectionQYBZ"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -550,9 +550,9 @@ export default {
   },
   mounted(){
     this.getWorkData()
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
@@ -753,6 +753,10 @@ export default {
       this.QYBZform.pageSize = pageSize
       this.QYBZget()
     },
+    QYBZgetBtn(){
+      this.QYBZform.page = 1
+      this.QYBZget()
+    },
     QYBZget () {
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
         _this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -70,6 +70,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -101,7 +114,7 @@
                 :enterpriseStandard="true"
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
-                :labelWidth="'180px'"
+                :labelWidth="'150px'"
                 v-model="qbfsForm.esMatingRelations"
               ></custom-input-for-all-standards2>
             </template>
@@ -215,19 +228,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-                  <el-input
-                    style="display: none;"
-                    v-model="qbfsForm.rqbJson">
-                  </el-input>
-                  <el-input
-                    clearable
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请选择代替企标编号"
-                    readonly
-                    @click.native="choiceQYBZ">
-                  </el-input>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -359,7 +359,7 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
-                  @click="QYBZget">查询
+                  @click="QYBZgetBtn">查询
                 </el-button>
                 <el-button
                   class="common-button-default"
@@ -376,7 +376,7 @@
                 :data="QYBZList"
                 tooltip-effect="dark"
                 style="width: 100%;padding:0 0 20px 0;"
-                height="100%"
+                class="table-height"
                 border
                 @selection-change="handleSelectionQYBZ"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -712,9 +712,9 @@ export default {
     }
   },
   mounted() {
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
@@ -801,6 +801,13 @@ export default {
     },
     TXJGenterDrawer () {
       let list = this.$refs.TXJGTree.getCheckedNodes()
+      if(list.length > 0){
+        let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
+        if (parenList.length > 0) {
+          this.$message.error('请选择二级及以下目录')
+          return
+        }
+      }
       let id = ''
       let name = ''
       list.map(item => {
@@ -838,7 +845,7 @@ export default {
     },
     QYBZenterDrawer () {
       if (this.QYBZformSelect.length > 1) {
-        this.$message.warning('请选择一条标准')
+        this.$message.warning('您只能选择一条标准进行带入')
       } else if (this.QYBZformSelect.length < 1){
         this.$message.warning('请选择要带入的标准')
       } else {
@@ -859,6 +866,11 @@ export default {
       this.QYBZform.pageSize = pageSize
       this.QYBZget()
     },
+    //企业标准查询
+    QYBZgetBtn(){
+      this.QYBZform.page = 1
+      this.QYBZget()
+    },
     QYBZget () {
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
         _this: this, loading: 'QYBZShow'
@@ -1150,5 +1162,9 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -46,6 +46,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -210,13 +223,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请输入代替企标编号"
-                    :maxlength="500"/>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -389,9 +395,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
-    }
+    // if(this.qbfsForm.passFlag){
+    //   this.qbfsForm = {}
+    // }
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {

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

@@ -529,6 +529,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  qbzxdFrom.commentText = this.commentText;
                   var json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/completeTask", {
                     taskIds: this.$route.query.taskIds,

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

@@ -104,6 +104,7 @@
         <el-timeline>
           <el-form
             ref="roleForm"
+            :rules="roleFormRules"
             :model="roleForm"
             class="label-input-form">
             <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -123,7 +124,8 @@
                   <h4>责任工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="责任工程师" @click.native="choiceZRR('2')">
+                    <el-input v-model="roleForm.dockUserName" placeholder="责任工程师"
+                              @click.native="choiceZRR('2', '选择标准立项单位整车/系统总工', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -227,6 +229,7 @@
       title="选择工作组组长"
       :visible.sync="workModel"
       size="900px"
+      @close="closeWorkDrawer"
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
@@ -259,14 +262,14 @@
                 </el-form-item>
               </el-form>
             </div>
+            <loading :loading="tableLoading">数据加载中...</loading>
             <el-table
               ref="workGroup"
               :data="workData"
               tooltip-effect="dark"
               border
               style="width: 100%; flex: auto;"
-              class="drag-table"
-              height="100%"
+              class="table-height"
               @selection-change="workChange"
               :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
@@ -298,7 +301,7 @@
         </div>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button size="mini" @click="closeWorkDrawer">取消</el-button>
         <el-button type="primary" size="mini" @click="OkWork">带入</el-button>
       </div>
     </el-drawer>
@@ -349,7 +352,7 @@
         :before-upload="beforeUpload"
         :action="importExcelUrl"
         :file-list="defaultFileList"
-        accept=".xlsx"
+        accept=".xls"
         name="file"
         ref="importFileAboutStand">
         <div style="padding: 20px 0">
@@ -378,6 +381,7 @@ export default {
   name: "qbzxdlxStep1",
   data() {
     return {
+      tableLoading: false,
       importModalshowflag: false,  //导入弹窗
       showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
       importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -419,6 +423,11 @@ export default {
         dockUser: '',
         dockUserName: '',
       },
+      roleFormRules:{
+        dockUserName: [
+          {required: true, message: '请选择责任工程师', trigger: 'change'},
+        ],
+      },
       // 上传路径
       uploadPath: 'api/att/attFile/upload',
       acceptShow: false,
@@ -583,6 +592,13 @@ export default {
     workChange(data) {
       this.workChangeList = data
     },
+    //工作组取消按钮
+    closeWorkDrawer(){
+      this.workModel = false
+      this.workSearch.workGroupName = ''
+      this.getWorkData()
+      this.$refs.workGroup.clearSelection()
+    },
     OkWork(){
       if(this.workChangeList.length > 1 ){
         this.$message.warning('您只能选择一条数据进行带入')
@@ -595,6 +611,7 @@ export default {
           this.$refs.qblx_pageData.validateField('wgLeaderName')
         }
         this.workModel = false
+        this.workSearch.workGroupName = ''
         this.$refs.workGroup.clearSelection()
       }
     },
@@ -608,10 +625,12 @@ export default {
       }, res => {
         this.workData = res.data.records;
         this.total = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
     },
     choiceLeader(){
+      this.getWorkData()
       this.workModel = true
     },
     choiceZRBM(type, title, id) {
@@ -819,6 +838,8 @@ export default {
       if (this.btnType === 'edit') {
         let Items = JSON.parse(localStorage.getItem('obj'))
         this.addQblxData.esName = Items.esName
+        this.addQblxData.unit = Items.unit
+        this.addQblxData.unitName = Items.unitName
         this.addQblxData.dutyUnit = Items.dutyUnit
         this.addQblxData.dutyPeopleId = Items.dutyPeopleId
         this.addQblxData.dutyPeople = Items.dutyPeople
@@ -977,7 +998,7 @@ export default {
                 }
                 if (finishCount === jsonData.length) {
                   this.isSubmit = false
-                  this.$router.push("/processCenter");
+                  this.$router.push('/processCenter')
                 }
                 this.isSubmit = false
               } else {
@@ -1006,7 +1027,7 @@ export default {
   height: 100%;
 
   /deep/ .el-upload-list__item-name {
-    margin-left: 48px;
+    //margin-left: 48px;
   }
 
   /deep/ .el-upload-list {
@@ -1098,6 +1119,10 @@ export default {
       border: 0;
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 
 </style>

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

@@ -25,6 +25,7 @@
           <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
             <div class="file-box" v-if="fileList.length > 0">
               <p v-for="item in fileList"
+                 style="margin-left: 10px;"
                  :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
                 <i
                   title="下载"
@@ -173,7 +174,7 @@
             <custom-input-for-all-standards2
               class="classDisplay"
               :config="{attrName: '采用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esStandRelations"
             ></custom-input-for-all-standards2>
           </template>
@@ -194,7 +195,7 @@
               :enterpriseStandard="true"
               :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
               :config="{attrName: '引用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esMatingRelations"
             ></custom-input-for-all-standards2>
           </template>
@@ -675,8 +676,20 @@ export default {
       //必填人员校验规则
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择工作组组长", trigger: "change" }
-        ]
+          { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" }
+        ],
+        countersignerName:[
+          {required: true, message:'请选择会签人员',  trigger: "change" }
+        ],
+        examineName:[
+          {required: true, message:'请选择标准体系工作组组长',  trigger: "change" }
+        ],
+        approverName:[
+          {required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长',  trigger: "change" }
+        ],
+        engineerName:[
+          {required: true, message:'请选择相关单位、工程研究总院标准法规部',  trigger: "change" }
+        ],
       },
       roleForm: {
         prcCreateUserName: this.$store.getters.userInfo.userName,

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

@@ -46,6 +46,7 @@
                 </el-form-item>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                    :picker-options="pickerOptions"
                     v-model="listForm.endTime"
                     type="date"
                     placeholder="请选择截止日期"
@@ -454,6 +455,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框
       categoryName: [], //项目细分类下拉框

src/pages/processCenter/pages/newProcess/index.vue

@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'62d7895323fc44fcd3a2d7fa1a0c84bf'">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -205,7 +205,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'c149ed69750916dce3e26c35c4728542'">
             <div class="card-box" @click="handleCreateProcess('buss2')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -219,6 +219,21 @@
             </div>
           </el-card>
         </div>
+        <div class="process-name">
+          <el-card shadow="hover" v-btn-permission="'2ddb307d6b6840ac4e7f8f46d4c8f437'">
+            <div class="card-box" @click="handleCreateProcess('26')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">企标制修订-立项计划</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </div>
         <div class="process-name">
           <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
             <div class="card-box" @click="handleCreateProcess('23')">

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

@@ -31,27 +31,33 @@ export default {
       const list = [
         {
           title: '待办流程',
-          name: 'ProcessCenter'
+          name: 'ProcessCenter',
+          permission:'4219fdb5e33dbbc84d845af98c947e66'
         },
         {
           title: '已办流程',
-          name: 'AlreadyProcess'
+          name: 'AlreadyProcess',
+          permission:'4f71b81686079ba2b7e3739d3994e0af'
         },
         {
           title: '已发流程',
-          name: 'AlreadySend'
+          name: 'AlreadySend',
+          permission:'b9abd00768c8ed97be89547c2da3f0eb'
         },
         {
           title: '监控流程',
           name: 'MonitorProcess',
+        permission:'e1eb3e91143c1cf356889e013e698672'
         },
         {
           title: '草稿',
-          name: 'TaskDraft'
+          name: 'TaskDraft',
+          permission:'fa19fb2dc2cf3055a64732dab6c40cb9'
         },
         {
           title: '新建流程',
-          name: 'NewProcess'
+          name: 'NewProcess',
+          permission:'b53e6722b33a37c0fa2d87a9b06cca40'
         },
       ]
 
@@ -59,7 +65,7 @@ export default {
         if (item.permission) {
           return this.$hasPermission(item.permission)
         } else {
-          return true
+          return false
         }
       })
     }

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

@@ -187,7 +187,7 @@ export default {
         size: this.$store.getters.userInfo.configContent,
         userId: this.$store.getters.userInfo.userId,
         prcName: this.searchForm.prcName,
-        prcType: parseInt(this.searchForm.prcType) || '',
+        prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
         prcNum: this.searchForm.prcNum
       }, {
         loading: 'loading',

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

@@ -216,7 +216,7 @@ export default {
             size: this.$store.getters.userInfo.configContent,
             userId: this.$store.getters.userInfo.userId,
             prcName: this.searchForm.prcName,
-            prcType: parseInt(this.searchForm.prcType) || '',
+            prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
             prcNum: this.searchForm.prcNum
           },
           {

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

@@ -1,7 +1,7 @@
 <!--新建流程页面-->
 <template>
   <div id="NewProcess">
-    <div v-if="bzfggllc">
+    <div >
       <el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
@@ -612,10 +612,10 @@ export default {
      * 标准法规管理流程
      * @returns {boolean}
      */
-    bzfggllc() {
-      const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
-      return this.checkPermission(idArray)
-    },
+    // bzfggllc() {
+    //   const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
+    //   return this.checkPermission(idArray)
+    // },
     /**
      * 政策管理流程
      * @returns {boolean}

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

@@ -76,7 +76,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcNum }}</a>
+              <a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ scope.row.prcNum }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -86,7 +86,7 @@
             width="180"
           >
             <template slot-scope="scope">
-              <span @click="dealWith(scope.row)" class="table-jump">{{ getPrcName(scope.row.prcType) }}</span>
+              <span @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -97,7 +97,7 @@
             min-width="250"
           ><!--scope.row.prcName-->
             <template slot-scope="scope">
-              <a @click="dealWith(scope.row)" class="table-jump">{{ getPrcNameFilter(scope.row) }}</a>
+              <a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcNameFilter(scope.row) }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -254,7 +254,7 @@ export default {
                 size: parseInt(this.$store.getters.userInfo.configContent),
                 userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
                 prcName: this.searchForm.prcName,
-                prcType: parseInt(this.searchForm.prcType) || '',
+                prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType  ||'',
                 prcNum: this.searchForm.prcNum
               },
               {
@@ -421,7 +421,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '批准'){
+          }else if (row.taskInfo === '起草单位高级经理审核'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {
@@ -454,7 +454,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '培训'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary11',
               query: {

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

@@ -247,7 +247,6 @@ export default {
       //草稿办理待开发
       const { prcType, id } = row
       const mes = JSON.parse(row.mes)
-      console.log(mes)
         this.$store.commit('setDetailMap', this.$route.path)
       switch (prcType) {
         // 标准入库、
@@ -394,7 +393,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '批准'){
+            }else if (mes.taskInfo === '起草单位高级经理审核'){
               this.$router.push({
                 name: 'bussLibrary8',
                 query: {
@@ -426,7 +425,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '培训'){
+            }else if (mes.taskInfo === '批准'){
               this.$router.push({
                 name: 'bussLibrary11',
                 query: {
@@ -899,6 +898,17 @@ export default {
             }
           })
           break
+        //企标制修订立项计划
+        case '26':
+          this.$router.push({
+            name: 'qbzxdlxStep1',
+            query: {
+              type: '26',
+              processName: '企标制修订立项计划',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

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

@@ -28,6 +28,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
+              v-btn-permission="'23e01cb6ac6bfcedd39537f236a769e5'"
               @click="searchSarAccessBtn">
               查询
             </el-button>
@@ -36,6 +37,7 @@
             <el-button
               class="common-button-default"
               size="small"
+              v-btn-permission="'23e01cb6ac6bfcedd39537f236a769e5'"
               @click="clearSearch">清空</el-button>
           </el-form-item>
         </el-form>
@@ -46,12 +48,14 @@
         type="primary"
         class="common-button-primary add-button"
         size="mini"
+        v-btn-permission="'226bcb0d4d1b5767183d51186f24c57a'"
         @click="showAddModel(1, null)"
       ><i class="el-icon-plus"></i>新增</el-button>
       <el-button
         class="common-button-default delete-button"
         :loading="delLoading"
         size="mini"
+        v-btn-permission="'bdc3bb8549669702642f86aa4323c568'"
         @click="deleteSarAccess('demore',null)"
       ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
     </div>
@@ -109,8 +113,8 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9cfce14dcb70220b1feb948f956b3e0e'">编辑</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'c5931f7d69d66aae5f45c9e88a137f5a'">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>

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

@@ -68,24 +68,26 @@
             </el-input>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
+            <el-button v-btn-permission="'6a1c8575a6ed7da8d441767c7e8dd407','e4aee670a804c8f26a2044c60800f835','da3564b242a91d112e50336ec5433c2e'" class="common-button-primary"
                        type="primary" size="small" @click="selectProductBtn">查询
             </el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default"
+            <el-button v-btn-permission="'855d8db42fd3e50f3f092f81f8c2c895' ,'149187e6e3a686a949a4119dadaafbef','bcbd7dae607dd0594b2d4c9c3a861b4f'" class="common-button-default"
                        @click="resetSelect" size="small">清空
             </el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
-                     v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
+                     v-btn-permission="'4b5207b6ebff8f5ca7990dd6debf7f60' ,'f5ffaf2df95f03970c4846ba4b703730','14802475aba2684ed63af6ef50812937'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" @click="selectMoreBtn">
+          <el-button type="primary" class="common-button-primary" size="mini"
+                     v-btn-permission="'5b26775620cf73b044d753bf1f07ceaf' , '39eb1c25f5865a14020708fe07ea4b5c','32d99dd10bef923935b0d19d3f2d2a90'"
+                     @click="selectMoreBtn">
             <i class="iconfont">&#xe7a5;</i>
             高级查询
           </el-button>
@@ -540,7 +542,6 @@ export default {
         XCXSSRQLAWS: '',
         //是否纳入认证清单
         isRelateAccess: '',
-        standType: 'INLAND',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2748,11 +2748,11 @@ export default {
         synopsis: [
           {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
         ],
-        standYear: [
-          {required: true, message: '标准年份不能为空', trigger: 'change'},
-          // {validator: this.verify.testNumberCode, trigger: 'change'},
-          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
-        ],
+        // standYear: [
+        //   {required: true, message: '标准年份不能为空', trigger: 'change'},
+        //   // {validator: this.verify.testNumberCode, trigger: 'change'},
+        //   {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
+        // ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -71,8 +71,8 @@
           <el-form :modal="sarBussionessSearch" :inline="true" class="high-search-form" label-width="110px">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="标准号" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100"></el-input>
+                <el-form-item label="企标编号" class="search-item">
+                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据企标编号查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -187,11 +187,11 @@
                 <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
                 <!--                  </el-select>-->
                 <!--                </el-form-item>-->
-                <el-formItem label="标准号" prop="numberName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+                <el-formItem label="企标编号" prop="numberName" class="search-item">
+                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据企标编号查找" :maxlength="100"/>
                 </el-formItem>
-                <el-formItem label="标准名称" prop="standName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+                <el-formItem label="中文名称" prop="standName" class="search-item">
+                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据中文名称查找" :maxlength="100"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
                   <el-button
@@ -416,27 +416,27 @@
           <el-table-column fixed="right"
                            v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
             <template slot-scope="scope">
-              <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
-                   @command="handleCommand"
-              >
-                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
-                           v-if="scope.row.collectBtn"
-                           @click="handleCommand([scope.row, '收藏'])"
-                >收藏
-                </el-button>
-                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
-                           v-else
-                           @click="handleCommand([scope.row, '取消收藏'])"
-                >取消收藏
-                </el-button>
-                <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                           v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑
-                </el-button>
-                <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                           v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除
-                </el-button>
-              </div>
-              <div v-else>
+<!--              <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"-->
+<!--                   @command="handleCommand"-->
+<!--              >-->
+<!--                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
+<!--                           v-if="scope.row.collectBtn"-->
+<!--                           @click="handleCommand([scope.row, '收藏'])"-->
+<!--                >收藏-->
+<!--                </el-button>-->
+<!--                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
+<!--                           v-else-->
+<!--                           @click="handleCommand([scope.row, '取消收藏'])"-->
+<!--                >取消收藏-->
+<!--                </el-button>-->
+<!--                <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
+<!--                           v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑-->
+<!--                </el-button>-->
+<!--                <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
+<!--                           v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除-->
+<!--                </el-button>-->
+<!--              </div>-->
+              <div>
                 <div @click.stop style="display: inline-block">
                   <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'"
                              v-if="scope.row.collectBtn"
@@ -449,9 +449,7 @@
                   >
                   </el-button>
                 </div>
-
               </div>
-
             </template>
 
 
@@ -573,10 +571,17 @@
                     <el-input
                       :config="field"
                       clearable
+                      :title="sarBussionessStandEO[field.attrField]"
                       v-model="sarBussionessStandEO[field.attrField]"
-                      :disabled="formdisableflag" placeholder="选择起草部门"
-                      @click.native="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDWId)">
+                      :disabled="formdisableflag" placeholder="选择起草部门">
                     </el-input>
+                    <el-button
+                            type="primary"
+                            size="mini"
+                            style="position:absolute;top: 10px;right: 0;"
+                            @click="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDW)"
+                            class="common-button-primary">手动查找
+                    </el-button>
                   </el-form-item>
                 </template>
                 <!--起草人QCRBUSS-->
@@ -587,7 +592,7 @@
                     class="add-form-item"
                   >
                     <template slot="label">起草人</template>
-                    <el-input v-model="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
+                    <el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
                     </el-input>
                     <!--                      <el-input-->
                     <!--                          :key="field.attrField"-->
@@ -642,7 +647,7 @@
                         <el-input
                           v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
                           placeholder="选择VPPS编码"
-                          @click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
+                          @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
                       </el-form-item>
                     </el-tooltip>
                   </template>
@@ -1078,11 +1083,6 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="中文名称" class="add-form-item form-item-disabled">
-                  <el-input v-model="sarBussionessSearch.standName"
-                            placeholder="请输入企标名称"
-                            clearable></el-input>
-                </el-form-item>
                 <el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled">
                   <el-input v-model="sarBussionessSearch.standEnName"
                             placeholder="请输入企标英文名称"
@@ -1123,10 +1123,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="企标编号" class="add-form-item form-item-disabled">
-                  <el-input v-model="sarBussionessSearch.standCode" clearable
-                            placeholder="请输入企标编号"></el-input>
-                </el-form-item>
                 <el-form-item label="标准年份" class="add-form-item form-item-disabled">
                   <el-input v-model.number="sarBussionessSearch.standYear"
                             placeholder="请输入标准年份"
@@ -1226,11 +1222,29 @@
                 <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                   <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                 </el-form-item>
-                <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+                <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
                   <el-input
-                    v-model="sarBussionessSearch.VPPSBMBUSS"
-                    placeholder="选择VPPS编码"
-                    @click.native="choiceZRR2('car', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
+                          v-model="sarBussionessSearch.CYCVPPSBMBUSS"
+                          placeholder="请输入关联模块--乘用车VPPS编码"
+                         ></el-input>
+                </el-form-item>
+                <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.KCVPPSBMBUSS"
+                          placeholder="请输入关联模块--卡车VPPS编码"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.DYBXHBUSS"
+                          placeholder="请输入模块结构单元变型号(卡车)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.CYCDYBXHBUSS"
+                          placeholder="请输入模块结构单元变型号(乘用车)"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -1244,18 +1258,6 @@
                             @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
                   </el-input>
                 </el-form-item>
-                <!--                              <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
-                <!--                                <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
-                <!--&lt;!&ndash;                                  <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
-                <!--&lt;!&ndash;                                      <el-option&ndash;&gt;-->
-                <!--&lt;!&ndash;                                              v-for="item in qcrOptions"&ndash;&gt;-->
-                <!--&lt;!&ndash;                                              placeholder="请选择"&ndash;&gt;-->
-                <!--&lt;!&ndash;                                              :key="item.value"&ndash;&gt;-->
-                <!--&lt;!&ndash;                                              :value="item.value"&ndash;&gt;-->
-                <!--&lt;!&ndash;                                              :label="item.label"&ndash;&gt;-->
-                <!--&lt;!&ndash;                                      ></el-option>&ndash;&gt;-->
-                <!--&lt;!&ndash;                                  </el-select>&ndash;&gt;-->
-                <!--                              </el-form-item>-->
                 <!--            能源类型-->
                 <template>
                   <custom-select-array
@@ -1264,18 +1266,6 @@
                     v-model="sarBussionessSearch['NYLXCLASS']"
                   ></custom-select-array>
                 </template>
-                <!--                              <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
-                <!--                                  <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>-->
-                <!--                                      <el-option-->
-                <!--                                              v-for="item in categoryOptions"-->
-                <!--                                              placeholder="请选择"-->
-                <!--                                              :key="item.value"-->
-                <!--                                              :value="item.value"-->
-                <!--                                              :label="item.label"-->
-                <!--                                      ></el-option>-->
-                <!--                                  </el-select>-->
-                <!--                              </el-form-item>-->
-                <!--            适用产品线（新增字段）-->
                 <template>
                   <custom-select-array
                     :config="sycpxOptions"
@@ -1283,20 +1273,30 @@
                     v-model="sarBussionessSearch['SYCPXCLASS']"
                   ></custom-select-array>
                 </template>
-                <!--                              <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">-->
-                <!--                                  <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>-->
-                <!--                                      <el-option-->
-                <!--                                              v-for="item in sycpxOptions"-->
-                <!--                                              placeholder="请选择"-->
-                <!--                                              :key="item.value"-->
-                <!--                                              :value="item.value"-->
-                <!--                                              :label="item.label"-->
-                <!--                                      ></el-option>-->
-                <!--                                  </el-select>-->
-                <!--                              </el-form-item>-->
-                <!--                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
-                                                  <el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
-                                              </el-form-item>-->
+                <el-form-item label="关联模块--乘用车vpps中文名称" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.CYCVPPSCNBUSS"
+                          placeholder="请输入关联模块--乘用车vpps中文名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="关联模块--卡车vpps中文名称" title="关联模块--卡车vpps中文名称" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.KCVPPSCNBUSS"
+                          placeholder="请输入关联模块--卡车vpps中文名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.DYMCBUSS"
+                          placeholder="请输入模块结构单元名称(卡车)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="sarBussionessSearch.CYCDYMCBUSS"
+                          placeholder="请输入关联模块--乘用车vpps中文名称"
+                  ></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -1398,17 +1398,11 @@
                   border
                   :height="300"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
-                  @selection-change="selectReplaceStandNumRowChange">
-              <el-table-column
-                      type="selection"
-                      width="55"
-                      align="center">
-              </el-table-column>
+          fontWeight: 'bold', height: '48px'}">
               <el-table-column
                       label="企标编号">
                   <template slot-scope="scope">
-                      <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
+                      <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
                   </template>
               </el-table-column>
             <el-table-column
@@ -2591,17 +2585,17 @@ export default {
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData && checkedData.length != 0) {
         if (checkedData.length > 0) {
-          if (this.drawerTitle2 === 'VPPS编码') {
-            this.sarBussionessSearch.VPPSBMBUSS =  checkedData.map(item => item.code).join(",")
-            this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+          if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
+            this.sarBussionessSearch.CYCVPPSBMBUSS =  checkedData.map(item => item.code).join(",")
+            this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
           } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
           }
         } else {
-          if (this.drawerTitle2 === 'VPPS编码') {
-            this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
-            this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
+          if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
+            this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
+            this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
           } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -3368,7 +3362,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(item,fs) {
       // const mj = item.attrInfoMap.QBMJ
       // if (mj === 'GXNX7D6H59') {
       //   // C1所有人都可查看
@@ -3446,10 +3440,11 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherBussStandardDetails',
         params: {
-          id: item.id,
+          id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
           pageType: 'BUSINESS_STAND'
         }
       })
+        console.log(routeUrl)
       window.open(routeUrl.href, '_blank')
     },
     // 编辑
@@ -3539,9 +3534,20 @@ export default {
       // $('#deptBtn').click()
       $('#deptBtn2').click()
     },
-    choiceQCR(type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
+    choiceQCR(type, title, nameId) {
+      this.nodeList2 = []
+      if (nameId) {
+        let nameId1 = nameId.split(',')
+        let idList = []
+        nameId1.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList2.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag = true
@@ -3572,7 +3578,9 @@ export default {
     },
     choiceQCDW(type, title, id) {
       this.nodeListZRBM = []
-      this.nodeListZRBM.push(id)
+      if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){
+        this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',')
+      }
       this.drawerTitle = title
       this.modalshowflagZRBM = true
     },
@@ -3593,7 +3601,16 @@ export default {
         this.sarBussionessSearch.QCDW = nameList
       }
       this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
-      this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
+      let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList
+      const arr=new Set()
+      let permission = tNameList.split(",");
+      permission.forEach((item, index) => {
+        arr.add(item)
+      })
+
+      let nameNew=Array.from(arr).join(',')
+      this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)
+
       if (this.sarBussionessStandEO.QCRBUSS) {
         this.$refs.sarBussionessStandForm.validateField('QCDW')
       }
@@ -3624,8 +3641,8 @@ export default {
                 nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss')
               }
               // 代替标准号
-              if (nowstandinfo.replaceStandNum != null) {
-                nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
+              if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) {
+                nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/，/ig, ',')
               }
               if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
                 nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -4323,37 +4340,29 @@ export default {
           formFieldList.forEach((item) => {
             const value = this.sarBussionessSearch[item.attrField]
             // 时间格式处理
-            if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') {
-              advanceSearchVOList.push({
-                connect: "and",
-                field: 'CYCVPPSBM',
-                type: 'like',
-                value: value
-              });
-            }else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') {
-              advanceSearchVOList.push({
-                connect: "and",
-                field: 'CYCVPPSCN',
-                type: 'like',
-                value: value
-              });
-            }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
+            if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
+                advanceSearchVOList.push({
+                    connect: "and",
+                    field: item.attrField || "",
+                    type: 'EQUALS',
+                    value: value
+                });
+            }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
               advanceSearchVOList.push({
                 connect: advanceSearchVOList.length > 0 ? "and" : "",
                 field: item.attrField || "",
                 type: "between",
+                value: (value ? value[0]+','+value[1] : "") || "",
+              });
+            }else if (value !== undefined && value !== null && value !== "") {
+              advanceSearchVOList.push({
+                connect: "and",
+                field: item.attrField || "",
+                type: 'like',
                 value: value
               });
             }
           })
-          if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
-            advanceSearchVOList.push({
-              connect: "and",
-              field: 'BARQ',
-              type: 'EQUALS',
-              value: formData.BARQ
-            });
-          }
         }
         formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
         this.SarExportSearchEo = formData;
@@ -4744,6 +4753,8 @@ export default {
         }
         if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
           rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
+        }else if(item.attrLen && item.attrType === 'INPUT_STR'){
+          rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
         }
         if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') {
           rule.push({

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -34,6 +34,7 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
+                                v-btn-permission="'1595c63ae9b14631ff3adefe51a92bdb'"
                                 type="primary"
                                 class="common-button-primary"
                                 size="mini"
@@ -43,6 +44,7 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
+                                v-btn-permission="'5c8347d102094d48139b30723e187113'"
                                 class="common-button-default"
                                 size="mini"
                                 @click="clearData">
@@ -56,6 +58,7 @@
             <el-button type="primary"
                        class="common-button-primary add-button"
                        size="mini"
+                       v-btn-permission="'66ae947771821e3bd064c5594a14d145'"
                        @click="addData"><i class="el-icon-plus"></i>新增
             </el-button>
 <!--            <el-button class="common-button-default in-button"-->
@@ -71,6 +74,7 @@
 <!--            </el-button>-->
             <el-button class="common-button-default"
                        size="mini"
+                       v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'"
                        @click="deleteList"><i class="iconfont">&#xe611;</i>删除
             </el-button>
         </div>
@@ -171,13 +175,13 @@
                                     <el-dropdown trigger="click" @command="handleCommand">
                                         <i class="iconfont">&#xe61e;</i>
                                         <el-dropdown-menu slot="dropdown">
-                                            <el-dropdown-item :command="[scope.row, '查看']">
+                                            <el-dropdown-item v-btn-permission="'68bc53399a9e0daf1cc2f1bb2aa1d566'" :command="[scope.row, '查看']">
                                                 查看
                                             </el-dropdown-item>
-                                            <el-dropdown-item :command="[scope.row, '编辑']">
+                                            <el-dropdown-item  v-btn-permission="'cc5d8f1a15726c62c5016e595246ec8b'" :command="[scope.row, '编辑']">
                                                 编辑
                                             </el-dropdown-item>
-                                            <el-dropdown-item :command="[scope.row, '删除']">
+                                            <el-dropdown-item v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'" :command="[scope.row, '删除']">
                                                 删除
                                             </el-dropdown-item>
                                         </el-dropdown-menu>

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -1419,13 +1419,13 @@
         },
         productModelAdd: {
           id : "",
-          sorDivide : "INLAND_STAND",
+          sorDivide : "FOREIGN_LAWS",
           menuName : "",
           parentId : null,
           parentIds : null,
           parentIdsName : "",
           displaySeq : "",
-          validFlag : "",
+          validFlag : "0",
           creationTime : "",
           modifyTime : "",
           remarks : "",
@@ -2257,6 +2257,8 @@
       saveProduct (name) {
         this.$refs[name].validate((valid) => {
           if (valid) {
+            this.productModelAdd.sorDivide = 'FOREIGN_LAWS'
+            this.productModelAdd.validFlag = '0'
             if (this.modalType === 1) {
               this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
                 _this: this
@@ -2337,11 +2339,11 @@
                 if(row.parentIds.indexOf(res.data.id) != -1){
                   this.productModelAdd.parentIds = row.parentIds
                 }else {
-                  this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
+                  this.productModelAdd.parentIds = row.parentIds + res.data.id+','
                   idsName = row.parentIdsName + ',' + res.data.menuName
                 }
               }else {
-                this.productModelAdd.parentIds = res.data.id
+                this.productModelAdd.parentIds = +','+res.data.id+','
                 idsName = res.data.menuName;
               }
               this.productModelAdd.parentId = res.data.id

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -160,7 +160,7 @@
         </el-button>
         <el-button class="common-button-default"
                    size="mini" @click="OCRAdd('2')"
-                   v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
+                   v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont">&#xe611;</i>编辑
         </el-button>
         <!--&lt;!&ndash;        <el-button class="common-button-default"
                            size="mini" :loading="searching"

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -56,7 +56,7 @@
               type="primary"
               class="common-button-default export-button"
               size="mini" @click="exportStandard"
-              v-btn-permission="'b46217ac825d49933b0f7349ba924ea7'"
+              v-btn-permission="'2f211ed7ff6c273c690a52f890ea8008'"
               title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
               icon="export"
             >导出

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -83,7 +83,7 @@
           width="80"
           align="center">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button>
+            <el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)"  v-btn-permission="'08e9f28f1afb80b706217bdd9c6323bd'">查看</el-button>
           </template>
         </el-table-column>
       </el-table>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -104,7 +104,7 @@
                 width="100"
                 align="center">
           <template slot-scope="scope">
-            <el-button class="common-button-primary" type="primary"  size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
+            <el-button class="common-button-primary" type="primary"  size="mini" @click="handleProjectCompliance(scope.row)"  v-btn-permission="'7d79b9521e77c73857ee788e30670e8d'">查看</el-button>
 <!--            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
           </template>
         </el-table-column>

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -79,11 +79,11 @@
       </div>
     </transition>
     <div class="effect">
-      <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">
+      <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')" v-btn-permission="'bb5501f4461476b330cbbc3c6f22780a'">
         添加
       </el-button>
-      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
-      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1">导出上报意见</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
     </div>
     <div class="container">
       <el-table

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -7,6 +7,7 @@
             <div class="header-right">
                 <el-button
                         type="primary"
+                        v-btn-permission="'141c18729a988fe5d9c52296f35ba9f4'"
                         size="mini"
                         class="common-button-primary"
                         v-if="addButton"
@@ -16,6 +17,7 @@
                 <el-button
                         type="primary"
                         size="mini"
+                        v-btn-permission="'42a77131e13b8cc67886025b44d9948d'"
                         class="common-button-primary"
                         v-if="addItemButton"
                         @click="addItem2">
@@ -26,6 +28,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="editButton"
+                        v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'"
                         @click="editItem">
                     编辑
                 </el-button>
@@ -33,6 +36,7 @@
                         type="primary"
                         size="mini"
                         class="common-button-primary"
+                        v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'"
                         v-if="seeButton"
                         @click="seeItem">
                     查看
@@ -42,6 +46,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="seeItemButton"
+                        v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'"
                         @click="handlePreview(standId)">
                     查看标准
                 </el-button>
@@ -50,6 +55,7 @@
                         size="mini"
                         class="common-button-default"
                         v-if="delectButton"
+                        v-btn-permission="'b1391e768988c363b177419e2ae16633'"
                         @click="delItem">
                     删除
                 </el-button>

src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue

@@ -10,6 +10,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="addButton"
+                        v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'"
                         @click="addItem">
                     新增
                 </el-button>
@@ -18,6 +19,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="addItemButton"
+                        v-btn-permission="'fc429d36f2d117f13f079aab59c28338'"
                         @click="addItem2">
                     新增政策
                 </el-button>
@@ -26,6 +28,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="editButton"
+                        v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'"
                         @click="editItem">
                     编辑
                 </el-button>
@@ -34,6 +37,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="seeButton"
+                        v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'"
                         @click="seeItem">
                     查看
                 </el-button>
@@ -42,6 +46,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="seeItemButton"
+                        v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'"
                         @click="handlePreview(standId)">
                     查看政策
                 </el-button>
@@ -50,6 +55,7 @@
                         size="mini"
                         class="common-button-default"
                         v-if="delectButton"
+                        v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'"
                         @click="delItem">
                     删除
                 </el-button>

src/pages/regulatoryRepository/workingGroup/index.vue

@@ -14,7 +14,7 @@
                 <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
             </el-tab-pane>
         </el-tabs>
-      <el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button>
+      <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
     </div>
 </template>
 <script>