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

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -138,7 +138,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>

src/components/navMenu/index.vue

@@ -135,11 +135,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            /*{
+            {
               title: '企业标准库',
               path: '/enterpriseStandardDatabase',
-              menuId: '01ed8f752748227777b3572d56ee9ab5'
+              menuId: '7feeb73929c25a6f1fd67952704ec02b'
-            },*/
+            },
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',

src/pages/details/otherBussStandardDetails/index.vue

@@ -3,52 +3,11 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
+      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
     </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
-        <div class="modular-header">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>
-          </div>
-          <div class="modular-header-btn">
-            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-          </div>
-        </div>
-        <div class="basic-information-content">
-          <p style="color: #C42626;"><label>企标编号：</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-          <p>
-            <label
-              title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-            >标准状态<i class="el-icon-warning-outline"></i>：</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
-          </p>
-          <p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-          <p><label>标准实施日期：</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
-          <p><label>代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replaceStandNum != null && sarStandardsInfoEO.replaceStandNum !== '' && sarStandardsInfoEO.replaceStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replaceStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-          <p><label>被代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replacedStandNum != null && sarStandardsInfoEO.replacedStandNum !== '' && sarStandardsInfoEO.replacedStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replacedStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-        </div>
       </div>
       <div
         class="details-content-modular clearfix"
@@ -56,10 +15,36 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header">
+        <div class="modular-header" v-if="item.label !== '基础信息'">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+        </div>
+        <div class="modular-header" v-if="item.label === '基础信息'">
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+          <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
+          <!--              </div>-->
+          <div class="modular-header-btn">
+            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+          </div>
         </div>
         <div class="modular-content">
+          <template v-if = "item.label === '基础信息'">
+            <div class="details-content-modular basic-information" style="margin-bottom: 0">
+              <div class="basic-information-content">
+              <p style="color: #C42626;"><label style=" margin-right: 164px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
+              <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+              <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+              <p>
+                <label style=" margin-right: 132px;"
+                        title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
+                >文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+              </p>
+              <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+              <p><label style=" margin-right: 115px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+            </div>
+            </div>
+          </template>
           <template
             v-for="(child, childIndex) in item.child"
             v-if="child.isShowImp === '0'"
@@ -2032,8 +2017,8 @@ export default {
     })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
-      const relatedPlansRes = await this.queryRelatedPlans()
+      // const relatedPlansRes = await this.queryRelatedPlans()
-      const relatedPlans = relatedPlansRes.list
+      // const relatedPlans = relatedPlansRes.list
       formFieldList.forEach((field) => {
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
@@ -2114,7 +2099,7 @@ export default {
   /deep/.details-content{
     /*padding: 0 67px;*/
     .details-content-modular{
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
       .modular-header{
         display: flex;
         align-items: center;
@@ -2186,8 +2171,8 @@ export default {
       }
       .basic-information-content{
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
         .standard-text{
           height: 50px;
           line-height: 50px;
@@ -2281,7 +2266,7 @@ export default {
       }
     }
     .basic-information{
-      border-top: 2px dashed #D1D1D1;
+      /*border-top: 2px dashed #D1D1D1;*/
       border-bottom: 2px dashed #D1D1D1;
       .modular-header{
         height: 60px;
@@ -2291,6 +2276,7 @@ export default {
         & > p{
           min-height: 55px;
           line-height: 55px;
+          border-bottom: 1px solid #E5E5E5;
         }
       }
     }

src/pages/details/otherStandardDetails/index.vue

@@ -44,7 +44,7 @@
               <div class="basic-information-content">
                 <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
-                  <label style=" margin-right: 150px;">标准号</label>
+                  <label style=" margin-right: 164px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{
                       sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
                     }}</span>
@@ -70,7 +70,7 @@
                     sarStandardsInfoEO.issueTime || '-'
                   }}</span></p>
                 <p>
-                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
+                  <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
                     sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
                   }}</span>
                 </p>
@@ -3023,8 +3023,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;
@@ -3147,8 +3147,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;

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

@@ -1360,11 +1360,12 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-               if(res.message === '修改成功'){
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
-                }
+              } else {
+                this.$message.error('已存在此国家/地区清单，修改失败')
               }
             }, e => {
             })

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

@@ -1304,6 +1304,7 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })

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

@@ -6,7 +6,8 @@
       <el-divider content-position="left">基础信息</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
+          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
+                   label-width="80px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -97,7 +98,8 @@
               <el-button
                   class="common-button-default"
                   size="small"
-                @click="clearSearchLaws">清空</el-button>
+                  @click="clearSearchLaws">清空
+              </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
@@ -166,18 +168,21 @@
       <div class="action-bar">
         <el-button
             class="common-button-default"
-          size="mini" @click="addSarAccess">添加</el-button>
+            size="mini" @click="addSarAccess">添加
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="showTableFlag"
             size="mini" @click="isShowTable"
-        >{{$t('m.showAddDataList')}}</el-button>
+        >{{ $t('m.showAddDataList') }}
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="!showTableFlag"
             size="mini"
             @click="isShowTable"
-        >{{$t('m.hideAddDataList')}}</el-button>
+        >{{ $t('m.hideAddDataList') }}
+        </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
@@ -271,7 +276,7 @@
         </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
-        <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
+        <loading :loading="dataLoading">{{ $t('m.dataAcquisition') }}</loading>
       </div>
     </div>
     <!--清单条目-->
@@ -282,12 +287,14 @@
             class="common-button-default export-button"
             size="mini" @click="exportAccessInfo('apart')"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+        ><i class="iconfont">&#xe6e9;</i>导出
+        </el-button>
         <el-button
             class="common-button-default delete-button"
             size="mini" @click="deleteSelectSarAccessInfo"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <el-table
           :data="sarAccessInfoList"
@@ -366,7 +373,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -378,7 +385,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -430,26 +437,33 @@
                 type="primary"
                 size="small" @click="moveUp(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >上移</el-button>
+            >上移
+            </el-button>
             <el-button
                 class="common-button-default"
                 type="danger"
                 size="small" @click="moveDown(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >下移</el-button>
+            >下移
+            </el-button>
             <el-button
                 size="small"
                 @click="editTghisRow(scope.row)"
                 class="common-button-default"
                 type="warning"
