优化

.env.development

@@ -1,5 +1,5 @@
 # VITE_API_BASE_URL = http://112.29.103.165:1616
-# VITE_API_BASE_URL = /api  
+VITE_API_BASE_URL = /api  
-VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name
+# VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name
 # VITE_API_BASE_URL = http://192.168.0.234:38080/hd-real-name
 # VITE_API_BASE_URL = http://192.168.0.234:38080

src/components/ContractForm/index.vue

@@ -409,6 +409,19 @@ const updateContractInfo = () => {
     Object.assign(contractInfoForm.value, props.contractInfo)
 }
 
+const resetForm = () => {
+    contractInfoForm.value = {
+        contractCode: '', // 合同编号
+        contractTermType: '以完成一定工作为期限的合同', // 合同期限类型
+        contractStartDate: null, // 合同签订日期
+        contractStopDate: null, // 合同终止日期
+        wageApprovedWay: '天', // 工资核定方式
+        wageCriterion: '', // 工资核定标准
+    }
+    contractImageList.value[0].fileList = []
+    contractImageIdList.value = []
+}
+
 // 初始化工资核定标准正则表达式
 const initSalaryRegexp = (num) => {
     // 确保num是1-999999之间的整数
@@ -499,6 +512,7 @@ const initSalaryMessage = (num) => {
 // 向父组件暴露方法
 defineExpose({
     validateContractForm,
+    resetForm,
     updateContractInfo,
 })
 

src/pages/person-entry/child-pages/addAndEditPerson.vue

@@ -119,6 +119,14 @@ const props = defineProps({
         type: [Number, String],
         default: '',
     },
+    proId: {
+        type: [Number, String],
+        default: '',
+    },
+    einStatus: {
+        type: [Number, String],
+        default: '',
+    },
 })
 
 // 步骤条

src/pages/person-exit/data-upload/index.vue

@@ -47,7 +47,10 @@
         <view class="red-text exit-title"> 离场工资结算确认单 </view>
 
         <view class="upload-content">
-            <text>离场工资结算确认单</text>
+            <text style="color: red; margin-right: 10rpx" v-show="exitParams?.isShanghai == 0">
+                *
+            </text>
+            <text> 离场工资结算确认单</text>
 
             <up-upload
                 multiple
@@ -85,12 +88,18 @@ import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm.j
 import NavBarModal from '@/components/NavBarModal/index.vue'
 const { safeAreaInsets } = uni.getSystemInfoSync()
 const commonStore = useCommonStore()
-const exitParams = ref({}) // 出场参数
+const exitParams = ref({
+    isShanghai: 0,
+}) // 出场参数
 const fileList = ref([]) // 离场工资结算确认单
 const exitContent = ref('') // 离场工资结算确认单内容
 const showModalConfirmExit = ref(false) // 确认出场提示弹框
 const fileIds = ref([]) // 上传文件ID
 
+defineOptions({
+    inheritAttrs: false,
+})
+
 // 删除图片
 const deletePic = (e) => {
     fileList.value = fileList.value.filter((item) => item.id !== e.file.id)
@@ -305,7 +314,7 @@ onLoad((options) => {
     display: flex;
     align-items: center;
 
-    & text:first-child {
+    & text:nth-child(2) {
         display: inline-block;
         width: 200rpx;
         color: #909399;

src/pages/person-exit/index.vue

@@ -123,6 +123,7 @@ const queryParams = ref({
     name: '',
     subName: '',
     proName: '',
+    proId: '',
 })
 
 const statusList = ref([
@@ -147,17 +148,20 @@ const onSearchName = () => {
     switch (searchType.value) {
         case 1:
             queryParams.value.name = searchValue.value
-            queryParams.value.proName = commonStore?.activeProjectName
+            queryParams.value.proName = ''
+            queryParams.value.proId = commonStore?.activeProjectId
             queryParams.value.subName = ''
             break
         case 2:
             queryParams.value.subName = searchValue.value
-            queryParams.value.proName = commonStore?.activeProjectName
+            queryParams.value.proName = ''
+            queryParams.value.proId = commonStore?.activeProjectId
             queryParams.value.name = ''
 
             break
         case 3:
             queryParams.value.proName = searchValue.value
+            queryParams.value.proId = ''
             queryParams.value.name = ''
             queryParams.value.subName = ''
             break
@@ -252,7 +256,8 @@ const hasMore = computed(() => {
 })
 
 onMounted(() => {
-    queryParams.value.proName = commonStore?.activeProjectName
+    // queryParams.value.proName = commonStore?.activeProjectName
+    queryParams.value.proId = commonStore?.activeProjectId
     onInputLoaded()
     getPersonExitListFun()
     uni.$on('refreshPersonExitList', onSearchName)

src/pages/shProjectDetails/child-pages/addProject.vue

@@ -215,6 +215,30 @@ const formRef = ref(null) // 表单ref
 const showLoading = ref(false) // 是否显示加载中
 const workerId = ref('') // 人员ID
 const personContractFormRef = ref(null) // 合同见证表单ref
+const contractInfo = ref({}) // 合同信息
+const contractImageList = ref([
+    {
+        type: 1,
+        fileList: [],
+        name: 'contract',
+        title: '人员手持合同照',
+    },
+]) // 合同图片
+
+const props = defineProps({
+    workerId: {
+        type: [Number, String],
+        default: '',
+    },
+    name: {
+        type: [String],
+        default: '',
+    },
+    idCard: {
+        type: [String],
+        default: '',
+    },
+})
 
 // 表单数据
 const formData = ref({
@@ -230,39 +254,6 @@ const formData = ref({
     postId: '',
     id: '',
 })
-const contractInfo = ref({}) // 合同信息
-const contractImageList = ref([
-    {
-        type: 1,
-        fileList: [],
-        name: 'contract',
-        title: '人员手持合同照',
-    },
-    // {
-    //     type: 2,
-    //     fileList: [],
-    //     name: 'contract',
-    //     title: '工作内容页',
-    // },
-    // {
-    //     type: 3,
-    //     fileList: [],
-    //     name: 'contract',
-    //     title: '薪酬约定页',
-    // },
-    // {
-    //     type: 4,
-    //     fileList: [],
-    //     name: 'contract',
-    //     title: '本人签名页',
-    // },
-    // {
-    //     type: 5,
-    //     fileList: [],
-    //     name: 'contract',
-    //     title: '其他照片',
-    // },
-]) // 合同图片
 
 // 表单验证规则
 const formRules = ref({
@@ -455,6 +446,7 @@ const submitData = async (isContinue) => {
                     teamName: '',
                     id: workerId.value,
                 }
+                personContractFormRef.value.resetForm()
             } else {
                 setTimeout(() => {
                     uni.navigateBack()

src/pages/shProjectDetails/index.vue

@@ -68,6 +68,10 @@ const workerId = ref('') // 人员ID
 const name = ref('') // 姓名
 const idCardNumber = ref('') // 身份证号码
 
+defineOptions({
+    inheritAttrs: false,
+})
+
 // 获取上海多工程明细
 const getShProjectDetailsListFun = async () => {
     const res = await getShProjectListByWorkerIdAPI({