diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index 2dd49786c..a4993dac7 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/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>
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 56cf10aca..1a187eead 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -135,11 +135,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            /*{
+            {
               title: '企业标准库',
               path: '/enterpriseStandardDatabase',
-              menuId: '01ed8f752748227777b3572d56ee9ab5'
-            },*/
+              menuId: '7feeb73929c25a6f1fd67952704ec02b'
+            },
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 202a871fd..035bc085c 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/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-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></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>
+        <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'"
@@ -1453,7 +1438,7 @@ export default {
         return true
       }
       // 缺少文件
-      if (this.$hasPermission('Lgfdg6839L')) {
+      if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) {
         this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
           attId: attId
         }, {
@@ -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 relatedPlans = relatedPlansRes.list
+      // const relatedPlansRes = await this.queryRelatedPlans()
+      // 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-weight: 400;
+        font-size: 16px;
+        /*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;
         }
       }
     }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 99e9ee793..3fc0d6699 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/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>
@@ -425,7 +425,7 @@
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
     </div>
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
-    <!--查看标准条款列表-->
+    <!--查看分解单-->
     <el-drawer
         title="查看分解单"
         :wrapperClosable="false"
@@ -559,11 +559,11 @@
 
           </el-table-column>
           <el-table-column
-              prop="xcxssrq"
+              prop="xccssrq"
               label="新车型实施日期(文本)"
               width="180">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -628,18 +628,18 @@
           @pageSizeChange="pageSizeChange7"></pagination>
 
 
-<!--      <el-pagination-->
-<!--          @size-change="pageSizeChange"-->
-<!--          @current-change="pageChange"-->
-<!--          :current-page="1"-->
-<!--          :page-sizes="[10, 20, 30, 50]"-->
-<!--          :page-size="100"-->
-<!--          layout="sizes, prev, pager, next, jumper"-->
-<!--          :total="standitemTotal">-->
-<!--      </el-pagination>-->
+      <!--      <el-pagination-->
+      <!--          @size-change="pageSizeChange"-->
+      <!--          @current-change="pageChange"-->
+      <!--          :current-page="1"-->
+      <!--          :page-sizes="[10, 20, 30, 50]"-->
+      <!--          :page-size="100"-->
+      <!--          layout="sizes, prev, pager, next, jumper"-->
+      <!--          :total="standitemTotal">-->
+      <!--      </el-pagination>-->
 
-<!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
-<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
+      <!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
+      <!--                  @pageSizeChange="pageSizeChange"></pagination>-->
 
     </el-drawer>
     <!--新增标准条款-->
@@ -819,9 +819,9 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
-                :title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
+                :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
-              standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
+              standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
 
@@ -852,51 +852,51 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任工程师">责任工程师</label>
           <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
-            {{standShowItemEO.dutyEngineer }}</span>
+            {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
           <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
-            {{standShowItemEO.comparedWithPrevious }}</span>
+            {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
-            {{standShowItemEO.complianceRequire }}</span>
+            {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceState">
-            {{standShowItemEO.complianceState }}</span>
+            {{ standShowItemEO.complianceState }}</span>
         </div>
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="FO">FO</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
-<!--              standShowItemEO.dutyEngineerShow-->
-<!--            }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
-<!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="FO">FO</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+        <!--              standShowItemEO.dutyEngineerShow-->
+        <!--            }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+        <!--        </div>-->
 
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
-<!--          <span class="see-drawer-val"-->
-<!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
-<!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
-<!--            }}</span>-->
-<!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+        <!--          <span class="see-drawer-val"-->
+        <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+        <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+        <!--            }}</span>-->
+        <!--        </div>-->
       </div>
     </el-drawer>
     <!-- 更新LOG -->
@@ -1251,6 +1251,7 @@ export default {
       knowIdList: '',
       total7: 0,
       page7: 1,
+      pageSize7: this.$store.getters.userInfo.configContent,
       addForm: {
         title: '',
         content: '',
@@ -1772,7 +1773,7 @@ export default {
       this.page7 = page
       this.selectSarStandItems()
     },
-    pageSizeChange7(pageSize){
+    pageSizeChange7(pageSize) {
       this.pageSize7 = pageSize
       this.selectSarStandItems()
     },
@@ -2099,7 +2100,7 @@ export default {
       console.log("pageSize");
       console.log(pageSize);
       // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.standItemSearch.pageSize =pageSize;
+      this.standItemSearch.pageSize = pageSize;
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
@@ -2331,12 +2332,14 @@ export default {
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        ...this.standItemSearch,
+        pageSize: this.pageSize7, page: this.page7,
+      }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          this.standItemList = res.data;
-          console.log(res.data);
-          this.total7 = res.data.length // 分页需要
+          this.standItemList = res.data.list;
+          this.total7 = res.data.count // 分页需要
         }
       }, e => {
       })
@@ -3020,8 +3023,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
-        font-weight: 400;
+        font-size: 16px;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;
@@ -3144,8 +3147,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
-        font-weight: 400;
+        font-size: 16px;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 7bc613d02..8864b3131 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1224,6 +1224,7 @@ export default {
     },
     //添加标准确定事件
     okStand() {
+      this.getStandData();
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 895b38f72..fb8005d12 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -236,6 +236,7 @@
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
                         json.responUserListName = this.form.responUserListName
+                        json.introduce = false
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 1d19fe428..e0d16c839 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -357,6 +357,7 @@
                         json.commentText = this.commentText
                         json.info = this.data
                         json.department = this.$store.getters.userInfo.orgName
+                        json.introduce = true
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -382,7 +383,17 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
-                        this.data = data.info || []
+                        if (data.introduce) {
+                            this.data = data.info || []
+                        } else {
+                            this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
+                                unique: data.uniques
+                            }, {}, res => {
+                                res.data.forEach(item => {
+                                    this.data.push(item)
+                                })
+                            })
+                        }
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 0d44e7924..0d73dd9a0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -354,7 +354,6 @@
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
-                        console.log(data);
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
                             if (item.state) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 813827b12..61b4a50d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -366,6 +366,7 @@
                         })
                         this.json = data
                         this.data = arr
+
                         this.oldData = data.oldinfo
                     }).catch(e => {
                     })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index c4cfc9b43..3907c404a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -6,42 +6,42 @@
         <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
           <el-form-item label="国家/地区" class="search-item search-item-last">
             <el-select
-              v-model="sarSarAccessEOSearch.countryArea"
-              placeholder="请选择"
-              filterable
+                v-model="sarSarAccessEOSearch.countryArea"
+                placeholder="请选择"
+                filterable
             >
               <el-option
-                v-for="item in countryOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
+                  v-for="item in countryOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
               >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="清单名称" class="search-item search-item-last">
             <el-input
-              v-model="sarSarAccessEOSearch.detailedListName"
-              placeholder="请输入清单名称"
+                v-model="sarSarAccessEOSearch.detailedListName"
+                placeholder="请输入清单名称"
             ></el-input>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              :loading="searching"
-              type="primary"
-              class="common-button-primary"
-              size="small"
-              v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-              @click="searchSarAccess">
+                :loading="searching"
+                type="primary"
+                class="common-button-primary"
+                size="small"
+                v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                @click="searchSarAccess">
               查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              class="common-button-default"
-              size="small"
-              v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-              @click="clearSearch">清空
+                class="common-button-default"
+                size="small"
+                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                @click="clearSearch">清空
             </el-button>
           </el-form-item>
         </el-form>
@@ -49,58 +49,59 @@
     </div>
     <div class="action-bar">
       <el-button
-        type="primary"
-        class="common-button-primary add-button"
-        size="mini"
-        @click="openModal(null,'addOpt')"
-        v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
+          type="primary"
+          class="common-button-primary add-button"
+          size="mini"
+          @click="openModal(null,'addOpt')"
+          v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
-        class="common-button-default delete-button"
-        :loading="delLoading"
-        size="mini"
-        @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
+          class="common-button-default delete-button"
+          :loading="delLoading"
+          size="mini"
+          @click="deleteSarAccess('demore',null)"
+          v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
-        :data="sarAccessListDatas"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+          :data="sarAccessListDatas"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          height="100%"
+          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectOne"
-        ref="selection"
+          @selection-change="selectOne"
+          ref="selection"
       >
         <el-table-column
-          type="selection"
-          width="55"
-          align="center">
+            type="selection"
+            width="55"
+            align="center">
         </el-table-column>
         <el-table-column
-          prop="countryArea"
-          label="国家/地区"
-          align="center">
+            prop="countryAreaShow"
+            label="国家/地区"
+            align="center">
         </el-table-column>
         <el-table-column
-          prop="detailedListName"
-          label="清单名称"
-          align="center"
-          width="260px"
+            prop="detailedListName"
+            label="清单名称"
+            align="center"
+            width="260px"
         >
           <template slot-scope="scope">
             <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="detailedListState"
-          label="清单状态"
-          align="center">
+            prop="detailedListState"
+            label="清单状态"
+            align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.detailedListState === '0'">未发布</span>
             <span v-if="scope.row.detailedListState === '1'">已发布</span>
@@ -108,27 +109,31 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="detailedListVision"
-          label="清单版本"
-          align="center">
+            prop="detailedListVision"
+            label="清单版本"
+            align="center">
           <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+                v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          prop="updateTime"
-          label="更新时间"
-          align="center">
+            prop="updateTime"
+            label="更新时间"
+            align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+            <div>{{
+                scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column
-          prop="updatePeople"
-          label="更新人"
-          align="center">
+            prop="updatePeople"
+            label="更新人"
+            align="center">
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -136,11 +141,14 @@
               <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="'b736f2469d49b3214cc8087419a24b60'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
+                    查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
+                    编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
+                    删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -189,14 +197,14 @@ export default {
       drawerTotal: 0, // 抽屉分页的总条数
       sarAccessEORules: {
         region: [
-          { required: true, message: "区域不能为空", trigger: "change" }
+          {required: true, message: "区域不能为空", trigger: "change"}
         ],
         country: [
-          { required: true, message: "国家不能为空", trigger: "change" }
+          {required: true, message: "国家不能为空", trigger: "change"}
         ],
         detailedListName: [
-          { required: true, message: "清单名称不能为空", trigger: "blur" },
-          { type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
+          {required: true, message: "清单名称不能为空", trigger: "blur"},
+          {type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
         ]
       },
       countryOptions: [],
@@ -215,11 +223,12 @@ export default {
         applyAuth: "" // 认证类型
       },
       dataSourceOptions: [
-        { value: "INLAND_STAND", label: "国内标准法规" },
-        { value: "FOREIGN_STAND", label: "海外标准法规" },
-        { value: "FOREIGN_LAWS", label: "国内外政策" },
-        { value: "BUSINESS", label: "企业标准 " }
+        {value: "INLAND_STAND", label: "国内标准法规"},
+        {value: "FOREIGN_STAND", label: "海外标准法规"},
+        {value: "FOREIGN_LAWS", label: "国内外政策"},
+        {value: "BUSINESS", label: "企业标准 "}
       ],
+      tableLoading: true,
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
@@ -258,7 +267,25 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records
+        let arr = res.data.records;
+        console.log('271', arr)
+        arr.forEach(item => {
+          // 国家地区转换
+          if (item.countryArea !== null || item.countryArea !== "") {
+            let k = (item.countryArea || "").split(',')
+            for (let i in this.countryOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.countryOptions[i].value === k[m]) {
+                  k[m] = this.countryOptions[i].label
+                }
+                item.countryAreaShow = k.join(',')
+              }
+            }
+          }
+        })
+        console.log('286',arr)
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
@@ -343,12 +370,15 @@ export default {
       });
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.countryAreaMap, item.value, item.label)
       })
     }
   },
+  created() {
+    this.searchSarAccess();
+  },
   mounted() {
     // 分页查询数据
     this.searchSarAccess();
@@ -380,6 +410,7 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
+
     .pagination {
       position: static;
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index b0af84fa9..2be49a492 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -57,6 +57,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -174,6 +175,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -277,6 +279,7 @@ export default {
         this.sarAccessListDatas = res.data.records;
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 50f1509bf..822bb4bd8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -67,6 +67,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -177,6 +178,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -292,6 +294,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
@@ -405,6 +408,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 08adba748..286380794 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.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>
@@ -80,7 +81,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item  label="标准名称" class="search-item">
+            <el-form-item label="标准名称" class="search-item">
               <el-input
                   v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
@@ -100,14 +101,17 @@
               <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" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
-              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -116,22 +120,22 @@
         </div>
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
+        <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
           <el-form-item label="标准号" class="labelBox">
             <el-input
-              style="width: 165px"
-              v-model="sarAccessInfo.standNumber"
-              placeholder="请输入"
-              size="small"
-              clearable/>
+                style="width: 165px"
+                v-model="sarAccessInfo.standNumber"
+                placeholder="请输入"
+                size="small"
+                clearable/>
           </el-form-item>
           <el-form-item label="标准名称" class="labelBox1">
             <el-input
-              style="width: 165px"
-              v-model="sarAccessInfo.standName"
-              placeholder="请输入"
-              size="small"
-              clearable/>
+                style="width: 165px"
+                v-model="sarAccessInfo.standName"
+                placeholder="请输入"
+                size="small"
+                clearable/>
           </el-form-item>
           <el-form-item>
             <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
@@ -141,18 +145,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
@@ -234,7 +241,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>
     <!--清单条目-->
@@ -245,13 +252,15 @@
             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-if="!disabledFlag"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <!--   清单条目的列表页   -->
       <el-table
@@ -277,7 +286,7 @@
             align="center"
             label="标准号">
           <template slot-scope="scope">
-            <a  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -287,134 +296,141 @@
             width="260px"
         >
           <template slot-scope="scope">
-            <a  @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="standEnName"
-          align="center"
-          width="180px"
-          label="英文名称">
+            prop="standEnName"
+            align="center"
+            width="180px"
+            label="英文名称">
           <template slot-scope="scope">
-            <a  @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="typeApplicable"
-          align="center"
-          width="180px"
-          label="适用车型">
+            prop="typeApplicable"
+            align="center"
+            width="180px"
+            label="适用车型">
         </el-table-column>
         <el-table-column
-          prop="nylx"
-          align="center"
-          width="180px"
-          label="能源类型">
+            prop="nylx"
+            align="center"
+            width="180px"
+            label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="ssrq"
-          sortable
-          align="center"
-          width="210px"
-          label="标准实施日期">
+            prop="ssrq"
+            sortable
+            align="center"
+            width="210px"
+            label="标准实施日期">
           <template slot-scope="scope">
             <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="zccssrqgj"
-          sortable
-          width="210px"
-          align="center"
-          label="在产车实施日期">
+            show-overflow-tooltip
+            prop="zccssrqgj"
+            sortable
+            width="210px"
+            align="center"
+            label="在产车实施日期">
           <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
-          prop="xcxssrqgj"
-          sortable
-          align="center"
-          width="210px"
-          label="新车型实施日期">
+            prop="xcxssrqgj"
+            sortable
+            align="center"
+            width="210px"
+            label="新车型实施日期">
           <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
-          show-overflow-tooltip
-          prop="zrbm"
-          width="210px"
-          align="center"
-          label="责任部门">
+            show-overflow-tooltip
+            prop="zrbm"
+            width="210px"
+            align="center"
+            label="责任部门">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="sycpx"
-          width="180px"
-          align="center"
-          label="适用产品线">
+            show-overflow-tooltip
+            prop="sycpx"
+            width="180px"
+            align="center"
+            label="适用产品线">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="cycvppsbm"
-          width="210px"
-          align="center"
-          label="乘用车VPPS编码">
+            show-overflow-tooltip
+            prop="cycvppsbm"
+            width="210px"
+            align="center"
+            label="乘用车VPPS编码">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="cycvppscn"
-          width="210px"
-          align="center"
-          label="乘用车VPPS中文名称">
+            show-overflow-tooltip
+            prop="cycvppscn"
+            width="210px"
+            align="center"
+            label="乘用车VPPS中文名称">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="kccvppsbm"
-          align="center"
-          width="210px"
-          label="卡车VPPS编码">
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            align="center"
+            width="210px"
+            label="卡车VPPS编码">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="kccvppscn"
-          align="center"
-          width="210px"
-          label="卡车VPPS中文名称">
+            show-overflow-tooltip
+            prop="kccvppscn"
+            align="center"
+            width="210px"
+            label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center"  fixed="right"  label="操作">
+        <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
-              class="common-button-default"
-              type="primary"
-              size="small" @click="moveUp(scope.$index, scope.row)"
-              v-if="!disabledFlag"
-            >上移</el-button>
+                class="common-button-default"
+                type="primary"
+                size="small" @click="moveUp(scope.$index, scope.row)"
+                v-if="!disabledFlag"
+            >上移
+            </el-button>
             <el-button
-              class="common-button-default"
-              type="danger"
-              size="small" @click="moveDown(scope.$index, scope.row)"
-              v-if="!disabledFlag"
-            >下移</el-button>
+                class="common-button-default"
+                type="danger"
+                size="small" @click="moveDown(scope.$index, scope.row)"
+                v-if="!disabledFlag"
+            >下移
+            </el-button>
             <el-button
-              size="small"
-              @click="editTghisRow(scope.row)"
-              class="common-button-default"
-              type="warning"
-            >编辑</el-button>
+                size="small"
+                @click="editTghisRow(scope.row)"
+                class="common-button-default"
+                type="warning"
+            >编辑
+            </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-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+      <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-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">
@@ -424,7 +440,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>
     <!--导入模态框-->
@@ -446,87 +463,89 @@
     </el-dialog>
 
     <el-drawer
-      title="编辑清单条目"
-      :visible.sync="drawerEdit"
-      :wrapperClosable="false"
-      size="800px"
-      >
+        title="编辑清单条目"
+        :visible.sync="drawerEdit"
+        :wrapperClosable="false"
+        size="800px"
+    >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
-          <el-form-item label="标准号">
-            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="标准名称" prop="standName">
-            <el-input v-model.trim="editRowData.standName" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="英文名称" prop="standEnName">
-            <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="适用车型" prop="typeApplicable">
-            <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="能源类型" prop="nylx">
-            <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="标准实施日期" prop="putTime">
-            <el-date-picker
+        <el-form-item label="标准号">
+          <el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
               v-model.trim="editRowData.ssrq"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="在产车实施日期" prop="zccssrqgj">
-            <el-date-picker
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="新车型实施日期" prop="xcxssrqgj">
-            <el-date-picker
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="责任部门" prop="zrbm">
-            <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="适用产品线" prop="sycpx">
-            <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-            <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-            <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-            <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-            <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-          </el-form-item>
-        </el-form>
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
       <div class="demo-drawer-footer">
-          <el-button
+        <el-button
             type="primary"
             class="common-button-primary"
             size="mini"
             icon="el-icon-check"
             @click="saveInfo"
-          >提交</el-button
-          >
-          <el-button
+        >提交
+        </el-button
+        >
+        <el-button
             size="mini"
             icon="el-icon-close"
             class="common-button-default"
             @click="cancelInfo"
-          >取消</el-button
-          >
-        </div>
+        >取消
+        </el-button
+        >
+      </div>
     </el-drawer>
   </div>
 </template>
@@ -545,14 +564,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 { dicTypeData, StandardsInfoPage } from '@/api/unqualProcess'
+import {mapGetters} from 'vuex'
+import {dicTypeData, StandardsInfoPage} from '@/api/unqualProcess'
 import {interfaceUrl} from "@/sysConfig";
+
 export default {
   name: 'ListOfStandardsAndRegulationsDetails',
   components: {
@@ -575,7 +595,7 @@ export default {
     CustomInputForPolicy,
     CustomRoleTree
   },
-  data () {
+  data() {
     return {
       textStatusMap: {},
       countryAreaMap: {},
@@ -589,7 +609,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
-        standSortShow:'',
+        standSortShow: '',
         standEnName: '',
         typeApplicable: '',
         nylx: '',
@@ -603,7 +623,7 @@ export default {
         kccvppsbm: '',
         kccvppscn: ''
       },
-      selectSearch : [],
+      selectSearch: [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -796,7 +816,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
-        standSortShow:'',
+        standSortShow: '',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -817,7 +837,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
-        standSortShow:'',
+        standSortShow: '',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -863,31 +883,31 @@ export default {
           // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'} gaoyan 2018-11-07 客户提到特殊符号校验问题
         ],
         lawsNumber: [
-          { required: true, message: '政策编号不能为空', trigger: 'change' },
-          { type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change' },
+          {required: true, message: '政策编号不能为空', trigger: 'change'},
+          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
           {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
         ],
         lawsName: [
-          { required: true, message: '中文名称不能为空', trigger: 'blur' },
-          { type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change' }
+          {required: true, message: '中文名称不能为空', trigger: 'blur'},
+          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         lawsEnName: [
-          { required: true, message: '英文名称不能为空', trigger: 'change' },
-          { type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change' }
+          {required: true, message: '英文名称不能为空', 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' },
-          { type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur' }
+          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
+          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}
         ],
         issueTime: [
-          { required: true, message: '发布日期不能为空', trigger: 'change' }
+          {required: true, message: '发布日期不能为空', trigger: 'change'}
         ]
       },
       formFieldListData: [], // 存储从接口取过来的原始数据
@@ -911,7 +931,7 @@ export default {
   },
   methods: {
     // 高级检索
-    selectMoreBtn () {
+    selectMoreBtn() {
       this.selectLawsStands()
       this.showSelectBox = !this.showSelectBox
       this.showTableFlag = false
@@ -924,7 +944,7 @@ export default {
       this.selectLawsStands()
     },
     // 法规维护人树
-    getDept () {
+    getDept() {
       return new Promise((resolve, reject) => {
         let url = 'sys/org/getTree'
         this.$http.get(url, {}, {
@@ -954,11 +974,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
@@ -977,20 +997,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 === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
+          || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
@@ -1003,23 +1023,23 @@ export default {
       }
       return true
     },
-    moreSearch () {
+    moreSearch() {
       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.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.sarAccessInfoSearch.standName = ''
@@ -1029,12 +1049,12 @@ export default {
       this.selectLawsStands()
     },
     // 数据来源change事件
-    dataSourceChange (val) {
+    dataSourceChange(val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
-      if (val === 'INLAND_STAND'){
-        this.twoOptions=[
+      if (val === 'INLAND_STAND') {
+        this.twoOptions = [
           {
             label: '适用车辆类型',
             value: 'CLLX',
@@ -1074,8 +1094,8 @@ export default {
           }
         ]
         // 海外标准法规可查字段
-      }else if (val === 'FOREIGN_STAND'){
-        this.twoOptions=[
+      } else if (val === 'FOREIGN_STAND') {
+        this.twoOptions = [
           {
             label: '适用车辆类型',
             value: 'CLLX',
@@ -1126,33 +1146,33 @@ export default {
      * 点击数据搜索 添加按钮事件
      * 判断是否添加重复数据
      */
-    addSarAccess () {
+    addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-              return items.id === item.id
-            })
-          if(addList > -1){
-              // this.$refs.accessTypeSelect.clearSelection()
-              this.$refs.entryTable.clearSelection()
-              this.$refs.searchTable.clearSelection()
+            return items.id === item.id
+          })
+          if (addList > -1) {
+            // this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
-            } else{
-              this.sarAccessInfoList.push(item)
-              // this.$refs.accessTypeSelect.clearSelection()
-              this.$refs.entryTable.clearSelection()
-              this.$refs.searchTable.clearSelection()
-            }
+          } else {
+            this.sarAccessInfoList.push(item)
+            // this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
+          }
         })
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }
     },
     // 上移 事件
