From de28a2d94cb8151f1deb854c6f7aaa6fcbc47ddb Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Mon, 28 Jul 2025 12:52:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?2025/07/28=20=E6=89=93=E5=9B=9E=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share_office_vehicle_info/view.vue                   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/door_access_control/share_office_vehicle_info/view.vue b/pages/door_access_control/share_office_vehicle_info/view.vue
index 703119a..0d2c2e7 100644
--- a/pages/door_access_control/share_office_vehicle_info/view.vue
+++ b/pages/door_access_control/share_office_vehicle_info/view.vue
@@ -40,7 +40,7 @@
             <view slot="label" class="mt-10">{{ info.QY_AUDIT_DATE }}</view>
           </u-cell>
           <u-cell>
-            <view slot="title" class="title">企业审核备注</view>
+            <view slot="title" class="title">打回原因</view>
             <view slot="label" class="mt-10">{{ info.QY_REMARK }}</view>
           </u-cell>
         </template>
@@ -90,7 +90,12 @@ export default {
         0: "全部",
         1: "东港区",
         2: "西港区",
-      }
+      },
+      IS_AUDIT_LIST: {
+        1: "待审核",
+        2: "审核通过",
+        3: "审核驳回",
+      },
     }
   },
   onLoad() {

From 52a4574be22d928d37f669a45a93a3a9883a52a7 Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Mon, 28 Jul 2025 14:49:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?2025/07/28=20=E7=9B=91=E7=AE=A1=E7=AB=AFapp?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=96=B0=E5=A2=9E=E5=8D=95=E4=BD=8D=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=20=E5=8D=95=E4=BD=8D=E8=BD=A6=E8=BE=86=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=B5=81=E7=A8=8B=E9=83=BD=E8=B5=B0=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share_office_vehicle_info/add.vue         | 29 +++++++++++++++++--
 .../share_office_vehicle_info/index.vue       |  5 ++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pages/door_access_control/share_office_vehicle_info/add.vue b/pages/door_access_control/share_office_vehicle_info/add.vue
index 4f87f5c..0681a27 100644
--- a/pages/door_access_control/share_office_vehicle_info/add.vue
+++ b/pages/door_access_control/share_office_vehicle_info/add.vue
@@ -10,6 +10,11 @@
         <u-form-item label="车牌号" prop="LICENCE_NO" borderBottom required>
           <u-input v-model="form.LICENCE_NO" border="none" input-align="right"/>
         </u-form-item>
+        <u-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE" borderBottom required
+                      @click="fnSingleChoiceClick('VEHICLE_BELONG_TYPE')">
+          <u-input v-model="form.VEHICLE_BELONG_TYPE_NAME" border="none" readonly input-align="right"/>
+          <u-icon name="arrow-right"></u-icon>
+        </u-form-item>
         <u-form-item label="车辆类型" prop="VEHICLE_TYPE" borderBottom required
                      @click="fnSingleChoiceClick('VEHICLE_TYPE')">
           <u-input v-model="form.VEHICLE_TYPE_NAME" border="none" readonly input-align="right"/>
@@ -28,7 +33,7 @@
         <u-form-item label="车辆所属部门" prop="DEPARTMENT_NAME" borderBottom required>
           <u-input :value="userInfo.DEPARTMENT_NAME" border="none" readonly input-align="right"/>
         </u-form-item>
-        <u-form-item label="车辆归属人" prop="USERNAME" borderBottom required>
+        <u-form-item v-if="form.VEHICLE_BELONG_TYPE !== '1'"  label="车辆归属人" prop="USERNAME" borderBottom required>
           <u-input :value="userInfo.USERNAME" border="none" readonly input-align="right"/>
         </u-form-item>
         <u-form-item label="行驶证照片" prop="drivingImgFiles" borderBottom required labelPosition="top"
@@ -90,6 +95,10 @@ export default {
         {id: "1", name: "东港区"},
         {id: "2", name: "西港区"},
       ],
+      VEHICLE_OWNERSHIP_TYPE_LIST: [
+        { id: "0", name: "员工车辆" },
+        { id: "1", name: "单位车辆" },
+      ],
       userList: [],
       form: {
         OLD_LICENCE_NO: '',
@@ -105,6 +114,8 @@ export default {
         drivingImgFiles: [],
         vehicleImgFiles: [],
         deleteFileIds: [],
+        VEHICLE_BELONG_TYPE: '',
+        VEHICLE_BELONG_TYPE_NAME: '',
       },
       rules: {
         LICENCE_TYPE: [{type: 'string', required: true, message: '请选择车牌类型', trigger: ['blur', 'change']}],
@@ -161,6 +172,9 @@ export default {
       if (event === 'portId') {
         this.picker.columns = [this.VEHICLE_PORT_LIST]
       }
+      if (event === 'VEHICLE_BELONG_TYPE') {
+        this.picker.columns = [this.VEHICLE_OWNERSHIP_TYPE_LIST]
+      }
       this.picker.show = true
     },
     fnSingleChoiceConfirm(event) {
@@ -180,6 +194,10 @@ export default {
         this.form.portId = event.value[0].id
         this.form.portName = event.value[0].name
       }
+      if (this.picker.type === 'VEHICLE_BELONG_TYPE') {
+        this.form.VEHICLE_BELONG_TYPE = event.value[0].id
+        this.form.VEHICLE_BELONG_TYPE_NAME = event.value[0].name
+      }
       this.fnSingleChoiceCancel()
     },
     fnSingleChoiceCancel() {
@@ -211,6 +229,11 @@ export default {
         this.form.portName = vehiclePort.name;
         this.form.portId = resData.pd.portId.toString();
       }
+      const vehicleOwnership = this.VEHICLE_OWNERSHIP_TYPE_LIST.find(item => item.id === resData.pd.portId.toString());
+      if (vehicleOwnership) {
+        this.form.VEHICLE_OWNERSHIP_TYPE = vehicleOwnership.name;
+        this.form.VEHICLE_OWNERSHIP_TYPE_NAME = resData.pd.VEHICLE_OWNERSHIP_TYPE.toString();
+      }
       const auditor = this.userList.find(item => item.userId === resData.pd.QY_AUDITOR);
       if (auditor) {
         this.form.QY_AUDITOR_NAME = auditor.name;
@@ -273,8 +296,8 @@ export default {
       const params = {
         ...this.form,
         DEPARTMENT_ID: this.userInfo.DEPARTMENT_ID,
-        USER_ID: this.userInfo.USER_ID,
-        USER_NAME: this.userInfo.NAME,
+        USER_ID: this.form.VEHICLE_BELONG_TYPE == 1 ? '' : this.userInfo.USER_ID,
+        USER_NAME: this.form.VEHICLE_BELONG_TYPE == 1 ? '' : this.userInfo.NAME,
         VEHICLE_DEPARTMENT_ID: this.userInfo.DEPARTMENT_ID,
         VEHICLE_DEPARTMENT_NAME: this.userInfo.DEPARTMENT_NAME,
         vehicleImgs: JSON.stringify(vehicleImgs),
diff --git a/pages/door_access_control/share_office_vehicle_info/index.vue b/pages/door_access_control/share_office_vehicle_info/index.vue
index d3d04a5..15b957c 100644
--- a/pages/door_access_control/share_office_vehicle_info/index.vue
+++ b/pages/door_access_control/share_office_vehicle_info/index.vue
@@ -77,8 +77,9 @@ export default {
       },
       VEHICLE_TYPE_MAP: {},
       VEHICLE_OWNERSHIP_TYPE_MAP: {
-        0: "员工车辆",
-        1: "单位车辆",
+        0: "平台新建",
+        1: "平台新建",
+        2: "平台新建",
       },
       IS_AUDIT_LIST: {
         1: "待审核",

From fcfdad284cc8f4dacbf1dbf6c332abdcab6bab26 Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Mon, 28 Jul 2025 14:58:23 +0800
Subject: [PATCH 3/5] =?UTF-8?q?2025/07/28=20=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=20=E6=B3=A8?=
 =?UTF-8?q?=E6=84=8F=E5=92=8C=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share_office_vehicle_info/add.vue                |  6 +++---
 .../share_office_vehicle_info/view.vue               | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/door_access_control/share_office_vehicle_info/add.vue b/pages/door_access_control/share_office_vehicle_info/add.vue
index 0681a27..a907aed 100644
--- a/pages/door_access_control/share_office_vehicle_info/add.vue
+++ b/pages/door_access_control/share_office_vehicle_info/add.vue
@@ -95,7 +95,7 @@ export default {
         {id: "1", name: "东港区"},
         {id: "2", name: "西港区"},
       ],
-      VEHICLE_OWNERSHIP_TYPE_LIST: [
+      VEHICLE_BELONG_TYPE_LIST: [
         { id: "0", name: "员工车辆" },
         { id: "1", name: "单位车辆" },
       ],
@@ -173,7 +173,7 @@ export default {
         this.picker.columns = [this.VEHICLE_PORT_LIST]
       }
       if (event === 'VEHICLE_BELONG_TYPE') {
-        this.picker.columns = [this.VEHICLE_OWNERSHIP_TYPE_LIST]
+        this.picker.columns = [this.VEHICLE_BELONG_TYPE_LIST]
       }
       this.picker.show = true
     },
@@ -229,7 +229,7 @@ export default {
         this.form.portName = vehiclePort.name;
         this.form.portId = resData.pd.portId.toString();
       }
-      const vehicleOwnership = this.VEHICLE_OWNERSHIP_TYPE_LIST.find(item => item.id === resData.pd.portId.toString());
+      const vehicleOwnership = this.VEHICLE_BELONG_TYPE_LIST.find(item => item.id === resData.pd.portId.toString());
       if (vehicleOwnership) {
         this.form.VEHICLE_OWNERSHIP_TYPE = vehicleOwnership.name;
         this.form.VEHICLE_OWNERSHIP_TYPE_NAME = resData.pd.VEHICLE_OWNERSHIP_TYPE.toString();
diff --git a/pages/door_access_control/share_office_vehicle_info/view.vue b/pages/door_access_control/share_office_vehicle_info/view.vue
index 0d2c2e7..376122a 100644
--- a/pages/door_access_control/share_office_vehicle_info/view.vue
+++ b/pages/door_access_control/share_office_vehicle_info/view.vue
@@ -14,6 +14,14 @@
           <view slot="title" class="title">车辆类型</view>
           <view slot="label" class="mt-10">{{ VEHICLE_TYPE_MAP[info.VEHICLE_TYPE] }}</view>
         </u-cell>
+        <u-cell>
+          <view slot="title" class="title">车辆归属类型</view>
+          <view slot="label" class="mt-10">{{ VEHICLE_BELONG_TYPE_LIST[info.VEHICLE_BELONG_TYPE] }}</view>
+        </u-cell>
+        <u-cell>
+          <view slot="title" class="title">审批人</view>
+          <view slot="label" class="mt-10">{{ info.QY_AUDITOR_NAME }}</view>
+        </u-cell>
         <u-cell>
           <view slot="title" class="title">范围</view>
           <view slot="label" class="mt-10">{{ VEHICLE_PORT_MAP[info.portId] }}</view>
@@ -96,6 +104,10 @@ export default {
         2: "审核通过",
         3: "审核驳回",
       },
+      VEHICLE_BELONG_TYPE_LIST: {
+        "0" : "员工车辆",
+        "1" : "单位车辆",
+      },
     }
   },
   onLoad() {

From 3aa8475037985335176cd605a99dd4481e60ec90 Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Mon, 28 Jul 2025 15:03:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?2025/07/28=20=E4=BF=AE=E6=94=B9=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/face/face_authentication.nvue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/mine/face/face_authentication.nvue b/pages/mine/face/face_authentication.nvue
index 85cec21..187c01a 100644
--- a/pages/mine/face/face_authentication.nvue
+++ b/pages/mine/face/face_authentication.nvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="fat">
-			<text class="fatt">请将人脸置于圆圈内</text>
+			<text class="fatt">请将人脸置于方框内</text>
 		</view>
 		<view class="livefater">
 			<view style="width: 700upx; height: 700upx; border-radius: 700upx; overflow: hidden">

From 9639d56b14410b38526419940b6bd9b0776cc914 Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Mon, 28 Jul 2025 17:55:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?2025/07/28=20=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E5=9B=BE=E5=83=8F=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/face/face_authentication.nvue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pages/mine/face/face_authentication.nvue b/pages/mine/face/face_authentication.nvue
index 187c01a..10f05a1 100644
--- a/pages/mine/face/face_authentication.nvue
+++ b/pages/mine/face/face_authentication.nvue
@@ -79,10 +79,7 @@
 								try {
 									// 	TODO  USERAVATARPREFIX   USERAVATARURL
 									// 调用 API 提交人脸图片
-									const fullBase64 = USERAVATARPREFIX + USERAVATARURL;
-									console.log(fullBase64)
-									console.log(this.$store.getters.getUserInfo.USER_ID)
-								    const res = await submitEditUserFace({ faceData: fullBase64, userId: this.$store.getters.getUserInfo.USER_ID });
+								    const res = await submitEditUserFace({  USERAVATARPREFIX: USERAVATARPREFIX,USERAVATARURL: USERAVATARURL, userId: this.$store.getters.getUserInfo.USER_ID });
 								    uni.hideLoading();
 								    uni.$u.toast('上传成功');
 									uni.navigateBack({ delta: 1 });