-            >编辑</el-button>
+            >编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="footer">
-      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess" v-if="!disabledFlag" :loading="loadData">{{$t('m.submit')}}</el-button>
+      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess"
-      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+                 v-if="!disabledFlag" :loading="loadData">{{ $t('m.submit') }}
+      </el-button>
+      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal"
+                 v-if="!disabledFlag">{{ $t('m.cancel') }}
+      </el-button>
     </div>
     <el-dialog :visible.sync="exportTestItemNameFlag" title="导出文件" width="300px">
       <el-form :inline="true" class="label-input-form search-area">
@@ -459,7 +473,8 @@
       </el-form>
       <span slot="footer" class="demo-drawer-footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancal">取消</el-button>
-        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                   @click="exportTestItem">提交</el-button>
       </span>
     </el-dialog>
     <!--导入模态框-->
@@ -551,14 +566,16 @@
             size="mini"
             icon="el-icon-check"
             @click="saveInfo"
-        >提交</el-button
+        >提交
+        </el-button
         >
         <el-button
             size="mini"
             icon="el-icon-close"
             class="common-button-default"
             @click="cancelInfo"
-        >取消</el-button
+        >取消
+        </el-button
         >
       </div>
     </el-drawer>
@@ -579,14 +596,15 @@ import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
 import TreePopover from '@/components/CustomFormComponents/TreePopover'
 import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText'
