From e7ce08b0a8037a4d5fb9b087aba817f5ffce607b Mon Sep 17 00:00:00 2001
From: "DESKTOP-00SUCB6\\Administrator" <qinshunyu07@sina.com>
Date: Mon, 6 Sep 2021 18:11:03 +0800
Subject: [PATCH] =?UTF-8?q?0906=20=20=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/h5/info.html                      |  4 +-
 src/utils/index.js                       | 11 +++++
 src/views/company/companyEdit.vue        | 37 ++++++++++-------
 src/views/company/companyInfo.vue        |  6 +--
 src/views/company/search.vue             |  2 +-
 src/views/home/index.vue                 |  6 +--
 src/views/home/index2.vue                | 11 ++---
 src/views/system/qualification/index.vue | 53 +++++++++++++++---------
 8 files changed, 83 insertions(+), 47 deletions(-)

diff --git a/public/h5/info.html b/public/h5/info.html
index c700e04..5a3e5b4 100644
--- a/public/h5/info.html
+++ b/public/h5/info.html
@@ -88,7 +88,7 @@
     }
     .content-box .content-text {
         font-size: 14px;
-        line-height: 44px;
+        /* line-height: 40px; */
         color: #666666;
         /* border-bottom: 1px dashed #D2E1EA; */
         overflow: hidden;
@@ -104,7 +104,7 @@
     .content-box .content-text label{
         display: inline-block;
         /* float: left; */
-        width: 40%;
+        /* width: 40%; */
         font-weight: 600;
         line-height: 34px;
         vertical-align: top;
diff --git a/src/utils/index.js b/src/utils/index.js
index 3ee1788..c67ab2d 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -14,6 +14,17 @@ export function formatDate(cellValue) {
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
+/**
+ * 表格时间格式化 - 时分秒
+ */
+ export function getFormatTime(cellValue) {
+  if (cellValue == null || cellValue == "") return "";
+  var date = new Date(cellValue)
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+  return hours + ':' + minutes + ':' + seconds
+}
 /*获取当前年月日*/
 export function getDay() {
   var nowDate = new Date();
diff --git a/src/views/company/companyEdit.vue b/src/views/company/companyEdit.vue
index c82f3b2..2dda081 100644
--- a/src/views/company/companyEdit.vue
+++ b/src/views/company/companyEdit.vue
@@ -170,8 +170,8 @@
                         <el-input v-if="isEdit" v-model="form.contactInformation" placeholder="请输入联系方式" />
                         <span v-else>{{form.contactInformation}}</span>
                     </el-form-item>
-                    <el-form-item label="省代码：" prop="provinceCode">
-                        <el-select v-if="isEdit" v-model="form.provinceCode" placeholder="请选择省代码" @change="changeProvince">
+                    <el-form-item label="省：" prop="provinceCode">
+                        <el-select v-if="isEdit" v-model="form.provinceCode" placeholder="请选择省" @change="changeProvince">
                         <el-option
                             v-for="dict in provinceCodeOptions"
                             :key="dict.dictValue"
@@ -181,8 +181,8 @@
                         </el-select>
                         <span v-else>{{form.provinceCode | filterProvinceCodeOptions(that)}}</span>
                     </el-form-item>
-                    <el-form-item label="市代码：" prop="cityCode">
-                        <el-select v-if="isEdit" v-model="form.cityCode" placeholder="请选择市代码"  @change="changeCity">
+                    <el-form-item label="市：" prop="cityCode">
+                        <el-select v-if="isEdit" v-model="form.cityCode" placeholder="请选择市"  @change="changeCity">
                         <el-option
                             v-for="(item,index) in cityCodeOptions"
                             :key="index"
@@ -192,8 +192,8 @@
                         </el-select>
                         <span v-else>{{form.cityCode | filterCityCodeOptions(that)}}</span>
                     </el-form-item>
-                    <el-form-item label="区代码：" prop="areaCode">
-                        <el-select v-if="isEdit" v-model="form.areaCode" placeholder="请选择县代码"  @change="changeArea">
+                    <el-form-item label="区(县)：" prop="areaCode">
+                        <el-select v-if="isEdit" v-model="form.areaCode" placeholder="请选择区(县)"  @change="changeArea">
                         <el-option
                             v-for="(item,index) in areaCodeOptions"
                             :key="index"
@@ -237,7 +237,7 @@
                     style="display: block"
                     v-model="form.enterpriseDescribeSwitch"
                     active-text="显示企业介绍信息"
-                    inactive-text="显示企业介绍信息"
+                    inactive-text="隐藏企业介绍信息"
                     :active-value="1"
                     :inactive-value="0">
                     </el-switch>
@@ -297,7 +297,7 @@ export default {
             }
         };
         const checkUrl = (rule, value, callback) => {
-            if(value.trim() == '')
+            if(!value || value.trim() == '')
             {
                 callback()
             }
@@ -410,13 +410,13 @@ export default {
                 { required: true, message: "法定代表人名称不能为空", trigger: "blur" }
                 ],
                 provinceCode: [
-                { required: true, message: "省代码不能为空", trigger: "change" }
+                { required: true, message: "省不能为空", trigger: "change" }
                 ],
                 cityCode: [
-                { required: true, message: "市代码不能为空", trigger: "change" }
+                { required: true, message: "市不能为空", trigger: "change" }
                 ],
                 areaCode: [
-                { required: true, message: "区代码不能为空", trigger: "change" }
+                { required: true, message: "区不能为空", trigger: "change" }
                 ],
                 typeLegalRepresentative: [
                 { required: true, message: "法定代表人类型不能为空", trigger: "change" }
@@ -583,12 +583,21 @@ export default {
             this.isEdit = true
         },
         changeProvince(newVal){
-            this.form.cityCode = null
-            this.form.areaCode = null
+            if(this.form.cityCode != null)
+            {
+                this.form.cityCode = null
+            }
+            if(this.form.areaCode != null)
+            {
+                this.form.areaCode = null
+            }
             this.getCityOrAreaList(newVal,1)
         },
         changeCity(newVal){
-            this.form.areaCode = null
+            if(this.form.areaCode != null)
+            {
+                this.form.areaCode = null
+            }
             this.getCityOrAreaList(newVal,2)
         },
         changeArea(newVal){
diff --git a/src/views/company/companyInfo.vue b/src/views/company/companyInfo.vue
index b8c9630..e5c8f01 100644
--- a/src/views/company/companyInfo.vue
+++ b/src/views/company/companyInfo.vue
@@ -22,19 +22,19 @@
                 <tr> 
                     <th>法定代表人证件类型：</th> 
                     <td>{{form.typeLegalRepresentative | filterTypeLegalRepresentative(that)}}</td> 
-                    <th>省代码：</th> 
+                    <th>省：</th> 
                     <td>{{form.provinceCode | filterProvinceCodeOptions(that)}}</td> 
                 </tr> 
                 <tr> 
                     <th>法定代表人证件号码：</th> 
                     <td>{{form.certificateNumberLegalRepresentative}}</td> 
-                    <th>市代码：</th> 
+                    <th>市：</th> 
                     <td>{{form.cityCode | filterCityCodeOptions(that)}}</td> 
                 </tr> 
                 <tr> 
                     <th>统一社会信用代码类型：</th> 
                     <td>{{form.corporateUnifiedSocialCreditType | filterCorporateUnifiedSocialCreditTypeOptions(that)}}</td> 
-                    <th>区代码：</th> 
+                    <th>区：</th> 
                     <td>{{form.areaCode | filterAreaCodeOptions(that)}}</td> 
                 </tr> 
                 <tr> 
diff --git a/src/views/company/search.vue b/src/views/company/search.vue
index 00bf1a8..6d2bcf1 100644
--- a/src/views/company/search.vue
+++ b/src/views/company/search.vue
@@ -181,7 +181,7 @@
             </div>
             <el-divider></el-divider>
         </el-drawer>
-        <el-dialog title="资质详情" :visible.sync="qualificationVisible" width="600px" append-to-body>
+        <el-dialog title="资质详情" :visible.sync="qualificationVisible" width="750px" append-to-body>
             <el-form ref="form" :model="qualificationFrom" label-width="120px">
                 <el-row>
                     <el-col :span="12">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c332371..c5db394 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -41,7 +41,7 @@
     </div>
 </template>
 <script>
-import {getDay} from "@/utils/index"
+import {getDay,getFormatTime} from "@/utils/index"
 import echarts from "echarts";
 // import echarts from "echarts5_0_1/echarts5_0_1.min.js";
 import "echarts-liquidfill";
@@ -72,10 +72,10 @@ export default {
     },
     mounted() {
         let theDate = new Date()
-        this.times = theDate.getHours()+":"+ theDate.getMinutes()+ ":" +theDate.getSeconds()
+        this.times = getFormatTime(theDate)
         setInterval(() => {
             let theDate = new Date()
-            this.times = theDate.getHours()+":"+ theDate.getMinutes()+ ":" +theDate.getSeconds() 
+            this.times = getFormatTime(theDate)
         }, 1000);
         this.getList()
         this.initEcharts()
diff --git a/src/views/home/index2.vue b/src/views/home/index2.vue
index b9689e6..ce83367 100644
--- a/src/views/home/index2.vue
+++ b/src/views/home/index2.vue
@@ -52,7 +52,8 @@
                             <el-form-item label="企业名片:">
                                 <vue-qr ref="QrInfo" :logoSrc="imageUrl" :text="qrInfo" :size="200" :margin="0"></vue-qr>
                             </el-form-item>
-                            <el-form-item >
+                            
+                            <el-form-item style="margin-top:58px;">
                                 <el-button type="primary" size="mini"  @click="downloadImg('QrInfo')">下载企业名片</el-button>
                             </el-form-item>
                         </el-col>
@@ -107,7 +108,7 @@
     </div>
 </template>
 <script>
-import {getDay} from "@/utils/index"
+import {getDay,getFormatTime} from "@/utils/index"
 
 import {getIndexInfo,getPartnersApplyForVerificationCodesBy,updatePartnersApplyForVerificationCodesBy,setVerificationCodesSwitch,getVerificationCodesSwitchByLogin} from "@/api/home/index"
 import vueQr from 'vue-qr'
@@ -135,7 +136,7 @@ export default {
             enterpriseUrl:'',
             // 表单参数
             form: {
-                isItPublic:'1',
+                isItPublic:'0',
                 time:'2'
             },
             imageUrl:"",
@@ -148,10 +149,10 @@ export default {
     },
     mounted() {
         let theDate = new Date()
-        this.times = theDate.getHours()+":"+ theDate.getMinutes()+ ":" +theDate.getSeconds()
+        this.times = getFormatTime(theDate)
         setInterval(() => {
             let theDate = new Date()
-            this.times = theDate.getHours()+":"+ theDate.getMinutes()+ ":" +theDate.getSeconds() 
+            this.times = getFormatTime(theDate)
         }, 1000);
         this.initData()
     },
diff --git a/src/views/system/qualification/index.vue b/src/views/system/qualification/index.vue
index aac9f2a..b62e2fc 100644
--- a/src/views/system/qualification/index.vue
+++ b/src/views/system/qualification/index.vue
@@ -2,11 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="发证日期" prop="dateOfIssue">
-        <el-date-picker clearable size="small"
+        <!-- <el-date-picker clearable size="small"
           v-model="queryParams.dateOfIssue"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择发证日期">
+        </el-date-picker> -->
+        <el-date-picker clearable size="small"
+          v-model="queryParams.dateOfIssue"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -191,7 +199,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dateOfIssue: null,
+        dateOfIssue: [],
       },
       // 表单参数
       form: {},
@@ -227,7 +235,14 @@ export default {
     /** 查询企业资质列表 */
     getList() {
       this.loading = true;
-      listQualification(this.queryParams).then(response => {
+      console.log(this.queryParams);
+      const params = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        minDateOfIssue:this.queryParams.dateOfIssue[0]?this.queryParams.dateOfIssue[0]:null,
+        maxDateOfIssue:this.queryParams.dateOfIssue[1]?this.queryParams.dateOfIssue[1]:null
+      }
+      listQualification(params).then(response => {
         this.qualificationList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -313,8 +328,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const enterpriseQualificationIds = row.enterpriseQualificationId || this.ids;
-      this.$confirm('是否确认删除企业资质编号为"' + enterpriseQualificationIds + '"的数据项?', "警告", {
+      const enterpriseQualificationName = row.qualificationName;
+      this.$confirm('是否确认删除企业资质名为"' + enterpriseQualificationName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -326,20 +341,20 @@ export default {
         })
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有企业资质数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportQualification(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        })
-    }
+    // handleExport() {
+    //   const queryParams = this.queryParams;
+    //   this.$confirm('是否确认导出所有企业资质数据项?', "警告", {
+    //       confirmButtonText: "确定",
+    //       cancelButtonText: "取消",
+    //       type: "warning"
+    //     }).then(() => {
+    //       this.exportLoading = true;
+    //       return exportQualification(queryParams);
+    //     }).then(response => {
+    //       this.download(response.msg);
+    //       this.exportLoading = false;
+    //     })
+    // }
   }
 };
 </script>