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

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

@@ -538,6 +538,7 @@ export default {
       })
     },
     closeDialog() {
+      this.treeData2 = []
       this.modalshowflag = false
     },
     confirmDialog() {
@@ -548,6 +549,7 @@ export default {
         if (res.ok) {
           this.$message.success('设置权限成功')
           this.modalshowflag = false
+          this.treeData2 = []
         }
       })
     },

src/pages/details/otherBussStandardDetails/index.vue

@@ -6,8 +6,8 @@
       <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
     </div>
     <!--主体内容-->
-    <div class="details-content">
+    <div class="details-content" style="position: relative">
-      <div class="details-content-modular basic-information">
+      <div class="details-content-modular basic-information" style="border-top: 2px dashed #D1D1D1;">
       </div>
       <div
         class="details-content-modular clearfix"
@@ -16,6 +16,16 @@
         v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
+               style="border-top:none;position: absolute;right: 36px;">
+              <div class="modular-header" style="height: 50px;">
+                <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()">更新记录</el-button>
+                </div>
+              </div>
+          </div>
           <el-collapse-item  :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <div class="modular-header" v-if="item.label !== '基础信息'">
@@ -25,11 +35,6 @@
                 <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>
             </template>
             <div class="modular-content">
@@ -74,7 +79,7 @@
                         <template v-if="!child.value && child.value.length === 0">-</template>
                       </p>
                     </template>
-                    <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+                    <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                     <p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                     <p class="half">
                       <label style=" margin-right: 156px;"
@@ -83,12 +88,28 @@
                     </p>
                     <p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
                     <p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+                    <template
+                            v-for="(child, childIndex) in item.child"
+                            v-if="child.isShowImp === '0'"
+                    >
+                      <p class="half">
+                        <label style=" margin-right: 157px;" :title="child.attrName">{{child.attrName}}</label>
+                        <span :title="child.value || '-'">
+                          <template v-if="child.value">
+                          {{ child.value }}
+                          </template>
+                          <template v-else>
+                            {{ '-' }}
+                          </template>
+                        </span>
+                      </p>
+                    </template>
                   </div>
                 </div>
               </template>
               <template
                       v-for="(child, childIndex) in item.child"
-                      v-if="child.isShowImp === '0'"
+                      v-if="child.isShowImp === '0' && item.label !== '基础信息'"
               >
                 <div
                         :key="childIndex"
