From 55da79ef0553501b59a52f0212bbcdefd7d50e6c Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sat, 1 Jun 2024 18:40:48 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=E6=8F=90=E4=BA=A4-=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/env.js                         |  2 +-
 src/views/enforce/enterpriseBaseInfo.vue  | 11 ++--
 src/views/enforce/noScan.vue              | 77 +++++++++++++++++------
 src/views/enforce/sign.vue                |  1 +
 src/views/enterprise/complaint.vue        |  4 +-
 src/views/enterprise/register.vue         |  9 +--
 src/views/enterprise/registrationList.vue | 18 +++---
 src/views/login.vue                       |  4 +-
 8 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/src/config/env.js b/src/config/env.js
index 6d0dc76..bfe2987 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -1,7 +1,7 @@
 //本地环境
 // let baseUrl="http://139.186.135.156:86";
 let baseUrl="http://10.132.108.3:85";
-// let baseUrl="http://192.168.1.117:85";
+// let baseUrl="http://127.0.0.1:85";
 // let wsUrl='ws://10.76.108.1:9326';
 export {
     baseUrl,
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index d58f33a..277824a 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -240,16 +240,19 @@ onMounted(() =>{
     getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
     // getEnterpriseInformation(props?.enterpriseNumber,success =>{
       if (null != success.data) {
+      	console.log(success);
           data.enterpriseInfo.enterpriseName = success.data.enterpriseName
           data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber
-		  console.log(success.data.companyOrgType)
 		  data.enterpriseInfo.enterpriseType = success.data.companyOrgType
 		  data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress
-		  data.enterpriseInfo.legalPerson = success.data.legalPerson 
+		  data.enterpriseInfo.legalPerson = success.data.legalPerson
 		  data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)'
-		  data.enterpriseInfo.establishmentTime = format(success.data.establishmentTime, 'yyyy-MM-dd');
-		  data.enterpriseInfo.operatingTerm = success.data.operatingTerm
+		  // data.enterpriseInfo.operatingTerm = success.data.operatingTerm
+		  var tmpoperatingTerm = success.data.operatingTerm;
+		  tmpoperatingTerm = tmpoperatingTerm.substring(0, success.data.operatingTerm.indexOf('null'));
+		  data.enterpriseInfo.operatingTerm = tmpoperatingTerm;
 		  data.enterpriseInfo.businessScope = success.data.businessScope
+		  data.enterpriseInfo.establishmentTime = format(success.data.establishmentTime, 'yyyy-MM-dd');
 		  //查询企业类型
 		  getDict({"dictType": "enterpriseType"},success =>{
 		    if (success.data !=null) {
diff --git a/src/views/enforce/noScan.vue b/src/views/enforce/noScan.vue
index 6fa3b9b..df6c6cc 100644
--- a/src/views/enforce/noScan.vue
+++ b/src/views/enforce/noScan.vue
@@ -13,22 +13,15 @@
     <div class="warp_body">
 <!--      {{ content }}-->
       <div class="subsearch">
-        <input class="searchbox" placeholder="请输入关键字搜索" name="keyword" id="" onclick="">
+        <input class="searchbox" v-model="searchParam.enterpriseName" placeholder="请输入关键字搜索" name="keyword" id="" onclick="search">
       </div>
       <div class="search-result">
-        <div class="case-item">
-          <div class="case-title">深圳市鹏程万里智慧科技有限公司</div>
-          <div class="case-info">统一社会信用代码：91511402MAA8RLGP7K</div>
-          <div class="case-area">福田区华强街道</div>
-          <div class="case-info"><span>法定代表人：张伟</span><span>证件号：4455**********0667</span></div>
-          <div class="case-info"><span>企业联系人：李玉明</span><span>联系电话：133****2558</span></div>
-        </div>
-        <div class="case-item">
-          <div class="case-title">深圳市鹏程展翼建筑装饰工程有限公司</div>
-          <div class="case-info">统一社会信用代码：92511402MAA8RLGP69</div>
-          <div class="case-area">福田区华强街道</div>
-          <div class="case-info"><span>法定代表人：王展华</span><span>证件号：4455**********0667</span></div>
-          <div class="case-info"><span>企业联系人：卫军</span><span>联系电话：133****2558</span></div>
+        <div class="case-item" v-for="(item, index) in enterpriseList" @click="toDetail(item)">
+          <div class="case-title">{{item.enterpriseName}}</div>
+          <div class="case-info">统一社会信用代码：{{item.enterpriseNumber}}</div>
+          <div class="case-area">{{item.enterpriseAddress}}</div>
+          <div class="case-info"><span>法定代表人：{{item.legalPerson}}</span><span>证件号：{{item.idNumbe}}</span></div>
+          <div class="case-info"><span>企业联系人：{{item.enterprise}}</span><span>联系电话：{{item.enterpriseTel}}</span></div>
         </div>
       </div>
 
@@ -38,18 +31,18 @@
   </div>
   </div>
 
-  <div v-if="visible" class="popup">
+  <div v-if="visible" class="popup" v-show="isCheck">
     <!-- 弹窗的内容 -->
     <div class="popup-content">
       <div class="subtitle">请选择不扫码的原因：</div>
       <div class="item-box">
-        <span class="item-btn active">企业拒绝出示二维码</span>
-        <span class="item-btn">网络/设备故障</span>
-        <span class="item-btn">其它</span>
+        <span :class="checkCss==1?'item-btn active':'item-btn'" @click="checkReason('企业拒绝出示二维码', 1)">企业拒绝出示二维码</span>
+        <span :class="checkCss==2?'item-btn active':'item-btn'" @click="checkReason('网络/设备故障', 2)">网络/设备故障</span>
+        <span :class="checkCss==3?'item-btn active':'item-btn'" @click="checkReason('其它', 3)">其它</span>
       </div>
       <div class="btnbox">
-        <button class='btn-reset' @click="">重置</button>
-        <button class='btn-search' @click="">确定</button>
+<!--        <button class='btn-reset' @click="">重置</button>-->
+        <button class='btn-search' @click="closeReason">确定</button>
       </div>
     </div>
   </div>
@@ -57,7 +50,20 @@
 </template>
 
 <script>
+  import { queryEnterpriseInfoList } from '../../api/enterprise'
 export default {
+  data() {
+    return {
+      isCheck: true,
+      checkCss: 1,
+      reason: "企业拒绝出示二维码",
+      enterpriseList: [],
+      searchParam: {
+        // 企业名称
+        enterpriseName:"",
+      }
+    }
+  },
   props: {
     visible: {
       type: Boolean,
@@ -68,9 +74,40 @@ export default {
       default: ''
     }
   },
+  created() {
+    this.queryList();
+  },
   methods: {
     closePopup() {
       this.$emit('close');
+    },
+    queryList() {
+      queryEnterpriseInfoList(null,success =>{
+        console.log(success)
+        if(success.success) {
+          this.enterpriseList.push(...success.data);
+        }
+        console.log(this.enterpriseList);
+      });
+    },
+    toDetail(item) {
+      this.$router.push({
+        path: "/sign",
+        query: {
+          reason: this.reason,
+          enterpriseNumber: item.salt,
+        }
+      });
+    },
+    search() {
+      queryList();
+    },
+    checkReason(val, key) {
+      this.reason = val;
+      this.checkCss = key;
+    },
+    closeReason() {
+      this.isCheck = false;
     }
   }
 }
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 1fb6d4b..f75375c 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -300,6 +300,7 @@ const getLinkageByParentIdToGA = (parentId) => {
 onMounted(() =>{
     // 数据填充
     // dataFillIn();
+    submitData.enforce = route?.query?.reason;
 
     //查询企业信息
     getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 407113e..e5f4577 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -113,7 +113,7 @@ import {addEnterpriseComplaint} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import {uploadFile} from '../../util/fileUpload'
 import { reactive, ref } from "vue";
-const { useMy } = $globalStore
+const { useCommon, useMy } = $globalStore
 
 const router = useRouter();
 const route = useRoute();
@@ -127,6 +127,8 @@ const data = reactive({
 });
 //保存参数
 const submitData = reactive({
+    // 用户id
+    userId: ref(useCommon.userId),
   //关联案件ID
   relId:"",
   //案件名称
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index f3d89cf..71a9284 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -168,7 +168,7 @@ const goBack = () => {
 };
 
 const submit = () =>{
-  // console.log(submitData);
+  console.log(submitData);
   addEnterpriseInformation(submitData,success =>{
     //重新设置本地存储
     useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber);
@@ -215,11 +215,12 @@ const selectOperatingTermDate  = () =>{
   console.log(data.showOperatingTermPicker)
 }
 const onDateConfirm = (value)=> {
-      console.log(value);
+      let tmptime = "";
       value.selectedValues.forEach((item,index) => {
-        console.log(item);
+          tmptime += item + "-";
       });
-      submitData.establishmentTime = "2023-04-21 00:00:00"
+      console.log(tmptime)
+      submitData.establishmentTime = tmptime.substring(0, tmptime.length-1);
       data.showDatePicker = false;
 }
 const formatDate = (date) => `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 818ecc4..0c5bc64 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -247,16 +247,16 @@
 
     });
 
- countWorkdays = (startDate) => {
-  let workdays = 0;
-  endDate = new Date();
-  for (let date = new Date(startDate); date <= endDate; date.setDate(date.getDate() + 1)) {
-    if (date.getDay() % 6 !== 0) { // 假设周末是6 (星期六) 和 0 (星期日)
-      workdays++;
+    const countWorkdays = (startDate) => {
+      let workdays = 0;
+      endDate = new Date();
+      for (let date = new Date(startDate); date <= endDate; date.setDate(date.getDate() + 1)) {
+        if (date.getDay() % 6 !== 0) { // 假设周末是6 (星期六) 和 0 (星期日)
+          workdays++;
+        }
+      }
+      return workdays;
     }
-  }
-  return workdays;
-}
 
     // 返回
     const goBack = () => {
diff --git a/src/views/login.vue b/src/views/login.vue
index c1afc4c..dab66d9 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -43,8 +43,8 @@ const onSubmit = async (values) => {
   // return;
   userLogin(values,success=>{
     console.log(success);
-        // router.push({ name: "Home" });
-        router.push({ name: "enforceHome" });
+        router.push({ name: "Home" });
+        // router.push({ name: "enforceHome" });
         //设置全局变量
         useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
         useCommon.SET_USER_ID(success.data.userId);