zx

src/api/basic/console/index.js

@@ -59,4 +59,13 @@ export function userUnbindingCommunity(params) {
 		method: 'get',
 		params: params,
 	})
+}
+
+// 校验公司名称
+export function checkCompanyName(params) {
+	return httpService({
+		url: `/user/settledApplication/checkCompanyName`,
+		method: 'get',
+		params: params,
+	})
 }

src/api/manage/index.js

@@ -23,7 +23,7 @@ export function isPass(params) {
 	return httpService({
 		url: `/user/settledApplication/isPass`,
 		method: 'post',
-		params: params,
+		data: params,
 	})
 }
 

src/views/Basic/home/depend/settledForm.js

@@ -19,6 +19,23 @@ export const form = {
 	businessLicenseImgUrls:[],
 	othersImgUrls:[],
 }
+
+//企业名称校验
+import {checkCompanyName} from "@/api/basic/console"
+const handleConfirm = (rule,value,callback) => {
+	if(!value){
+		callback();
+	  }else{
+		checkCompanyName({companyName: value}).then(res => {
+			if (res.data == '该企业已入驻') {
+			callback(new Error("该企业已入驻!"));
+			} else {
+			callback();
+			}
+		})
+	}
+}
+
 export const rules = {
 	tel: [
 		{
@@ -42,9 +59,10 @@ export const rules = {
 	companyName: [
 		{
 			required: true,
-			message: "请输入公司名称",
+			message: "请输入企业名称",
 			trigger: "blur",
-		}],
+		},
+		{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}],
 	socialCreditCode: [
 		{
 			required: true,

src/views/Basic/home/newOrder.vue

@@ -139,7 +139,7 @@ export default {
     methods: {
         getApi() {
             let obj = {pageNum: 1,size: 1000};
-            getChargingList(Object.assign(obj, {name: ''})).then(res => {
+            getChargingList(Object.assign(obj, {name: '',status: 1})).then(res => {
                 let data = res.data.rows;
                 this.modelData = data
             })
@@ -225,6 +225,14 @@ export default {
                     createOrder(this.form).then((res) => {
                         if (res.code === 200) {
                         this.$message.success(res.msg);
+                        let data = res.data
+                        let routeData = this.$router.resolve({ 
+                            path: '/Manage/Pay', 
+                            query: {
+                                htmls: data 
+                            }
+                        });
+                        window.open(routeData.href, '_blank');
                         this.$router.go(-1);
                         } else {
                         this.$message.error(res.msg);
@@ -233,6 +241,7 @@ export default {
                 }
             })
         },
+        
         cancel() {
 			      this.$router.go(-1);
         }

src/views/Basic/home/settled.vue

@@ -11,32 +11,6 @@
       layout="vertical"
       :wrapper-col="wrapperCol"
     >
-      <a-form-model-item
-        ><div class="cardTitle">关联账号</div></a-form-model-item
-      >
-      <a-form-model-item ref="tel" label="手机号" prop="tel">
-        <a-input
-          v-model="form.tel"
-          style="width: 60%"
-          placeholder="请输入手机号"
-          @blur="
-            () => {
-              $refs.tel.onFieldBlur();
-            }
-          "
-        />
-      </a-form-model-item>
-      <a-form-model-item label="手机验证码" prop="code">
-        <a-input
-          placeholder="请输入验证码"
-          v-model="form.code"
-          style="width: 60%; margin-right: 10px"
-        />
-        <!-- <a-button type="primary" @click="getCode">获取验证码</a-button> -->
-        <a-button type="primary" @click="getCode" :disabled="inCodeGap">
-                    {{inCodeGap == false ? '获取验证码' : codeGap+'s后再次获取'}}
-        </a-button>
-      </a-form-model-item>
       <a-form-model-item
         ><div class="cardTitle">基础信息</div></a-form-model-item
       >
@@ -190,6 +164,31 @@
           v-model="form.contactsAddressDetail"
         ></a-input>
       </a-form-model-item>
+      <a-form-model-item
+        ><div class="cardTitle">关联账号</div></a-form-model-item
+      >
+      <a-form-model-item ref="tel" label="手机号" prop="tel">
+        <a-input
+          v-model="form.tel"
+          style="width: 60%"
+          placeholder="请输入手机号"
+          @blur="
+            () => {
+              $refs.tel.onFieldBlur();
+            }
+          "
+        />
+      </a-form-model-item>
+      <a-form-model-item label="手机验证码" prop="code">
+        <a-input
+          placeholder="请输入验证码"
+          v-model="form.code"
+          style="width: 60%; margin-right: 10px"
+        />
+        <a-button type="primary" @click="getCode" :disabled="inCodeGap">
+                    {{inCodeGap == false ? '获取验证码' : codeGap+'s后再次获取'}}
+        </a-button>
+      </a-form-model-item>
     </a-form-model>
     <div style="text-align: center">
       <a-button type="primary" @click="onSubmit"> 提交 </a-button>
@@ -231,20 +230,20 @@ export default {
 		},
 		// 获取验证码
 		getCode() {
-      let num = setInterval(() => {
-        this.inCodeGap = true;
-        this.codeGap -= 1;
-        if(this.codeGap < 1) {
-          clearInterval(num);
-          if(this.codeGap < 1) {
-            this.inCodeGap = false;
-            this.codeGap = 60;
-          }
-        }
-      },1000)
 			sendTelCode({ tel: this.form.tel }).then((res) => {
 				if (res) {
-					// this.$message.success("取消成功");
+          let num = setInterval(() => {
+            this.inCodeGap = false;
+            this.inCodeGap = true;
+            this.codeGap -= 1;
+            if(this.codeGap < 1) {
+              clearInterval(num);
+              if(this.codeGap < 1) {
+                this.inCodeGap = false;
+                this.codeGap = 60;
+              }
+            }
+          },1000)
 					this.$message.success(res.msg);
 				}
 			});

src/views/Manage/OrderManage/_addOrder.vue

@@ -240,6 +240,7 @@ export default {
 
 <style lang="less">
 .main-content {
+    width: 1400px;
     margin-left: 125px;
 }
 </style>

src/views/Manage/SettleRequestManage/_detail.vue

@@ -122,8 +122,13 @@ export default {
 			this.$router.go(-1);
 		},
 		auditSubmit(){
-      isPass(this.appForm).then( () => {
+      isPass(this.appForm).then((res) => {
-
+          if (res.code === 200) {
+						this.$message.success(res.msg);
+            this.$router.go(-1);
+					} else {
+						this.$message.error(res.msg);
+					}
       })
 			this.auditShow = false
 		},