From a208e8bfa0ddaa54cd23e306f9bc75cd03e39db6 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 22 Apr 2024 09:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=99=BB=E8=AE=B0=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=8D=89=E7=A8=BF=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enforce.js                       |  2 +
 src/components/header-nav/index.vue      |  2 +-
 src/views/administrative/appointment.vue | 10 ++++-
 src/views/enforce/sign.vue               | 51 ++++++++++++++++++++++--
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/api/enforce.js b/src/api/enforce.js
index 625944d..c8d0704 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -30,6 +30,8 @@ export const addEnforcementInspectionProgram = (params, success, error) =>_post(
 
 //保存执法信息登记
 export const addEnforcementRegistration = (params, success, error) => _post("/code/registration/add",params,success,error)
+export const editEnforcementRegistration = (params, success, error) => _post("/code/registration/edit",params,success,error)
+export const getRegByUserIdAndZero = (id, success, error) => _get("/code/registration/getByUserIdAndZero",null,success,error)
 
 //查询历史检查信息
 export const queryRegistrationList = (params, success, error) => _get("/code/registration/queryList",params,success,error)
diff --git a/src/components/header-nav/index.vue b/src/components/header-nav/index.vue
index 6597685..b7677d7 100644
--- a/src/components/header-nav/index.vue
+++ b/src/components/header-nav/index.vue
@@ -15,7 +15,7 @@
         </template>
 
         <template #right>
-          <van-button v-if="data?.leftArrowtag" round block type="info">{{rightText}}</van-button>
+<!--          <van-button v-if="data?.leftArrowtag" round block type="info">{{rightText}}</van-button>-->
         </template>
       </van-nav-bar>
     </div>
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 5fbe713..bd67e7c 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -2,7 +2,7 @@
 	<div class="address_edit">
 		<!-- 导航栏 -->
 		<div class="header_body">
-			<header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查预约`" @rightClick="tmpSave" :rightArrow="true" rightText="保存"></header-nav>
+			<header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查预约`"></header-nav>
 		</div>
 		<!-- 中间 -->
 		<div>
@@ -92,7 +92,8 @@
 
             <div class="warp_body">
                 <van-action-bar>
-                    <van-button round block type="info" native-type="submit">提交</van-button>
+                    <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
+                    <van-button round block type="info" native-type="submit" @click="submit">提交</van-button>
                 </van-action-bar>
             </div>
         </van-form>
@@ -285,10 +286,15 @@ const dataFillIn = () => {
 
 const tmpSave = () => {
     showSuccessToast('临时保存');
+    console.log(submitData)
     addEnterpriseLawEnforcement(submitData,success =>{
         //跳转企业二维码地址
         if(success.success){
             showSuccessToast('保存成功');
+            router.push(
+                {
+                    path: "/appointmentList"
+                });
         }
     },error=>{
         console.log("保存失败")
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 8a95c84..a94b7f3 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -127,7 +127,7 @@
                 </van-cell-group>
 
                 <van-action-bar>
-                  <van-button round block type="info" native-type="submit" @click="submit(0)">保存</van-button>
+                  <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
                   <van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button>
                 </van-action-bar>
             </van-form>
@@ -158,7 +158,7 @@
 <script setup name="register">
 
 import { showSuccessToast } from 'vant';
-import {addEnforcementRegistration,queryUserInfo} from '../../api/enforce'
+import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo} from '../../api/enforce'
 import {getEnterpriseInformation} from '../../api/enterprise'
 import { reactive, ref } from "vue";
 import {uploadFile} from "../../util/fileUpload";
@@ -167,6 +167,7 @@ import {formattedTime} from "@/util/util";
 import Popup from './userFilter.vue';
 import {getDict} from "../../api/Home";
 import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
+import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";
 
 const { useMy } = $globalStore
 
@@ -192,6 +193,8 @@ const data = reactive({
 });
 //保存参数
 const submitData = reactive({
+    // id
+    id:"",
     //执法部门
     lawEnforcement:"",
     lawEnforcementId:"",
@@ -279,6 +282,8 @@ const getLinkageByParentIdToGA = (parentId) => {
 //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
+    dataFillIn();
+
     //查询企业信息
     getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
       if (null != success.data) {
@@ -365,9 +370,49 @@ const gaCancel = () => {
 }
 /* 检查要求 end */
 
+const dataFillIn = () => {
+    getRegByUserIdAndZero(null,success =>{
+        //跳转企业二维码地址
+        if(success.success){
+            Object.keys(submitData).forEach((item) => {
+                submitData[item] = success.data[item] ? success.data[item] : "";
+            })
+            data.lawEnforcementItemText =success.data['params'].lawEnforcementItemText;
+            data.lawEnforcementBasisText =success.data['params'].lawEnforcementBasisText;
+            submitData.lawCertificateNumText =success.data['lawEnforcer'];
+            submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo'];
+            submitData.subsidiaryerText =success.data['subsidiaryer'];
+            if(success.data['reslut']==0) {
+                tapGood();
+            } else {
+                tapBad();
+            }
+            submitData.fileList = [];
+            submitData.fileListObj = [];
+            showSuccessToast('保存成功');
+        }
+    },error=>{
+        console.log("保存失败")
+    })
+}
+
+const tmpSave = () => {
+    showSuccessToast('临时保存');
+    console.log(submitData);
+    addEnforcementRegistration(submitData,success =>{
+        //跳转企业二维码地址
+        if(success.success){
+            showSuccessToast('保存成功');
+            router.push({ path: "/enforceHome" });
+        }
+    },error=>{
+        console.log("保存失败")
+    })
+}
+
 const submit = (type) =>{
   submitData.isSubmit = type;
-    addEnforcementRegistration(submitData,success =>{
+    editEnforcementRegistration(submitData,success =>{
     //跳转首页
     if(success.success){
         showSuccessToast('登记成功');