-    moveUp (index, row) {
+    moveUp(index, row) {
       if (index === 0) {
         this.$message({
           message: '已经是列表中第一个素材！',
@@ -1164,7 +1184,7 @@ export default {
         this.$set(this.sarAccessInfoList, index, temp)
       }
     },
-    moveDown (index) {
+    moveDown(index) {
       if (index === (this.sarAccessInfoList.length - 1)) {
         this.$message({
           message: '已经是列表中最后一个素材！',
@@ -1193,21 +1213,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: '确定',
@@ -1229,26 +1249,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 = []
@@ -1257,21 +1278,21 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null)  {
+            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 {
-             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
-           }
-           if (this.sarAccessInfoList[i].zccssrqgj === null) {
-             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
-           }else {
-             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
-           }
+            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+            } else {
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
+            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+            } else {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
@@ -1296,51 +1317,42 @@ export default {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
-            this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
-              _this: this,
-              loading: 'loadData'
-            }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
+            if (this.sarAccessInfoList.length !== 0) {
+              this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+                _this: this,
+                loading: 'loadData'
+              }, res => {
                 if (res.ok) {
-                  if (res.data === "数据库为空，添加成功"){
+                  if (res.data === "数据库为空，添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
-                  }
-                  else if (res.data === "其他清单添加成功"){
+                  } else if (res.data === "车型类别清单添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
-                  }
-                  else if (res.data === "车型类别清单添加成功"){
-                    this.$message.success('新增成功')
-                    this.isNext = true
-                    this.$router.push({
-                      name: 'AccessStandardsAndRegulations'
-                    })
-                  }else if(res.data === "车型类别清单添加失败"){
+                  } else if (res.data === "车型类别清单添加失败") {
                     this.$message.error('已存在此车型类别清单，新增失败')
-                  }
-                  else if (res.data === "国家/地区清单添加成功"){
+                  } else if (res.data === "国家/地区清单添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
-                  }else if(res.data === "国家/地区清单添加失败"){
+                  } else if (res.data === "国家/地区清单添加失败") {
                     this.$message.error('已存在此国家/地区清单，新增失败')
                   }
-
                 }
-              } else {
-                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
-              }
-            }, e => {
-            })
+              }, e => {
+                console.log(e)
+              })
+            } else {
+              this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+            }
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1348,22 +1360,137 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                //this.$message.success('编辑成功')
-                this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此国家/地区清单，修改失败')
               }
             }, e => {
             })
           }
-        }else {
+        } else {
           this.$message.error('请检查表单是否填写正确')
         }
       })
     },
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //        if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //          rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //        }else {
+    //          rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //        }
+    //        if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //          rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //        }else {
+    //          rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //        }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               if (res.data === "数据库为空，添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }
+    //               else if (res.data === "其他清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }
+    //               else if (res.data === "车型类别清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else if(res.data === "车型类别清单添加失败"){
+    //                 this.$message.error('已存在此车型类别清单，新增失败')
+    //               }
+    //               else if (res.data === "国家/地区清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else if(res.data === "国家/地区清单添加失败"){
+    //                 this.$message.error('已存在此国家/地区清单，新增失败')
+    //               }
+    //
+    //             }
+    //           } else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             //this.$message.success('编辑成功')
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1383,7 +1510,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, 'sycpx', item.attrInfoMap.SYCPX)
@@ -1402,7 +1529,7 @@ export default {
       })
     },
     // 查询数据搜索 table 数据