-import CustomDatePickWithText ,{ formatText }from '@/components/CustomFormComponents/DatePickerGroupWithText'
+import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
+
 export default {
   name: 'OtherAddEit',
   components: {
@@ -609,10 +627,10 @@ export default {
     CustomInputForPolicy,
     CustomRoleTree
   },
-  data () {
+  data() {
     return {
       textStatusMap: {},
-      selectSearch : [],
+      selectSearch: [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -637,7 +655,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
-        standSortShow:'',
+        standSortShow: '',
         standEnName: '',
         typeApplicable: '',
         syrz: '',
@@ -900,31 +918,31 @@ export default {
           // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'} gaoyan 2018-11-07 客户提到特殊符号校验问题
         ],
         lawsNumber: [
-          { required: true, message: '政策编号不能为空', trigger: 'change' },
+          {required: true, message: '政策编号不能为空', trigger: 'change'},
-          { type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change' },
+          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
           {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
         ],
         lawsName: [
-          { required: true, message: '中文名称不能为空', trigger: 'blur' },
+          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          { type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change' }
+          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         lawsEnName: [
-          { required: true, message: '英文名称不能为空', trigger: 'change' },
+          {required: true, message: '英文名称不能为空', trigger: 'change'},
-          { type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change' }
+          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
           // { validator: this.verify.valiateEnName, trigger: 'blur' }
         ],
         lawsState: [
-          { required: true, message: '文本状态不能为空', trigger: 'change' }
+          {required: true, message: '文本状态不能为空', trigger: 'change'}
         ],
         countryArea: [
-          { required: true, message: '适用区域不能为空', trigger: 'change' }
+          {required: true, message: '适用区域不能为空', trigger: 'change'}
         ],
         replaceLawsNum: [
-          { required: true, message: '代替政策编号不能为空', trigger: 'change' },
+          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
-          { type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur' }
+          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}
         ],
         issueTime: [
-          { required: true, message: '发布日期不能为空', trigger: 'change' }
+          {required: true, message: '发布日期不能为空', trigger: 'change'}
         ]
       },
       formFieldListData: [], // 存储从接口取过来的原始数据
@@ -950,13 +968,13 @@ export default {
   },
   methods: {
     // 高级检索
-    selectMoreBtn () {
+    selectMoreBtn() {
       this.showSelectBox = !this.showSelectBox
       this.showTableFlag = false
       this.selectLawsStands()
     },
     // 法规维护人树
-    getDept () {
+    getDept() {
       return new Promise((resolve, reject) => {
         let url = 'sys/org/getTree'
         this.$http.get(url, {}, {
@@ -986,11 +1004,11 @@ export default {
       })
     },
     // 删除上传的文件
-    delFileInfo (file, fileList) {
+    delFileInfo(file, fileList) {
       this.fileInfoList = fileList
     },
     // 上传文件成功回调
-    uploadBackSuccess (res, file, fileList) {
+    uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
         this.fileInfoList = fileList
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
@@ -1001,20 +1019,20 @@ export default {
       }
     },
     // 相关附件 上传之前钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       var filename = file.name
       var index1 = filename.lastIndexOf('.')
       var index2 = filename.length
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
+      if (fileSuffix !== undefined && fileSuffix !== null) {
         fileSuffix = fileSuffix.toUpperCase()
       }
       // 判断上传文件格式
       if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-        || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+          || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
@@ -1027,24 +1045,24 @@ export default {
       }
       return true
     },
-    moreSearch () {
+    moreSearch() {
       this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
-    isShowTable () {
+    isShowTable() {
       this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
     // 点数据搜索 查询按钮 事件
-    searchLawsStands () {
+    searchLawsStands() {
       this.showTableFlag = false
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
-    clearSearchLaws () {
+    clearSearchLaws() {
       this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
@@ -1057,14 +1075,14 @@ export default {
       this.selectLawsStands()
     },
     // 数据来源change事件
-    dataSourceChange (val) {
+    dataSourceChange(val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
-      if (val === 'INLAND_STAND'){
+      if (val === 'INLAND_STAND') {
         this.selectLawsStands()
         // 海外标准法规可查字段
-      }else if (val === 'FOREIGN_STAND'){
+      } else if (val === 'FOREIGN_STAND') {
         this.selectLawsStands()
         // 国内外政策可查字段
       }
@@ -1073,7 +1091,7 @@ export default {
      * 点击数据搜索 添加按钮事件
      * 判断是否添加重复数据
      */
-    addSarAccess () {
+    addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
@@ -1082,12 +1100,12 @@ export default {
           addList = this.sarAccessInfoList.findIndex(items => {
             return items.id === item.id
           })
-          if(addList > -1){
+          if (addList > -1) {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
-          } else{
+          } else {
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
@@ -1102,7 +1120,7 @@ export default {
       }
     },
     // 上移 事件
-    moveUp (index, row) {
+    moveUp(index, row) {
       if (index === 0) {
         this.$message({
           message: '已经是列表中第一个素材！',
@@ -1114,7 +1132,7 @@ export default {
         this.$set(this.sarAccessInfoList, index, temp)
       }
     },
-    moveDown (index) {
+    moveDown(index) {
       if (index === (this.sarAccessInfoList.length - 1)) {
         this.$message({
           message: '已经是列表中最后一个素材！',
@@ -1143,21 +1161,21 @@ export default {
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
-    importmodalFlags () {
+    importmodalFlags() {
       this.importmodalFlag = true
       this.$nextTick(() => {
         this.$refs['importfile'].clearFiles()
       })
     },
     // 点击 模板下载 按钮事件
-    uploadImportModal () {
+    uploadImportModal() {
       window.open('/api/lawss/sarSarAccess/exportTemplate?fileName=标准法规清单导入模板.xlsx')
     },
     /**
      * 点击清单条目 删除按钮 事件
      * 删除不想添加的AccessInfo信息
      */
-    deleteSelectSarAccessInfo () {
+    deleteSelectSarAccessInfo() {
       if (this.sarAccessInfoListArry.length > 0) {
         this.$confirm('确认删除选中数据？', '确认删除', {
           confirmButtonText: '确定',
@@ -1179,26 +1197,27 @@ export default {
           })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
-        }).catch(() => {})
+        }).catch(() => {
+        })
       } else {
         this.$message.error('请选择需要删除的清单条目!')
       }
     },
     // 清单条目 table select事件
-    sarAccessInfoSelect (selectData) {
+    sarAccessInfoSelect(selectData) {
       this.sarAccessInfoListArry = []
       for (let i = 0; i < selectData.length; i++) {
         this.sarAccessInfoListArry.push(selectData[i].id);
       }
     },
     // 点击取消按钮 返回事件
-    backCancal () {
+    backCancal() {
       this.$router.push({
         name: 'AccessStandardsAndRegulations'
       })
     },
     // 提交按钮 事件
-    saveSarAccess () {
+    saveSarAccess() {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
@@ -1209,17 +1228,17 @@ export default {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].ssrq === null) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
-            }else {
+            } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
-            }else {
+            } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
-            }else {
+            } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }
           }
@@ -1290,14 +1309,17 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此车型类别清单，修改失败')
               }
             }, e => {
             })
           }
-        }else {
+        } else {
           this.$message.error('请检查表单是否填写正确')
         }
       })
@@ -1398,7 +1420,7 @@ export default {
         if (item.zrbm !== null || item.zrbm !== "") {
           let k = (item.zrbm || "").split(',')
           for (let i in this.zrbmOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.zrbmOptions[i].value === k[m]) {
                 k[m] = this.zrbmOptions[i].label
               }
@@ -1410,7 +1432,7 @@ export default {
         if (item.nylx !== null) {
           let k = (item.nylx || "").split(',')
           for (let i in this.categoryOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.categoryOptions[i].value === k[m]) {
                 k[m] = this.categoryOptions[i].label
               }
@@ -1422,7 +1444,7 @@ export default {
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
           for (let i in this.CycxOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.CycxOptions[i].value === k[m]) {
                 k[m] = this.CycxOptions[i].label
               }
@@ -1434,7 +1456,7 @@ export default {
         if (item.sycpx !== null) {
           let k = (item.sycpx || "").split(',')
           for (let i in this.sycpxOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.sycpxOptions[i].value === k[m]) {
                 k[m] = this.sycpxOptions[i].label
               }
@@ -1446,7 +1468,7 @@ export default {
         if (item.syrz !== null) {
           let k = (item.syrz || "").split(',')
           for (let i in this.syrzOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.syrzOptions[i].value === k[m]) {
                 k[m] = this.syrzOptions[i].label
               }
@@ -1471,7 +1493,7 @@ export default {
         this.$set(item, 'cycvppscn', '')
         this.$set(item, 'kccvppsbm', '')
         this.$set(item, 'kccvppscn', '')
-      }else {
+      } else {
         this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
         this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
         this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
@@ -1488,7 +1510,7 @@ export default {
     },
     // 查询数据搜索 table 数据
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1504,7 +1526,7 @@ export default {
       })
     },
     //  查询按钮
-    selectLawsStands () {
+    selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1515,7 +1537,7 @@ export default {
     },
     /** 高级查询查询按钮*/
     selectPage() {
-      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+      StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1541,11 +1563,11 @@ export default {
       }
     },
     // 数据搜索table判断checked状态
-    selectable (row) {
+    selectable(row) {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (val) {
+    sarAccessInfoSearchSelect(val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
         this.addWord(item)
@@ -1553,32 +1575,32 @@ export default {
       this.changeText(this.selectedAccInfoSearchList)
     },
     // 数据搜索 清单类型 table select事件
-    accessSarTypeSelect (selectData) {
+    accessSarTypeSelect(selectData) {
       this.accessSarTypeList = selectData
     },
     // 数据搜索table分页页码改变回调
-    drawerPageChange (page) {
+    drawerPageChange(page) {
       this.drawerPage = page
       this.sarAccessInfoSearch.page = this.drawerPage
       this.selectLawsStands()
     },
 
     // 数据搜索table分页条数改变回调
-    drawerPageSizeChange () {
+    drawerPageSizeChange() {
       this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
-    exportAccessInfo (type) {
+    exportAccessInfo(type) {
       if (this.sarAccessInfoListArry.length > 0) {
         this.exportTestItemNameFlag = true
         this.exportName = ''
-      }else {
+      } else {
         this.$message.warning('请选择数据进行导出')
       }
     },
     // 导出确定功能
-    exportTestItem () {
+    exportTestItem() {
       let exportNames = this.exportName
       let exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
@@ -1591,7 +1613,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
@@ -1601,11 +1623,11 @@ export default {
       this.exportTestItemNameFlag = false
     },
     // 导出取消按钮关闭模态、置空
-    cancal () {
+    cancal() {
       this.exportTestItemNameFlag = false
     },
     // 导入 beforeUpload 事件
-    handleFormatbeforeUpload (file) {
+    handleFormatbeforeUpload(file) {
       let filename = file.name
       let index1 = filename.lastIndexOf('.')
       let index2 = filename.length
@@ -1623,7 +1645,7 @@ export default {
       return true
     },
     // 导入成功事件
-    importFileSuccess (response, file, fileList) {
+    importFileSuccess(response, file, fileList) {
       var a
       var b = ''
       if (response.data) {
@@ -1670,7 +1692,7 @@ export default {
       }
     },
     // 点击清单条目 新增按钮 事件
-    addEntry () {
+    addEntry() {
       this.editAddType = 1
       this.addEditTitle = '新增'
       this.isDisabled = false
@@ -1683,13 +1705,13 @@ export default {
       this.addEntryForm.authObjId = ''
       this.addEntryForm.proEssessUserId = ''
       this.addEntryForm.sarType = 'TEMP'
-      this.addEntryForm.attrField=''
+      this.addEntryForm.attrField = ''
       this.$nextTick(() => {
         this.$refs['addEntryForm'].resetFields()
       })
     },
     // 请求部门结构树
-    getOrgTreeSource () {
+    getOrgTreeSource() {
       this.$http.get('sys/org/getTree', {}, {_this: this},
           res => {
             if (res.ok) {
@@ -1712,7 +1734,7 @@ export default {
           })
     },
     // 新增提交事件
-    saveOrUpdateStands () {
+    saveOrUpdateStands() {
       this.isSubmit = true
       this.$refs['addEntryForm'].validate((valid) => {
         if (valid) {
@@ -1766,7 +1788,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -1777,7 +1800,7 @@ export default {
       })
     },
     // 标准号验证
-    validateStandNumber (standinfo) {
+    validateStandNumber(standinfo) {
       return new Promise((resolve, reject) => {
         let obj = JSON.parse(JSON.stringify(standinfo))
         this.$http.post('lawss/sarStandardsInfo/validateStandNumber', obj, {
@@ -1794,20 +1817,20 @@ export default {
       })
     },
     // 表单清空
-    resetForm () {
+    resetForm() {
       this.isSubmit = false
       this.$refs['addEntryForm'].resetFields()
     },
     /**
      * 获取新增弹框的表单
      */
-    getAddFormFieldList (ruKu) {
+    getAddFormFieldList(ruKu) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
             res => {
               if (res.ok) {
                 // const { data: { STAND: data } } = res
-              const { data = {} } = res
+                const {data = {}} = res
                 this.formFieldListData = data[ruKu] || []
                 // this.resolveFormFieldList()
                 resolve()
@@ -1817,7 +1840,7 @@ export default {
             })
       })
     },
-    resolveFormFieldList (isEdit) {
+    resolveFormFieldList(isEdit) {
       const data = this.formFieldListData
       this.formFieldList = data.map((item) => {
         // FO 法规
@@ -1844,7 +1867,7 @@ export default {
     /**
      * 展示位置
      */
-    queryDisplayLocation (accessType) {
+    queryDisplayLocation(accessType) {
       return new Promise((resolve, reject) => {
         let sarType = accessType === 'INLAND_STAND' ? 'STAND' : accessType === 'FOREIGN_STAND' ? 'INLAND_STAND' : 'FOREIGN_LAWS'
         this.$http.get('lawssBase/utArea/getAreaList', {
@@ -1860,7 +1883,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (data) {
+    handlePreview(data) {
       let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
@@ -1872,7 +1895,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 请求上传的文件信息
-    getFileInfo () {
+    getFileInfo() {
       this.$http.get('att/attFile/getMultiFileInfos', {
         fileIds: this.$route.query.fileIds
       }, {
@@ -1893,7 +1916,7 @@ export default {
       })
     },
     // 获取工作组信息下拉框信息
-    getGzzOption () {
+    getGzzOption() {
       this.$http.get('lawss/sarGroupMenu/queryGroup', '', {
         _this: this
       }, res => {
@@ -1910,7 +1933,7 @@ export default {
       })
     },
     // 新增、编辑标准时验证标准编号是否重复
-    validCode (rule, value, callback) {
+    validCode(rule, value, callback) {
       let find = 0
       this.sarAccessInfoList.map(item => {
         if (item.code === value) {
@@ -1925,7 +1948,7 @@ export default {
       callback()
     },
     // 新增、编辑项目评估角色change事件
-    roleListChange (val) {
+    roleListChange(val) {
       this.ROLELIST.map(item => {
         if (item.value === val) {
           this.addEntryForm.proEssessUser = item.label
@@ -1933,7 +1956,7 @@ export default {
       })
     },
     // 表格回显要求类型
-    getAskType (val) {
+    getAskType(val) {
       let askTypeName = ''
       this.accessSarTypeOptions.map(item => {
         if (item.value === val) {
@@ -1943,7 +1966,7 @@ export default {
       return askTypeName
     },
     // 表格回显监管类型
-    getAskNature (val) {
+    getAskNature(val) {
       if (!val) {
         val = ''
       }
@@ -1953,7 +1976,7 @@ export default {
 
       return askTypeName.join(',')
     },
-    onChecked () {
+    onChecked() {
       this.sarStandardsInfoEO.FO = ''
       this.sarStandardsInfoEO.XMPGJS = ''
     },
@@ -1984,7 +2007,7 @@ export default {
       })
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
@@ -1999,7 +2022,7 @@ export default {
   },
   watch: {
     // 监听 清单类型
-    isListType (newVal, oldVal) {
+    isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
       this.drawerTotal = 0
@@ -2010,8 +2033,8 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
-  mounted () {
+  mounted() {
-    this.zqaId =this.$route.query.id;
+    this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     //this.getData()
@@ -2077,40 +2100,46 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.list-of-standards-and-regulations-details{
+.list-of-standards-and-regulations-details {
   height: calc(~'100% - 50px');
   background: #ffffff;
   overflow-y: auto;
-  .basic-information{
+
-    & > .search-area{
+  .basic-information {
-      & > .left{
+    & > .search-area {
+      & > .left {
         width: 100%;
       }
     }
   }
-  .basic-information, .data-search, .list-entry{
+
+  .basic-information, .data-search, .list-entry {
     padding-top: 0.1px;
     background: #ffffff;
-    .el-divider{
+
-      .el-divider__text{
+    .el-divider {
+      .el-divider__text {
         color: #409EFF;
         font-size: 16px;
       }
     }
   }
-  .data-search{
+
-    .standards-drawer-table-one{
+  .data-search {
+    .standards-drawer-table-one {
       position: relative;
       padding: 0 10px;
       height: 356px;
     }
   }
-  .list-entry{
+
-    .el-tabs{
+  .list-entry {
+    .el-tabs {
       padding: 0 10px;
     }
   }
-  .footer{
+
+  .footer {
     position: absolute;
     bottom: 0;
     padding: 0 10px;
@@ -2121,32 +2150,39 @@ export default {
     text-align: right;
   }
 }
+
 .labelBox {
   /deep/ .el-form-item__label {
     padding-right: 5px;
     padding-left: 23px;
   }
 }
+
 .labelBox1 {
   /deep/ .el-form-item__label {
     padding-right: 5px;
   }
 }
+
 .un-select {
   user-select: none;
 }
-::v-deep .el-drawer__header{
+
-  &>span:first-child{
+::v-deep .el-drawer__header {
-    outline: none!important;
+  & > span:first-child {
+    outline: none !important;
   }
 }
-::v-deep .el-drawer{
+
-  outline: none!important;
+::v-deep .el-drawer {
+  outline: none !important;
 }
-/deep/.wx-resolve {
+
+/deep/ .wx-resolve {
   .el-select__tags {
     padding: 4px;
   }
+
   .el-tag {
     margin: 2px;
   }

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

@@ -18,7 +18,6 @@
                   :data="treeList"
                   highlight-current
                   @node-click="treeClick"
-                  :filter-node-method="filterNode"
                   default-expand-all
                   :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -182,20 +181,23 @@
                 <el-form-item class="search-item btn-box">
                     <el-button
                             :loading="searching"
-                    icon="el-icon-search"
                             type="primary"
+                            size="mini"
                             class="common-button-primary"
-                    round
+                            v-btn-permission=""
-                    @click="getBussionStandTableBtn(sarBussionessSearch)"
+                            @click="getBussionStandTableBtn(sarBussionessSearch)">
-                    :title="goSearch">
+                        查询
                     </el-button>
                     <el-button
+                            size="mini"
                             class="common-button-default"
-                    icon="el-icon-refresh-left"
+                            v-btn-permission=""
-                    round
+                            @click="clearAllSearch('sarBussionessSearch')">清空
-                    @click="clearAllSearch('sarBussionessSearch')"
+                    </el-button>
-                  ></el-button>
+                    <el-button size="mini" type="primary" class="common-button-primary"
-<!--                  <el-button type="primary" class="common-button-primary" round  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>-->
+                               v-btn-permission="" @click="selectMoreBtn"><i
+                            class="iconfont">&#xe7a5;</i>高级检索
+                    </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -312,18 +314,6 @@
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="standStatusShow"
-            label="标准状态"
-            width="110"
-          >
-            <template slot="header" slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" placement="bottom">
-                <span>标准状态 <i class="el-icon-warning-outline"></i></span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
           <el-table-column
             prop="issueTime"
             label="发布日期"
@@ -344,42 +334,14 @@
               {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
             </template>
           </el-table-column>
-          <el-table-column
-            label="主起草人"
-            width="100"
-          >
-            <template slot-scope="scope">
-              {{ getQCRName(scope.row) }}
-            </template>
-          </el-table-column>
           <el-table-column
                     show-overflow-tooltip
-            prop="attrInfoMap.ZRBMName"
+                    sortable
-            label="起草部门">
+                    prop="standStatusShow"
-          </el-table-column>
+                    label="文本状态"
-
+                    width="110"
-          <el-table-column
-            show-overflow-tooltip
-            prop="attrInfoMap.SVPPSName"
-            label="SVPPS"
-            width="120"
             >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="replaceStandNum"
-            label="代替企标编号"
-            width="210"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="replacedStandNum"
-            label="被代替标准编号"
-            width="210"
-          >
-          </el-table-column>
-
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
@@ -431,17 +393,32 @@
             :rules="sarBussionessStandRules"
             class="label-input-form"
           >
-<!--            <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">-->
+
-<!--              <el-select v-model="sarBussionessStandEO.standSort" filterable>-->
+<!--            <custom-input-for-standards-->
-<!--                <el-option-->
+<!--              :config="{-->
-<!--                  v-for="item in standSortOptions"-->
+<!--                attrName: '代替企标编号',-->
-<!--                  placeholder="请选择"-->
+<!--                attrField: 'replaceStandNum',-->
-<!--                  :key="item.value"-->
+<!--              }"-->
-<!--                  :value="item.value"-->
+<!--              v-model="sarBussionessStandEO.replaceStandNum"-->
-<!--                  :label="item.label"-->
+<!--              :disabled="formdisableflag"-->
-<!--                ></el-option>-->
+<!--            ></custom-input-for-standards>-->
-<!--              </el-select>-->
+            <!--      动态数据-->
-<!--            </el-form-item>-->
+            <template v-for="(displayLocation, index) in dynamicFormField">
+              <el-col :span="24" :key="index">
+                  <div class="divider-line">{{ displayLocation.label }}</div>
+              </el-col>
+                <template v-if="displayLocation.label === '基础信息'" >
+                    <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">
+                        <el-select v-model="sarBussionessStandEO.standSort" filterable>
+                            <el-option
+                                    v-for="item in standSortOptions"
+                                    placeholder="请选择"
+                                    :key="item.value"
+                                    :value="item.value"
+                                    :label="item.label"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item
                             label="企标编号"
                             prop="standCode"
@@ -457,28 +434,32 @@
                                 disabled
                         ></el-input>
                     </el-form-item>
-            <el-form-item label="中文名称" prop="standName" label-width="150px" class="add-form-item">
+                    <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
+                        <el-input v-model="sarBussionessStandEO.standYear"
+                                  placeholder="请输入标准年份"
+                                  value-format="yyyy-MM-dd"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="企标名称" prop="standName" label-width="150px" class="add-form-item">
                         <el-input v-model="sarBussionessStandEO.standName"
-                        placeholder="请输入标准名称"
+                                  placeholder="请输入企标名称"
                                   clearable></el-input>
                     </el-form-item>
-            <el-form-item label="英文名称" prop="standEnName" label-width="150px" class="add-form-item">
+                    <el-form-item label="企标英文名称" prop="standEnName" label-width="150px" class="add-form-item">
                         <el-input v-model="sarBussionessStandEO.standEnName"
-                        placeholder="请输入标准英文名称"
+                                  placeholder="请输入企标英文名称"
                                   clearable></el-input>
                     </el-form-item>
-            <el-form-item title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" prop="standStatus" label-width="150px" class="add-form-item">
+                    <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-              <template slot="label">标准状态<i class="el-icon-warning-outline"></i></template>
+                                  prop="textStatus" label-width="150px" class="add-form-item">
-              <el-select
+                        <template slot="label">文本状态</template>
-                v-model="sarBussionessStandEO.standStatus"
+                        <el-select v-model="sarBussionessStandEO.textStatusBuss"
-                placeholder="请选择标准状态"
+                                   placeholder="请选择文本状态"
                                    clearable>
                             <el-option
                                     v-for="opt in standStateOptions"
                                     :key="opt.value"
-                  :value="opt.value === undefined ? '' :opt.value"
+                                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
-                  :label="opt.label"
-                  :disabled="opt.value !== 'AY9L9FMSEW' && opt.value !== standStatus"
                             >
                                 {{ opt.label }}
                             </el-option>
@@ -496,27 +477,7 @@
                                        clearable
                         ></el-datePicker>
                     </el-form-item>
-            <custom-input-for-standards
+                </template>
-              :config="{
-                attrName: '代替企标编号',
-                attrField: 'replaceStandNum',
-              }"
-              v-model="sarBussionessStandEO.replaceStandNum"
-              :disabled="formdisableflag"
-            ></custom-input-for-standards>
-<!--            <custom-input-for-standards-->
-<!--              :config="{-->
-<!--                attrName: '被代替企标编号',-->
-<!--                attrField: 'replacedStandNum',-->
-<!--              }"-->
-<!--              v-model="sarBussionessStandEO.replacedStandNum"-->
-<!--              :disabled="formdisableflag"-->
-<!--            ></custom-input-for-standards>-->
-            <!--      动态数据-->
-            <template v-for="(displayLocation, index) in dynamicFormField">
-              <el-col :span="24" v-if="displayLocation.label !== '关联信息'" :key="index">
-                <div class="divider-line">{{ displayLocation.label }}</div>
-              </el-col>
                 <template v-for="field in displayLocation.child">
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
@@ -526,7 +487,7 @@
                     :disabled="formdisableflag"
                   ></custom-SVPPS>
                 </template>
-                <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJH'">
+                <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJLBUSS' && field.attrField !== 'XGJH'">
                   <template v-if="field.attrField === 'GFXYYWJ'">
                     <custom-input-for-standards
                       :key="field.attrField"
@@ -535,6 +496,68 @@
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>
                   </template>
+                  <template v-else-if="field.attrField === 'FSRQBUSS'">
+                    <custom-input
+                      :key="field.attrField"
+                      :config="field"
+                      v-model="sarBussionessStandEO[field.attrField]"
+                      :disabled="true"
+                    ></custom-input>
+                  </template>
+                    <template v-else-if="field.attrField === 'TXLBBUSS'">
+                        <el-form-item
+                                prop="TXLBBUSS"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">体系类别</template>
+                            <el-input v-model="sarBussionessStandEO.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'VPPSBMBUSS'">
+                        <el-form-item
+                                prop="VPPSBMBUSS"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">关联模块--VPPS编码</template>
+                            <el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS)"></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'VPPSCNBUSS'">
+                        <el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
+                            <el-input
+                                    v-model="sarBussionessStandEO.VPPSCNBUSS" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'DTQBBHBUSS'">
+                        <custom-input-for-standards
+                                :key="field.attrField"
+                                :config="field"
+                                :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="formdisableflag"
+                                @popoverHide="popoverHideQuery"
+                        ></custom-input-for-standards>
+                    </template>
+                    <template v-else-if="field.attrField === 'BDTQBBHBUSS'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
+                    <template v-else-if="field.attrField === 'XCSJBUSS'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
                     <template v-else>
                         <custom-input
                                 :key="field.attrField"
@@ -546,7 +569,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
-                    v-if="field.attrField !== 'FZRQ'"
                     :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
@@ -850,13 +872,13 @@
       </el-dialog>
     </div>
     <!--高级查询-->
-    <AdvancedQuery
+<!--    <AdvancedQuery-->
-      :isAdvancedSearch.sync="isAdvancedSearch"
+<!--      :isAdvancedSearch.sync="isAdvancedSearch"-->
-      :twoOptions="twoOptions"
+<!--      :twoOptions="twoOptions"-->
-      :threeOptions="threeOptions"
+<!--      :threeOptions="threeOptions"-->
-      @twoSelectChange="twoSelectChange"
+<!--      @twoSelectChange="twoSelectChange"-->
-      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"
+<!--      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"-->
-    ></AdvancedQuery>
+<!--    ></AdvancedQuery>-->
     <!--企标编号生成组件-->
     <GenerationNumber
       :is-show.sync="isShow"
@@ -942,6 +964,27 @@
                       @click="closeModal">取消</el-button>
           </div>
       </el-drawer>
+      <!-- 组件树-->
+      <tree-select-new
+              :multiple=false
+              :lazy=false
+              :modalShowFlag="modalShowFlag1"
+              :drawerTitle="drawerTitle1"
+              width = "500"
+              :data="standSystemOptions"
+              :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+              :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+      <tree-select-new
+              width = "500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag2"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :urlChild="urlChild"
+              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
   </div>
 </template>
 
@@ -956,6 +999,9 @@ import CustomInputForStandards from '@/components/CustomFormComponents/InputForS
 import customSelectArray from '@/components/CustomFormComponents/SelectArray'
 import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+
 import {mapGetters} from 'vuex'
 export default {
   name: 'EnterpriseStandardDatabase',
@@ -969,7 +1015,9 @@ export default {
     CustomInputForStandards,
     customSelectArray,
     CustomOrg,
-    CustomSVPPS
+    CustomSVPPS,
+    TreeSelect,
+    TreeSelectNew
   },
   props: {
   },
@@ -979,6 +1027,14 @@ export default {
         label: 'menuName',
       children: 'children'
       },
+        defaultProps: {
+            children: 'children',
+            label: 'menuName'
+        },
+        nodeKey: 'id',
+        nodeKeyCode: 'code',
+        nodeKeyModel: 'model',
+        defaultCheckedKeys: [],
         productModal: false, // 模态框是否打开
         modalType: '',
         productTitle: '', // 模态框标题
@@ -1073,7 +1129,6 @@ export default {
       formFieldListData: {},
       formFieldList: [],
       allSelectOptions: {},
-      countryOptions: [],
       configPage: 1,
       configPageNow: 1,
       loading: false,
@@ -1110,12 +1165,16 @@ export default {
       // 组织机构
       bussionessStandNodes: [],
       sarBussionessStandEO: {
+        TXLBBUSS:'',
+        VPPSBMBUSS:'',
+        VPPSCNBUSS:'',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
         issueUnit: '', // 发布部门
         assemClass: '',
         id: '',
         standType: 'INLAND', // 标准分类
+        textStatusBuss:'',
         country: 'CN',
         standSort: '',
         applyArctic: '',
@@ -1344,10 +1403,7 @@ export default {
         certPutTimeList: []
       }, // 标准新增过程中用到的对象
       energyKindOptions: [], // 能源种类下拉框
-      applyAuthOptions: [], // 适用认证下拉框
       applyCountryOptions: [], // 国家/地区下拉框
-      regionOptions: [], // 国家/地区下拉框
-      applyArcticOptions: [], // 适用车型下拉框
       formdisableflag: false,
       defaultAddFormFieldRules: {
         // standSort: [
@@ -1446,10 +1502,8 @@ export default {
       exportName: '',
       countRootId: 0,
       parentNode: [],
-      searching: false,
       deleteMenuModal: false,
       goSearch: '',
-      tableFlag: '',
       SarExportSearchEo: {},
       sarBussionessSearch: {
         orgName: '', // 部门名称
@@ -1502,13 +1556,53 @@ export default {
         standSort: '',
         replaceStandNum: ''
       }, // 分页查询过程中用到的对象
-      standSortOptions: [], // 企标类别下拉框
       standGeneraOptions: [], // 企标大类下拉框
       standSubclassOptions: [], // 企标细类下拉框-所有数据
       standSubclassSelectOptions: [], // 企业细类下拉框-选中大类后 所有数据
+      searchNodes: [], // 高级检索中责任部门
+        defaultCheckedKeys1: [],
+        defaultCheckedKeys2: [],
+        defaultCheckedKeys3: [],
+        defaultCodeProps: {
+            children: 'children',
+            label: 'code'
+        },
+        defaultModelProps: {
+            children: 'children',
+            label: 'model'
+        },
+        busVppsOptions: [], // 车系体系架构
+        modelOptions: [], // 模块体系架构
+        searching: false,
+        stahndinfoList: [],
+        tableFlag: '',
+        // sycpxOptions: [], // 适用产品线
+        syzrOptions: [], // 适用认证
+        // zrgcsOptions: [], // 责任工程师
+
+        countryOptions: [],
+        regionOptions: [], // 区域
+        standSortOptions: [], // 标准类别下拉框
+        standSystemOptions: [], // 标准体系下拉框
+        sycpxOptions: [], // 适用产品线下拉框
+        zrbmOptions: [], // 责任部门下拉框
+        zrgcsOptions: [], // 责任工程师下拉框
+        txlbOptions: [], // 体系类别下拉框
+        standSortConfigOptions: [], // 标准类别下拉框
+        applyArcticOptions: [], // 适用车型下拉框
         standStateOptions: [], // 标准状态下拉框
         standNatureOptions: [], // 标准性质下拉框
-      searchNodes: [], // 高级检索中责任部门
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        applyAuthOptions: [], // 适用认证下拉框
+        categoryOptions: [], // 所属类别下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        cysdOptions:[], //我司参与深度下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
       addOrUPdateFlag: 1, // 新增：1， 修改：2
       modalshowflag: false,
@@ -1556,10 +1650,69 @@ export default {
       isShow: false,
       standStatus: '',
       qcbm: '',
-      qcbmName: ''
+      qcbmName: '',
+      drawerTitle1:'',
+      modalShowFlag1: false,
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      url:'',
+      urlChild:'',
     }
   },
   methods: {
+      dateFormatter () {
+          //默认返回yyyy-MM-dd HH-mm-ss
+          const d = new Date();
+          const year = d.getFullYear();//得到年
+          const month = (d.getMonth()+1)<10 ? '0'+(d.getMonth()+1) : (d.getMonth()+1);//得到月
+          const day = d.getDate()<10 ? '0'+d.getDate() : d.getDate();//得到日
+          const hour = d.getHours()<10 ? '0'+d.getHours() : d.getHours();//得到时
+          const minute = d.getMinutes()<10 ? '0'+d.getMinutes() : d.getMinutes();//得到分
+          const second = d.getSeconds()<10 ? '0'+d.getSeconds() : d.getSeconds();//得到秒
+          return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为：YY-MM-DD hh:mm:ss（当前时间）
+      },
+      popoverHideQuery(ids,attrField){
+          console.log(ids)
+          console.log("-----------------------------")
+          console.log(attrField)
+      },
+      popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+              }else {
+                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
+                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
+              }
+          }
+          this.modalShowFlag2 = false
+          this.$forceUpdate()
+      },
+      popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+              }else {
+                  this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
+              }
+          }
+          this.modalShowFlag1 = false
+          this.$forceUpdate()
+      },
+      choiceZRR2 (type, title, id) {
+          this.drawerTitle = title
+          this.modalShowFlag2 = true
+          this.url = ''
+          this.urlChild = ''
+          this.url="sarVppsTree/list"
+          this.urlChild="sarVppsTree/childByList"
+      },
+      choiceZRR1 (type, title, id) {
+          this.drawerTitle1 = title
+          this.modalShowFlag1 = true
+      },
       closeModal () {
           this.productModal = false
           this.closeDrawer()
@@ -2153,80 +2306,9 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
-      const mj = item.attrInfoMap.QBMJ
+      // const mj = item.attrInfoMap.QBMJ
-      if (mj === 'GXNX7D6H59') {
+      // if (mj === 'GXNX7D6H59') {
-        // C1所有人都可查看
+      //   // C1所有人都可查看
-        let routeUrl = this.$router.resolve({
-          name: 'OtherBussStandardDetails',
-          params: {
-            id: item.id,
-            pageType: 'BUSINESS_STAND'
-          }
-        })
-        window.open(routeUrl.href, '_blank')
-      } else if (mj === 'JLAPYG7YCT') {
-        // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
-        // （起草部门、相关部门、会签部门，部门下所有人员）
-        const attrInfoMap = item.attrInfoMap || {}
-        const xgbm = attrInfoMap.XGBM || '' // 相关部门
-        const qcbm = attrInfoMap.ZRBM || '' // 起草部门
-        const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
-        const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
-        const currentUserInfo = this.userInfo
-        const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
-        const inBm = currentBm.some(item => {
-          return bm.indexOf(item) > -1
-        })
-        // 如果当前用户的部门和科室不在全部部门里  就不允许查看
-        if (!inBm) {
-          this.$message.warning('当前用户无权限查看此详情')
-          return false
-        }
-        let routeUrl = this.$router.resolve({
-          name: 'OtherBussStandardDetails',
-          params: {
-            id: item.id,
-            pageType: 'BUSINESS_STAND'
-          }
-        })
-        window.open(routeUrl.href, '_blank')
-      } else if (mj === 'ACF675Z88W') {
-        // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
-        const attrInfoMap = item.attrInfoMap || {}
-        const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
-        const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
-        const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
-        const userInfo = this.userInfo
-        const currentId = userInfo.userId // 当前用户的id
-        // 如果当前用户的部门和科室不在全部部门里  就不允许查看
-        if (!(qcr.indexOf(currentId) > -1)) {
-          // this.$message.warning('当前用户无权限查看此详情')
-          this.$http.get('lawss/sarBussionessStand/selectPerson', {
-            qbid: item.id
-          }, {
-            _this: this
-          }, res => {
-            if (res.data === "1") {
-              // 为1有权限
-              let routeUrl = this.$router.resolve({
-                name: 'OtherBussStandardDetails',
-                params: {
-                  id: item.id,
-                  pageType: 'BUSINESS_STAND'
-                }
-              })
-              window.open(routeUrl.href, '_blank')
-            } else {
-              this.$message.warning('当前用户无权限查看此详情')
-              return false
-            }
-          }, e => {
-            return false
-
-          })
-
-        }
-      }
       //   let routeUrl = this.$router.resolve({
       //     name: 'OtherBussStandardDetails',
       //     params: {
@@ -2235,6 +2317,77 @@ export default {
       //     }
       //   })
       //   window.open(routeUrl.href, '_blank')
+      // } else if (mj === 'JLAPYG7YCT') {
+      //   // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
+      //   // （起草部门、相关部门、会签部门，部门下所有人员）
+      //   const attrInfoMap = item.attrInfoMap || {}
+      //   const xgbm = attrInfoMap.XGBM || '' // 相关部门
+      //   const qcbm = attrInfoMap.ZRBM || '' // 起草部门
+      //   const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
+      //   const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
+      //   const currentUserInfo = this.userInfo
+      //   const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
+      //   const inBm = currentBm.some(item => {
+      //     return bm.indexOf(item) > -1
+      //   })
+      //   // 如果当前用户的部门和科室不在全部部门里  就不允许查看
+      //   if (!inBm) {
+      //     this.$message.warning('当前用户无权限查看此详情')
+      //     return false
+      //   }
+      //   let routeUrl = this.$router.resolve({
+      //     name: 'OtherBussStandardDetails',
+      //     params: {
+      //       id: item.id,
+      //       pageType: 'BUSINESS_STAND'
+      //     }
+      //   })
+      //   window.open(routeUrl.href, '_blank')
+      // } else if (mj === 'ACF675Z88W') {
+      //   // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
+      //   const attrInfoMap = item.attrInfoMap || {}
+      //   const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
+      //   const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
+      //   const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
+      //   const userInfo = this.userInfo
+      //   const currentId = userInfo.userId // 当前用户的id
+      //   // 如果当前用户的部门和科室不在全部部门里  就不允许查看
+      //   if (!(qcr.indexOf(currentId) > -1)) {
+      //     // this.$message.warning('当前用户无权限查看此详情')
+      //     this.$http.get('lawss/sarBussionessStand/selectPerson', {
+      //       qbid: item.id
+      //     }, {
+      //       _this: this
+      //     }, res => {
+      //       if (res.data === "1") {
+      //         // 为1有权限
+      //         let routeUrl = this.$router.resolve({
+      //           name: 'OtherBussStandardDetails',
+      //           params: {
+      //             id: item.id,
+      //             pageType: 'BUSINESS_STAND'
+      //           }
+      //         })
+      //         window.open(routeUrl.href, '_blank')
+      //       } else {
+      //         this.$message.warning('当前用户无权限查看此详情')
+      //         return false
+      //       }
+      //     }, e => {
+      //       return false
+      //
+      //     })
+      //
+      //   }
+      // }
+      let routeUrl = this.$router.resolve({
+        name: 'OtherBussStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'BUSINESS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
     },
     // 编辑
     selectStandardPro (item, state) {
@@ -2272,6 +2425,7 @@ export default {
           this.loading = false
         })
         this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
+        this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
         this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus))
         let subClass = item.standSubclass
         this.sarBussionessStandEO.standSubclass = subClass
@@ -3445,8 +3599,17 @@ export default {
   watch: {
       filterText(val) {
           this.$refs.tree.filter(val);
+      },
+      'sarBussionessStandEO.issueTime': {
+          handler: function() {
+              if(this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== ''){
+                  let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
+                  const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
+                  this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
               }
           },
+      },
+  },
   computed: {
     // 是否拥有拖拽权限
     hasPermissionDrag () {
@@ -3475,14 +3638,27 @@ export default {
       this.countryOptions = res.data.COUNTRY
       this.applyCountryOptions = res.data.COUNTRY
       this.regionOptions = res.data.REGION // 区域
-      this.applyArcticOptions = res.data.PRODUCTTYPE // 根据需求文档，产品类别对应标准属性中的“适用车型”
       this.standStateOptions = res.data.BUSSSTATE
-      this.standSortOptions = res.data.BUSSSTANDCLASS
       this.energyKindOptions = res.data.ENERGYTYPES
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standGeneraOptions = res.data.BUSSBIGCLASS
       this.standSubclassOptions = res.data.BUSSFINECLASS
-      this.applyAuthOptions = res.data.PROVETYPE
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+        this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+        this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.cysdOptions = res.data.WSCYSD // 我司参与深度
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.txlbOptions = res.data.TXLBCLASS // 体系类别
+        this.qcdwOptions = res.data.QCDW // 起草单位
+        this.nylxOptions = res.data.NYLXCLASS // 能源类型
+        this.syrzOptions = res.data.SYRZCLASS // 适用认证
+        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       // this.classifyCodeOptions = res.data.STANDCLASSIFY
     }, e => {
     })

src/router/index.js

@@ -1288,7 +1288,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '企业标准库',
-          menuId: '3YVZP8R4TC',
+          menuId: '7feeb73929c25a6f1fd67952704ec02b',
           parentPath: '/enterpriseStandardDatabase'
         }
       },