From f233860daf2c53416bb725c222e959bc2bea407c Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 17:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/index.vue   |  2 +-
 .../pages/addEdit.vue                         |  3 ++
 .../pages/details.vue                         | 54 +++----------------
 3 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index 67eb09919..5fae96a98 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -88,7 +88,7 @@ export default {
     this.tabValue = this.list[0].name;
   },
   beforeRouteLeave(to, from, next) {
-    const toName = ["ListOfStandardsAndRegulationsDetails", "Details", "ProjectAddEit", "OtherAddEit"];
+    const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"];
     // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
     if (toName.includes(to.name)) {
       this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 45fb65403..24dcc9a41 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -561,6 +561,7 @@
             <el-date-picker
               v-model.trim="editRowData.putTime"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -568,6 +569,7 @@
             <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -575,6 +577,7 @@
             <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 3cdc9baf3..ab7f62f3e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -15,10 +15,9 @@
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
-          <span class="transition-box-span"  v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo  > 0">
-              <span>{{ sarAccessEO.countryArea }}</span>
+          <span class="transition-box-span">
+             {{ sarAccessEO.countryArea }}
             </span>
-          <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
         <p v-else></p>
         <p class="transition-box-p">
@@ -71,26 +70,6 @@
                 :label="item.label"
               />
             </el-select>
-<!--            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
-            <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
-              <el-input
-                v-model="standardForm.responseUnit"
-                placeholder="请选择部门"
-                readonly
-                id="depBtnsAuth"
-                slot="reference"
-              />
-              <div class="api">
-                <laws-tree :zNodes="depNode"
-                           deptSelect
-                           treeDivId="depTreeAuth"
-                           @treeDblClick="(treeId, treeNode) => treeDblAuthDepartClick(treeId, treeNode)"
-                           :editable="false"
-                           ref="depTreeAuth"
-                           class="ztree" style="height: 300px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -142,7 +121,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="能源类型"  >
+            <el-form-item label="能源类型" label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.nylx"
@@ -158,7 +137,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任部门"  >
+            <el-form-item label="责任部门"  label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.zrbm"
@@ -174,7 +153,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="适用产品线"  >
+            <el-form-item label="适用产品线"  label-width="86px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.sycpx"
@@ -464,7 +443,7 @@ export default {
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false
+      isShow: false,
     };
   },
   methods: {
@@ -519,25 +498,7 @@ export default {
     },
 
     back() {
-      this.$router.push({
-        name: 'AccessStandardsAndRegulations',
-      })
-     /* if (this.sarAccessEO.sortKey === '1') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '国家/地区清单'
-        })
-      } else if(this.sarAccessEO.sortKey === '2') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '项目类清单'
-        })
-      } else {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '其他清单'
-        })
-      }*/
+      this.$router.push({name: 'AccessStandardsAndRegulations'})
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
@@ -774,7 +735,6 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
-      console.log(this.sarAccessEO)
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();