-    selectLawsStands () {
+    selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1413,7 +1540,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) {
@@ -1433,7 +1560,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)
@@ -1461,11 +1588,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 => {
         if (item.attrInfoMap === null) {
@@ -1480,7 +1607,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)
@@ -1498,22 +1625,22 @@ 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++) {
-                if (this.zrbmOptions[i].value === k[m]) {
-                  k[m]  = this.zrbmOptions[i].label
-                }
-                item.zrbm = k.join(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m < k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m] = this.zrbmOptions[i].label
               }
+              item.zrbm = k.join(',')
             }
+          }
         }
         // 能源类型转换
         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
+                k[m] = this.categoryOptions[i].label
               }
               item.nylx = k.join(',')
             }
@@ -1523,9 +1650,9 @@ 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
+                k[m] = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -1535,9 +1662,9 @@ 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
+                k[m] = this.sycpxOptions[i].label
               }
               item.sycpx = k.join(',')
             }
@@ -1546,32 +1673,32 @@ export default {
       })
     },
     // 数据搜索 清单类型 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 exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
         exportList = this.sarAccessInfoListArry
@@ -1583,18 +1710,18 @@ 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)
         this.$message.success('导出信息成功')
       }
       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
@@ -1612,7 +1739,7 @@ export default {
       return true
     },
     // 导入成功事件
