From 096e21b740f33e6d21cf2b3eef231369452a958a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Jan 2024 11:48:10 +0800
Subject: [PATCH] fix

---
 src/pages/activity/add/index.vue    |  2 --
 src/pages/activity/list/index.vue   |  2 +-
 src/pages/preschool/audit/index.vue |  2 +-
 src/pages/preschool/list/index.vue  | 35 ++++++++++++++--------------
 src/pages/preschool/manage/auth.vue |  3 +++
 src/pages/supplier/audit/index.vue  |  2 +-
 src/pages/supplier/list/index.vue   | 36 ++++++++++++++---------------
 src/pages/supplier/manage/auth.vue  |  4 ++++
 src/setting.js                      |  2 +-
 9 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/pages/activity/add/index.vue b/src/pages/activity/add/index.vue
index db22502..ebd32b8 100644
--- a/src/pages/activity/add/index.vue
+++ b/src/pages/activity/add/index.vue
@@ -291,8 +291,6 @@ export default {
         competitionScope: 1,
         whetherToShowApplicants: '1',
         reportingPlace: '',
-        competitionRangeList: [],
-        competitionRegistration: {},
         createSource: 0,
         quantityLimit: '',
         classificationId: ''
diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue
index e11bcff..38b81f2 100644
--- a/src/pages/activity/list/index.vue
+++ b/src/pages/activity/list/index.vue
@@ -192,7 +192,7 @@ export default {
         endTime: "",
         platformSource: null,
         competitionScope: [],
-        createSource: 0
+        createSource: null
       },
       multipleSelection: [],
       dateList: [
diff --git a/src/pages/preschool/audit/index.vue b/src/pages/preschool/audit/index.vue
index 4372203..4833c99 100644
--- a/src/pages/preschool/audit/index.vue
+++ b/src/pages/preschool/audit/index.vue
@@ -122,7 +122,7 @@ export default {
       if (this.submiting) return false
       this.submiting = true
       try {
-        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
+        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&authenticationStatus=${auditStatus === 2 ? 2 : 0}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
           this.$router.back()
           Util.successMsg('审核成功！');
         })
diff --git a/src/pages/preschool/list/index.vue b/src/pages/preschool/list/index.vue
index 7fc2763..f283e1c 100644
--- a/src/pages/preschool/list/index.vue
+++ b/src/pages/preschool/list/index.vue
@@ -27,11 +27,18 @@
           </el-select>
         </li>
         <li>
-          <el-input style="width: 300px"
-                    placeholder="请输入园所名称、联系人、账号、手机号"
-                    prefix-icon="el-icon-search"
-                    v-model="form.keyWord"
-                    clearable />
+          <label>会员状态</label>
+          <el-select style="width: 116px"
+                     v-model="form.schoolId"
+                     clearable
+                     filterable
+                     placeholder="请选择"
+                     @change="initData">
+            <el-option v-for="(item, i) in platformList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
         </li>
         <!-- <li>
           <label>来源</label>
@@ -62,19 +69,6 @@
                           value-format="yyyy-MM-dd"
                           clearable></el-date-picker>
         </li>
-        <li>
-          <label>会员状态</label>
-          <el-select v-model="form.schoolId"
-                     clearable
-                     filterable
-                     placeholder="请选择会员状态"
-                     @change="initData">
-            <el-option v-for="(item, i) in platformList"
-                       :key="i"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </li>
         <li>
           <label>认证状态</label>
           <el-select v-model="form.authenticationStatus"
@@ -89,6 +83,11 @@
           </el-select>
         </li>
       </ul>
+      <el-input style="width: 300px"
+                placeholder="请输入园所名称、联系人、账号、手机号"
+                prefix-icon="el-icon-search"
+                v-model="form.keyWord"
+                clearable />
     </div>
 
     <div class="relative">
diff --git a/src/pages/preschool/manage/auth.vue b/src/pages/preschool/manage/auth.vue
index 6eb7dee..ea7a91a 100644
--- a/src/pages/preschool/manage/auth.vue
+++ b/src/pages/preschool/manage/auth.vue
@@ -172,6 +172,9 @@ export default {
       if (!form.legalPerson) return Util.warningMsg('请输入法人')
       if (this.submiting) return false
       this.submiting = true
+
+      // 幼儿园和供应商有两个状态 authenticationStatus是认证状态，auditStatus是流程审批状态，authenticationStatus改成已认证后，auditStatus也要改成通过；authenticationStatus改成未认证后，如果未提交的，auditStatus要改成未提交，如果是已提交的，则改成不通过
+      form.auditStatus = form.authenticationStatus
       try {
         await this.$post(this.api.updateCertification, form).then(res => {
           Util.successMsg('保存成功！');
diff --git a/src/pages/supplier/audit/index.vue b/src/pages/supplier/audit/index.vue
index 4372203..4833c99 100644
--- a/src/pages/supplier/audit/index.vue
+++ b/src/pages/supplier/audit/index.vue
@@ -122,7 +122,7 @@ export default {
       if (this.submiting) return false
       this.submiting = true
       try {
-        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
+        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&authenticationStatus=${auditStatus === 2 ? 2 : 0}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
           this.$router.back()
           Util.successMsg('审核成功！');
         })
diff --git a/src/pages/supplier/list/index.vue b/src/pages/supplier/list/index.vue
index afcefc7..49f0c6d 100644
--- a/src/pages/supplier/list/index.vue
+++ b/src/pages/supplier/list/index.vue
@@ -27,11 +27,18 @@
           </el-select>
         </li>
         <li>
-          <el-input style="width: 300px"
-                    placeholder="请输入供应商名称、联系人、账号、手机号"
-                    prefix-icon="el-icon-search"
-                    v-model="form.keyWord"
-                    clearable />
+          <label>会员状态</label>
+          <el-select style="width: 116px"
+                     v-model="form.schoolId"
+                     clearable
+                     filterable
+                     placeholder="请选择"
+                     @change="initData">
+            <el-option v-for="(item, i) in platformList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
         </li>
         <!-- <li>
           <label>来源</label>
@@ -62,19 +69,6 @@
                           value-format="yyyy-MM-dd"
                           clearable></el-date-picker>
         </li>
-        <li>
-          <label>会员状态</label>
-          <el-select v-model="form.schoolId"
-                     clearable
-                     filterable
-                     placeholder="请选择会员状态"
-                     @change="initData">
-            <el-option v-for="(item, i) in platformList"
-                       :key="i"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </li>
         <li>
           <label>认证状态</label>
           <el-select v-model="form.authenticationStatus"
@@ -89,6 +83,12 @@
           </el-select>
         </li>
       </ul>
+
+      <el-input style="width: 330px"
+                placeholder="请输入供应商名称、联系人、账号、手机号"
+                prefix-icon="el-icon-search"
+                v-model="form.keyWord"
+                clearable />
     </div>
 
     <div class="relative">
diff --git a/src/pages/supplier/manage/auth.vue b/src/pages/supplier/manage/auth.vue
index be99d38..0d86f29 100644
--- a/src/pages/supplier/manage/auth.vue
+++ b/src/pages/supplier/manage/auth.vue
@@ -148,8 +148,12 @@ export default {
       if (!form.companyName) return Util.warningMsg('请输入供应商名称')
       if (!form.creditCode) return Util.warningMsg('请输入统一社会信用代码')
       if (!form.legalPerson) return Util.warningMsg('请输入法人')
+
       if (this.submiting) return false
       this.submiting = true
+      // 幼儿园和供应商有两个状态 authenticationStatus是认证状态，auditStatus是流程审批状态，authenticationStatus改成已认证后，auditStatus也要改成通过；authenticationStatus改成未认证后，如果未提交的，auditStatus要改成未提交，如果是已提交的，则改成不通过
+      // form.auditStatus = form.authenticationStatus === 2 ? 2 : form.auditStatus
+      form.auditStatus = form.authenticationStatus
       try {
         await this.$post(this.api.updateCertification, form).then(res => {
           Util.successMsg('保存成功！');
diff --git a/src/setting.js b/src/setting.js
index 7af381a..feca650 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,7 +5,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
 let host = `${location.origin}/`
 if (isDev) {
   host = 'http://124.71.79.122/'
-	host = 'http://192.168.31.217:10010/'
+	// host = 'http://192.168.31.217:10010/'
 }
 
 const Setting = {