Merge remote-tracking branch 'origin/dev-2.0-mkmj' into dev-2.0-mkmj

# Conflicts:
#	pages/mine/face/face_authentication.nvue

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_BELONG_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_BELONG_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_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();
+      }
       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),

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: "待审核",

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>
@@ -40,7 +48,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 +98,16 @@ export default {
         0: "全部",
         1: "东港区",
         2: "西港区",
-      }
+      },
+      IS_AUDIT_LIST: {
+        1: "待审核",
+        2: "审核通过",
+        3: "审核驳回",
+      },
+      VEHICLE_BELONG_TYPE_LIST: {
+        "0" : "员工车辆",
+        "1" : "单位车辆",
+      },
     }
   },
   onLoad() {

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">