From 81d0d1e9f46847f88a3f20ee2bd07788eb020a80 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Mon, 2 Dec 2024 10:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=E4=BF=9D=E5=AE=89=E8=AF=81=E5=8F=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/.env.development          |   2 +-
 collect_information/package.json              |   1 -
 .../src/pages/projectManager/index/index.vue  |   5 +-
 collect_information/src/request/index.ts      |   2 +-
 .../projectDetails/projectDetails.vue         |   5 +-
 .../securityUserForm/securityUserForm.scss    |  10 +-
 .../securityUserForm/securityUserForm.vue     | 180 ++++++++++++++++--
 collect_information/src/utils/index.ts        |  23 +++
 collect_information/types/global.d.ts         |   4 +
 .../projectManager/securityUserForm/index.ts  |  10 +-
 .../src/components/layout/SystemMenus.vue     |   1 -
 .../src/views/serviceManagement/index.vue     |   2 -
 12 files changed, 216 insertions(+), 29 deletions(-)

diff --git a/collect_information/.env.development b/collect_information/.env.development
index 4e393f7..1f4b2bd 100644
--- a/collect_information/.env.development
+++ b/collect_information/.env.development
@@ -1,7 +1,7 @@
 # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
 TARO_APP_ID="wx0acd1c4fcf94bdd3"
 # TARO_APP_BASE_API="http://172.10.10.93:8765"
-TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
+TARO_APP_BASE_API="http://172.10.10.93:8765"
 
 
 
diff --git a/collect_information/package.json b/collect_information/package.json
index 348ad9a..1830680 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -59,7 +59,6 @@
     "dayjs": "^1.11.13",
     "pinia": "^2.2.2",
     "vue": "^3.0.0"
-
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",
diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue
index 13de3c5..e4c007c 100644
--- a/collect_information/src/pages/projectManager/index/index.vue
+++ b/collect_information/src/pages/projectManager/index/index.vue
@@ -42,6 +42,7 @@
       </view>
     </view>
     <view style="background-color: #e9eef4; height: 15rpx"></view>
+
   </view>
 </template>
 <script setup lang="ts">
@@ -95,6 +96,8 @@ const subModuleList = ref([
     url: '',
   },
 ])
-
 const subNavigation = async (url: string) => Taro.navigateTo({ url })
+
+
+
 </script>
diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts
index 9c89ee8..b1dacfa 100644
--- a/collect_information/src/request/index.ts
+++ b/collect_information/src/request/index.ts
@@ -30,7 +30,7 @@ class CustomRequest {
   BASE_API: string = process.env.TARO_APP_BASE_API;
 
   private request<T>(url: string, method: keyof Taro.request.Method, options: ApiOptions, params?: object,): Promise<JsonResult<T>> {
-    // console.log(this.BASE_API,'0000000')
+    console.log(this.BASE_API,'0000000')
     return new Promise<JsonResult<T>>((resolve, reject) => {
       if (options.loading) {
         Taro.showLoading({
diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
index 535d4c7..cabc5fa 100644
--- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
@@ -189,7 +189,9 @@ const formAdd = () => {
     securityNumber: '',
     remark: '',
     homeAddress: '',
-    telephone: ''
+    telephone: '',
+    photo:'',
+    noSecurityNumberDesc:''
   } as SecurityUserFormParams
   Taro.navigateTo({url: `/subPages/projectManager/securityUserForm/securityUserForm?securityUser=${JSON.stringify(params)}&&type=formInput`})
 }
@@ -237,6 +239,7 @@ const detail = (item: ServiceProjectSecurityUserPagerVo) => {
   securityUserDetail.value = item
 }
 const securityUserEdit = (item: ServiceProjectSecurityUserPagerVo) => {
+  console.log(item)
   const params = {...item, sex: item.sex.value}
   Taro.navigateTo({url: `/subPages/projectManager/securityUserForm/securityUserForm?securityUser=${JSON.stringify(params)}&type=formInput`})
 }
diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
index 4dd980a..c0a88ff 100644
--- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
+++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.scss
@@ -1,8 +1,12 @@
 .form {
   .formButton {
+    //position: fixed;
+    bottom: 60px;
     display: flex;
-    margin-top: auto;
-    justify-content: space-around;
-    margin-bottom: 30px
+    -webkit-justify-content: space-around;
+    margin-bottom: 10rpx;
+    right: 0;
+    width: 100%;
+    height: 140px
   }
 }
diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
index e0ccea7..b75519c 100644
--- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
+++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
@@ -1,6 +1,18 @@
 <template>
   <view class="form">
     <nut-form ref="formRef" :model-value="formData" :rules="rules">
+      <nut-form-item label="头像" prop="avatar">
+        <view @click="chooseImage">
+           <image v-if="!Url" src="@/assets/logo/avatar1.png" style="width:50px;height: 50px"></image>
+           <image v-else :src="Url" style="width:150px;height: 150px"></image>
+        </view>
+      </nut-form-item>
+      <nut-form-item label="身份证" prop="idCard">
+        <view style="display: flex;justify-content: space-between;align-items: center">
+          <nut-input v-model="formData.idCard" placeholder="请填写身份证" type="text" @blur="cardBlur"/>
+          <view style="color: #3a6bbe;width: 70px;text-align: center;" @click="idCardBlur(formData,0)">查询</view>
+        </view>
+      </nut-form-item>
       <nut-form-item label="姓名" prop="name">
         <nut-input v-model="formData.name" placeholder="请输入姓名" type="text"/>
       </nut-form-item>
@@ -11,9 +23,6 @@
           </nut-radio>
         </nut-radio-group>
       </nut-form-item>
-      <nut-form-item label="身份证" prop="idCard">
-        <nut-input v-model="formData.idCard" placeholder="请填写身份证" type="text" @blur="idCardBlur"/>
-      </nut-form-item>
       <nut-form-item label="出生日期" prop="dateOfBirth">
         <view @click="showPicker = true">
           {{
@@ -34,16 +43,19 @@
       <nut-form-item label="地址" prop="homeAddress">
         <nut-input v-model="formData.homeAddress" placeholder="请输入地址" type="text"/>
       </nut-form-item>
-      <nut-form-item label="保安证号" prop="securityNumber">
+      <nut-form-item label="保安证件号" prop="securityNumber">
         <nut-input v-model="formData.securityNumber" placeholder="请输入保安证号" type="text"/>
       </nut-form-item>
+      <nut-form-item label="无证说明" v-if="!formData.securityNumber">
+        <nut-input v-model="formData.noSecurityNumberDesc" placeholder="无证说明" type="text"/>
+      </nut-form-item>
       <nut-form-item label="备注" prop="remark">
         <nut-input v-model="formData.remark" placeholder="请填写备注" type="text"/>
       </nut-form-item>
     </nut-form>
     <view class="formButton">
       <nut-button style="width: 45%" type="success" size="small" @click="submit">提交</nut-button>
-      <nut-button style="width: 45%" size="small" @click="formRef?.reset()">重置表单</nut-button>
+      <nut-button style="width: 45%" size="small" @click="reset">重置表单</nut-button>
     </view>
     <nut-popup v-model:visible="showPicker" position="bottom">
       <nut-date-picker
@@ -55,6 +67,15 @@
         @cancel="showPicker = false"
       ></nut-date-picker>
     </nut-popup>
+    <nut-dialog content="详情" v-model:visible="visible" @ok="onOk" @cancel="cancel">
+      <slot>
+        <view style="margin-bottom: 5px">
+          <view>姓名：{{ securityNumberByIdCard?.name ? securityNumberByIdCard?.name : '无' }}</view>
+          <view>保安证件号：{{ securityNumberByIdCard?.bayzh ? securityNumberByIdCard?.bayzh : '无' }}</view>
+          <view>身份证：{{ securityNumberByIdCard?.sfzhm ? securityNumberByIdCard?.sfzhm : "无" }}</view>
+        </view>
+      </slot>
+    </nut-dialog>
   </view>
 </template>
 <script setup lang="ts">
@@ -65,17 +86,22 @@ import api from "@/request";
 import './securityUserForm.scss'
 import Taro, {useLoad} from "@tarojs/taro";
 import dayjs from "dayjs";
-import {SecurityUserFormParams} from "@/types/subPages/projectManager/securityUserForm";
+import {SecurityUserFormParams, securityNumberByIdCard} from "@/types/subPages/projectManager/securityUserForm";
 import {FormInstance} from "@nutui/nutui-taro";
+import {generateSimpleObjectName, getResignedObjectUrl} from "@/utils";
+
 
 const SEX = enumSelectNodes('Sex')
-
+const minioBaseUrl = process.env.TARO_APP_MINIO_URL
 const showPicker = ref(false)
-
+const Url =ref('')
 const type = ref<'formInput' | 'QcCodeInput'>(null!);
-
 const formData = ref<SecurityUserFormParams>({} as any)
 const formRef = ref<FormInstance>(null!)
+const visible = ref<boolean>(false)
+const securityNumberByIdCard = ref<securityNumberByIdCard>()
+const uploadRef = ref<any>(null)
+const modelValue = ref('')
 
 const rules: FormRules = {
   name: [
@@ -94,27 +120,63 @@ const rules: FormRules = {
   ]
 };
 
+
 useLoad((options) => {
   type.value = options.type;
   if (type.value === 'QcCodeInput') {
     formData.value = {
+      name: '',
       serviceProjectId: options.pid,
       securityUnitId: options.uid,
       sex: 0,
-      idCard:null,
-      telephone:null,
-      dateOfBirth: null
+      idCard: null,
+      telephone: null,
+      dateOfBirth: null,
+      noSecurityNumberDesc: options.noSecurityNumberDesc,
+      photo: options.photo,
     }
   } else {
     const form = JSON.parse(options.securityUser)
-    formData.value = Object.assign({}, form, {idCard: form.idCard.originalValue, telephone: form.telephone.originalValue})
+    console.log(form)
+    formData.value = Object.assign({}, form, {
+      idCard: form.idCard.originalValue,
+      telephone: form.telephone.originalValue
+    })
   }
 })
 
-const idCardBlur = (e: any) => {
-  const value = e.detail.value
+const idCardBlur = async (e: any, num: number) => {
+  const value = e.idCard
+  if (value) {
+    Taro.request({
+      url: 'https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard',
+      data: {
+        idCard: value
+      },
+      method: 'GET',
+      success: ({data}) => {
+        visible.value = true
+        securityNumberByIdCard.value = data.data
+      }
+    })
+    return
+  } else {
+    visible.value = false
+    console.log(value)
+  }
+  cardBlur(value, num)
+}
+
+const cardBlur = (e, num) => {
+  let value = ''
+  if (num === 0) {
+    value = e
+  } else {
+    value = e.detail.value
+  }
   if (!value?.length || value.length < 18) {
     formData.value.dateOfBirth = null;
+    cancel()
     return
   }
   const birthDate = value.substring(6, 14);
@@ -124,7 +186,84 @@ const idCardBlur = (e: any) => {
   formData.value.dateOfBirth = new Date(parseInt(year), parseInt(month) - 1, parseInt(day))
 }
 
+const onOk = () => {
+  formData.value.securityNumber = securityNumberByIdCard.value?.bayzh
+  formData.value.name = securityNumberByIdCard.value?.name
+}
+const cancel = () => {
+  formData.value.securityNumber = ''
+  formData.value.name = ''
+  visible.value = false
+}
+const chooseImage = () => {
+  Taro.chooseImage({
+    count: 1,
+    sizeType: ['original', 'compressed'],
+    sourceType: ['album', 'camera'],
+    success: async (resp) => {
+      Url.value = resp.tempFilePaths[0]
+      // console.log(resp.tempFilePaths[0])
+      const objectName = generateSimpleObjectName(resp.tempFiles[0].path, '/securityUser')
+      const uploadUrl = await getResignedObjectUrl(process.env.TARO_APP_MINIO_BUCKET, objectName)
+      modelValue.value = '/' + process.env.TARO_APP_MINIO_BUCKET + objectName;
+      console.log(modelValue)
+      // Taro.request({
+      //   url: uploadUrl,
+      //   data: resp.tempFiles,
+      //   method: 'PUT',
+      //   header: {
+      //     'content-type': 'application/json'
+      //   },
+      //   success: (resp) => {
+      //     console.log(resp)
+      //   }
+      // })
+      Taro.getFileSystemManager().readFile({
+        filePath: resp.tempFiles[0].path, // 文件路径
+        encoding: 'base64',      // 指定编码为 base64
+        success (res) {
+          console.log(res.data)
+          // 成功回调，这里可以创建一个 Blob 对象
+          const blob = b64toBlob(res.data, 'image/jpeg'); // 根据实际情况指定 MIME 类型
+          // 创建一个 File 对象
+          const file = new File([blob], 'filename.jpg', {type: 'image/jpeg'});
+          console.log(file)
+           Taro.request({
+               url:uploadUrl,
+               data: file,
+               method:'PUT',
+               success:(res)=>{
+                 console.log(res)
+               }
+           })
+          // 现在你可以使用 file 变量了
+        },
+        fail (err) {
+          console.error('读取文件失败:', err);
+        }
+      });
+    }
+  })
+}
+const b64toBlob = (b64Data, contentType='', sliceSize=512)  =>{
+  const byteCharacters = atob(b64Data);
+  const byteArrays:any = [];
+  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+    const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+    const byteNumbers = new Array(slice.length);
+    for (let i = 0; i < slice.length; i++) {
+      byteNumbers[i] = slice.charCodeAt(i);
+    }
+    const byteArray = new Uint8Array(byteNumbers);
+    byteArrays.push(byteArray);
+  }
+  return new Blob(byteArrays, {type: contentType});
+}
+
+
 const submit = () => {
+  console.log(formData.value.photo)
   formRef.value?.validate().then(async ({valid}) => {
     if (valid) {
       let url: string;
@@ -146,16 +285,23 @@ const submit = () => {
         securityUnitId: formData.value.securityUnitId,
         name: '',
         workPost: '',
-        telephone: null ,
+        telephone: null,
         sex: 0,
         nativePlace: '',
         idCard: null,
         dateOfBirth: null,
         securityNumber: '',
         remark: '',
-        homeAddress: ''
+        homeAddress: '',
+        noSecurityNumberDesc: '',
+        photo: ''
       }
+      uploadRef.value?.clearUploadQueue()
     }
   })
 }
+
+const reset = () => {
+  formRef.value?.reset()
+}
 </script>
diff --git a/collect_information/src/utils/index.ts b/collect_information/src/utils/index.ts
index e69de29..97e1e48 100644
--- a/collect_information/src/utils/index.ts
+++ b/collect_information/src/utils/index.ts
@@ -0,0 +1,23 @@
+import dayjs from "dayjs";
+import api from "@/request";
+
+export const generateSimpleObjectName = (fileName: string, parentDir?: String): string => {
+    const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+    let objectName = parentDir + dayjs().format('/YYYY/MM/DD/') + uuid.replace(/-/g, '');
+    console.log(fileName,objectName,'4444')
+    if (fileName && fileName.length > 0) {
+        objectName += fileName.substring(fileName.lastIndexOf('.'))
+    }
+    console.log(objectName,'888')
+    return objectName;
+}
+
+export const getResignedObjectUrl = async (bucketName: string, objectName: string): Promise<string> => {
+    return (await api.get<string>('/common/getResignedObjectUrl', {
+        bucketName,
+        objectName
+    })).data as string;
+}
diff --git a/collect_information/types/global.d.ts b/collect_information/types/global.d.ts
index 541699b..7aadb7f 100644
--- a/collect_information/types/global.d.ts
+++ b/collect_information/types/global.d.ts
@@ -25,6 +25,10 @@ declare namespace NodeJS {
     TARO_APP_ID: string
     /** 后台服务接口地址 **/
     TARO_APP_BASE_API: string
+
+    TARO_APP_MINIO_BUCKET:string
+
+    TARO_APP_MINIO_URL:string
   }
 }
 
diff --git a/collect_information/types/subPages/projectManager/securityUserForm/index.ts b/collect_information/types/subPages/projectManager/securityUserForm/index.ts
index 11484dd..a86cb44 100644
--- a/collect_information/types/subPages/projectManager/securityUserForm/index.ts
+++ b/collect_information/types/subPages/projectManager/securityUserForm/index.ts
@@ -2,7 +2,7 @@ export interface SecurityUserFormParams {
   snowFlakeId?: string;
   securityUnitId: string;
   serviceProjectId: string;
-  name?: string;
+  name: string | undefined;
   workPost?: string;
   telephone: value | null;
   sex: number;
@@ -10,7 +10,9 @@ export interface SecurityUserFormParams {
   idCard: value | null;
   dateOfBirth?: Date | null;
   securityNumber?: string;
+  photo?:string;
   remark?: string;
+  noSecurityNumberDesc:string;
   homeAddress?: string
 }
 
@@ -18,3 +20,9 @@ export  interface  value{
   desensitizedValue?:string
   originalValue?:string
 }
+
+export  interface  securityNumberByIdCard{
+  name: string | undefined
+  bayzh?: string
+  sfzhm?: string
+}
diff --git a/securityManagement/src/components/layout/SystemMenus.vue b/securityManagement/src/components/layout/SystemMenus.vue
index 4e34340..8429600 100644
--- a/securityManagement/src/components/layout/SystemMenus.vue
+++ b/securityManagement/src/components/layout/SystemMenus.vue
@@ -18,7 +18,6 @@ import MenuItem from "@/components/layout/MenuItem.vue";
 const route = useRoute()
 
 const activeMenus = computed(() => [route.path]);
-console.log(activeMenus)
 
 </script>
 
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index 9430a8e..dd36fff 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -206,7 +206,6 @@ const columns: TableProps['columns'] = [
           <a-button  danger>删除</a-button>
         </a-popconfirm>
         <a-button type="primary" onClick={ async ()=>{
-          console.log(record,'9999999')
           visible.value = true
           serviceTitle.value = '编辑服务项目'
           idNumberDisabled.value = record.twoType.value !== 'outsource';
@@ -402,7 +401,6 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
 
 const UnitId = ref('')
 const submit = async()=>{
-  console.log(13123)
   await formRef.value.validate()
   const snowFlakeId = ref('')
   if (serviceTitle.value === '新增服务项目') {