diff --git a/.env.development b/.env.development index 7aa79be..2a54d74 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV = 'development' -VITE_APP_BASE_URL = 'http://ccc.cn/' +VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/' # VITE_APP_BASE_URL = 'http://www.eng.local/' # VITE_APP_BASE_URL = 'http://192.168.1.5:9090/' \ No newline at end of file diff --git a/src/views/apply_with_seal/edit.vue b/src/views/apply_with_seal/edit.vue index 87b2c2b..23f80f3 100644 --- a/src/views/apply_with_seal/edit.vue +++ b/src/views/apply_with_seal/edit.vue @@ -109,7 +109,7 @@ - + @@ -121,7 +121,7 @@ - @@ -134,7 +134,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -209,6 +209,7 @@ const formData = reactive({ org_id: "", depar: '', stampman: '', + stampman_name: '', project_id: '', project_name: '', project_director: '', @@ -217,11 +218,14 @@ const formData = reactive({ borrow: '', returndate: '', applicant: '', + applicant_name: '', date: '', sjborrow: '', sjborrower: '', + sjborrower_name: '', sjreturn: '', returnee: '', + returnee_name: '', annex: [], projectInfo: {} @@ -234,22 +238,27 @@ const customEvent = (e: any) => { showDialog.value = false } -const tableKey = ref('') +let keys; + //打开弹窗 const userclick = async (key) => { - tableKey.value = key + keys=key showDialog3.value = true await nextTick() personnel.value.open() } + + //确认 const submituser = (e: any) => { - formData[tableKey.value] = e.name + formData[keys] = e.id + formData[keys+'_name'] = e.name showDialog3.value = false } + const chekcDate = (rule: any, value: any, callback: any) => { if (new Date(formData.returndate) < new Date(formData.borrow)) { callback(new Error('印章借用日期不能早于结束借用日期')) diff --git a/src/views/approval_issuance_achievement_documents/edit.vue b/src/views/approval_issuance_achievement_documents/edit.vue index b5cf049..83b5d69 100644 --- a/src/views/approval_issuance_achievement_documents/edit.vue +++ b/src/views/approval_issuance_achievement_documents/edit.vue @@ -28,7 +28,7 @@ - + @@ -49,6 +49,10 @@ +
+ + +
@@ -71,6 +75,8 @@ const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') const showDialog = ref(false) +const showDialog3 = ref(false) +const personnel = ref() // 弹窗标题 @@ -91,6 +97,7 @@ const formData = reactive({ number: '', apptime: '', person: '', + person_name: "", tips: '', fd_1: '', fd_2: '', @@ -105,6 +112,19 @@ const customEvent = (e) => { showDialog.value = false } +//打开弹窗 +const userclick = async () => { + showDialog3.value = true + await nextTick() + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData.person_name = e.name + formData.person = e.id + showDialog3.value = false +} // 表单验证 const formRules = reactive({ diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue index 463d39b..4a8d119 100644 --- a/src/views/cost_projects/edit.vue +++ b/src/views/cost_projects/edit.vue @@ -1,6 +1,7 @@