From 59e39ef5a5254ff4198e36b065f7ca2ea1e495bf Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 10 Oct 2023 15:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=94=BF=E7=AD=96-?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=96=87=E5=8F=B7=E5=BF=85=E5=A1=AB=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=94=BF=E7=AD=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/standSystem.vue                |  9 +++-
 .../policy/components/configStandDrawer.vue   | 44 +++++++++++--------
 .../policy/components/editDrawer.vue          | 23 ++++++++--
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/standSystem.vue b/src/pages/config/pages/attributeCustom/components/standSystem.vue
index cae98aa9a..a33fc2aac 100644
--- a/src/pages/config/pages/attributeCustom/components/standSystem.vue
+++ b/src/pages/config/pages/attributeCustom/components/standSystem.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="tree">
+    <loading :loading="loading">加载中...</loading>
     <el-tree
         :data="data"
         :props="defaultProps"
@@ -100,6 +101,7 @@ export default {
       drawerTitle: '',
       drawerVisible: false,
       addModel: {},
+      loading: false,
       rules
     };
   },
@@ -111,7 +113,12 @@ export default {
       console.log(data);
     },
     async getData () {
-      const res = await this.$http._getData(this.api.getListStandLimit,{dicId:'9m4qqqaansxmox5e82zm'})
+      const res = await this.$http._getData(this.api.getListStandLimit,{
+        dicId:'9m4qqqaansxmox5e82zm'
+      },{
+        _this:this,
+        loading: 'loading'
+      })
       if (res.ok &&  res.data) {
         this.data = res.data
       }
diff --git a/src/pages/policyRegulation/policy/components/configStandDrawer.vue b/src/pages/policyRegulation/policy/components/configStandDrawer.vue
index a42c6e1c2..d9b6d299b 100644
--- a/src/pages/policyRegulation/policy/components/configStandDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/configStandDrawer.vue
@@ -15,9 +15,9 @@
             <!--                  <el-input v-model="sarConfigStandSearch.standName" @keyup.enter.native="searchConfiguraStand"-->
             <!--                            placeholder="根据标准名称查找" clearable/>-->
             <!--                </el-formItem>-->
-            <el-formItem label="政策编号" prop="lawsNumber" class="search-item">
-              <el-input v-model="sarConfigStandSearch.lawsNumber" @keyup.enter.native="searchConfiguraStand"
-                        placeholder="根据政策编号查找" clearable/>
+            <el-formItem label="政策文号" prop="lawsNo" class="search-item">
+              <el-input v-model="sarConfigStandSearch.lawsNo" @keyup.enter.native="searchConfiguraStand"
+                        placeholder="根据政策文号查找" clearable/>
             </el-formItem>
             <!--                <el-formItem label="企标类别" prop="standSort" class="search-item">-->
             <!--                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据企标类别查找"-->
@@ -26,8 +26,8 @@
             <!--                    </el-option>-->
             <!--                  </el-select>-->
             <!--                </el-formItem>-->
-            <el-formItem label="政策名称" prop="numberName" class="search-item">
-              <el-input v-model="sarConfigStandSearch.numberName" @keyup.enter.native="searchConfiguraStand" placeholder="根据政策名称查找" clearable :maxlength="100"/>
+            <el-formItem label="政策名称" prop="lawsName" class="search-item">
+              <el-input v-model="sarConfigStandSearch.lawsName" @keyup.enter.native="searchConfiguraStand" placeholder="根据政策名称查找" clearable :maxlength="100"/>
             </el-formItem>
             <el-form-item class="search-item btn-box">
               <el-button
@@ -68,8 +68,8 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="lawsNumber"
-              label="政策编号"
+              prop="lawsNo"
+              label="政策文号"
               width="150"
               align="center"
           >
@@ -90,22 +90,23 @@
               width="120"
               sortable
               align="center">
+            <template slot-scope="scope">
+              <span>{{formatDate(scope.row.issueTime)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
-              prop="XCXSSRQLAWS"
+              prop="ssrqlaws"
               label="实施日期"
               width="120"
               sortable
               align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
-              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
-              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
+              <span>{{formatDate(scope.row.ssrqlaws)}}</span>
             </template>
           </el-table-column>
           <el-table-column
               prop="standStatusShow"
-              label="标准状态"
+              label="文本状态"
               width="100"
               align="center">
           </el-table-column>
@@ -154,8 +155,8 @@ export default {
         validFlag: '0',
         // menuId: '',
         // classifyCode: '',
-        // numberName: '',
-        // lawsNumber: '',
+        lawsName: '',
+        lawsNo: '',
         // quoteStand: '',
         // standCode: '',
         // standName: '',
@@ -193,8 +194,8 @@ export default {
       this.selectConfiguraStand()
     },
     clearAllSearch (flag) {
-      this.sarConfigStandSearch.lawsNumber=''
-      this.sarConfigStandSearch.numberName=''
+      this.sarConfigStandSearch.lawsNo=''
+      this.sarConfigStandSearch.lawsName=''
       this.configPage = 1
       this.sarConfigStandSearch.page = 1
       this.selectConfiguraStand()
@@ -202,8 +203,8 @@ export default {
     // 取消配置标准
     cancelConfigStand () {
       this.configStandFlag = false
-      this.sarConfigStandSearch.lawsNumber=''
-      this.sarConfigStandSearch.numberName=''
+      this.sarConfigStandSearch.lawsNo=''
+      this.sarConfigStandSearch.lawsName=''
       this.configPage = 1
       this.selectConfigStand = []
     },
@@ -299,6 +300,13 @@ export default {
         })
       }
     },
+    formatDate (dateStr) {
+      if (dateStr && dateStr!== '') {
+        let dateArr = dateStr.split(',')
+        return dateArr.map(date => date.slice(0,10)).join(',')
+      }
+      return dateStr
+    },
   }
 }
 </script>
diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index 4a6a9721e..075d843cf 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -767,7 +767,7 @@ export default {
           {validator: this.verify.valiateEnName, trigger: 'change'}
         ],
         lawsNo: [
-          // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
+          {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
         ],
         issueTime: [
@@ -796,7 +796,7 @@ export default {
         //   {required: true, type: 'string', message: '政策编号不能为空', trigger: 'change'},
         //   {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'}
         // ],
-      },// 完整校验
+      },
       littleSarLawsStandRules: {
         lawsTypeFirstLevel: [
           {required: true, message: '1级政策分类不能为空', trigger: 'change'}
@@ -814,7 +814,24 @@ export default {
           {required: true, message: '政策名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change'},
           {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
-        ]
+        ],
+        lawsEnName: [
+          {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'},
+          {validator: this.verify.valiateEnName, trigger: 'change'}
+        ],
+        lawsNo: [
+          {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
+          {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
+        ],
+        issueCompany: [
+          {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'}
+        ],
+        lawsNotisyncNum: [
+          {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'}
+        ],
+        lawsRemark: [
+          {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'}
+        ],
       },// 认证清单为否 的校验
       commentCycleDate2:'',
       pickerOptions: {