-    importFileSuccess (response, file, fileList) {
+    importFileSuccess(response, file, fileList) {
       var a
       var b = ''
       if (response.data) {
@@ -1659,7 +1786,7 @@ export default {
       }
     },
     // 点击清单条目 新增按钮 事件
-    addEntry () {
+    addEntry() {
       this.editAddType = 1
       this.addEditTitle = '新增'
       this.isDisabled = false
@@ -1672,13 +1799,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) {
@@ -1701,7 +1828,7 @@ export default {
           })
     },
     // 新增提交事件
-    saveOrUpdateStands () {
+    saveOrUpdateStands() {
       this.isSubmit = true
       this.$refs['addEntryForm'].validate((valid) => {
         if (valid) {
@@ -1755,7 +1882,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -1766,7 +1894,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, {
@@ -1783,7 +1911,7 @@ export default {
       })
     },
     // 表单清空
-    resetForm () {
+    resetForm() {
       this.isSubmit = false
       this.$refs['addEntryForm'].resetFields()
     },
@@ -1791,7 +1919,7 @@ export default {
      * 赋值内容到入库标准抽屉内
      * item  清单行数据
      */
-    copyStandDrawer (item) {
+    copyStandDrawer(item) {
       this.sarStandardsInfoEO.accessType = item.accessType
       this.sarStandardsInfoEO.standNumber = item.code // 标准编号
       this.sarStandardsInfoEO.standName = item.name // 中文名称
@@ -1830,13 +1958,13 @@ export default {
     /**
      * 获取新增弹框的表单
      */
-    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()
@@ -1846,7 +1974,7 @@ export default {
             })
       })
     },
-    resolveFormFieldList (isEdit) {
+    resolveFormFieldList(isEdit) {
       const data = this.formFieldListData
       this.formFieldList = data.map((item) => {
         // FO 法规
@@ -1873,7 +2001,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', {
@@ -1889,7 +2017,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (data) {
+    handlePreview(data) {
       let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
@@ -1901,7 +2029,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 请求上传的文件信息
-    getFileInfo () {
+    getFileInfo() {
       this.$http.get('att/attFile/getMultiFileInfos', {
         fileIds: this.$route.query.fileIds
       }, {
@@ -1922,7 +2050,7 @@ export default {
       })
     },
     // 获取工作组信息下拉框信息
-    getGzzOption () {
+    getGzzOption() {
       this.$http.get('lawss/sarGroupMenu/queryGroup', '', {
         _this: this
       }, res => {
@@ -1939,7 +2067,7 @@ export default {
       })
     },
     // 新增、编辑标准时验证标准编号是否重复
-    validCode (rule, value, callback) {
+    validCode(rule, value, callback) {
       let find = 0
       this.sarAccessInfoList.map(item => {
         if (item.code === value) {
@@ -1954,7 +2082,7 @@ export default {
       callback()
     },
     // 新增、编辑项目评估角色change事件
-    roleListChange (val) {
+    roleListChange(val) {
       this.ROLELIST.map(item => {
         if (item.value === val) {
           this.addEntryForm.proEssessUser = item.label
@@ -1962,7 +2090,7 @@ export default {
       })
     },
     // 表格回显要求类型
-    getAskType (val) {
+    getAskType(val) {
       let askTypeName = ''
       this.accessSarTypeOptions.map(item => {
         if (item.value === val) {
@@ -1972,7 +2100,7 @@ export default {
       return askTypeName
     },
     // 表格回显监管类型
-    getAskNature (val) {
+    getAskNature(val) {
       if (!val) {
         val = ''
       }
@@ -1981,7 +2109,7 @@ export default {
       }).map(item => item.label)
       return askTypeName.join(',')
     },
-    onChecked () {
+    onChecked() {
       this.sarStandardsInfoEO.FO = ''
       this.sarStandardsInfoEO.XMPGJS = ''
     },
@@ -2014,7 +2142,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, 'sycpx', item.attrInfoMap.SYCPX)
@@ -2031,7 +2159,7 @@ export default {
       })
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.countryAreaMap, item.value, item.label)
         this.$set(this.textStatusMap, item.value, item.label)
@@ -2044,7 +2172,7 @@ export default {
   },
   watch: {
     // 监听 清单类型
-    isListType (newVal, oldVal) {
+    isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
       this.selectedAccInfoSearchList = []
@@ -2054,8 +2182,8 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
-  mounted () {
-    this.zqaId =this.$route.query.id;
+  mounted() {
+    this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     // this.getData()
@@ -2121,43 +2249,50 @@ 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{
-      & > .left{
+
+  .basic-information {
+    & > .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;
       }
     }
   }
+
   .showSelectBox {
     padding: 10px;
   }
-  .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;
@@ -2168,32 +2303,39 @@ export default {
     text-align: right;
   }
 }
+
 .labelBox {
   /deep/ .el-form-item__label {
     padding-right: 5px;
     padding-left: 15px;
   }
 }
+
 .labelBox1 {
   /deep/ .el-form-item__label {
     padding-right: 5px;
   }
 }
+
 .un-select {
   user-select: none;
 }
-::v-deep .el-drawer__header{
-  &>span:first-child{
-    outline: none!important;
+
+::v-deep .el-drawer__header {
+  & > 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;
   }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0dcf834b2..5013827b8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1264,27 +1264,38 @@ export default {
             })
             sarAccessEO.fileIds = relateFile.join(',')
           }
+
+
           if (!sarAccessEO.id) {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
-            this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
-              _this: this,
-              loading: 'loadData'
-            }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
+            if (this.sarAccessInfoList.length !== 0) {
+              this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+                _this: this,
+                loading: 'loadData'
+              }, res => {
                 if (res.ok) {
-                  this.$message.success('新增成功')
-                  this.isNext = true
-                  this.$router.push({
-                    name: 'AccessStandardsAndRegulations'
-                  })
+                  if (res.data === "数据库为空，添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "其他清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  }
                 }
-              }else {
-                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
-              }
-            }, e => {
-            })
+              }, e => {
+                console.log(e)
+              })
+            } else {
+              this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+            }
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1293,6 +1304,7 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
@@ -1305,6 +1317,92 @@ export default {
         }
       })
     },
+    // 提交按钮 事件
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //         }else {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               this.$message.success('新增成功')
+    //               this.isNext = true
+    //               this.$router.push({
+    //                 name: 'AccessStandardsAndRegulations'
+    //               })
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     pageInfo() {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index a3bfb7b8d..43f6c4d65 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -6,50 +6,51 @@
       <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>
             <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
               <el-select
-                v-model="sarAccessEO.carType"
-                placeholder="请选择"
-                filterable
-                size="small"
+                  v-model="sarAccessEO.carType"
+                  placeholder="请选择"
+                  filterable
+                  size="small"
               >
                 <el-option
-                  v-for="item in CycxOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
+                    v-for="item in CycxOptions"
+                    :value="item.value"
+                    :key="item.value"
+                    :label="item.label"
                 />
               </el-select>
             </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
-                v-model="sarAccessEO.remark"
-                type="textarea"
-                :disabled="disabledFlag"
-                clearable
-                resize="none"
-                :autosize="{ minRows: 4, maxRows: 8}"
-                placeholder="请输入"
+                  v-model="sarAccessEO.remark"
+                  type="textarea"
+                  :disabled="disabledFlag"
+                  clearable
+                  resize="none"
+                  :autosize="{ minRows: 4, maxRows: 8}"
+                  placeholder="请输入"
               ></el-input>
             </el-form-item>
             <br/><br/>
             <el-form-item label="附件" prop="relateFile" class="search-item">
               <el-upload
-                ref="relevantFile"
-                :action="uploadFileListPath"
-                show-file-list
-                :file-list="fileInfoList"
-                name="file"
-                accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                :on-remove="delFileInfo"
-                :on-success="uploadBackSuccess"
-                :before-upload="beforeUpload"
-                :on-preview="handleOnPreview"
+                  ref="relevantFile"
+                  :action="uploadFileListPath"
+                  show-file-list
+                  :file-list="fileInfoList"
+                  name="file"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                  :on-remove="delFileInfo"
+                  :on-success="uploadBackSuccess"
+                  :before-upload="beforeUpload"
+                  :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -69,35 +70,36 @@
             <el-form-item label="数据来源" class="search-item">
               <el-select v-model="sarAccessInfoSearch.dataSource" filterable @change="dataSourceChange">
                 <el-option
-                  v-for="item in dataSourceOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
+                    v-for="item in dataSourceOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="标准名称" class="search-item">
               <el-input
-                v-model="sarAccessInfoSearch.standName"
-                placeholder="请输入"
-                :maxlength="100"
+                  v-model="sarAccessInfoSearch.standName"
+                  placeholder="请输入"
+                  :maxlength="100"
               ></el-input>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                type="primary"
-                class="common-button-primary"
-                size="small"
-                @click="searchLawsStands">
+                  type="primary"
+                  class="common-button-primary"
+                  size="small"
+                  @click="searchLawsStands">
                 查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                class="common-button-default"
-                size="small"
-                @click="clearSearchLaws">清空</el-button>
+                  class="common-button-default"
+                  size="small"
+                  @click="clearSearchLaws">清空
+              </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
@@ -109,52 +111,52 @@
         </div>
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
+        <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
           <el-form-item label="标准号" class="labelBox">
             <el-input
-              style="width: 165px;"
-              v-model="sarAccessInfo.standNumber"
-              placeholder="请输入"
-              size="small"
-              clearable/>
+                style="width: 165px;"
+                v-model="sarAccessInfo.standNumber"
+                placeholder="请输入"
+                size="small"
+                clearable/>
           </el-form-item>
           <el-form-item label="标准名称" class="labelBox1">
             <el-input
-              style="width: 165px"
-              v-model="sarAccessInfo.standName"
-              placeholder="请输入"
-              size="small"
-              clearable/>
+                style="width: 165px"
+                v-model="sarAccessInfo.standName"
+                placeholder="请输入"
+                size="small"
+                clearable/>
           </el-form-item>
           <el-form-item label="适用车型" class="labelBox1">
             <el-select
-              v-model="sarAccessInfo.typeApplicable"
-              placeholder="请选择"
-              clearable
-              filterable
-              size="small"
+                v-model="sarAccessInfo.typeApplicable"
+                placeholder="请选择"
+                clearable
+                filterable
+                size="small"
             >
               <el-option
-                v-for="item in CycxOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
+                  v-for="item in CycxOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
               />
             </el-select>
           </el-form-item>
           <el-form-item label="适用认证" class="labelBox1">
             <el-select
-              v-model="sarAccessInfo.syrz"
-              placeholder="请选择"
-              clearable
-              filterable
-              size="small"
+                v-model="sarAccessInfo.syrz"
+                placeholder="请选择"
+                clearable
+                filterable
+                size="small"
             >
               <el-option
-                v-for="item in syrzOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
+                  v-for="item in syrzOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
               />
             </el-select>
           </el-form-item>
@@ -165,105 +167,108 @@
       </div>
       <div class="action-bar">
         <el-button
-          class="common-button-default"
-          size="mini" @click="addSarAccess">添加</el-button>
+            class="common-button-default"
+            size="mini" @click="addSarAccess">添加
+        </el-button>
         <el-button
-          class="common-button-default"
-          v-if="showTableFlag"
-          size="mini" @click="isShowTable"
-        >{{$t('m.showAddDataList')}}</el-button>
+            class="common-button-default"
+            v-if="showTableFlag"
+            size="mini" @click="isShowTable"
+        >{{ $t('m.showAddDataList') }}
+        </el-button>
         <el-button
-          class="common-button-default"
-          v-if="!showTableFlag"
-          size="mini"
-          @click="isShowTable"
-        >{{$t('m.hideAddDataList')}}</el-button>
+            class="common-button-default"
+            v-if="!showTableFlag"
+            size="mini"
+            @click="isShowTable"
+        >{{ $t('m.hideAddDataList') }}
+        </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
-          v-show="!isListType"
-          :data="sarAccessInfoSearchList"
-          style="width: 100%"
-          border
-          height="300px"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+            v-show="!isListType"
+            :data="sarAccessInfoSearchList"
+            style="width: 100%"
+            border
+            height="300px"
+            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="sarAccessInfoSearchSelect"
-          ref="searchTable"
+            @selection-change="sarAccessInfoSearchSelect"
+            ref="searchTable"
         >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-            :selectable="selectable"
+              type="selection"
+              width="55"
+              align="center"
+              :selectable="selectable"
           >
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            show-overflow-tooltip
-            fixed="left"
-            align="center"
-            width="180px"
-            label="标准号">
+              prop="standNumber"
+              show-overflow-tooltip
+              fixed="left"
+              align="center"
+              width="180px"
+              label="标准号">
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            label="标准名称"
+              prop="standName"
+              align="center"
+              label="标准名称"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
-            prop="typeApplicable"
-            align="center"
-            label="适用车型"
+              prop="typeApplicable"
+              align="center"
+              label="适用车型"
           >
           </el-table-column>
           <el-table-column
-            prop="syrz"
-            align="center"
-            label="适用认证"
+              prop="syrz"
+              align="center"
+              label="适用认证"
           >
           </el-table-column>
           <el-table-column
-            prop="issueTime"
-            sortable
-            align="center"
-            label="发布日期">
+              prop="issueTime"
+              sortable
+              align="center"
+              label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
-            sortable
-            align="center"
-            label="新车型实施日期">
+              prop="xcxssrqgj"
+              sortable
+              align="center"
+              label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="zccssrqgj"
-            sortable
-            align="center"
-            label="在产车实施日期">
+              show-overflow-tooltip
+              prop="zccssrqgj"
+              sortable
+              align="center"
+              label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="textStatus"
-            width="120px"
-            align="center"
-            label="文本状态">
+              show-overflow-tooltip
+              prop="textStatus"
+              width="120px"
+              align="center"
+              label="文本状态">
             <template slot-scope="scope">
               <span>{{ textStatusMap[scope.row.textStatus] }}</span>
             </template>
@@ -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>
     <!--清单条目-->
@@ -279,177 +284,186 @@
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
         <el-button
-          class="common-button-default export-button"
-          size="mini" @click="exportAccessInfo('apart')"
-          v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+            class="common-button-default export-button"
+            size="mini" @click="exportAccessInfo('apart')"
+            v-btn-permission="''"
+        ><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>
+            class="common-button-default delete-button"
+            size="mini" @click="deleteSelectSarAccessInfo"
+            v-btn-permission="''"
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <el-table
-        :data="sarAccessInfoList"
-        class="un-select"
-        style="width: 100%"
-        border
-        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="sarAccessInfoList"
+          class="un-select"
+          style="width: 100%"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}"
-        @selection-change="sarAccessInfoSelect"
-        ref="entryTable"
+          @selection-change="sarAccessInfoSelect"
+          ref="entryTable"
       >
         <el-table-column
-          type="selection"
-          width="55"
-          align="center">
+            type="selection"
+            width="55"
+            align="center">
         </el-table-column>
         <el-table-column
-          prop="standNumber"
-          show-overflow-tooltip
-          width="180px"
-          fixed="left"
-          align="center"
-          label="标准号">
+            prop="standNumber"
+            show-overflow-tooltip
+            width="180px"
+            fixed="left"
+            align="center"
+            label="标准号">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="standName"
-          label="标准名称"
-          align="center"
-          width="260px"
+            prop="standName"
+            label="标准名称"
+            align="center"
+            width="260px"
         >
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="standEnName"
-          align="center"
-          width="180px"
-          label="英文名称">
+            prop="standEnName"
+            align="center"
+            width="180px"
+            label="英文名称">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="typeApplicable"
-          align="center"
-          width="180px"
-          label="适用车型">
+            prop="typeApplicable"
+            align="center"
+            width="180px"
+            label="适用车型">
         </el-table-column>
         <el-table-column
-          prop="nylx"
-          align="center"
-          width="180px"
-          label="能源类型">
+            prop="nylx"
+            align="center"
+            width="180px"
+            label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="ssrq"
-          sortable
-          align="center"
-          width="210px"
-          label="标准实施日期">
+            prop="ssrq"
+            sortable
+            align="center"
+            width="210px"
+            label="标准实施日期">
           <template slot-scope="scope">
             <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="zccssrqgj"
-          sortable
-          width="210px"
-          align="center"
-          label="在产车实施日期">
+            show-overflow-tooltip
+            prop="zccssrqgj"
+            sortable
+            width="210px"
+            align="center"
+            label="在产车实施日期">
           <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
-          prop="xcxssrqgj"
-          sortable
-          align="center"
-          width="210px"
-          label="新车型实施日期">
+            prop="xcxssrqgj"
+            sortable
+            align="center"
+            width="210px"
+            label="新车型实施日期">
           <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
-          show-overflow-tooltip
-          prop="zrbm"
-          width="210px"
-          align="center"
-          label="责任部门">
+            show-overflow-tooltip
+            prop="zrbm"
+            width="210px"
+            align="center"
+            label="责任部门">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="sycpx"
-          width="180px"
-          align="center"
-          label="适用产品线">
+            show-overflow-tooltip
+            prop="sycpx"
+            width="180px"
+            align="center"
+            label="适用产品线">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="cycvppsbm"
-          width="210px"
-          align="center"
-          label="乘用车VPPS编码">
+            show-overflow-tooltip
+            prop="cycvppsbm"
+            width="210px"
+            align="center"
+            label="乘用车VPPS编码">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="cycvppscn"
-          width="210px"
-          align="center"
-          label="乘用车VPPS中文名称">
+            show-overflow-tooltip
+            prop="cycvppscn"
+            width="210px"
+            align="center"
+            label="乘用车VPPS中文名称">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="kccvppsbm"
-          align="center"
-          width="210px"
-          label="卡车VPPS编码">
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            align="center"
+            width="210px"
+            label="卡车VPPS编码">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="kccvppscn"
-          align="center"
-          width="210px"
-          label="卡车VPPS中文名称">
+            show-overflow-tooltip
+            prop="kccvppscn"
+            align="center"
+            width="210px"
+            label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
-              class="common-button-default"
-              type="primary"
-              size="small" @click="moveUp(scope.$index, scope.row)"
-              v-if="!disabledFlag"
-            >上移</el-button>
+                class="common-button-default"
+                type="primary"
+                size="small" @click="moveUp(scope.$index, scope.row)"
+                v-if="!disabledFlag"
+            >上移
+            </el-button>
             <el-button
-              class="common-button-default"
-              type="danger"
-              size="small" @click="moveDown(scope.$index, scope.row)"
-              v-if="!disabledFlag"
-            >下移</el-button>
+                class="common-button-default"
+                type="danger"
+                size="small" @click="moveDown(scope.$index, scope.row)"
+                v-if="!disabledFlag"
+            >下移
+            </el-button>
             <el-button
-              size="small"
-              @click="editTghisRow(scope.row)"
-              class="common-button-default"
-              type="warning"
-            >编辑</el-button>
+                size="small"
+                @click="editTghisRow(scope.row)"
+                class="common-button-default"
+                type="warning"
+            >编辑
+            </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-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+      <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-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,19 +473,20 @@
       </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>
     <!--导入模态框-->
     <el-dialog title="导入信息" :visible.sync="importmodalFlag" width="400px">
       <el-upload
-        drag
-        :action="importExcelUrl"
-        ref="importfile"
-        name="file"
-        accept=".xlsx"
-        :before-upload="handleFormatbeforeUpload"
-        :on-success="importFileSuccess"
+          drag
+          :action="importExcelUrl"
+          ref="importfile"
+          name="file"
+          accept=".xlsx"
+          :before-upload="handleFormatbeforeUpload"
+          :on-success="importFileSuccess"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -480,14 +495,14 @@
       </el-upload>
     </el-dialog>
     <el-drawer
-      title="编辑清单条目"
-      :visible.sync="drawerEdit"
-      :wrapperClosable="false"
-      size="800px"
+        title="编辑清单条目"
+        :visible.sync="drawerEdit"
+        :wrapperClosable="false"
+        size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
         <el-form-item label="标准号">
-          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+          <el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
         </el-form-item>
         <el-form-item label="标准名称" prop="standName">
           <el-input v-model.trim="editRowData.standName" :disabled="true"/>
@@ -503,26 +518,26 @@
         </el-form-item>
         <el-form-item label="标准实施日期" prop="ssrq">
           <el-date-picker
-            v-model.trim="editRowData.ssrq"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
+              v-model.trim="editRowData.ssrq"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
-            v-model.trim="editRowData.zccssrqgj"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
+              v-model.trim="editRowData.zccssrqgj"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
-            v-model.trim="editRowData.xcxssrqgj"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
+              v-model.trim="editRowData.xcxssrqgj"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="责任部门" prop="zrbm">
@@ -546,19 +561,21 @@
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
-          type="primary"
-          class="common-button-primary"
-          size="mini"
-          icon="el-icon-check"
-          @click="saveInfo"
-        >提交</el-button
+            type="primary"
+            class="common-button-primary"
+            size="mini"
+            icon="el-icon-check"
+            @click="saveInfo"
+        >提交
+        </el-button
         >
         <el-button
-          size="mini"
-          icon="el-icon-close"
-          class="common-button-default"
-          @click="cancelInfo"
-        >取消</el-button
+            size="mini"
+            icon="el-icon-close"
+            class="common-button-default"
+            @click="cancelInfo"
+        >取消
+        </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' },
-          { type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change' },
+          {required: true, message: '政策编号不能为空', trigger: 'change'},
+          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
           {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
         ],
         lawsName: [
-          { required: true, message: '中文名称不能为空', trigger: 'blur' },
-          { type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change' }
+          {required: true, message: '中文名称不能为空', trigger: 'blur'},
+          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         lawsEnName: [
-          { required: true, message: '英文名称不能为空', trigger: 'change' },
-          { type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change' }
+          {required: true, message: '英文名称不能为空', 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' },
-          { type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur' }
+          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
+          {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 === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
+          || 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,21 +1091,21 @@ export default {
      * 点击数据搜索 添加按钮事件
      * 判断是否添加重复数据
      */
-    addSarAccess () {
+    addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-              return items.id === item.id
-            })
-          if(addList > -1){
+            return items.id === item.id
+          })
+          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 = []
@@ -1207,19 +1226,19 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null)  {
+            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())
             }
           }
@@ -1246,27 +1265,42 @@ export default {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
-            this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
-              _this: this,
-              loading: 'loadData'
-            }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
+            if (this.sarAccessInfoList.length !== 0) {
+              this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+                _this: this,
+                loading: 'loadData'
+              }, res => {
                 if (res.ok) {
-                  if (res.data === "车型类别清单添加成功") {
+                  if (res.data === "数据库为空，添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
-                  }else{
+                  } else if (res.data === "车型类别清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "车型类别清单添加失败") {
                     this.$message.error('已存在此车型类别清单，新增失败')
+                  } else if (res.data === "国家/地区清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "国家/地区清单添加失败") {
+                    this.$message.error('已存在此国家/地区清单，新增失败')
                   }
                 }
-              }else {
-                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
-              }
-            }, e => {
-            })
+              }, e => {
+                console.log(e)
+              })
+            } else {
+              this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+            }
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1275,18 +1309,110 @@ 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('请检查表单是否填写正确')
         }
       })
     },
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //         }else {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               if (res.data === "车型类别清单添加成功") {
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else{
+    //                 this.$message.error('已存在此车型类别清单，新增失败')
+    //               }
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     // 字段转化
     changeText(val) {
       val.forEach(item => {
@@ -1294,9 +1420,9 @@ 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
+                k[m] = this.zrbmOptions[i].label
               }
               item.zrbm = k.join(',')
             }
@@ -1306,9 +1432,9 @@ 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
+                k[m] = this.categoryOptions[i].label
               }
               item.nylx = k.join(',')
             }
@@ -1318,9 +1444,9 @@ 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
+                k[m] = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -1330,9 +1456,9 @@ 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
+                k[m] = this.sycpxOptions[i].label
               }
               item.sycpx = k.join(',')
             }
@@ -1342,9 +1468,9 @@ 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
+                k[m] = this.syrzOptions[i].label
               }
               item.syrz = k.join(',')
             }
@@ -1367,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)
@@ -1384,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) {
@@ -1400,7 +1526,7 @@ export default {
       })
     },
     //  查询按钮
-    selectLawsStands () {
+    selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1411,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) {
@@ -1437,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)
@@ -1449,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) {
@@ -1487,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('导出信息成功')
@@ -1497,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
@@ -1519,7 +1645,7 @@ export default {
       return true
     },
     // 导入成功事件
-    importFileSuccess (response, file, fileList) {
+    importFileSuccess(response, file, fileList) {
       var a
       var b = ''
       if (response.data) {
@@ -1566,7 +1692,7 @@ export default {
       }
     },
     // 点击清单条目 新增按钮 事件
-    addEntry () {
+    addEntry() {
       this.editAddType = 1
       this.addEditTitle = '新增'
       this.isDisabled = false
@@ -1579,36 +1705,36 @@ 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) {
-            let treeNode = []
-            res.data.map((item, index) => {
-              let treeItem = {}
-              for (let key in item) {
-                if (key === 'orgName') {
-                  treeItem.name = item[key]
-                } else {
-                  treeItem[key] = item[key]
+          res => {
+            if (res.ok) {
+              let treeNode = []
+              res.data.map((item, index) => {
+                let treeItem = {}
+                for (let key in item) {
+                  if (key === 'orgName') {
+                    treeItem.name = item[key]
+                  } else {
+                    treeItem[key] = item[key]
+                  }
                 }
-              }
-              treeNode[index] = treeItem
-            })
-            this.depNode = treeNode
-            this.depFONode = treeNode
-            this.depRoleNode = treeNode
-          }
-        })
+                treeNode[index] = treeItem
+              })
+              this.depNode = treeNode
+              this.depFONode = treeNode
+              this.depRoleNode = treeNode
+            }
+          })
     },
     // 新增提交事件
-    saveOrUpdateStands () {
+    saveOrUpdateStands() {
       this.isSubmit = true
       this.$refs['addEntryForm'].validate((valid) => {
         if (valid) {
@@ -1662,7 +1788,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -1673,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, {
@@ -1690,30 +1817,30 @@ 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
-              this.formFieldListData = data[ruKu] || []
-              // this.resolveFormFieldList()
-              resolve()
-            }
-          }, e => {
-            reject(e)
-          })
+            res => {
+              if (res.ok) {
+                // const { data: { STAND: data } } = res
+                const {data = {}} = res
+                this.formFieldListData = data[ruKu] || []
+                // this.resolveFormFieldList()
+                resolve()
+              }
+            }, e => {
+              reject(e)
+            })
       })
     },
-    resolveFormFieldList (isEdit) {
+    resolveFormFieldList(isEdit) {
       const data = this.formFieldListData
       this.formFieldList = data.map((item) => {
         // FO 法规
@@ -1740,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', {
@@ -1756,7 +1883,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (data) {
+    handlePreview(data) {
       let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
@@ -1768,7 +1895,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 请求上传的文件信息
-    getFileInfo () {
+    getFileInfo() {
       this.$http.get('att/attFile/getMultiFileInfos', {
         fileIds: this.$route.query.fileIds
       }, {
@@ -1789,7 +1916,7 @@ export default {
       })
     },
     // 获取工作组信息下拉框信息
-    getGzzOption () {
+    getGzzOption() {
       this.$http.get('lawss/sarGroupMenu/queryGroup', '', {
         _this: this
       }, res => {
@@ -1806,7 +1933,7 @@ export default {
       })
     },
     // 新增、编辑标准时验证标准编号是否重复
-    validCode (rule, value, callback) {
+    validCode(rule, value, callback) {
       let find = 0
       this.sarAccessInfoList.map(item => {
         if (item.code === value) {
@@ -1821,7 +1948,7 @@ export default {
       callback()
     },
     // 新增、编辑项目评估角色change事件
-    roleListChange (val) {
+    roleListChange(val) {
       this.ROLELIST.map(item => {
         if (item.value === val) {
           this.addEntryForm.proEssessUser = item.label
@@ -1829,7 +1956,7 @@ export default {
       })
     },
     // 表格回显要求类型
-    getAskType (val) {
+    getAskType(val) {
       let askTypeName = ''
       this.accessSarTypeOptions.map(item => {
         if (item.value === val) {
@@ -1839,7 +1966,7 @@ export default {
       return askTypeName
     },
     // 表格回显监管类型
-    getAskNature (val) {
+    getAskNature(val) {
       if (!val) {
         val = ''
       }
@@ -1849,7 +1976,7 @@ export default {
 
       return askTypeName.join(',')
     },
-    onChecked () {
+    onChecked() {
       this.sarStandardsInfoEO.FO = ''
       this.sarStandardsInfoEO.XMPGJS = ''
     },
@@ -1880,7 +2007,7 @@ export default {
       })
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
@@ -1895,7 +2022,7 @@ export default {
   },
   watch: {
     // 监听 清单类型
-    isListType (newVal, oldVal) {
+    isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
       this.drawerTotal = 0
@@ -1906,8 +2033,8 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
-  mounted () {
-    this.zqaId =this.$route.query.id;
+  mounted() {
+    this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     //this.getData()
@@ -1947,7 +2074,7 @@ export default {
         //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
         // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
-        this.sarAccessEO.projectName = accessRow.projectName
+        this.sarAccessEO.carType = accessRow.carType
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
@@ -1973,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{
-      & > .left{
+
+  .basic-information {
+    & > .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;
@@ -2017,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{
-    outline: none!important;
+
+::v-deep .el-drawer__header {
+  & > 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;
   }
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d7bcc80e6..63534935d 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/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)">
@@ -180,22 +179,25 @@
                   <el-input v-model="sarBussionessSearch.numberName" clearable placeholder="根据标准号/名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
-                  <el-button
-                    :loading="searching"
-                    icon="el-icon-search"
-                    type="primary"
-                    class="common-button-primary"
-                    round
-                    @click="getBussionStandTableBtn(sarBussionessSearch)"
-                    :title="goSearch">
-                  </el-button>
-                  <el-button
-                    class="common-button-default"
-                    icon="el-icon-refresh-left"
-                    round
-                    @click="clearAllSearch('sarBussionessSearch')"
-                  ></el-button>
-<!--                  <el-button type="primary" class="common-button-primary" round  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>-->
+                    <el-button
+                            :loading="searching"
+                            type="primary"
+                            size="mini"
+                            class="common-button-primary"
+                            v-btn-permission=""
+                            @click="getBussionStandTableBtn(sarBussionessSearch)">
+                        查询
+                    </el-button>
+                    <el-button
+                            size="mini"
+                            class="common-button-default"
+                            v-btn-permission=""
+                            @click="clearAllSearch('sarBussionessSearch')">清空
+                    </el-button>
+                    <el-button size="mini" type="primary" class="common-button-primary"
+                               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="发布日期"
@@ -345,41 +335,13 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="主起草人"
-            width="100"
-          >
-            <template slot-scope="scope">
-              {{ getQCRName(scope.row) }}
-            </template>
+                    show-overflow-tooltip
+                    sortable
+                    prop="standStatusShow"
+                    label="文本状态"
+                    width="110"
+            >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="attrInfoMap.ZRBMName"
-            label="起草部门">
-          </el-table-column>
-
-          <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,93 +393,92 @@
             :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>-->
-<!--                <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"
-              label-width="150px"
-              class="add-form-item form-item-disabled"
-            >
-              <el-input
-                v-model="sarBussionessStandEO.standCode"
-                :maxlength="100"
-                placeholder="请输入企标编号"
-                clearable
-                readonly
-                disabled
-              ></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="请输入标准名称"
-                        clearable></el-input>
-            </el-form-item>
-            <el-form-item label="英文名称" prop="standEnName" label-width="150px" class="add-form-item">
-              <el-input v-model="sarBussionessStandEO.standEnName"
-                        placeholder="请输入标准英文名称"
-                        clearable></el-input>
-            </el-form-item>
-            <el-form-item title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" prop="standStatus" label-width="150px" class="add-form-item">
-              <template slot="label">标准状态<i class="el-icon-warning-outline"></i></template>
-              <el-select
-                v-model="sarBussionessStandEO.standStatus"
-                placeholder="请选择标准状态"
-                clearable>
-                <el-option
-                  v-for="opt in standStateOptions"
-                  :key="opt.value"
-                  :value="opt.value === undefined ? '' :opt.value"
-                  :label="opt.label"
-                  :disabled="opt.value !== 'AY9L9FMSEW' && opt.value !== standStatus"
-                >
-                  {{ opt.label }}
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="发布日期" prop="issueTime" label-width="150px" class="add-form-item">
-              <el-datePicker v-model="sarBussionessStandEO.issueTime"
-                             :editable="false"
-                             placeholder="请选择发布日期"></el-datePicker>
-            </el-form-item>
-            <el-form-item label="标准实施日期" prop="putTime" label-width="150px" class="add-form-item">
-              <el-datePicker v-model="sarBussionessStandEO.putTime"
-                             :editable="false"
-                             placeholder="请选择实施日期"
-                             clearable
-              ></el-datePicker>
-            </el-form-item>
-            <custom-input-for-standards
-              :config="{
-                attrName: '代替企标编号',
-                attrField: 'replaceStandNum',
-              }"
-              v-model="sarBussionessStandEO.replaceStandNum"
-              :disabled="formdisableflag"
-            ></custom-input-for-standards>
+
 <!--            <custom-input-for-standards-->
 <!--              :config="{-->
-<!--                attrName: '被代替企标编号',-->
-<!--                attrField: 'replacedStandNum',-->
+<!--                attrName: '代替企标编号',-->
+<!--                attrField: 'replaceStandNum',-->
 <!--              }"-->
-<!--              v-model="sarBussionessStandEO.replacedStandNum"-->
+<!--              v-model="sarBussionessStandEO.replaceStandNum"-->
 <!--              :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 :span="24" :key="index">
+                  <div class="divider-line">{{ displayLocation.label }}</div>
               </el-col>
-              <template v-for="field in displayLocation.child">
+                <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"
+                            label-width="150px"
+                            class="add-form-item form-item-disabled"
+                    >
+                        <el-input
+                                v-model="sarBussionessStandEO.standCode"
+                                :maxlength="100"
+                                placeholder="请输入企标编号"
+                                clearable
+                                readonly
+                                disabled
+                        ></el-input>
+                    </el-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="请输入企标名称"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="企标英文名称" prop="standEnName" label-width="150px" class="add-form-item">
+                        <el-input v-model="sarBussionessStandEO.standEnName"
+                                  placeholder="请输入企标英文名称"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
+                                  prop="textStatus" label-width="150px" class="add-form-item">
+                        <template slot="label">文本状态</template>
+                        <el-select v-model="sarBussionessStandEO.textStatusBuss"
+                                   placeholder="请选择文本状态"
+                                   clearable>
+                            <el-option
+                                    v-for="opt in standStateOptions"
+                                    :key="opt.value"
+                                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                            >
+                                {{ opt.label }}
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="发布日期" prop="issueTime" label-width="150px" class="add-form-item">
+                        <el-datePicker v-model="sarBussionessStandEO.issueTime"
+                                       :editable="false"
+                                       placeholder="请选择发布日期"></el-datePicker>
+                    </el-form-item>
+                    <el-form-item label="标准实施日期" prop="putTime" label-width="150px" class="add-form-item">
+                        <el-datePicker v-model="sarBussionessStandEO.putTime"
+                                       :editable="false"
+                                       placeholder="请选择实施日期"
+                                       clearable
+                        ></el-datePicker>
+                    </el-form-item>
+                </template>
+                <template v-for="field in displayLocation.child">
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
                     :key="field.attrField"
@@ -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,18 +496,79 @@
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>
                   </template>
-                  <template v-else>
+                  <template v-else-if="field.attrField === 'FSRQBUSS'">
                     <custom-input
                       :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
-                      :disabled="formdisableflag"
+                      :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"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="formdisableflag"
+                        ></custom-input>
+                    </template>
                 </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]"
@@ -559,7 +581,6 @@
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
-                    :allowType="field.attrField === 'QBWB' ? ['.doc', '.docx','.ppt'] : field.attrField === 'GCWB' ? ['.jpg', '.png', '.jpeg', '.gif', '.xls', '.xlsx', '.ppt','.pdf','.doc','.docx'] : []"
                   ></custom-file>
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -850,13 +871,13 @@
       </el-dialog>
     </div>
     <!--高级查询-->
-    <AdvancedQuery
-      :isAdvancedSearch.sync="isAdvancedSearch"
-      :twoOptions="twoOptions"
-      :threeOptions="threeOptions"
-      @twoSelectChange="twoSelectChange"
-      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"
-    ></AdvancedQuery>
+<!--    <AdvancedQuery-->
+<!--      :isAdvancedSearch.sync="isAdvancedSearch"-->
+<!--      :twoOptions="twoOptions"-->
+<!--      :threeOptions="threeOptions"-->
+<!--      @twoSelectChange="twoSelectChange"-->
+<!--      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"-->
+<!--    ></AdvancedQuery>-->
     <!--企标编号生成组件-->
     <GenerationNumber
       :is-show.sync="isShow"
@@ -942,6 +963,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 +998,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 +1014,9 @@ export default {
     CustomInputForStandards,
     customSelectArray,
     CustomOrg,
-    CustomSVPPS
+    CustomSVPPS,
+    TreeSelect,
+    TreeSelectNew
   },
   props: {
   },
@@ -979,6 +1026,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 +1128,6 @@ export default {
       formFieldListData: {},
       formFieldList: [],
       allSelectOptions: {},
-      countryOptions: [],
       configPage: 1,
       configPageNow: 1,
       loading: false,
@@ -1110,12 +1164,16 @@ export default {
       // 组织机构
       bussionessStandNodes: [],
       sarBussionessStandEO: {
+        TXLBBUSS:'',
+        VPPSBMBUSS:'',
+        VPPSCNBUSS:'',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
         issueUnit: '', // 发布部门
         assemClass: '',
         id: '',
         standType: 'INLAND', // 标准分类
+        textStatusBuss:'',
         country: 'CN',
         standSort: '',
         applyArctic: '',
@@ -1344,10 +1402,7 @@ export default {
         certPutTimeList: []
       }, // 标准新增过程中用到的对象
       energyKindOptions: [], // 能源种类下拉框
-      applyAuthOptions: [], // 适用认证下拉框
       applyCountryOptions: [], // 国家/地区下拉框
-      regionOptions: [], // 国家/地区下拉框
-      applyArcticOptions: [], // 适用车型下拉框
       formdisableflag: false,
       defaultAddFormFieldRules: {
         // standSort: [
@@ -1446,10 +1501,8 @@ export default {
       exportName: '',
       countRootId: 0,
       parentNode: [],
-      searching: false,
       deleteMenuModal: false,
       goSearch: '',
-      tableFlag: '',
       SarExportSearchEo: {},
       sarBussionessSearch: {
         orgName: '', // 部门名称
@@ -1502,13 +1555,53 @@ export default {
         standSort: '',
         replaceStandNum: ''
       }, // 分页查询过程中用到的对象
-      standSortOptions: [], // 企标类别下拉框
       standGeneraOptions: [], // 企标大类下拉框
       standSubclassOptions: [], // 企标细类下拉框-所有数据
       standSubclassSelectOptions: [], // 企业细类下拉框-选中大类后 所有数据
-      standStateOptions: [], // 标准状态下拉框
-      standNatureOptions: [], // 标准性质下拉框
       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: [], // 标准性质下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        applyAuthOptions: [], // 适用认证下拉框
+        categoryOptions: [], // 所属类别下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        cysdOptions:[], //我司参与深度下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
       addOrUPdateFlag: 1, // 新增：1， 修改：2
       modalshowflag: false,
@@ -1556,10 +1649,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,88 +2305,88 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
-      const mj = item.attrInfoMap.QBMJ
-      if (mj === 'GXNX7D6H59') {
-        // 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: {
-      //     id: item.id,
-      //     pageType: 'BUSINESS_STAND'
+      // const mj = item.attrInfoMap.QBMJ
+      // if (mj === 'GXNX7D6H59') {
+      //   // 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
       //   }
-      // })
-      // window.open(routeUrl.href, '_blank')
+      //   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 +2424,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,7 +3598,16 @@ 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: {
     // 是否拥有拖拽权限
@@ -3475,14 +3637,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 => {
     })
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 879ff25bd..0c1c556e0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -713,6 +713,8 @@ export default {
            this.dataList.push(item)
          }
        })
+       this.detailedListModel = false
+       this.standModel = false
      }else{
        this.$message.warning('请至少选择一条数据进行添加')
      }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 612bd54e5..9198a2f34 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -214,11 +214,7 @@
         </div>
       </div>
       <div class="footer">
-        <pagination
-          :page="pageNo"
-          :total="total"
-          @pageChange="pageChange"
-          @pageSizeChange="pageSizeChange"></pagination>
+        <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 864bd9717..c6b2707c8 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -60,6 +60,24 @@
                         align="center"
                         label="修改意见内容(包括理由或依据)"
                 >
+                    <el-table-column
+                            prop="oldText"
+                            align="center"
+                            label="修改前"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="newText"
+                            align="center"
+                            label="修改后"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="reason"
+                            align="center"
+                            label="修改理由"
+                    >
+                    </el-table-column>
                 </el-table-column>
                 <el-table-column
                         prop="deptName"
@@ -104,12 +122,18 @@
         >
             <div class="demo-drawer-content add-demo">
                 <div class="search-area">
-                    <el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
-                        <el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item">
+                    <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                        <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
                             <el-input  v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
                         </el-form-item>
-                        <el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item">
-                            <el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
+                        <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
+                            <el-input  v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+                            <el-input  v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+                            <el-input  v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -139,18 +163,27 @@
                 isSubmit: false,
                 opinionContent: { // 抽屉数据
                     partCode: '',
-                    content: '',
+                    oldText: '',
+                    newText: '',
+                    reason: ''
                 },
                 opinionContentRules: {
                     partCode: [
                         { required: true, message: '请输入章节编号', trigger: 'blur' },
                     ],
-                    content: [
-                        { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' }
+                    oldText: [
+                        { required: true, message: '请输入修改前内容', trigger: 'blur' }
+                    ],
+                    newText: [
+                        { required: true, message: '请输入修改后内容', trigger: 'blur' }
+                    ],
+                    reason: [
+                        { required: true, message: '请输入修改理由', trigger: 'blur' }
                     ],
                 },
                 standinfoList: [], // 详情列表
                 form: {
+                    ideaId: this.$route.query.item.id,
                     cid: this.$route.query.item.cid,
                     page: 1,
                     size: this.$store.getters.userInfo.configContent,
@@ -231,12 +264,16 @@
                     this.id = row.id
                     this.opiniontitle = '编辑意见内容'
                     this.opinionContent.partCode = row.partCode
-                    this.opinionContent.content = row.content
+                    this.opinionContent.reason = row.reason
+                    this.opinionContent.oldText = row.oldText
+                    this.opinionContent.newText = row.newText
                 } else {
                     this.id = ''
                     this.opiniontitle = '新增意见'
                     this.opinionContent.partCode = ''
-                    this.opinionContent.content = ''
+                    this.opinionContent.reason = ''
+                    this.opinionContent.oldText = ''
+                    this.opinionContent.newText = ''
                 }
                 this.isDialog = true
             },
@@ -273,8 +310,12 @@
                     if (valid) {
                         var url = ''
                         var form = {
+                            ideaId: this.$route.query.item.id,
                             cid: this.$route.query.item.cid,
                             content: this.opinionContent.content,
+                            oldText: this.opinionContent.oldText,
+                            newText: this.opinionContent.newText,
+                            reason: this.opinionContent.reason,
                             partCode: this.opinionContent.partCode,
                             userId: this.$store.getters.userInfo.userId || '',
                             userName: this.$store.getters.userInfo.userName || '',
diff --git a/src/router/index.js b/src/router/index.js
index 010ac773b..c01c0ef07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1288,7 +1288,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '企业标准库',
-          menuId: '3YVZP8R4TC',
+          menuId: '7feeb73929c25a6f1fd67952704ec02b',
           parentPath: '/enterpriseStandardDatabase'
         }
       },
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index efe1b4c11..d3cd25a02 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '10.96.10.171'
-// const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = '10.96.10.171'
 const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
+// const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'