@@ -1182,8 +1203,8 @@ export default {
     },
     handleChange1(val) {
       if(val && val === '基础信息'){
-        this.activeState = true;
+          this.activeState = true
-      }
+       }
     },
     getPlanStatusName(status) {
       switch (status) {
@@ -2470,8 +2491,6 @@ export default {
       }
     }
     .basic-information{
-      /*border-top: 2px dashed #D1D1D1;*/
-      border-bottom: 2px dashed #D1D1D1;
       .modular-header{
         height: 60px;
         border-bottom: none;

src/pages/details/otherLawsStandDetails/index.vue

@@ -6,8 +6,8 @@
       <span>{{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 企标详情</span>
     </div>
     <!--主体内容-->
-    <div class="details-content">
+    <div class="details-content" style="position: relative">
-      <div class="details-content-modular basic-information">
+      <div class="details-content-modular basic-information" style="border-top: 2px dashed #D1D1D1;">
       </div>
       <div
         class="details-content-modular clearfix"
@@ -15,141 +15,156 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header" v-if="item.label !== '基础信息'">
+        <el-collapse v-model="activeNames" @change="handleChange">
-          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
-        </div>
+               style="border-top:none;position: absolute;right: 36px;border: none">
-        <div class="modular-header" v-if="item.label === '基础信息'">
+            <div class="modular-header" style="height: 50px;">
-          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+              <div class="modular-header-btn">
-          <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
+                <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-          <!--              </div>-->
+                <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-          <div class="modular-header-btn">
+                <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+              </div>
-            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+            </div>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
           </div>
-        </div>
+          <el-collapse-item  :name="item.label" @click.native="handleChange1(item.label)">
-        <div class="modular-content">
+            <template slot="title">
-          <template v-if = "item.label === '基础信息'">
+              <div class="modular-header" v-if="item.label !== '基础信息'">
-            <div class="details-content-modular basic-information" style="margin-bottom: 0">
+                <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
-              <div class="basic-information-content">
+              </div>
-              <p style="color: #C42626;" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p>
+              <div class="modular-header" v-if="item.label === '基础信息'">
-              <p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p>
+                <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
-              <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p>
+                <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
-              <p style="border: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.lawsEnName || '-' }}</span></p>
+                <!--              </div>-->
-              <p class="half"><label style=" margin-right: 157px;">发文日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+              </div>
-              <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
+            </template>
-              <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
+            <div class="modular-content">
-              <p class="half"><label style=" margin-right: 120px;">征集意见周期</label><span>{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}</span></p>
+              <template v-if = "item.label === '基础信息'">
-              <p class="half">
+                <div class="details-content-modular basic-information" style="margin-bottom: 0;border: none">
-                <label style=" margin-right: 156px;"
+                  <div class="basic-information-content">
-                        title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
+                    <p style="color: #C42626;" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p>
-                >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+                    <p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p>
-              </p>
+                    <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p>
-                <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
+                    <p v-if="activeState" style=""><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.lawsEnName || '-' }}</span></p>
-                <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 157px;">发文日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-                <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
-                <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
-                <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 120px;">征集意见周期</label><span>{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}</span></p>
-                <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
+                    <p class="half">
-                <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
+                      <label style=" margin-right: 156px;"
-                <p class="half"><label style=" margin-right: 192px;">备注</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>
+                             title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                <p class="half"><label style=" margin-right: 192px;"></label><span></span></p>
+                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
-            </div>
+                    </p>
-            </div>
+                    <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
-          </template>
+                    <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
-          <template
+                    <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
-            v-for="(child, childIndex) in item.child"
+                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p>
-            v-if="child.isShowImp === '0'"
+                    <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
-          >
+                    <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
-            <div
+                    <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
-              :key="childIndex"
+                    <p class="half"><label style=" margin-right: 192px;">备注</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>
-              class="modular-item"
+                    <template v-for="(child, childIndex) in item.child2">
-              :class="halfClass(child, item.child[childIndex + 1], childIndex)"
+                      <p class="half">
-            >
+                        <label style=" margin-right: 156px;">{{child.attrName}}</label>
-              <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                        <span>{{ child.value || '-' }}</span>
-              <span
+                      </p>
-                v-if="child.attrField === 'ZYQCR'"
+                    </template>
-                class="modular-content-p-val clearfix"
+                  </div>
-                :title="child.value || '-'"
+                </div>
+              </template>
+              <template
+                      v-for="(child, childIndex) in item.child"
+                      v-if="child.isShowImp === '0'"
               >
+                <div
+                        :key="childIndex"
+                        :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
+                >
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <span
+                          v-if="child.attrField === 'ZYQCR'"
+                          class="modular-content-p-val clearfix"
+                          :title="child.value || '-'"
+                  >
                 <template v-if="child.value">
                   {{ child.value }}
                   <put-question-button
-                    style="float: right;"
+                          style="float: right;"
-                    :resId="sarStandardsInfoEO.id"
+                          :resId="sarStandardsInfoEO.id"
-                    :resType="saveStandType"
+                          :resType="saveStandType"
                   ></put-question-button>
                 </template>
                 <template v-else>
                   {{ '-' }}
                 </template>
               </span>
-              <!--规范性引用文件-->
+                  <!--规范性引用文件-->
-              <template v-else-if="child.attrField === 'GFXYYWJ' && child.value">
+                  <template v-else-if="child.attrField === 'GFXYYWJ' && child.value">
-                <p class="modular-content-p-val">
+                    <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
                   </span>
-                </p>
+                    </p>
-              </template>
+                  </template>
-              <!--相关流程-->
+                  <!--相关流程-->
-              <template v-else-if="child.attrField === 'XGLC' && child.value">
+                  <template v-else-if="child.attrField === 'XGLC' && child.value">
-                <p class="modular-content-p-val">
+                    <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
                   </span>
-                </p>
+                    </p>
-              </template>
+                  </template>
-              <!--相关计划-->
+                  <!--相关计划-->
-              <template v-else-if="child.attrField === 'XGJH' && child.value">
+                  <template v-else-if="child.attrField === 'XGJH' && child.value">
                 <span
-                    v-if="child.value.length === 0"
+                        v-if="child.value.length === 0"
-                    class="modular-content-p-val"
+                        class="modular-content-p-val"
-                    :title="'-'"
+                        :title="'-'"
                 >
                   {{ '-' }}
                 </span>
-                <p v-else class="modular-content-p-val">
+                    <p v-else class="modular-content-p-val">
                   <span v-for="(item, index) in child.value" :key="index">
                     <a @click="showXGJH(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">查看计划</a>
                   </span>
-                </p>
+                    </p>
-              </template>
+                  </template>
-              <span
+                  <span
-                  v-else-if="child.attrField === 'SVPPS'"
+                          v-else-if="child.attrField === 'SVPPS'"
-                  class="modular-content-p-val"
+                          class="modular-content-p-val"
-                  :title="child.tips || '-'"
+                          :title="child.tips || '-'"
-              >
+                  >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
               </span>
-              <span
+                  <span
-                v-else-if="child.attrType !== 'FILE'"
+                          v-else-if="child.attrType !== 'FILE'"
-                class="modular-content-p-val"
+                          class="modular-content-p-val"
-                :title="child.value || '-'"
+                          :title="child.value || '-'"
-              >
+                  >
                 {{ child.value || '-' }}
               </span>
-              <div v-else class="modular-content-p-flies">
+                  <div v-else class="modular-content-p-flies">
-                <p
+                    <p
-                  class="files-title"
+                            class="files-title"
-                  v-for="(file, fileIndex) in child.value"
+                            v-for="(file, fileIndex) in child.value"
-                  :key="fileIndex"
+                            :key="fileIndex"
-                >
+                    >
-                  <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                      <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
+                      <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
-                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
+                      <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
-                  <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
-                </p>
+                    </p>
-<!--                <el-button-->
+                    <!--                <el-button-->
-<!--                  @click="showItemsModel(child.attrField)"-->
+                    <!--                  @click="showItemsModel(child.attrField)"-->
-<!--                  class="decomposition-btn"-->
+                    <!--                  class="decomposition-btn"-->
-<!--                  icon="icon-separate"-->
+                    <!--                  icon="icon-separate"-->
-<!--                >标准分解单</el-button>-->
+                    <!--                >标准分解单</el-button>-->
-              </div>
+                  </div>
-            </div>
+                </div>
 
-          </template>
+              </template>
-        </div>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
       </div>
     </div>
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
@@ -886,13 +901,26 @@ export default {
   components: {
     PutQuestionButton
   },
+  filters: {
+    ellipsis (value) {
+      if (!value) return ''
+      if (value.length > 12) {
+        return value.slice(0,12) + '...'
+      }
+      return value
+    }
+  },
   data () {
     return {
+      activeNames: ['基础信息'],
+      activeState: false,
       visiblePlanCheck: false,
       form: {},
       relateDialog: false,
+      relateDialog1: false,
       relateList: [],
       relateNowList: [],
+      relateNowList1: [],
       sarType: sarType,
       loading: true,
       showItemInfoModal: false,
@@ -1091,6 +1119,14 @@ export default {
   watch: {
   },
   methods: {
+    handleChange(val) {
+      console.log(val)
+    },
+    handleChange1(val) {
+      if(val && val === '基础信息'){
+        this.activeState = true
+      }
+    },
     getPlanStatusName(status) {
       switch (status) {
         case "1":
@@ -2064,16 +2100,39 @@ export default {
         })
       })
       displayLocation.forEach(location => {
+
+        // 动态属性字段-SYRZ 单独添加至基础信息
+        const list2 = displayLocation.filter ( item => item.label === '适用范围');
+        if(location.label === '基础信息' && list2 && list2.length > 0){
+          if (!list2[0].child) {
+            location['child2'] = []
+          }else {
+            const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
+            location['child2'] = childList
+          }
+        }
+
         const child = location.child || []
         const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
         const fieldsIsTextAreaOrFile = child.filter(field => {
-          return !halfType.includes(field.attrType)
+          return field.attrField !== 'YYRZLAWS' && !halfType.includes(field.attrType)
         })
         const fieldOthers = child.filter(field => {
           return halfType.includes(field.attrType)
         })
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
       })
+
+      for (let i = 0; i < displayLocation.length; i++) {
+        //  sss
+        if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+          const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+          if(childList.length === 0){
+            displayLocation.splice(i,1)
+          }
+        }
+      }
+
       this.dynamicFormField = displayLocation
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
@@ -2097,6 +2156,62 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+/deep/ .el-collapse{
+  border: none;
+}
+
+/deep/ .el-collapse-item__wrap{
+  border: none;
+}
+/deep/ .decomposition-btn {
+  position: absolute;
+  top: 6px;
+  right: 0;
+  padding: 0 10px;
+  height: 30px;
+  line-height: 30px;
+  font-size: 14px;
+  color: #07C160;
+  border: 1px solid #07C160;
+  background: rgba(1, 193, 96, 0.1);
+
+  /deep/ .icon-separate {
+    display: inline-block;
+    margin-right: 3px;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center center;
+    vertical-align: sub;
+    background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+  }
+}
+/deep/ .icon-download {
+  display: inline-block;
+  margin-left: 3px;
+  width: 18px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center center;
+  vertical-align: sub;
+  cursor: pointer;
+  background-image: url("~assets/images/shangqi/img/download.png");
+}
+
+/deep/ .icon-download2 {
+  display: inline-block;
+  margin-left: 3px;
+  width: 18px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center center;
+  vertical-align: sub;
+  cursor: pointer;
+  background-image: url("~assets/images/shangqi/img/download2.png");
+}
 .other-standard-details{
   padding: 15px 30px 0;
   width: 1200px;
@@ -2120,6 +2235,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: space-between;
+        width: 100%;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
         .modular-header-title{
@@ -2134,7 +2250,8 @@ export default {
             background-size: 100% 100%;
             background-position: center center;
             background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
-            vertical-align: top;
+            position: relative;
+            top: 2px;
           }
           & > span{
             padding-left: 10px;
@@ -2201,8 +2318,8 @@ export default {
           .modular-content-p-name{
             display: inline-block;
             width: 220px;
-            height: 50px;
+            height: 43px;
-            line-height: 50px;
+            line-height: 43px;
             font-size: 16px;
             color: #333333;
             vertical-align: top;
@@ -2282,16 +2399,14 @@ export default {
       }
     }
     .basic-information{
-      /*border-top: 2px dashed #D1D1D1;*/
-      border-bottom: 2px dashed #D1D1D1;
       .modular-header{
         height: 60px;
         border-bottom: none;
       }
       .basic-information-content{
         & > p{
-          min-height: 55px;
+          min-height: 43px;
-          line-height: 55px;
+          line-height: 43px;
           border-bottom: 1px solid #E5E5E5;
         }
       }

src/pages/details/otherStandardDetails/index.vue

@@ -8,7 +8,7 @@
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
     </div>
     <!--主体内容-->
-    <div class="details-content">
+    <div class="details-content" style="position: relative">
       <div class="details-content-modular basic-information">
       </div>
       <div
@@ -18,25 +18,24 @@
               v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
+          style="border-top:none;position: absolute;right: 36px;">
+            <div class="modular-header" style="height: 50px;">
+              <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()">更新记录</el-button>
+                <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
+                <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
+              </div>
+            </div>
+          </div>
           <el-collapse-item  :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <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="details-content-modular basic-information" style="border-top:none">
-                  <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()">更新记录</el-button>
-                      <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
-                      <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
-                    </div>
-                  </div>
-                </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>
@@ -121,9 +120,8 @@
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
-                        <label style=" margin-right: 143px;">{{child.attrName}}</label><span>
+                        <label style=" margin-right: 143px;">{{child.attrName}}</label>
-                        {{ child.value || '-' }}
+                        <span>{{ child.value || '-' }}</span>
-                  </span>
                       </p>
                     </template>
                     <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
@@ -3145,7 +3143,7 @@
             if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
               half.push(field)
             } else {
-              if(field.attrField && field.attrField !== 'FBGBJBD'){
+              if(field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ'){
                 one.push(field)
               }
             }

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

@@ -1206,7 +1206,7 @@ export default {
           }
           else if(row.taskInfo === '责任人反馈情况'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep5-1',
+              name: 'zdrzbzORzchgxxmscStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -1230,7 +1230,7 @@ export default {
           }
           else if(row.taskInfo === '法规管理员审核'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep7-1',
+              name: 'zdrzbzORzchgxxmscStep7',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

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

@@ -402,7 +402,9 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                              <el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
+<!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
+                              <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
+ <!--         ************************************** 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                                 <el-input
                                     disabled
                                     style="display: none;"

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

@@ -347,7 +347,9 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                          <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
+                          <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                             <div v-if="jdwjFileMap.length>0" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
                               {{value.name}}
                             </div>

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

@@ -261,7 +261,9 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
+                <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                  <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                   <div v-if="form.jdwjName" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
                  {{value.name}}
                   </div>

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

@@ -647,7 +647,9 @@
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
+                <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
+                <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
+                  <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                   <el-input
                       disabled
                       style="display: none;"

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

@@ -254,7 +254,9 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                          <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
+                          <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                             <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                               {{ form.jdwjName }}
                             </div>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="zdrzbzORzchgxxmsc-step5-1">
+  <div class="zdrzbzORzchgxxmsc-step5">
     <ProcessHeader toggle>
       <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
       <template slot="proNode">责任人反馈{{ feedbackDept==='1'?'事业部':'产品规划部' }}情况</template>
@@ -297,7 +297,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
 import axios from "axios";
 
 export default {
-  name: "zdrzbzORzchgxxmscStep5-1",
+  name: "zdrzbzORzchgxxmscStep5",
   data() {
     return {
       //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -512,7 +512,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.zdrzbzORzchgxxmsc-step5-1 {
+.zdrzbzORzchgxxmsc-step5 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="zdrzbzORzchgxxmsc-step7-1">
+  <div class="zdrzbzORzchgxxmsc-step7">
     <ProcessHeader toggle>
       <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
       <template slot="proNode">法规管理员审核</template>
@@ -298,7 +298,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
 import axios from "axios";
 
 export default {
-  name: "zdrzbzORzchgxxmscStep7-1",
+  name: "zdrzbzORzchgxxmscStep7",
   data() {
     return {
       //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -499,7 +499,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.zdrzbzORzchgxxmsc-step7-1 {
+.zdrzbzORzchgxxmsc-step7 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -1029,7 +1029,7 @@ export default {
           }
           else if(row.taskInfo === '责任人反馈情况'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep5-1',
+              name: 'zdrzbzORzchgxxmscStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -1053,7 +1053,7 @@ export default {
           }
           else if(row.taskInfo === '法规管理员审核'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep7-1',
+              name: 'zdrzbzORzchgxxmscStep7',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -38,7 +38,7 @@ export default {
       other: false,
       library: false,
       list: [],
-      tabValue: "listOfCountries",
+      tabValue: "",
       menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"]
     };
   },
@@ -79,7 +79,22 @@ export default {
         }
       }
     });
-    this.list = list
+    if(this.country === true){
+      this.tabValue = "listOfCountries"
+      return;
+    }else if(this.project === true){
+      this.tabValue = "listProject"
+      return;
+    }else if(this.tracking === true){
+      this.tabValue = "listTracking"
+      return;
+    }else if(this.other === true){
+      this.tabValue = "listOther"
+      return;
+    }else if(this.library === true){
+      this.tabValue = "localProductsOrProjectLibrary"
+      return;
+    }
   },
   beforeRouteLeave(to, from, next) {
     const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"];

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

@@ -4,25 +4,22 @@
     <div class="search-area">
       <div class="left">
         <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" >
-          <el-form-item label="国家/地区" class="search-item search-item-last">
+          <el-form-item label="标准编号/政策编号:" class="search-item search-item-last">
-            <el-select
-              v-model="sarSarAccessEOSearch.country"
-              placeholder="请选择"
-              filterable
-            >
-              <el-option
-                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.ListName"
+                v-model="sarSarAccessEOSearch.lawId"
-              placeholder="请输入清单名称"
+                placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="标准名称/政策名称:" class="search-item search-item-last">
+            <el-input
+              v-model="sarSarAccessEOSearch.lawName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="产品类型:" class="search-item search-item-last">
+            <el-input
+                v-model="sarSarAccessEOSearch.productType"
+                placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item class="search-item btn-box">
@@ -49,15 +46,13 @@
         type="primary"
         class="common-button-primary add-button"
         size="mini"
-        @click="openModal(null,'addOpt')"
+        @click="showAddModel(1, null)"
-        v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
       ><i class="el-icon-plus"></i>新增</el-button>
       <el-button
         class="common-button-default delete-button"
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
       ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
     </div>
     <div class="container">
@@ -78,64 +73,42 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="countryArea"
+          prop="lawId"
-          label="国家/地区"
+          width="250"
+          label="标准编号/政策编号"
           align="center">
         </el-table-column>
         <el-table-column
-          prop="detailedListName"
+          prop="lawName"
-          label="清单名称"
+          label="标准名称/政策名称"
           align="center"
-          width="260px"
+          width="300px"
         >
         </el-table-column>
         <el-table-column
-          prop="detailedListState"
+          prop="productType"
-          label="清单状态"
+          label="产品类型"
           align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.state === '1'">未发布</span>
-            <span v-if="scope.row.state === '2'">已发布</span>
-          </template>
         </el-table-column>
         <el-table-column
-          prop="detailedListVesion"
+          prop="implTime"
-          label="清单版本"
-          align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">V{{ scope.row.detailedListVesion }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="applicationScope"
-          label="适用领域"
-          align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">V{{ scope.row.applicationScope }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updateTime"
-          label="更新时间"
           sortable
+          label="实施时间"
           align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '' }}</div>
-          </template>
         </el-table-column>
         <el-table-column
-          prop="updatePeople"
+          prop="implRequire"
-          label="更新人"
+          label="实施要求"
           align="center">
         </el-table-column>
-        <el-table-column label="操作" align="center" width="50" fixed="right">
+        <el-table-column label="操作" min-width="50" align="center">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <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="'HYY8NGY2RYT3VEDRSK5V'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -145,6 +118,155 @@
       <loading :loading="loading">数据获取中</loading>
       <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
     </div>
+    <!-- 编辑抽屉-->
+    <el-drawer
+        :title="attributeTitle"
+        :wrapperClosable="false"
+        :visible.sync="showInfoModal"
+        size="800px"
+        :styles="styles"
+        :close="cancelModel"
+    >
+      <div class="demo-drawer-content">
+        <el-form
+            ref="attributeEO"
+            :model="attributeEO"
+            :rules="attributeEOFormRules"
+            class="label-input-form"
+            label-width="130px"
+            v-if="showInfoModal"
+        >
+          <el-form-item
+              label="标准编号/政策编号"
+              prop="lawId"
+              class="add-form-item"
+          >
+            <el-input
+                style="width: 45%"
+                v-model.trim="attributeEO.lawId"
+                placeholder="请输入标准编号/政策编号"
+                clearable
+            />
+<!--            :disabled="this.addOrEdit !== 'add'"-->
+            <el-button type="primary" size="mini" @click="">手动查找</el-button>
+          </el-form-item>
+          <el-form-item
+              label="标准名称/政策名称"
+              prop="lawName"
+              class="add-form-item"
+          >
+            <el-input
+                v-model.trim="attributeEO.lawName"
+                placeholder="请输入标准名称/政策名称"
+                clearable
+            />
+          </el-form-item>
+          <el-form-item
+              label="产品类型"
+              prop="productType"
+              class="add-form-item"
+          >
+            <el-select
+                placeholder="请选择产品类型"
+                v-model="attributeEO.productType"
+                filterable
+            >
+              <el-option
+                  v-for="item in attrTypeOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+              label="实施时间"
+              prop="implTime"
+              class="add-form-item"
+          >
+            <el-date-picker
+                v-model="attributeEO.implTime"
+                type="date"
+                placeholder="请选择实施时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+              label="实施要求"
+              prop="implRequire"
+              class="add-form-item"
+          >
+            <el-select
+                placeholder="请选择实施要求"
+                v-model="attributeEO.implRequire"
+                filterable
+            >
+              <el-option
+                  v-for="item in attrTypeOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item-->
+<!--              label="是否关联其他类别"-->
+<!--              title="是否关联其他类别"-->
+<!--              prop="isRelate"-->
+<!--              class="add-form-item"-->
+<!--          >-->
+<!--            <el-select-->
+<!--                placeholder="请选择类别"-->
+<!--                v-model="attributeEO.isRelate"-->
+<!--                filterable-->
+<!--            >-->
+<!--              <el-option-->
+<!--                  v-for="item in isRelateOptions"-->
+<!--                  :value="item.value"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item-->
+<!--              label="关联类别"-->
+<!--              prop="relateDicId"-->
+<!--              v-if="attributeEO.isRelate === '0'"-->
+<!--              class="add-form-item"-->
+<!--          >-->
+<!--            <el-select-->
+<!--                v-model="attributeEO.relateDicId"-->
+<!--                placeholder="请选择类别"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                  v-for="opt in relateDicIdOptions"-->
+<!--                  :value="opt.value"-->
+<!--                  :key="opt.value"-->
+<!--                  :label="opt.label"-->
+<!--              >{{ opt.label }}</el-option-->
+<!--              >-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+        </el-form>
+      </div>
+      <div id="roleFormButton" class="demo-drawer-footer">
+        <el-button
+            type="primary"
+            class="common-button-primary"
+            size="mini"
+            :loading="submitLoading"
+            icon="el-icon-check"
+            @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+            size="mini"
+            icon="el-icon-close"
+            class="common-button-default"
+            @click="cancelModel"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -153,14 +275,54 @@ export default {
   name: "listTracking",
   data () {
     return {
+      submitLoading: false,
+      attrTypeOptions: [
+        { label: '下拉选项', value: 'SEL_OPTION' },
+        { label: '树形结构', value: 'TREE' }
+      ],
+      addOrEdit: '',
+      attributeEOFormRules: {
+        lawId: [
+          { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' },
+        ],
+        lawName: [
+          { required: true, message: '标准名称/政策名称不能为空', trigger: 'blur' },
+        ],
+        productType: [
+          { required: true, message: '产品类型不能为空', trigger: 'change' }
+        ],
+        implTime: [
+          { required: true, message: '实施日期不能为空', trigger: 'change' }
+        ],
+        implRequire: [
+          { required: true, message: '实施要求不能为空', trigger: 'change' }
+        ],
+      },
+      attributeEO: {
+        id: '',
+        lawId: '',
+        lawName: '',
+        productType: '',
+        implTime: '',
+        implRequire: '',
+      },
+      styles: {
+        height: 'calc(100% - 55px)',
+        overflow: 'auto',
+        paddingBottom: '53px',
+        position: 'static'
+      },
+      attributeTitle: '',
+      showInfoModal: false,
       searching: false,
       total: 0,
       page: 1,
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
-        ListName: '',
+        lawId: '',
-        country: '',
+        lawName: '',
+        productType: '',
         accessContent: '',
         energyKind: '',
         applyArctic: '',
@@ -173,6 +335,7 @@ export default {
       sarAccessListTotal: 0,
       loading: false,
       selectedList: [],
+      selectedString: '',
       // 新增、编辑 准入信息字段
       sarAccessEO: {
         country: '',
@@ -183,18 +346,6 @@ export default {
       },
       drawerPage: 1, // 当前抽屉分页的页码
       drawerTotal: 0, // 抽屉分页的总条数
-      sarAccessEORules: {
-        region: [
-          {required: true, message: '区域不能为空', trigger: 'change'}
-        ],
-        country: [
-          {required: true, message: '国家不能为空', trigger: 'change'}
-        ],
-        accessContent: [
-          {required: true, message: '表格名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表格名称不能超过100个字符', trigger: 'blur'}
-        ]
-      },
       countryOptions: [],
       drawerCountryOptions: [], // 准入信息 国家下拉框
       drawerCountryTwoOptions: [], // 数据搜索-多属性搜索国家下拉框
@@ -247,11 +398,153 @@ export default {
     }
   },
   methods: {
+    saveInfo () {
+      this.$refs['attributeEO'].validate((valid) => {
+        if (valid) {
+            if (this.addOrEdit === 'add') {
+              this.submitLoading = true
+              this.$http.putData(
+                  '/sarIssueTrack/issueTrack',
+                  this.attributeEO,
+                  {
+                    _this: this,
+                    loading: 'roleDataLoading'
+                  },
+                  (res) => {
+                    if (res.ok) {
+                      this.submitLoading = false
+                      this.showInfoModal = false
+                      this.searchSarAccessBtn()
+                      this.getAttrByPage()
+                      this.cancelModel()
+                      // this.showInfoModal = false
+                    } else {
+                      this.submitLoading = false
+                    }
+                  }
+              )
+            } else {
+              this.$http.postData(
+                  'sarIssueTrack/issueTrack',
+                  this.attributeEO,
+                  {
+                    _this: this,
+                    loading: 'roleDataLoading'
+                  },
+                  (res) => {
+                    if (res.ok) {
+                      this.submitLoading = false
+                      this.showInfoModal = false
+                      this.searchSarAccessBtn()
+                      this.getAttrByPage()
+                      this.cancelModel()
+                      this.showInfoModal = false
+                    } else {
+                      this.submitLoading = false
+                    }
+                  }
+              )
+            }
+          }
+      })
+    },
+    cancelModel () {
+      this.$nextTick(() => {
+        this.$refs['attributeEO'].resetFields()
+        this.attributeEO = {
+          id: '',
+          lawId: '',
+          lawName: '',
+          productType: '',
+          implTime: '',
+          implRequire: '',
+        }
+      })
+      this.showInfoModal = false
+    },
+    showAddModel (oprState, row) {
+      this.oprState = oprState
+      if (this.oprState === 1) {
+        this.addOrEdit = 'add'
+        this.attributeTitle = '新增'
+        this.getDictionarySelList(null)
+        this.$nextTick(() => {
+          this.attributeEO = {
+            id: '',
+            lawId: '',
+            lawName: '',
+            productType: '',
+            implTime: '',
+            implRequire: '',
+          }
+          this.$refs['attributeEO'].resetFields()
+        })
+        this.showInfoModal = true
+      } else if (this.oprState === 2) {
+        this.addOrEdit = 'edit'
+        this.attributeTitle = '编辑'
+        this.getDictionarySelList(null)
+        this.attributeEO = JSON.parse(JSON.stringify(row))
+        this.showInfoModal = true
+      }
+    },
+    getDictionarySelList (id) {
+      this.$http.get(
+          'sys/dictionary/getDictionarySelList',
+          {
+            id: id
+          },
+          {
+            _this: this
+          },
+          (res) => {
+            this.relateDicIdOptions = res.data
+          },
+          (e) => {}
+      )
+    },
+    // 删除
+    deleteSarAccess(flag, id) {
+      if (flag === 'delOne') {
+        this.selectedList = [];
+        this.selectedList[0] = id;
+      }
+      if (this.selectedList.length === 0) {
+        this.$message.warning('请选择要删除的数据')
+      } else {
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          for (let i = 0; i < this.selectedList.length; i++) {
+            this.selectedString += this.selectedList[i]+","
+          }
+          let selectedString = this.selectedString.substring(0,this.selectedString.length-1)
+          this.$http.delete("sarIssueTrack/issueTrack", {selectedString},{
+            _this: this,
+            loading: 'roleDataLoading'
+          }, (res) => {
+            this.selectedList = [];
+            this.$message.success('删除成功')
+            this.searchSarAccessBtn()
+            this.getAttrByPage()
+            this.cancelModel()
+          }, e => {
+          });
+        }).catch(() => {
+          // 取消删除，清空选择
+          this.selectedList = [];
+        })
+      }
+    },
     // 更多
     handleCommand (command) {
+      console.log('536',command)
       switch (command[1]) {
         case '编辑':
-          this.editTable(command[0])
+          this.showAddModel(2, command[0])
           break
         case '删除':
           this.deleteSarAccess('delOne', command[0].id)
@@ -265,7 +558,24 @@ export default {
     },
     //分页查询
     searchSarAccess (advanceSearch) {
-
+      console.log('准备开始分页查询')
+      this.$http.get("/sarIssueTrack/issueTrack", {
+        page: 1,
+        pageSize: this.pageSize,
+        ...this.sarSarAccessEOSearch,
+        sortKey: 2
+      }, {
+        _this: this
+      }, res => {
+        let arr = res.data;
+        console.log('分页查询中',arr)
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
+        this.sarSarAccessEOSearch.page = 1
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+      });
+      console.log('分页查询完毕')
     },
     pageChange (page) {
       this.sarSarAccessEOSearch.page = page
@@ -277,7 +587,9 @@ export default {
     },
     clearSearch (search = true) {
       // search 字段是为了处理高级查询时清空字段用的
-      this.sarSarAccessEOSearch.country = ''
+      this.sarSarAccessEOSearch.lawId = ''
+      this.sarSarAccessEOSearch.lawName = ''
+      this.sarSarAccessEOSearch.productType = ''
       this.sarSarAccessEOSearch.accessContent = ''
       this.sarSarAccessEOSearch.applyArctic = ''
       this.sarSarAccessEOSearch.energyKind = ''
@@ -285,15 +597,6 @@ export default {
       this.sarSarAccessEOSearch.page = 1
       search && this.searchSarAccess()
     },
-    // 新增相关
-    openModal (row, optType) {
-      this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails'
-      })
-    },
-    // 删除
-    deleteSarAccess (flag, id) {
-    },
     // 表格选择框
     selectOne (alldata, nowdata) {
       this.selectedList = []
@@ -301,16 +604,26 @@ export default {
         this.selectedList.push(alldata[i]['id'])
       }
     },
-    // 点击 table编辑按钮 事件
+    // // 点击 table编辑按钮 事件
-    editTable (item) {
+    // editTable (item) {
-      sessionStorage.setItem('accessRow', JSON.stringify(item))
+    //   sessionStorage.setItem('accessRow', JSON.stringify(item))
-      this.$router.push({
+    //   this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails',
+    //     name: 'ListOfStandardsAndRegulationsDetails',
-        query: {
+    //     query: {
-          id: item.id
+    //       id: item.id
-        }
+    //     }
-      })
+    //   })
-    },
+    // },
+    // async handleTableEdit (params) {
+    //   await this.queryDisplayLocationList(params.sarType)
+    //   // this.$refs['attributeEO'] && this.$refs['attributeEO'].resetFields()
+    //   this.addOrEdit = 'edit'
+    //   this.attributeTitle = '编辑'
+    //   this.showInfoModal = true
+    //   this.$nextTick(() => {
+    //     this.attributeEO = JSON.parse(JSON.stringify(params))
+    //   })
+    // },
   },
   mounted () {
     // 分页查询数据

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -184,6 +184,7 @@
          fontWeight: 'bold', height: '48px'}"
             @selection-change="standSelectChange">
             <el-table-column
+                v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba')>0"
               type="selection"
               width="55"
               align="center">
@@ -276,35 +277,61 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50">
+            <el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" width="100">
               <template slot-scope="scope">
-                <div @click.stop style="display: inline-block">
+                <div  v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
-                  <el-dropdown trigger="click" @command="handleCommand">
+                      @command="handleCommand"
-                    <i class="iconfont">&#xe61e;</i>
+                >
-                    <el-dropdown-menu slot="dropdown">
+                      <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
-                      <el-dropdown-item v-btn-permission="''"
+                             v-if="scope.row.collectBtn"
-                                        v-if="scope.row.collectBtn"
+                             @click="handleCommand([scope.row, '收藏'])"
-                                        :command="[scope.row, '收藏']"
+                             >收藏
-                      >
+                      </el-button>
-                        收藏
+                  <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
-                      </el-dropdown-item>
+                             v-else
-                      <el-dropdown-item v-btn-permission="'abcf82476e9f7bf2469896b3b0cb84fa'"
+                             @click="handleCommand([scope.row, '取消收藏'])"
-                                        v-else
+                  >取消收藏
-                                        :command="[scope.row, '取消收藏']"
+                  </el-button>
-                      >
+                  <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                        取消收藏
+                                    v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
-                      </el-dropdown-item>
+                  </el-button>
-                      <el-dropdown-item :command="[scope.row, '编辑']"
+                  <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                                        v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
+                                    v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
-                      </el-dropdown-item>
+                  </el-button>
-                      <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
+                </div>
-                      <el-dropdown-item :command="[scope.row, '删除']"
+
-                                        v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
+                <div v-else>
-                      </el-dropdown-item>
+                  <div @click.stop style="display: inline-block">
-                    </el-dropdown-menu>
+                    <el-dropdown trigger="click" @command="handleCommand">
-                  </el-dropdown>
+                      <i class="iconfont">&#xe61e;</i>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                                          v-if="scope.row.collectBtn"
+                                          :command="[scope.row, '收藏']"
+                        >
+                          收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                                          v-else
+                                          :command="[scope.row, '取消收藏']"
+                        >
+                          取消收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item :command="[scope.row, '编辑']"
+                                          v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
+                        </el-dropdown-item>
+                        <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
+                        <el-dropdown-item :command="[scope.row, '删除']"
+                                          v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
+                        </el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
                 </div>
               </template>
+
+
+
             </el-table-column>
           </el-table>
         </div>
@@ -645,6 +672,7 @@
                       class="add-form-item"
                     >
                       <template slot="label">责任部门</template>
+
                       <el-input
                         :key="field.attrField"
                         :config="field"
@@ -1377,271 +1405,309 @@
         :wrapperClosable="false"
         :visible.sync="isAdvancedSearch">
         <div class="demo-drawer-content">
-          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice"
+          <el-form :model="sarStandardsSearch"
+                   :inline="true"
+                   class="label-input-form table-lattice"
+                   label-width="68px"
                    style="display: flex;flex-wrap: wrap">
-            <!--            标准号-->
+            <ProcessTitle>
-            <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
+              <template slot="title">基础信息</template>
-              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
+            </ProcessTitle>
-                        :maxlength="100"
+            <div class="prc-content-border">
-                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+              <el-row :gutter="24">
-            </el-form-item>
+                <el-col :span="12">
-            <!--            标准名称-->
+                  <!--            标准号-->
-            <el-form-item :label="$t('m.standName')" class="serch-form-item">
+                  <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
-              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
+                    <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
-                        :maxlength="500"
+                              :maxlength="100"
-                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-            </el-form-item>
+                  </el-form-item>
-            <!--            标准英文名称-->
+                  <!--            标准名称-->
-            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
+                  <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
-              <el-input v-model="sarStandardsSearch.standEnName"
+                    <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
-                        :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+                              :maxlength="500"
-                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-            </el-form-item>
+                  </el-form-item>
-            <!--            标准类别-->
+                  <!--            标准年份-->
-            <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
+                  <el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
-              <search-select
+                    <el-input
-                v-model="sarStandardsSearch.standSort"
+                            v-model="sarStandardsSearch.standYear"
-                :placeholder="$t('m.standardCategoryTips')"
+                            placeholder="根据标准年份查找">
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                    </el-input>
-                :options="standSortOptions"
+                  </el-form-item>
-                clearable/>
+                  <!--            文本状态-->
-            </el-form-item>
+                  <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
-            <!--            代替标准号-->
+                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
-            <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
+                      <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
-                        clearable :maxlength="100"
+                                 :key="opt.value" :label="opt.label">{{ opt.label }}
-                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                      </el-option>
-            </el-form-item>
+                    </el-select>
-            <!--            被代替标准号-->
+                  </el-form-item>
-            <el-form-item label="被代替标准号">
+                  <!--            体系类别-->
-              <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
-                        @keyup.enter.native="btnSearch"></el-input>
+                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
-            </el-form-item>
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-            <!--            标准年份-->
+                      <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-            <el-form-item :label="$t('m.standardYear')" class="serch-form-item">
+                                 :label="opt.label">{{ opt.label }}
-              <el-input
+                      </el-option>
-                v-model="sarStandardsSearch.standYear"
+                    </el-select>
-                placeholder="根据标准年份查找">
+                  </el-form-item>
-              </el-input>
+                </el-col>
-            </el-form-item>
+                <el-col :span="12">
-
+                  <!--            标准类别-->
-            <!--            标准发布日期-->
+                  <el-form-item :label="$t('m.standardCategory')" class="add-form-item form-item-disabled">
-            <el-form-item label="标准发布日期" class="serch-form-item">
+                    <search-select
-              <el-date-picker
+                            v-model="sarStandardsSearch.standSort"
-                v-model="sarStandardsSearch.issueTime"
+                            :placeholder="$t('m.standardCategoryTips')"
-                type="date"
+                            @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                value-format="yyyy-MM-dd"
+                            :options="standSortOptions"
-                placeholder="根据标准发布日期查找">
+                            clearable/>
-              </el-date-picker>
+                  </el-form-item>
-            </el-form-item>
+                  <!--            标准英文名称-->
-            <!--            适用车型-->
+                  <el-form-item :label="$t('m.standardEnglishName')" :title="$t('m.standardEnglishName')" class="add-form-item form-item-disabled">
-            <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
+                    <el-input v-model="sarStandardsSearch.standEnName"
-              <el-select v-model="sarStandardsSearch.applyArctic"
+                              :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
-                         :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                  </el-form-item>
-                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
+                  <!--            标准发布日期-->
-                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                  <el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
-                </el-option>
+                    <el-date-picker
-              </el-select>
+                            v-model="sarStandardsSearch.issueTime"
-            </el-form-item>
+                            type="date"
-
+                            value-format="yyyy-MM-dd"
-            <!--            是否纳入标准清单-->
+                            placeholder="根据标准发布日期查找">
-            <el-form-item label="是否纳入标准清单" class="serch-form-item">
+                    </el-date-picker>
-              <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
+                  </el-form-item>
-                <el-option value="1" label="是"></el-option>
+                  <!--            标准性质-->
-                <el-option value="0" label="否"></el-option>
+                  <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
-              </el-select>
+                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
-            </el-form-item>
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-
+                      <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
-
+                                 :key="opt.value" :label="opt.label">{{ opt.label }}
-            <!--            文本状态-->
+                      </el-option>
-            <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
+                    </el-select>
-              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                  </el-form-item>
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                  <!--            是否纳入标准清单-->
-                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
+                  <el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
-                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                    <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
-                </el-option>
+                      <el-option value="1" label="是"></el-option>
-              </el-select>
+                      <el-option value="0" label="否"></el-option>
-            </el-form-item>
+                    </el-select>
-            <!--            标准性质-->
+                  </el-form-item>
-            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
+                </el-col>
-              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
+              </el-row>
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+            </div>
-                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
+            <ProcessTitle>
-                           :key="opt.value" :label="opt.label">{{ opt.label }}
+              <template slot="title">实施日期</template>
-                </el-option>
+            </ProcessTitle>
-              </el-select>
+            <div class="prc-content-border">
-            </el-form-item>
+              <el-row :gutter="24">
-
+                <el-col :span="12">
-            <!--            自定义属性-->
+                  <!--            自定义属性-->
-            <!--            实施日期-->
+                  <!--            实施日期-->
-            <el-form-item label="实施日期">
+                  <el-form-item label="实施日期" class="add-form-item form-item-disabled">
-              <el-date-picker
+                    <el-date-picker
-                v-model="advanceSearchMapping.SSRQ"
+                            v-model="advanceSearchMapping.SSRQ"
-                type="date"
+                            type="date"
-                value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
-                placeholder="根据实施日期查找">
+                            placeholder="根据实施日期查找">
-              </el-date-picker>
+                    </el-date-picker>
-            </el-form-item>
+                  </el-form-item>
-            <!--            新车型实施日期-->
+                  <!--            在产车实施日期-->
-            <el-form-item title="新车型实施日期" label="新车型实施日期">
+                  <el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
-              <el-date-picker
+                    <el-date-picker
-                value-format="yyyy-MM-dd"
+                            v-model="advanceSearchMapping.ZCCSSRQ"
-                v-model="advanceSearchMapping.XCXSSRQ"
+                            type="date"
-                type="date"
+                            value-format="yyyy-MM-dd"
-                placeholder="根据新车型实施日期查找">
+                            placeholder="根据在产车实施日期查找">
-              </el-date-picker>
+                    </el-date-picker>
-            </el-form-item>
+                  </el-form-item>
-            <!--            在产车实施日期-->
+                </el-col>
-            <el-form-item title="在产车实施日期" label="在产车实施日期">
+                <el-col :span="12">
-              <el-date-picker
+                  <!--            新车型实施日期-->
-                v-model="advanceSearchMapping.ZCCSSRQ"
+                  <el-form-item title="新车型实施日期" label="新车型实施日期" class="add-form-item form-item-disabled">
-                type="date"
+                    <el-date-picker
-                value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
-                placeholder="根据在产车实施日期查找">
+                            v-model="advanceSearchMapping.XCXSSRQ"
-              </el-date-picker>
+                            type="date"
-            </el-form-item>
+                            placeholder="根据新车型实施日期查找">
-            <!--            归口管理部门-->
+                    </el-date-picker>
-            <el-form-item label="归口管理部门">
+                  </el-form-item>
-              <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
+                </el-col>
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+              </el-row>
-                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+            </div>
-                           :key="opt.value" :label="opt.label">{{ opt.label }}
+            <ProcessTitle>
-                </el-option>
+              <template slot="title">适用范围</template>
-              </el-select>
+            </ProcessTitle>
-            </el-form-item>
+            <div class="prc-content-border">
-            <!--            起草单位-->
+              <el-row :gutter="24">
-            <el-form-item label="起草单位">
+                <el-col :span="12">
-              <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
+                  <!--            归口管理部门-->
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                  <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
-                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
-                           :label="opt.label">{{ opt.label }}
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                </el-option>
+                      <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
-              </el-select>
+                                 :key="opt.value" :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                      </el-option>
-            <!--            我司参与深度-->
+                    </el-select>
-            <el-form-item label="我司参与深度">
+                  </el-form-item>
-              <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
+                  <!--            我司参与深度-->
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                  <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                    <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
-                           :label="opt.label">{{ opt.label }}
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                </el-option>
+                      <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-              </el-select>
+                                 :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                      </el-option>
-
+                    </el-select>
-            <!--            能源类型-->
+                  </el-form-item>
-            <el-form-item label="能源类型">
+                  <!--            适用车型-->
-              <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
+                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="sarStandardsSearch.applyArctic"
-                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                               :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
-                           :label="opt.label">{{ opt.label }}
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                </el-option>
+                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
-              </el-select>
+                                 :key="opt.value" :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                      </el-option>
-            <!--            适用产品线（新增字段）-->
+                    </el-select>
-            <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
+                  </el-form-item>
-              <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
+                  <!--            适用认证-->
-                         clearable
+                  <el-form-item label="适用认证" class="add-form-item form-item-disabled">
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
-                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                           :label="opt.label">{{ opt.label }}
+                      <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-                </el-option>
+                                 :label="opt.label">{{ opt.label }}
-              </el-select>
+                      </el-option>
-            </el-form-item>
+                    </el-select>
-            <!--            适用认证-->
+                  </el-form-item>
-            <el-form-item label="适用认证">
+                  <!--            责任工程师-->
-              <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
+                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
-                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                           :label="opt.label">{{ opt.label }}
+                      <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-                </el-option>
+                                 :label="opt.label">{{ opt.label }}
-              </el-select>
+                      </el-option>
-            </el-form-item>
+                    </el-select>
-            <!--            责任部门-->
+                  </el-form-item>
-            <el-form-item label="责任部门">
+                  <!--            关联模块--乘用车VPPS编码-->
-              <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
+                  <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber"  class="add-form-item form-item-disabled">
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
-                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                              placeholder=" 关联模块--乘用车VPPS编码"
-                           :label="opt.label">{{ opt.label }}
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                </el-option>
+                  </el-form-item>
-              </el-select>
+                  <!--           关联模块--乘用车vpps中文名称-->
-            </el-form-item>
+                  <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber"  class="add-form-item form-item-disabled">
-            <!--            责任工程师-->
+                    <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
-            <el-form-item label="责任工程师">
+                              placeholder="关联模块--乘用车vpps中文名称"
-              <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                  </el-form-item>
-                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                  <!--关联模块--卡车VPPS编码-->
-                           :label="opt.label">{{ opt.label }}
+                  <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"  class="add-form-item form-item-disabled">
-                </el-option>
+                    <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
-              </el-select>
+                              placeholder="关联模块--卡车VPPS编码"
-            </el-form-item>
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-            <!--            采标编号-->
+                  </el-form-item>
-            <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            采标程度-->
-            <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="advanceSearchMapping.CBCD" clearable
-                        placeholder="根据采标程度查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            引用标准-->
-            <el-form-item label="引用标准">
-              <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            被引用标准-->
-            <el-form-item label="被引用标准">
-              <el-input v-model="advanceSearchMapping.BYYBJ" clearable
-                        placeholder="根据被引用标准查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-
-
-            <!--            体系类别-->
-            <el-form-item label="体系类别">
-              <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-                           :label="opt.label">{{ opt.label }}
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <!--            关联模块--乘用车VPPS编码-->
-            <el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
-              <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
-                        placeholder=" 关联模块--乘用车VPPS编码"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--           关联模块--乘用车vpps中文名称-->
-            <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
-              <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
-                        placeholder="关联模块--乘用车vpps中文名称"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--关联模块--卡车VPPS编码-->
-            <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
-              <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
-                        placeholder="关联模块--卡车VPPS编码"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--关联模块--卡车vpps中文名称-->
-            <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
-              <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
-                        placeholder="关联模块--卡车vpps中文名称"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
 
+                </el-col>
+                <el-col :span="12">
+                  <!--            起草单位-->
+                  <el-form-item label="起草单位"  class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <!--            能源类型-->
+                  <el-form-item label="能源类型" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <!--            适用产品线（新增字段）-->
+                  <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
+                               clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <!--            责任部门-->
+                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <!--            关联模块--乘用车VPPS编码-->
+                  <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
+                              placeholder=" 关联模块--乘用车VPPS编码"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  <!--关联模块--卡车vpps中文名称-->
+                  <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
+                              placeholder="关联模块--卡车vpps中文名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+            <ProcessTitle>
+              <template slot="title">关联信息</template>
+            </ProcessTitle>
+            <div class="prc-content-border">
+              <el-row :gutter="24">
+                <el-col :span="12">
+                  <!--            代替标准号-->
+                  <el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
+                    <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
+                              clearable :maxlength="100"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  <!--            采标编号-->
+                  <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  <!--            引用标准-->
+                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
 
+                </el-col>
+                <el-col :span="12">
+                  <!--            被代替标准号-->
+                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
+                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                  <!--            被引用标准-->
+                  <el-form-item label="被引用标准" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.BYYBJ" clearable
+                              placeholder="根据被引用标准查找"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
             <!--            标记-->
             <!--            标签-->
-            <el-form-item label="标签">
+<!--            <el-form-item label="标签">-->
-              <el-input v-model="advanceSearchMapping.GXHBQ" clearable
+<!--              <el-input v-model="advanceSearchMapping.GXHBQ" clearable-->
-                        placeholder="根据被标签查找"
+<!--                        placeholder="根据被标签查找"-->
-                        @keyup.enter.native="btnSearch"></el-input>
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
-            </el-form-item>
+<!--            </el-form-item>-->
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1687,6 +1753,7 @@
 </template>
 
 <script>
+import store from '@/store'
 import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandards'
 import CustomInput from '@/components/CustomFormComponents/Input'
 import CustomTextarea from '@/components/CustomFormComponents/Textarea'
@@ -1707,6 +1774,8 @@ import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePicke
 import {interfaceUrl} from '@/sysConfig'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+
 
 export default {
   name: 'domesticStandardsAndRegulations',
@@ -1729,7 +1798,8 @@ export default {
     CustomDatePickWithText2,
     TreeSelect,
     MechanismTree,
-    TreeSelectNew
+    TreeSelectNew,
+    ProcessTitle
   },
   data() {
     return {
@@ -2423,6 +2493,21 @@ export default {
     }
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
     // 国内标签过滤
     filterNode(value, data) {
       if (!value) return true;
@@ -2956,7 +3041,6 @@ export default {
       this.$set(data, 'showDel', false)
     },
     treeClick(treeNode) {
-      console.log("hello")
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
@@ -3081,7 +3165,7 @@ export default {
     },
     // 查询二级菜单
     selectMenu() {
-      this.$http.get('sarResource/ts-resource/getList', {
+      this.$http.get('sarResource/ts-resource/getListStand', {
         sorDivide: 'INLAND_STAND',
         userId: this.$store.getters.userInfo.userId
       }, {}, res => {
@@ -4975,6 +5059,7 @@ export default {
       this.sarStandardsInfoEO['ZRGCS'] = nameList;
     },
     choiceZRBM(type, title, id) {
+
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title
@@ -4993,8 +5078,10 @@ export default {
           nameList += item.name
         }
       })
+
       this.sarStandardsInfoEO.ZRBMId = idList;
       this.sarStandardsInfoEO['ZRBM'] = nameList;
+
     },
   },
   computed: {
@@ -5086,6 +5173,16 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+  /deep/.contentTitle{
+    width: 100%;
+  }
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      /*border: none;*/
+      width: 100%;
+      padding: 0 20px 0;
+    }
+  }
 /deep/ .icon-tree {
   margin: 0 5px 0 10px;
   position: relative;
@@ -5320,30 +5417,6 @@ export default {
   outline: none !important;
 }
 
-.label-input-form {
-  &.table-lattice {
-    /deep/ .el-form-item__label {
-      width: 100px;
-      height: 30px;
-      border: 1px solid #DCDFE6;
-      border-right: none;
-      line-height: 30px;
-      text-align: center;
-      margin-top: 6px;
-      background: #F9F9F9;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis
-    }
-
-    /deep/ .el-input__inner {
-      height: 30px;
-      line-height: 30px;
-      border-radius: 0 !important;
-    }
-  }
-}
-
 .el-date-editor.el-input, .el-date-editor.el-input__inner {
   width: 190px
 }

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

@@ -281,6 +281,7 @@
           @selection-change="standSelectChange"
         >
           <el-table-column
+              v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96')>0"
             type="selection"
             width="55"
             align="center">
@@ -371,36 +372,74 @@
                 </span>
               </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="80">
+
-            <template slot-scope="scope">
+            <el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="100">
-              <div @click.stop style="display: inline-block">
+              <template slot-scope="scope">
-                <el-dropdown trigger="click" @command="handleCommand">
+              <div  v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
-                  <i class="iconfont">&#xe61e;</i>
+                    @command="handleCommand"
-                  <el-dropdown-menu slot="dropdown">
+              >
-                    <el-dropdown-item
+                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
-                      v-if="scope.row.collectBtn"
+                           v-if="scope.row.collectBtn"
-                      :command="[scope.row, '收藏']"
+                           @click="handleCommand([scope.row, '收藏'])"
-                      v-btn-permission="'d9730d984627af948053df56a2db7997'"
+                >收藏
-                    >
+                </el-button>
-                      收藏
+                <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
-                    </el-dropdown-item>
+                           v-else
-                    <el-dropdown-item
+                           @click="handleCommand([scope.row, '取消收藏'])"
-                      v-else
+                >取消收藏
-                      :command="[scope.row, '取消收藏']"
+                </el-button>
-                      v-btn-permission="'d96e086ce3dfa75201bdf8e67cd9fe6d'"
+                <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                    >
+                           v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑
-                      取消收藏
+                </el-button>
-                    </el-dropdown-item>
+                <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
+                           v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除
-<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
+                </el-button>
-<!--                    <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
-                    <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
-                    <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
-                  </el-dropdown-menu>
-                </el-dropdown>
               </div>
-            </template>
+
-          </el-table-column>
+              <div v-else>
+
+                  <div @click.stop style="display: inline-block">
+                    <el-dropdown trigger="click" @command="handleCommand">
+                      <i class="iconfont">&#xe61e;</i>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item
+                            v-if="scope.row.collectBtn"
+                            :command="[scope.row, '收藏']"
+                            v-btn-permission="'d9730d984627af948053df56a2db7997'"
+                        >
+                          收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item
+                            v-else
+                            :command="[scope.row, '取消收藏']"
+                            v-btn-permission="'d9730d984627af948053df56a2db7997'"
+                        >
+                          取消收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
+                        <!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
+                        <!--                    <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
+                        <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="a7a38a95ea374695fc3128037f6feccf">删除</el-dropdown-item>
+                        <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
+
+              </div>
+
+              </template>
+
+
+            </el-table-column>
+
+
+
+
+
+
+
+
+
         </el-table>
         <pagination :page="tableFlag === '' ? sarBussionessSearch.page : tableFlag.page " :total="total"
                     @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
@@ -1235,6 +1274,7 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 import {mapGetters} from 'vuex'
+import store from "@/store";
 export default {
   name: 'EnterpriseStandardDatabase',
   components: {
@@ -1929,6 +1969,21 @@ export default {
     }
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
       dateFormatter () {
           //默认返回yyyy-MM-dd HH-mm-ss
           const d = new Date();

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -181,7 +181,9 @@
                 @selection-change="standSelectChange"
         >
           <el-table-column
-                  type="selection"
+              v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe')>0"
+
+              type="selection"
                   width="55"
                   align="center">
           </el-table-column>
@@ -271,35 +273,66 @@
                 </span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="80">
+
+
+          <el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" width="100">
             <template slot-scope="scope">
-              <div @click.stop style="display: inline-block">
+
-                <el-dropdown trigger="click" @command="handleCommand">
+            <div  v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk') == 1"
-                  <i class="iconfont">&#xe61e;</i>
+                  @command="handleCommand"
-                  <el-dropdown-menu slot="dropdown">
+            >
-                    <el-dropdown-item
+              <el-button type="text" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                            v-if="scope.row.collectBtn"
+                         v-if="scope.row.collectBtn"
-                            :command="[scope.row, '收藏']"
+                         @click="handleCommand([scope.row, '收藏'])"
-                            v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
+              >收藏
-                    >
+              </el-button>
-                      收藏
+              <el-button type="text" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                    </el-dropdown-item>
+                         v-else
-                    <el-dropdown-item
+                         @click="handleCommand([scope.row, '取消收藏'])"
-                            v-else
+              >取消收藏
-                            :command="[scope.row, '取消收藏']"
+              </el-button>
-                            v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbp'"
+              <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                    >
+                         v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbr'">编辑
-                      取消收藏
+              </el-button>
-                    </el-dropdown-item>
+              <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbr'">编辑</el-dropdown-item>
+                         v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbk'">删除
-                    <!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
+              </el-button>
-                    <!--                    <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
+            </div>
-                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbk'">删除</el-dropdown-item>
+
-                    <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
+            <div v-else>
-                  </el-dropdown-menu>
+
-                </el-dropdown>
+                <div @click.stop style="display: inline-block">
-              </div>
+                  <el-dropdown trigger="click" @command="handleCommand">
+                    <i class="iconfont">&#xe61e;</i>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item
+                          v-if="scope.row.collectBtn"
+                          :command="[scope.row, '收藏']"
+                          v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
+                      >
+                        收藏
+                      </el-dropdown-item>
+                      <el-dropdown-item
+                          v-else
+                          :command="[scope.row, '取消收藏']"
+                          v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
+                      >
+                        取消收藏
+                      </el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbr'">
+                        编辑
+                      </el-dropdown-item>
+                      <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbk'">
+                        删除
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
+
+            </div>
             </template>
+
           </el-table-column>
         </el-table>
         <pagination :page="tableFlag === '' ? lawsStandInfoSearch.page : tableFlag.page " :total="total"
@@ -1286,6 +1319,7 @@
   import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
   import {mapGetters} from 'vuex'
+  import store from "@/store";
   export default {
     name: 'foreignRegulationsDatabase',
     components: {
@@ -2104,6 +2138,21 @@
       }
     },
     methods: {
+      isPermission (value) {
+        let hasCount = 0
+        let set =new Set( value.split(","))
+        let menuList = store.getters.getMenuList
+        if (menuList === '') {
+          return hasCount
+        } else {
+          menuList.map((menu) => {
+            if ( set.has(menu.id)|| value === undefined || value === '') {
+              hasCount++
+            }
+          })
+        }
+        return hasCount
+      },
       dateFormatter () {
         //默认返回yyyy-MM-dd HH-mm-ss
         const d = new Date();

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -181,7 +181,8 @@
             @selection-change="standSelectChange"
             @sort-change="sortChange">
             <el-table-column
-              type="selection"
+                v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a')>0"
+                type="selection"
               width="55"
               align="center">
             </el-table-column>
@@ -310,37 +311,66 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50">
+            <el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">
               <template slot-scope="scope">
-                <div @click.stop style="display: inline-block">
+
-                  <el-dropdown trigger="click" @command="handleCommand">
+              <div  v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"
-                    <i class="iconfont">&#xe61e;</i>
+                    @command="handleCommand"
-                    <el-dropdown-menu slot="dropdown">
+              >
-                      <el-dropdown-item
+                <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
-                        v-if="scope.row.collectBtn"
+                           v-if="scope.row.collectBtn"
-                        :command="[scope.row, '收藏']"
+                           @click="handleCommand([scope.row, '收藏'])"
-                        v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
+                >收藏
-                      >
+                </el-button>
-                        收藏
+                <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
-                      </el-dropdown-item>
+                           v-else
-                      <el-dropdown-item
+                           @click="handleCommand([scope.row, '取消收藏'])"
-                        v-else
+                >取消收藏
-                        :command="[scope.row, '取消收藏']"
+                </el-button>
-                        v-btn-permission="'47e155667f521467ed941c89d118e770'"
+                <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                      >
+                           v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑
-                        取消收藏
+                </el-button>
-                      </el-dropdown-item>
+                <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">
+                           v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">删除
-                        编辑
+                </el-button>
-                      </el-dropdown-item>
+              </div>
-                      <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
+
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">
+              <div v-else>
-                        删除
+
-                      </el-dropdown-item>
+                  <div @click.stop style="display: inline-block">
-                    </el-dropdown-menu>
+                    <el-dropdown trigger="click" @command="handleCommand">
-                  </el-dropdown>
+                      <i class="iconfont">&#xe61e;</i>
-                </div>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item
+                            v-if="scope.row.collectBtn"
+                            :command="[scope.row, '收藏']"
+                            v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
+                        >
+                          收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item
+                            v-else
+                            :command="[scope.row, '取消收藏']"
+                            v-btn-permission="'47e155667f521467ed941c89d118e770'"
+                        >
+                          取消收藏
+                        </el-dropdown-item>
+                        <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">
+                          编辑
+                        </el-dropdown-item>
+                        <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
+                        <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">
+                          删除
+                        </el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
+
+              </div>
+
               </template>
+
+
             </el-table-column>
           </el-table>
         </div>
@@ -1581,6 +1611,7 @@ import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePicke
 import {interfaceUrl} from "@/sysConfig";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import store from "@/store";
 
 export default {
   name: 'foreignStandardsAndRegulations',
@@ -2286,6 +2317,21 @@ export default {
     }
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
     // 海外标签过滤
     filterNode(value, data) {
       if (!value) return true;
@@ -2870,7 +2916,7 @@ export default {
     },
     // 查询二级菜单
     selectMenu() {
-      this.$http.get('sarResource/ts-resource/getList', {
+      this.$http.get('sarResource/ts-resource/getListStand', {
         sorDivide: 'FOREIGN_STAND',
         userId: this.$store.getters.userInfo.userId
       }, {}, res => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -855,7 +855,9 @@ export default {
 
       // 项目分类数组
       notProjectData: [],
-      projectData: []
+      projectStatus: [],
+      projectData: [],
+      notProjectStatus: [],
     };
   },
   methods: {
@@ -879,7 +881,7 @@ export default {
     // 获取标准类别List数据
     getAllInforList() {
       this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
-        this.xmztOptions = res.data.XMZT;
+        // this.xmztOptions = res.data.XMZT;
         this.scxxOptions = res.data.SCXX;
         this.countryList = res.data.COUNTRY;
         this.energyKindOptions = res.data.ENERGYTYPES;
@@ -1213,10 +1215,12 @@ export default {
         if (this.localProTableSearch.prodectCode === "Maintenance") {
           this.localProTableList = res.data.Maintenance.records;
           this.productTypeOptions = this.projectData
+          this.xmztOptions = this.projectStatus
           this.total = res.data.Maintenance.total;
         } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
           this.localProTableList = res.data.notMaintenance.records;
           this.productTypeOptions = this.notProjectData
+          this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
         // this.localProTableList.map((item) => {
@@ -1546,18 +1550,30 @@ export default {
     },
     selectSort() {
       solostarData().then(res=>{
-        res.data.MaintenanceProjectStatus.forEach((item, index)=>{
+        res.data.MaintenanceProjectClassification.forEach((item, index)=>{
           this.projectData.push({
             label: item,
             value: index
           })
         })
-        res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
+        res.data.MaintenanceProjectStatus.forEach((item, index)=>{
+          this.projectStatus.push({
+            label: item,
+            value: index
+          })
+        })
+        res.data.notMaintenanceProjectClassification.forEach((item, index)=>{
           this.notProjectData.push({
             label: item,
             value: index
           })
         })
+        res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
+          this.notProjectStatus.push({
+            label: item,
+            value: index
+          })
+        })
       })
     }
   },

src/router/index.js

@@ -447,10 +447,10 @@ const routes = [
         }
       },
       {
-        path: '/zdrzbzORzchgxxmscStep5-1',
+        path: '/zdrzbzORzchgxxmscStep5',
-        name: 'zdrzbzORzchgxxmscStep5-1',
+        name: 'zdrzbzORzchgxxmscStep5',
         //1代表各事业部，2代表产品规划部
-        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5-1.vue'),
+        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5.vue'),
         meta: {
           requireAuth: true,
           title: '重点认证标准/政策合规性项目审查流程'
@@ -466,9 +466,9 @@ const routes = [
         }
       },
       {
-        path: '/zdrzbzORzchgxxmscStep7-1',
+        path: '/zdrzbzORzchgxxmscStep7',
-        name: 'zdrzbzORzchgxxmscStep7-1',
+        name: 'zdrzbzORzchgxxmscStep7',
-        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7-1.vue'),
+        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7.vue'),
         meta: {
           requireAuth: true,
           title: '重点认证标准/政策合规性项目审查流程'