-
+
@@ -22,8 +21,7 @@
-
@@ -38,9 +36,8 @@
-
@@ -79,7 +76,11 @@
-
+
-
+
@@ -116,22 +116,7 @@
-
+
@@ -195,6 +180,15 @@ const formData = reactive({
approve_id: 0
})
+const chekcDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.margin_amount_return_date) < new Date(formData.bid_opening_date)) {
+ callback(new Error('保证金退还时间早于开标日期'))
+ } else {
+ callback()
+ }
+}
+
+
//获取值
const customEvent = (e: any) => {
formData.project_id = e.id;
diff --git a/src/views/build_division/edit.vue b/src/views/build_division/edit.vue
index 56f446e..fefa75b 100644
--- a/src/views/build_division/edit.vue
+++ b/src/views/build_division/edit.vue
@@ -1,52 +1,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -57,10 +41,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
-
import { builddivisionAdd, builddivisionEdit, builddivisionDetail } from '@/api/build/build_division'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
@@ -124,10 +105,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
-
-
await formRef.value?.validate()
-
const data = { ...formData }
mode.value == 'edit'
? await builddivisionEdit(data)
@@ -140,10 +118,6 @@ const handleSubmit = async () => {
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
-
-
-
-
}
// 关闭回调
diff --git a/src/views/build_division/index.vue b/src/views/build_division/index.vue
index be6b52d..cf675a7 100644
--- a/src/views/build_division/index.vue
+++ b/src/views/build_division/index.vue
@@ -50,7 +50,7 @@
+
diff --git a/src/views/build_plan/detail.vue b/src/views/build_plan/detail.vue
index 4ebc1fa..1dfe106 100644
--- a/src/views/build_plan/detail.vue
+++ b/src/views/build_plan/detail.vue
@@ -2,127 +2,76 @@
+
+
+ {{ formData.project_name }}
+
+
+ {{ formData.project_code }}
+
+
+ {{ formData.plan_start_date }}
+
+
+ {{ formData.plan_end_date }}
+
+
+ {{ formData.process_step_no }}
+
+
+ {{ formData.process_step }}
+
+
+ {{ formData.quality_control_points }}
+
-
-
-
- {{ formData.project_name }}
-
-
-
-
- {{ formData.project_code }}
-
-
+
+ {{ formData.project_member_name }}
+
+
+ {{ formData.work_user }}
+
+
+ {{ formData.work_content }}
+
+
+ {{ formData.workload }}
+
+
+ {{ formData.unit }}
+
+
+ {{ formData.price }}
+
+
+ {{ formData.amount }}
+
+
+ {{ formData.done_workload }}
+
+ {{ formData.residue_workload }}
+
+ {{ formData.completion_degree }}
+
-
-
- {{ formData.plan_start_date }}
-
-
-
-
- {{ formData.plan_end_date }}
-
-
+
+
+
-
-
- {{ formData.process_step_no }}
-
-
-
-
- {{ formData.process_step }}
-
-
-
-
-
- ![]()
-
-
-
-
- {{ formData.quality_control_points }}
-
-
-
-
-
- {{ formData.project_member_name }}
-
-
-
-
- {{ formData.work_user }}
-
-
-
-
- {{ formData.work_content }}
-
-
-
-
-
- {{ formData.workload }}
-
-
-
-
- {{ formData.unit }}
-
-
-
-
-
- {{ formData.price }}
-
-
-
-
- {{ formData.amount }}
-
-
-
-
- {{ formData.done_workload }}
-
-
-
-
- {{ formData.residue_workload }}
-
-
-
-
- {{ formData.completion_degree }}
-
-
-
-
-
-
-
@@ -174,8 +117,6 @@ import { usePaging } from '@/hooks/usePaging'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
-import { buildreportsDetail, buildpersonsDetail } from '@/api/build/build_plan'
-import { timeFormat } from '@/utils/util'
import { buildreportLists } from "@/api/build/build_report.ts"
import { buildreportDetaillists } from "@/api/build/build_report_detail.ts"
@@ -256,10 +197,6 @@ const formData = reactive({
})
-const getLists = (e) => {
-}
-
-
// 获取详情
const setFormData = async (data: Record) => {
Object.assign(formData, data)
diff --git a/src/views/build_plan/edit.vue b/src/views/build_plan/edit.vue
index 2bc0fab..aad6836 100644
--- a/src/views/build_plan/edit.vue
+++ b/src/views/build_plan/edit.vue
@@ -1,8 +1,7 @@
>()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
+const showDetail = ref(false)
const dtimevalue = ref([])
// 查询条件
const queryParams = reactive({
@@ -139,14 +140,16 @@ const handleDelete = async (id: number | any[]) => {
await buildprocesssettingsDelete({ id })
getLists()
}
-const handledetail = async (data: any) => {
- let res = await buildprocesssettingsDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await buildprocesssettingsDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
+
getLists()
diff --git a/src/views/build_report/detail.vue b/src/views/build_report/detail.vue
deleted file mode 100644
index 076ca88..0000000
--- a/src/views/build_report/detail.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-
- >()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
-
+const showDetail = ref(false)
// 查询条件
const queryParams = reactive({
happen_date: '',
@@ -145,9 +125,10 @@ const handleDelete = async (id: number | any[]) => {
await qualitysuperviseDelete({ id })
getLists()
}
-const handledetail = async (data: any) => {
- let res = await qualitysuperviseDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await qualitysuperviseDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
diff --git a/src/views/subcontracting_contract_negotiation/edit.vue b/src/views/subcontracting_contract_negotiation/edit.vue
index 108b3d0..e312437 100644
--- a/src/views/subcontracting_contract_negotiation/edit.vue
+++ b/src/views/subcontracting_contract_negotiation/edit.vue
@@ -194,8 +194,29 @@ if (props.project) {
project_code.value = props.project.project_code;
}
+
+const chekcDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.warranty_expire_date) < new Date(formData.sign_date)) {
+ callback(new Error('洽商质保到期时间早于签订日期'))
+ } else {
+ callback()
+ }
+}
+
// 表单验证
-const formRules = reactive({});
+const formRules = reactive({
+
+ warranty_expire_date: [{
+ required: true,
+ message: '洽商质保到期时间',
+ trigger: ['blur']
+ },
+ {
+ validator: chekcDate,
+ trigger: ['blur']
+ }],
+
+});
// 获取详情
const setFormData = async (data: Record) => {
diff --git a/src/views/supplier/detail.vue b/src/views/supplier/detail.vue
index 8092054..2de185d 100644
--- a/src/views/supplier/detail.vue
+++ b/src/views/supplier/detail.vue
@@ -47,15 +47,7 @@
formData.remark
}}
-
diff --git a/src/views/supplier_contacts/detail.vue b/src/views/supplier_contacts/detail.vue
index 3596227..864f298 100644
--- a/src/views/supplier_contacts/detail.vue
+++ b/src/views/supplier_contacts/detail.vue
@@ -3,61 +3,50 @@
{{
- formData.name }}
+ formData.name }}
{{
- formData.sex_text }}
+ formData.sex_text }}
{{
- formData.supplier_name }}
+ formData.supplier_name }}
{{ formData.contacts_type_text
}}
{{
- formData.responsible }}
+ formData.responsible }}
{{
- formData.title }}
+ formData.title }}
{{
- formData.contacts_cate_text }}
+ formData.contacts_cate_text }}
{{
- formData.department }}
+ formData.department }}
{{
- formData.duties }}
+ formData.duties }}
{{
- formData.work_phone }}
+ formData.work_phone }}
{{
- formData.mobile }}
+ formData.mobile }}
{{
- formData.email }}
+ formData.email }}
{{
- formData.fax }}
-
+ formData.fax }}
{{
- formData.zip_code }}
+ formData.zip_code }}
{{
- formData.email }}
+ formData.email }}
{{
- formData.id_type_text }}
+ formData.id_type_text }}
{{
- formData.family_address }}
-
+ formData.family_address }}
{{
- formData.remark }}
+ formData.remark }}
-
diff --git a/src/views/supplier_contacts/edit.vue b/src/views/supplier_contacts/edit.vue
index 8638f0a..57e3ea4 100644
--- a/src/views/supplier_contacts/edit.vue
+++ b/src/views/supplier_contacts/edit.vue
@@ -1,7 +1,6 @@
暂无文件
- 施工汇报
-
-
![]()
-
-
暂无文件
@@ -131,38 +80,32 @@
-
人工明细
-
+
@@ -35,12 +34,6 @@
-
-
-
![]()
@@ -58,8 +51,8 @@
-
+
diff --git a/src/views/build_plan/index.vue b/src/views/build_plan/index.vue
index a456c18..1c25acd 100644
--- a/src/views/build_plan/index.vue
+++ b/src/views/build_plan/index.vue
@@ -56,7 +56,7 @@
+
diff --git a/src/views/build_process_settings/detail.js b/src/views/build_process_settings/detail.js
new file mode 100644
index 0000000..65cdd38
--- /dev/null
+++ b/src/views/build_process_settings/detail.js
@@ -0,0 +1,37 @@
+const detailConfig = {
+ title: "施工工序",
+ config: [
+ {
+ label: "分部工程",
+ value: "division_engineering"
+ },
+ {
+ label: "子分部工程",
+ value: "sub_division_engineering"
+ },
+ {
+ label: "分项工程",
+ value: "subentry_engineering"
+ },
+ {
+ label: "分项工程编码",
+ value: "subentry_engineering_code"
+ },
+ {
+ label: "工序步骤号",
+ value: "process_step_no"
+ },
+ {
+ label: "图例说明",
+ value: "annex",
+ column: 1
+ },
+ {
+ label: "质量控制点",
+ value: "quality_control_points"
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/build_process_settings/detail.vue b/src/views/build_process_settings/detail.vue
deleted file mode 100644
index e31c893..0000000
--- a/src/views/build_process_settings/detail.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
@@ -73,12 +73,13 @@ import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
-
-
-
-
-
-
- {{ formData.division_engineering }}
-
-
-
-
- {{ formData.sub_division_engineering }}
-
-
-
-
-
- {{ formData.subentry_engineering }}
-
-
-
-
- {{ formData.subentry_engineering_code }}
-
-
-
-
- {{ formData.process_step_no }}
-
-
-
-
- {{ formData.process_step }}
-
-
-
-
- {{ formData.quality_control_points }}
-
-
-
-
- {{ formData.quality_control_points }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/build_process_settings/edit.vue b/src/views/build_process_settings/edit.vue
index 24387a0..6378dec 100644
--- a/src/views/build_process_settings/edit.vue
+++ b/src/views/build_process_settings/edit.vue
@@ -1,32 +1,26 @@
-
-
+
-
-
-
-
-
-
-
@@ -34,7 +28,8 @@
-
@@ -80,12 +75,8 @@ import Popup from '@/components/popup/index.vue'
import { buildprocesssettingsAdd, buildprocesssettingsEdit, buildprocesssettingsDetail } from '@/api/build/build_process_settings'
import type { PropType } from 'vue'
-
const showDialog = ref(false)
-const subentry_engineering = ref('')
-const subentry_engineering_code = ref('')
-const sub_division_engineering = ref('')
-const division_engineering = ref('')
+
defineProps({
dictData: {
type: Object as PropType>,
@@ -101,12 +92,16 @@ const mode = ref('add')
// 弹窗标题
const popupTitle = computed(() => {
- return mode.value == 'edit' ? '编辑分部分项划分表' : '新增分部分项划分表'
+ return mode.value == 'edit' ? '编辑施工工序' : '新增施工工序表'
})
// 表单数据
const formData = reactive({
id: '',
+ "division_engineering": "",
+ "sub_division_engineering": "",
+ "subentry_engineering": "",
+ "subentry_engineering_code": "",
process_step_no: '',
process_step: '',
quality_control_points: '',
@@ -116,10 +111,10 @@ const formData = reactive({
const customEvent = (e) => {
formData.division_id = e.id;
- subentry_engineering.value = e.subentry_engineering
- subentry_engineering_code.value = e.subentry_engineering_code
- sub_division_engineering.value = e.sub_division_engineering
- division_engineering.value = e.division_engineering
+ formData.subentry_engineering = e.subentry_engineering
+ formData.subentry_engineering_code = e.subentry_engineering_code
+ formData.sub_division_engineering = e.sub_division_engineering
+ formData.division_engineering = e.division_engineering
showDialog.value = false
}
@@ -132,8 +127,6 @@ const formRules = reactive({
// 获取详情
const setFormData = async (data: Record) => {
-
-
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
diff --git a/src/views/build_process_settings/index.vue b/src/views/build_process_settings/index.vue
index 71e9d46..68f9477 100644
--- a/src/views/build_process_settings/index.vue
+++ b/src/views/build_process_settings/index.vue
@@ -35,9 +35,7 @@
-
+
@@ -47,7 +45,8 @@
@click="handleDelete(row.id)">
删除
-
+
+
详情
@@ -60,7 +59,8 @@
-
-
-
-
-
-
-
-
- {{ formData.zy_code }}
-
-
-
-
- {{ formData.project_name }}
-
-
-
-
-
-
- {{ formData.subentry_engineering }}
-
-
-
-
- {{ formData.process_step }}
-
-
-
-
- {{ formData.plan_start_date }}
-
-
-
-
- {{ formData.plan_end_date
- }}
-
-
-
-
- {{ formData.project_member_name
- }}
-
-
-
-
- {{ formData.workload }}
-
-
-
-
- {{ formData.work_user }}
-
-
-
-
- {{ formData.work_content }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/build_report/edit.vue b/src/views/build_report/edit.vue
index 6ce0541..112ea64 100644
--- a/src/views/build_report/edit.vue
+++ b/src/views/build_report/edit.vue
@@ -99,14 +99,7 @@
人工明细
diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue
index dcc4f82..31af99b 100644
--- a/src/views/contract/edit.vue
+++ b/src/views/contract/edit.vue
@@ -17,10 +17,14 @@
+
+
-
-
+
-
+
-
+
-
-
) => {
Object.assign(formData, data)
budgetDetailLists(data.id)
- if (data.annex && data.annex.length > 0) {
-
- const arry1 = data.annex.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
- }
getbidDocumentExaminationFlows()
diff --git a/src/views/material_purchase_request/edit.vue b/src/views/material_purchase_request/edit.vue
index 293ea40..32f8f41 100644
--- a/src/views/material_purchase_request/edit.vue
+++ b/src/views/material_purchase_request/edit.vue
@@ -178,10 +178,7 @@ const handleDelete = (row: any) => {
tablist1.splice(index, 1);
};
-// 删除上传的文件
-const delFileFn = (index: number) => {
- formDataannex.splice(index, 1)
-}
+
//获取所有组织
const getlist = () => {
getAll().then((res) => {
@@ -271,18 +268,6 @@ const formRules = reactive({
// 获取详情
const setFormData = async (data: Record) => {
- if (data.annex && data.annex.length > 0) {
-
- const arry1 = data.annex.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
- }
-
if (data.dept_id) {
getlist1(data.org_id)
}
@@ -293,7 +278,6 @@ const setFormData = async (data: Record) => {
}
}
-
project_name.value = data.project_name;
project_code.value = data.project_code
materialrequestDetailLists({ project_material_budget_detail_id: formData.id }).then(res => {
@@ -314,9 +298,6 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- if (formDataannex.length > 0) {
- formData.annex = formDataannex.map((item: any) => item.uri)
- }
if (tablist1.length > 0) {
formData.purchase_request_detail = tablist1.map((item) => ({
"project_material_budget_detail_id": item.id,
@@ -324,10 +305,7 @@ const handleSubmit = async () => {
"remark": item.remark
}))
}
-
await formRef.value?.validate()
-
-
const data = { ...formData }
mode.value == 'edit'
? await materialrequestEdit(data)
diff --git a/src/views/material_purchase_request_detail/detail.vue b/src/views/material_purchase_request_detail/detail.vue
index daa31cc..a5879bc 100644
--- a/src/views/material_purchase_request_detail/detail.vue
+++ b/src/views/material_purchase_request_detail/detail.vue
@@ -1,48 +1,43 @@
>()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
-
+const showDetail = ref(false)
// 查询条件
const queryParams = reactive({
serial_number: '',
node: '',
-
-
})
-
// 选中数据
const selectData = ref([])
@@ -139,12 +128,13 @@ const handleEdit = async (data: any) => {
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')
- awaitqualitydetectiontempDelete({ id })
+ await qualitydetectiontempDelete({ id })
getLists()
}
-const handledetail = async (data: any) => {
- let res = await qualitydetectiontempDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await qualitydetectiontempDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
diff --git a/src/views/quality_supervise/detail.js b/src/views/quality_supervise/detail.js
new file mode 100644
index 0000000..2595569
--- /dev/null
+++ b/src/views/quality_supervise/detail.js
@@ -0,0 +1,43 @@
+const detailConfig = {
+ title: "质量监督表",
+ config: [
+ {
+ label: "组织名称",
+ value: "org_name"
+ },
+ {
+ label: "部门名称",
+ value: "dept_name"
+ },
+ {
+ label: "项目名称",
+ value: "project_name"
+ },
+ {
+ label: "项目编码",
+ value: "project_code"
+ },
+ {
+ label: "发生日期",
+ value: "happen_date"
+ },
+ {
+ label: "内容",
+ value: "content"
+ },
+ {
+ label: "备注",
+ value: "remark",
+ column: 1
+
+ },
+ {
+ label: "附件",
+ value: "file",
+ column: 1
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/quality_supervise/detail.vue b/src/views/quality_supervise/detail.vue
deleted file mode 100644
index 38dc9ae..0000000
--- a/src/views/quality_supervise/detail.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
@@ -85,18 +68,15 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { qualitysuperviseLists, qualitysuperviseDelete, qualitysuperviseDetail } from '@/api/quality_supervise'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
-const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
-
+
@@ -22,8 +21,11 @@
-
-
+
+
@@ -49,8 +51,8 @@
-
@@ -74,8 +76,7 @@
-
diff --git a/src/views/finance_payment_plan/edit.vue b/src/views/finance_payment_plan/edit.vue
index 74f81cc..404fbd2 100644
--- a/src/views/finance_payment_plan/edit.vue
+++ b/src/views/finance_payment_plan/edit.vue
@@ -1,8 +1,7 @@
>()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-
-const showDtail = ref(false)
+const showDetail = ref(false)
const imaterialList = ref([])
@@ -155,17 +150,16 @@ const handleDelete = async (id: number | any[]) => {
await materialDelete({ id })
getLists()
}
-//详情
-const handledetail = async (data: any) => {
- let res = await materialDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await materialDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
-
//获取分类列表
const imateriallist = () => {
apimaterialLists({ page_no: 1, page_size: 9999 }).then((res) => {
diff --git a/src/views/material_purchase_request/detail.vue b/src/views/material_purchase_request/detail.vue
index 0842662..53b3838 100644
--- a/src/views/material_purchase_request/detail.vue
+++ b/src/views/material_purchase_request/detail.vue
@@ -4,27 +4,17 @@
{{
- formData.project_name }}
+ formData.project_name }}
{{
- formData.project_code }}
+ formData.project_code }}
{{
- formData.material_purchase_request_code }}
+ formData.material_purchase_request_code }}
{{
- formData.remark
- }}
-
+ formData.remark
+ }}
-
@@ -37,7 +27,6 @@
@@ -131,16 +112,6 @@ const budgetDetailLists = (id) => {
const setFormData = async (data: Record
-
+
@@ -106,15 +105,15 @@
-
-
@@ -215,7 +214,7 @@ const formData = reactive({
period: "",
amount: "",
foreign_currency_remark: "",
- status: '',
+ // status: '',
remark: "",
annex: [],
contract_cate: 1,
diff --git a/src/views/material_list/detail.js b/src/views/material_list/detail.js
new file mode 100644
index 0000000..f9a5116
--- /dev/null
+++ b/src/views/material_list/detail.js
@@ -0,0 +1,61 @@
+const detailConfig = {
+ title: "自购材料表",
+ config: [
+ {
+ label: "材料大类",
+ value: "first_level_name"
+ },
+ {
+ label: "材料中类",
+ value: "second_level_name"
+ },
+ {
+ label: "材料小类",
+ value: "three_level_name"
+ },
+ {
+ label: "材料编码",
+ value: "code"
+ },
+ {
+ label: "品牌",
+ value: "brand"
+ },
+ {
+ label: "材料名称",
+ value: "name"
+ },
+ {
+ label: "规格型号",
+ value: "specs"
+ },
+ {
+ label: "单位",
+ value: "unit"
+ },
+ {
+ label: "安全库存量",
+ value: "inventory"
+ },
+ {
+ label: "参数说明",
+ value: "parameter_description"
+ },
+ {
+ label: "附件",
+ value: "annex",
+ column: 1
+ },
+ {
+ label: "销售指导价",
+ value: "sales_price"
+ },
+ {
+ label: "预算成本价",
+ value: "cost_price"
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/material_list/detail.vue b/src/views/material_list/detail.vue
deleted file mode 100644
index f676985..0000000
--- a/src/views/material_list/detail.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/material_list/index.vue b/src/views/material_list/index.vue
index a3b2717..37c709b 100644
--- a/src/views/material_list/index.vue
+++ b/src/views/material_list/index.vue
@@ -20,9 +20,6 @@
-
-
-
查询
重置
@@ -30,16 +27,16 @@
-
+
-
删除
-
+ -->
@@ -54,19 +51,17 @@
+
-
+
编辑
-
删除
-
+
详情
@@ -78,7 +73,8 @@
@@ -91,16 +87,15 @@ import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
-
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
-
-
-
-
-
-
- {{ formData.first_level_name }}
-
-
-
-
- {{ formData.second_level_name }}
-
-
-
-
-
- {{ formData.three_level_name
- }}
-
-
-
-
-
- {{ formData.name }}
-
-
-
-
- {{ formData.code }}
-
-
-
-
- {{ formData.brand
-
- }}
-
-
-
-
- {{ formData.specs }}
-
-
-
-
- {{ formData.parameter_description }}
-
-
-
-
- {{ formData.unit }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/material_list/edit.vue b/src/views/material_list/edit.vue
index 37cf1c2..c6398cc 100644
--- a/src/views/material_list/edit.vue
+++ b/src/views/material_list/edit.vue
@@ -82,16 +82,12 @@
placeholder="请输入参数说明" />
-
-
-
-
- 文件{{ index + 1 }}查看
-
-
-
- 暂无附件
-
+
-
+
{{
- formData.project_name }}
+ formData.project_name }}
{{
- formData.project_code }}
+ formData.project_code }}
{{
- formData.apply_date }}
+ formData.apply_date }}
{{
- formData.arrival_date }}
+ formData.arrival_date }}
{{
- formData.material_name }}
+ formData.material_name }}
{{
- formData.material_code }}
+ formData.material_code }}
{{
- formData.material_first_level }}
+ formData.material_first_level }}
{{
- formData.material_second_level
- }}
+ formData.material_second_level
+ }}
{{
- formData.material_three_level }}
+ formData.material_three_level }}
{{
- formData.material_unit }}
-
+ formData.material_unit }}
{{
- formData.num
- }}
+ formData.num
+ }}
{{
- formData.material_brand
- }}
+ formData.material_brand
+ }}
{{
formData.material_parameter_description
- }}
+ }}
-
-
+ }}
diff --git a/src/views/material_warehouse/detail.js b/src/views/material_warehouse/detail.js
new file mode 100644
index 0000000..6f0a95c
--- /dev/null
+++ b/src/views/material_warehouse/detail.js
@@ -0,0 +1,58 @@
+const detailConfig = {
+ title: "仓库管理表",
+ config: [
+ {
+ label: "部门",
+ value: "dept_name"
+ },
+ {
+ label: "组织",
+ value: "org_name"
+ },
+ {
+ label: "项目名称",
+ value: "project_name"
+ },
+ {
+ label: "项目编码",
+ value: "project_code"
+ },
+ {
+ label: "仓库编码",
+ value: "code"
+ },
+ {
+ label: "仓库名称",
+ value: "name"
+ },
+ {
+ label: "MRP仓库",
+ value: "is_mrp_text"
+ },
+ {
+ label: "负责人",
+ value: "head_user_name"
+ },
+ {
+ label: "地址",
+ value: "address"
+ },
+ {
+ label: "联系电话",
+ value: "telephone"
+ },
+ {
+ label: "备注",
+ value: "remark",
+ column: 1
+ },
+ {
+ label: "附件",
+ value: "annex",
+ column: 1
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/material_warehouse/detail.vue b/src/views/material_warehouse/detail.vue
deleted file mode 100644
index e01af59..0000000
--- a/src/views/material_warehouse/detail.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-
- >()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
+const showDetail = ref(false)
// 查询条件
@@ -145,10 +145,10 @@ const handleDelete = async (id: number | any[]) => {
await materialwarehouseDelete({ id })
getLists()
}
-//详情
-const handledetail = async (data: any) => {
- let res = await materialwarehouseDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await materialwarehouseDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
diff --git a/src/views/project/components/Overview.vue b/src/views/project/components/Overview.vue
index 79a43a7..fe83d14 100644
--- a/src/views/project/components/Overview.vue
+++ b/src/views/project/components/Overview.vue
@@ -1,7 +1,7 @@
{{ formData.name
- }}
+ }}
{{ formData.project_code }}
@@ -28,17 +28,17 @@
{{ formData.estimated_construction }}
{{
- formData.project_estimation }}
+ formData.project_estimation }}
{{
- formData.name
- }}
+ formData.name
+ }}
{{ formData.contacts }}
{{ formData.department }}
{{ formData.position }}
-
+
{{ formData.telephone }}
{{ formData.discovery_time }}
@@ -51,8 +51,8 @@
{{ formData.competitor }}
{{
- formData.construction_funds_sources_text
- }}
+ formData.construction_funds_sources_text
+ }}
{{
formData.construction_payment_method
}}
@@ -66,15 +66,7 @@
formData.my_construction_recognition_text
}}
-
diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue
index 65c7db7..133de4a 100644
--- a/src/views/project/edit.vue
+++ b/src/views/project/edit.vue
@@ -86,7 +86,7 @@
-
@@ -231,6 +231,7 @@ import Popup from '@/components/popup/index.vue'
import { apiProjectAdd, apiProjectEdit, apiProjectDetail } from '@/api/project'
import { getAllProjectTypes } from '@/api/projecttype'
import type { PropType } from 'vue'
+import { checkPhone } from "@/utils/validate"
const protype = reactive([])
@@ -297,6 +298,17 @@ const formData = reactive({
// 表单验证
const formRules = reactive({
+ telephone: [
+
+ {
+ required: true,
+ message: '请输入电话号码',
+ trigger: ['blur']
+ },
+ {
+ validator: checkPhone,
+ trigger: ['blur']
+ }]
})
diff --git a/src/views/project_estimate/edit.vue b/src/views/project_estimate/edit.vue
index b39e0b9..55c2fe3 100644
--- a/src/views/project_estimate/edit.vue
+++ b/src/views/project_estimate/edit.vue
@@ -1,12 +1,10 @@
>()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
-
+const showDetail = ref(false)
// 查询条件
const queryParams = reactive({
accept_date: '',
@@ -152,14 +133,14 @@ const handleDelete = async (id: number | any[]) => {
await qualityacceptDelete({ id })
getLists()
}
-const handledetail = async (data: any) => {
- let res = await qualityacceptDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await qualityacceptDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
-
getLists()
diff --git a/src/views/quality_accident/detail.js b/src/views/quality_accident/detail.js
index b62fc85..03985a7 100644
--- a/src/views/quality_accident/detail.js
+++ b/src/views/quality_accident/detail.js
@@ -1,5 +1,5 @@
const detailConfig = {
- title: "质量事件表",
+ title: "安全事故表",
config: [
{
label: "组织名称",
diff --git a/src/views/quality_accident/edit.vue b/src/views/quality_accident/edit.vue
index 9e6796b..18677e1 100644
--- a/src/views/quality_accident/edit.vue
+++ b/src/views/quality_accident/edit.vue
@@ -74,29 +74,20 @@
-
-
-
-
-
-
-
-
-
@@ -108,18 +99,9 @@ import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { qualityaccidentAdd, qualityaccidentEdit, qualityaccidentDetail } from '@/api/quality_accident'
-import { toChinesNum } from "@/utils/util";
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
-import configs from "@/config"
import useUserStore from "@/stores/modules/user";
-const protype = reactive([])
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
-const active = ref(0)
-const formDataannex = reactive([])
+
const list1 = reactive([])
const list2 = reactive([])
const showDialog = ref(false)
@@ -127,7 +109,6 @@ const project_name = ref('')
const project_code = ref('')
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
defineProps({
dictData: {
@@ -209,9 +190,7 @@ const setFormData = async (data: Record) => {
getlist1(data.dept_id
)
}
-
project_name.value = data.project_name
-
project_code.value = data.project_code
}
const getDetail = async (row: Record) => {
diff --git a/src/views/quality_detection/detail.js b/src/views/quality_detection/detail.js
new file mode 100644
index 0000000..0b91bcd
--- /dev/null
+++ b/src/views/quality_detection/detail.js
@@ -0,0 +1,87 @@
+const detailConfig = {
+ title: "质量检测表",
+ config: [
+ {
+ label: "组织名称",
+ value: "org_name"
+ },
+ {
+ label: "部门名称",
+ value: "dept_name"
+ },
+ {
+ label: "项目名称",
+ value: "project_name"
+ },
+ {
+ label: "检测任务",
+ value: "detection_task"
+ },
+ {
+ label: "所属阶段",
+ value: "owning_stage"
+ },
+ {
+ label: "责任人",
+ value: "standard_duration"
+ },
+ {
+ label: "计划开始时间",
+ value: "scheduled_start_time"
+ },
+ {
+ label: "计划结束时间",
+ value: "scheduled_end_time"
+ },
+ {
+ label: "是否完成",
+ value: "complete"
+ },
+ {
+ label: "实际开始时间",
+ value: "actual_start_time"
+ },
+ {
+ label: "实际结束时间",
+ value: "actual_end_time"
+ },
+ {
+ label: "资料编号",
+ value: "document_number"
+ },
+ {
+ label: "资料名称",
+ value: "document_name"
+ },
+ {
+ label: "文件稿本",
+ value: "document_manuscript"
+ },
+ {
+ label: "是否归档",
+ value: "archiving"
+ },
+ {
+ label: "资料内容要求",
+ value: "data_content_requirements"
+ },
+ {
+ label: "detection_situation",
+ value: "detection_situation"
+ },
+ {
+ label: "备注",
+ value: "remark",
+ column: 1
+
+ },
+ {
+ label: "附件",
+ value: "file",
+ column: 1
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/quality_detection/detail.vue b/src/views/quality_detection/detail.vue
deleted file mode 100644
index ffa6bda..0000000
--- a/src/views/quality_detection/detail.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
- >()
+import detailConfig from './detail'
+
const editRef = shallowRef>()
+const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
-const showDtail = ref(false)
+const showDetail = ref(false)
// 查询条件
const queryParams = reactive({
@@ -157,9 +157,10 @@ const handleDelete = async (id: number | any[]) => {
await qualitydetectionDelete({ id })
getLists()
}
-const handledetail = async (data: any) => {
- let res = await qualitydetectionDetail({ id: data.id })
- showDtail.value = true
+// 详情
+const handleDetail = async (id: any) => {
+ let res = await qualitydetectionDetail({ id })
+ showDetail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
diff --git a/src/views/quality_detection_temp/detail.js b/src/views/quality_detection_temp/detail.js
new file mode 100644
index 0000000..92409b9
--- /dev/null
+++ b/src/views/quality_detection_temp/detail.js
@@ -0,0 +1,39 @@
+const detailConfig = {
+ title: "质量检测模板表",
+ config: [
+ {
+ label: "组织名称",
+ value: "org_name"
+ },
+ {
+ label: "部门名称",
+ value: "dept_name"
+ },
+ {
+ label: "质量检测节点",
+ value: "node_text"
+ },
+ {
+ label: "序号",
+ value: "serial_number"
+ },
+ {
+ label: "标准工期",
+ value: "standard_duration"
+ },
+ {
+ label: "备注",
+ value: "remark",
+ column: 1
+
+ },
+ {
+ label: "附件",
+ value: "file",
+ column: 1
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/quality_detection_temp/detail.vue b/src/views/quality_detection_temp/detail.vue
deleted file mode 100644
index 38dc9ae..0000000
--- a/src/views/quality_detection_temp/detail.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
@@ -81,28 +76,22 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { qualitydetectiontempLists, qualitydetectiontempDelete, qualitydetectiontempDetail } from '@/api/quality_detection_temp'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
-const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
-
-
-
-
-
-
-
- {{ formData.org_name
- }}
-
-
-
-
-
- {{ formData.dept_name
- }}
-
-
-
-
-
- {{ formData.project_name }}
-
-
-
-
-
- {{ formData.project_code
- }}
-
-
-
-
-
- {{ formData.code }}
-
-
-
-
- {{ formData.name
- }}
-
-
-
-
- {{ formData.is_mrp_text
-
- }}
-
-
-
-
- {{ formData.head_user_name
- }}
-
-
-
-
- {{ formData.address
- }}
-
-
-
-
-
- {{ formData.remark }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/material_warehouse/edit.vue b/src/views/material_warehouse/edit.vue
index 36ce031..6c98f29 100644
--- a/src/views/material_warehouse/edit.vue
+++ b/src/views/material_warehouse/edit.vue
@@ -1,19 +1,16 @@
- {{ item.name }}
- x
-
-
-
+
-
@@ -88,12 +87,13 @@ import { timeFormat } from '@/utils/util'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
+
-
+
@@ -41,7 +38,6 @@
-
-
-
-
@@ -136,31 +114,9 @@ const personnel = ref()
const next = () => {
if (active.value++ > 3) active.value = 0
}
-// 上传文件
-const handleAvatarSuccess_four = (
- response,
- uploadFile
-) => {
- if (response.code == 0) {
- ElMessage.error(response.msg);
- return;
- }
- formDataannex.push(
- { uri: response.data.uri, name: response.data.name }
-
-
- );
-};
const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
-
- // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
- // // if (!value) {
- // // return callback(new Error('邮箱不能为空'))
- // // }
-
-
if (value && !mailReg.test(value)) {
callback(new Error('请输入正确的邮箱格式'))
} else {
@@ -257,19 +213,6 @@ const submituser = (e: any) => {
}
// 获取详情
const setFormData = async (data: Record) => {
- if (data.annex && data.annex.length > 0) {
-
- const arry1 = data.annex.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
- }
-
-
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
@@ -284,11 +227,6 @@ const setFormData = async (data: Record) => {
project_code.value = data.project_code
code.value = data.code
head_user_name.value = data.head_user_name
-
- // contract_name.value = data.contract.contract_name;
- // contract_no.value = data.contract.contract_code
-
-
}
const getDetail = async (row: Record) => {
const data = await materialwarehouseDetail({
@@ -300,11 +238,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- formData.annex = formDataannex.map((item: any) => item.uri)
-
await formRef.value?.validate()
-
-
const data = { ...formData }
mode.value == 'edit'
? await materialwarehouseEdit(data)
diff --git a/src/views/material_warehouse/index.vue b/src/views/material_warehouse/index.vue
index 1e38623..99dfaf7 100644
--- a/src/views/material_warehouse/index.vue
+++ b/src/views/material_warehouse/index.vue
@@ -30,13 +30,13 @@
-
+
-
删除
@@ -55,16 +55,15 @@
-
编辑
-
删除
-
+
详情
@@ -76,7 +75,7 @@
-
-
+
- {{ item.name }}
- x
-
-
-
-
-
- 暂无文件
-
+
-
+
-
+
@@ -14,10 +12,18 @@
+
+
+
+
+
+
+
+
+
-
+
@@ -146,6 +160,7 @@ const formData = reactive({
customer_demand_id: '',
estimate_source: '',
create_user: '',
+ recording_time: "",
quotation_date: '',
invoice_type: '',
technician: '',
@@ -182,6 +197,7 @@ if (props.project) customEvent(props.project);
const customEvent1 = (e: any) => {
formData.customer_demand_id = e.id;
+ formData.recording_time = e.recording_time
customer_demand_name.value = e.theme
showDialog1.value = false;
};
@@ -234,11 +250,26 @@ const popupTitle = computed(() => {
})
-
+const chekcDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.quotation_date) < new Date(formData.recording_time)) {
+ callback(new Error('报价日期不能早于客户需求记录时间'))
+ } else {
+ callback()
+ }
+}
// 表单验证
const formRules = reactive({
-
+ quotation_date: [{
+ required: true,
+ message: '报价日期不能为空',
+ trigger: ['blur']
+ },
+ {
+ validator: chekcDate,
+ trigger: ['blur']
+ }],
+ project_id: [{ required: true, message: '不可为空', trigger: 'change' }]
})
@@ -271,6 +302,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
// await formRef.value?.validate()
+ // alert(4545)
const data = { ...formData, }
mode.value == 'edit'
? await apiProjectEstimateEdit(data)
diff --git a/src/views/project_labor_contract/edit.vue b/src/views/project_labor_contract/edit.vue
index 7a464ab..0d1f300 100644
--- a/src/views/project_labor_contract/edit.vue
+++ b/src/views/project_labor_contract/edit.vue
@@ -58,13 +58,19 @@
-
+
-
+
@@ -75,14 +81,19 @@
value-format="YYYY-MM-DD" placeholder="选择计划开始日期">
-
+
-
+
@@ -189,7 +200,35 @@ const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑劳动合同' : '新增劳动合同'
})
+const chekcDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.trial_end_date) < new Date(formData.trial_start_date)) {
+ callback(new Error('试用期结束日不能早于试用期起始日'))
+ } else {
+ callback()
+ }
+}
+const chekcDate1 = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.trial_start_date) < new Date(formData.signing_date)) {
+ callback(new Error('试用期起始日期不能早于合同签定日期'))
+ } else {
+ callback()
+ }
+}
+const chekcDate2 = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.end_date) < new Date(formData.start_date)) {
+ callback(new Error('终止时间不能早于起始时间'))
+ } else {
+ callback()
+ }
+}
+const chekcDate3 = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.release_time) < new Date(formData.signing_date)) {
+ callback(new Error('解除时间不能早于合同签定日期'))
+ } else {
+ callback()
+ }
+}
// 表单验证
const formRules = reactive({
diff --git a/src/views/project_salary_payment/detail.vue b/src/views/project_salary_payment/detail.vue
index 3f36952..664e5bc 100644
--- a/src/views/project_salary_payment/detail.vue
+++ b/src/views/project_salary_payment/detail.vue
@@ -108,7 +108,7 @@ const formData = reactive({
// 获取详情
const setFormData = async (data: Record) => {
Object.assign(formData, data)
- let res = await projectsalaryDetailLists({ payment_salary_id: data.id })
+ let res = await projectsalaryDetailLists({ salary_payment_id: data.id })
formData.payment_detail = res.lists
}
diff --git a/src/views/project_salary_payment/edit.vue b/src/views/project_salary_payment/edit.vue
index 203a69a..4bc0580 100644
--- a/src/views/project_salary_payment/edit.vue
+++ b/src/views/project_salary_payment/edit.vue
@@ -243,7 +243,7 @@ const setFormData = async (data: Record) => {
project_code.value = data.project_code
idcard.value = data.person_idcard
person_name.value = data.person_name
- let res = await projectsalaryDetailLists({ payment_salary_id: data.id })
+ let res = await projectsalaryDetailLists({ salary_payment_id: data.id })
Object.assign(paymentlist, res.lists)
}
diff --git a/src/views/project_total_budget/edit.vue b/src/views/project_total_budget/edit.vue
index 9c58fab..fde0f97 100644
--- a/src/views/project_total_budget/edit.vue
+++ b/src/views/project_total_budget/edit.vue
@@ -47,7 +47,7 @@
-
+
@@ -145,34 +145,34 @@ const list2 = reactive([])
const project_amount = ref(0)
const project_rate = ref(0)
-const tableData = reactive([{
- name: "材料/设备成本(元)",
- text: '用于控制材料成本',
- cost: "", rate: "",
- cl_cost: ''
-},
-{
- name: "分包成本(元)",
- text: '用于控制分包成本', cost: "", rate: "",
- fb_cost: '',
-},
-{
- name: "人工成本(元)",
- text: '用于控制工时成本及项目人力成本', cost: "", rate: "",
- rg_cost: ''
-},
-{
- name: "费用成本(元)",
- text: '用于控制费用报销及差旅报销', cost: "", rate: "",
- fy_cost: ''
-},
-{
- name: "机械 & 工具成本(元)",
- text: '用于控制机械及设备成本', cost: "", rate: "",
- jj_cost: ''
-},
+// const tableData = reactive([{
+// name: "材料/设备成本(元)",
+// text: '用于控制材料成本',
+// cost: "", rate: "",
+// cl_cost: ''
+// },
+// {
+// name: "分包成本(元)",
+// text: '用于控制分包成本', cost: "", rate: "",
+// fb_cost: '',
+// },
+// {
+// name: "人工成本(元)",
+// text: '用于控制工时成本及项目人力成本', cost: "", rate: "",
+// rg_cost: ''
+// },
+// {
+// name: "费用成本(元)",
+// text: '用于控制费用报销及差旅报销', cost: "", rate: "",
+// fy_cost: ''
+// },
+// {
+// name: "机械 & 工具成本(元)",
+// text: '用于控制机械及设备成本', cost: "", rate: "",
+// jj_cost: ''
+// },
-])
+// ])
const contract_name = ref('')
const project_name = ref('')
const project_code = ref('')
@@ -193,13 +193,6 @@ const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
}
const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
-
- // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
- // // if (!value) {
- // // return callback(new Error('邮箱不能为空'))
- // // }
-
-
if (value && !mailReg.test(value)) {
callback(new Error('请输入正确的邮箱格式'))
} else {
@@ -241,42 +234,42 @@ const customEvent2 = (e: any) => {
custom_name.value = e.custom_name;
showDialog2.value = false;
};
-const updateCost = () => {
+// const updateCost = () => {
- for (let i = 0; i < tableData.length; i++) {
- const row = tableData[i];
+// for (let i = 0; i < tableData.length; i++) {
+// const row = tableData[i];
- if (row.cost && row.cost > 0) {
- row.rate = (row.cost / Number(totalenum.value)).toFixed(2) + '%';
- } else {
- row.rate = ''
- }
+// if (row.cost && row.cost > 0) {
+// row.rate = (row.cost / Number(totalenum.value)).toFixed(2) + '%';
+// } else {
+// row.rate = ''
+// }
- }
-};
+// }
+// };
//监听获取成本%
-const costinput = (row, index) => {
+// const costinput = (row, index) => {
- row.rate = (row.cost / Number(totalenum.value)).toFixed(2) + '%'
+// row.rate = (row.cost / Number(totalenum.value)).toFixed(2) + '%'
- if (index == 0) {
- formData.cl_cost = row.cost
- } else if (index == 2) {
- formData.fb_cost = row.cost
- } else if (index == 3) {
- formData.rg_cost = row.cost
- } else if (index == 4) {
- formData.fy_cost = row.cost
- } else if (index == 5) {
- formData.jj_cost = row.cost
- }
+// if (index == 0) {
+// formData.cl_cost = row.cost
+// } else if (index == 2) {
+// formData.fb_cost = row.cost
+// } else if (index == 3) {
+// formData.rg_cost = row.cost
+// } else if (index == 4) {
+// formData.fy_cost = row.cost
+// } else if (index == 5) {
+// formData.jj_cost = row.cost
+// }
-}
+// }
//打开弹窗
@@ -290,68 +283,68 @@ const submituser = (e: any) => {
formData.project_manager = e.id;
manage_name.value = e.name;
}
-interface Product {
- id: string
- name: string
- text: string
- cost: number
- rate: string
- cl_cost: number
+// interface Product {
+// id: string
+// name: string
+// text: string
+// cost: number
+// rate: string
+// cl_cost: number
-}
-interface SummaryMethodProps {
- columns: TableColumnCtx[]
- data: T[]
-}
-const getSummaries = (param: SummaryMethodProps) => {
- // FIXME
- updateCost();
- if (formData && formData.contract_amount && project_amount.value) {
- project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
- project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
- }
- if (project_amount.value) {
- project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
- project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
- }
- const { columns, data } = param
- const sums: string[] = []
- columns.map((column, index) => {
+// }
+// interface SummaryMethodProps {
+// columns: TableColumnCtx[]
+// data: T[]
+// }
+// const getSummaries = (param: SummaryMethodProps) => {
+// // FIXME
+// updateCost();
+// if (formData && formData.contract_amount && project_amount.value) {
+// project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
+// project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
+// }
+// if (project_amount.value) {
+// project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
+// project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
+// }
+// const { columns, data } = param
+// const sums: string[] = []
+// columns.map((column, index) => {
- if (column.label == '序号') {
- sums[index] = '合计'
- return
- }
- if (column.label == '分项') {
- sums[index] = ''
- return
- }
- if (column.label === '成本占比') {
- sums[index] = ''
- return
- }
+// if (column.label == '序号') {
+// sums[index] = '合计'
+// return
+// }
+// if (column.label == '分项') {
+// sums[index] = ''
+// return
+// }
+// if (column.label === '成本占比') {
+// sums[index] = ''
+// return
+// }
- const values = data.map((item: any) => Number(item[column.property]))
+// const values = data.map((item: any) => Number(item[column.property]))
- if (!values.every((value) => Number.isNaN(value))) {
+// if (!values.every((value) => Number.isNaN(value))) {
- sums[index] = `${values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!Number.isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)}`
- } else {
- sums[index] = 'N/A'
- }
+// sums[index] = `${values.reduce((prev, curr) => {
+// const value = Number(curr)
+// if (!Number.isNaN(value)) {
+// return prev + curr
+// } else {
+// return prev
+// }
+// }, 0)}`
+// } else {
+// sums[index] = 'N/A'
+// }
- })
- totalenum.value = sums[2]
- project_amount.value = sums[2]
- return sums
-}
+// })
+// totalenum.value = sums[2]
+// project_amount.value = sums[2]
+// return sums
+// }
//监听输入
@@ -420,19 +413,6 @@ const getlist1 = (id: any) => {
// 获取详情
const setFormData = async (data: Record) => {
- if (data.budget_list && data.budget_list.length > 0) {
-
- const arry1 = data.budget_list.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
- }
-
-
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
@@ -443,17 +423,6 @@ const setFormData = async (data: Record) => {
project_name.value = data.project_name
project_code.value = data.project_code
- tableData[0].cost = data.cl_cost
-
- tableData[1].cost = data.fb_cost
-
- tableData[2].cost = data.rg_cost
-
- tableData[3].cost = data.fy_cost
-
- tableData[4].cost = data.jj_cost
-
-
if (data && data.contract_name) {
contract_name.value = data.contract_name;
@@ -471,8 +440,6 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
-
-
await formRef.value?.validate()
const data = { ...formData }
@@ -500,27 +467,27 @@ const handleClose = () => {
emit('close')
}
-watch(
- [totalenum, project_amount, project_rate,], (newValue, oldValue) => {
- updateCost();
- if (formData && formData.contract_amount && project_amount.value) {
- project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
- project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
- }
- },
+// watch(
+// [totalenum, project_amount, project_rate,], (newValue, oldValue) => {
+// updateCost();
+// if (formData && formData.contract_amount && project_amount.value) {
+// project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
+// project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
+// }
+// },
-)
+// )
-watch(
- () => formData.contract_amount,
- (newValue, oldValue) => {
+// watch(
+// () => formData.contract_amount,
+// (newValue, oldValue) => {
- if (project_amount.value) {
- project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
- project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
- }
- }
-)
+// if (project_amount.value) {
+// project_amount.value = Number(formData.contract_amount) - Number(project_amount.value);
+// project_rate.value = (Number(project_amount.value) / Number(formData.contract_amount)).toFixed(2) + '%';
+// }
+// }
+// )
defineExpose({
open,
diff --git a/src/views/project_total_budget/edit1.vue b/src/views/project_total_budget/edit1.vue
new file mode 100644
index 0000000..b458176
--- /dev/null
+++ b/src/views/project_total_budget/edit1.vue
@@ -0,0 +1,527 @@
+
+
+
diff --git a/src/views/quality_accept/detail.js b/src/views/quality_accept/detail.js
new file mode 100644
index 0000000..7a75fa3
--- /dev/null
+++ b/src/views/quality_accept/detail.js
@@ -0,0 +1,55 @@
+const detailConfig = {
+ title: "质量验收表",
+ config: [
+ {
+ label: "组织名称",
+ value: "org_name"
+ },
+ {
+ label: "部门名称",
+ value: "dept_name"
+ },
+ {
+ label: "项目名称",
+ value: "project_name"
+ },
+ {
+ label: "项目编码",
+ value: "project_code"
+ },
+ {
+ label: "验收日期",
+ value: "accept_date"
+ },
+ {
+ label: "验收类型",
+ value: "type"
+ },
+ {
+ label: "验收工程师",
+ value: "engineer"
+ },
+ {
+ label: "验收内容",
+ value: "content"
+ },
+ {
+ label: "验收类型",
+ value: "type"
+ },
+ {
+ label: "备注",
+ value: "remark",
+ column: 1
+
+ },
+ {
+ label: "附件",
+ value: "file",
+ column: 1
+ },
+ ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/quality_accept/detail.vue b/src/views/quality_accept/detail.vue
deleted file mode 100644
index 38dc9ae..0000000
--- a/src/views/quality_accept/detail.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
@@ -91,18 +74,16 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { qualityacceptLists, qualityacceptDelete, qualityacceptDetail } from '@/api/quality_accept'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/project_total_budget/index.vue b/src/views/project_total_budget/index.vue
index 2c576ac..a141f2f 100644
--- a/src/views/project_total_budget/index.vue
+++ b/src/views/project_total_budget/index.vue
@@ -47,7 +47,7 @@
+
+
+
+
+
+ + + +
-
-
-
-
-
-
- {{ formData.org_name }}
-
-
-
-
-
-
- {{ formData.dept_name
-
- }}
-
-
-
-
-
- {{ formData.name
- }}
-
-
-
-
-
- {{ formData.type
- }}
-
-
-
-
- {{ formData.publish_dep
-
- }}
-
-
-
-
- {{ formData.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/quality_accept/edit.vue b/src/views/quality_accept/edit.vue
index c87095d..44d06c6 100644
--- a/src/views/quality_accept/edit.vue
+++ b/src/views/quality_accept/edit.vue
@@ -1,8 +1,7 @@
-
-
-
- {{ item.name }}
- x
-
-
-
+
@@ -62,36 +61,14 @@
-
-
-
-
@@ -108,45 +85,17 @@ import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { qualityacceptAdd, qualityacceptEdit, qualityacceptDetail } from '@/api/quality_accept'
-import { toChinesNum } from "@/utils/util";
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
-const protype = reactive([])
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
-const active = ref(0)
-const formDataannex = reactive([])
+
const list1 = reactive([])
const list2 = reactive([])
const showDialog = ref(false)
const project_name = ref('')
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
-// 上传文件
-const handleAvatarSuccess_four = (
- response,
- uploadFile
-) => {
- if (response.code == 0) {
- ElMessage.error(response.msg);
- return;
- }
- formDataannex.push(
- { uri: response.data.uri, name: response.data.name }
-
- );
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => {
- formDataannex.splice(index, 1)
-}
defineProps({
dictData: {
type: Object as PropType>,
@@ -186,7 +135,7 @@ const getlist1 = (id: any) => {
// 弹窗标题
const popupTitle = computed(() => {
- return mode.value == 'edit' ? '编辑质量目标表' : '新增质量目标表'
+ return mode.value == 'edit' ? '编辑质量验收表' : '新增质量验收表'
})
// 表单数据
@@ -213,20 +162,6 @@ const formRules = reactive({
// 获取详情
const setFormData = async (data: Record) => {
- if (data.file && data.file.length > 0) {
-
- const arry1 = data.file.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
-
- }
-
-
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
@@ -234,8 +169,7 @@ const setFormData = async (data: Record) => {
}
}
if (data.dept_id) {
- getlist1(data.dept_id
- )
+ getlist1(data.org_id)
}
project_name.value = data.project_name
@@ -252,11 +186,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- formData.file = formDataannex.map((item) => item.uri)
-
await formRef.value?.validate()
-
-
const data = { ...formData }
mode.value == 'edit'
? await qualityacceptEdit(data)
diff --git a/src/views/quality_accept/index.vue b/src/views/quality_accept/index.vue
index 96ee9c7..155e451 100644
--- a/src/views/quality_accept/index.vue
+++ b/src/views/quality_accept/index.vue
@@ -38,29 +38,12 @@
-
-
-
-
-
+
@@ -70,10 +53,9 @@
@click="handleDelete(row.id)">
删除
-
-
+
@@ -83,7 +65,8 @@
-
-
+
- {{ item.name }}
- x
-
-
-
-
- 文件{{ i + 1 }}查看
-
-
- 暂无文件
-
-
-
-
-
-
-
-
-
-
- {{ formData.org_name }}
-
-
-
-
-
-
- {{ formData.dept_name
-
- }}
-
-
-
-
-
- {{ formData.name
- }}
-
-
-
-
-
- {{ formData.type
- }}
-
-
-
-
- {{ formData.publish_dep
-
- }}
-
-
-
-
- {{ formData.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/quality_detection/edit.vue b/src/views/quality_detection/edit.vue
index 1a91a09..1a93ed9 100644
--- a/src/views/quality_detection/edit.vue
+++ b/src/views/quality_detection/edit.vue
@@ -1,8 +1,7 @@
-
+
@@ -156,18 +155,11 @@ import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { qualitydetectionAdd, qualitydetectionEdit, qualitydetectionDetail } from '@/api/quality_detection'
-import { toChinesNum } from "@/utils/util";
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
+
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
-const protype = reactive([])
-const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
-const active = ref(0)
-const formDataannex = reactive([])
const list1 = reactive([])
const list2 = reactive([])
const showDialog = ref(false)
@@ -175,7 +167,6 @@ const project_name = ref('')
import feedback from '@/utils/feedback'
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
defineProps({
dictData: {
@@ -262,7 +253,7 @@ const setFormData = async (data: Record) => {
}
}
if (data.dept_id) {
- getlist1(data.dept_id
+ getlist1(data.org_id
)
}
diff --git a/src/views/quality_detection/index.vue b/src/views/quality_detection/index.vue
index 05b4017..19363da 100644
--- a/src/views/quality_detection/index.vue
+++ b/src/views/quality_detection/index.vue
@@ -39,7 +39,7 @@
@@ -93,17 +93,17 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { qualitydetectionLists, qualitydetectionDelete, qualitydetectionDetail } from '@/api/quality_detection'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
+
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef
-
+
+
删除
-
-
+
@@ -85,7 +85,7 @@
-
-
-
-
-
-
- {{ formData.org_name }}
-
-
-
-
-
-
- {{ formData.dept_name
-
- }}
-
-
-
-
-
- {{ formData.name
- }}
-
-
-
-
-
- {{ formData.type
- }}
-
-
-
-
- {{ formData.publish_dep
-
- }}
-
-
-
-
- {{ formData.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/quality_detection_temp/edit.vue b/src/views/quality_detection_temp/edit.vue
index 233385f..ae91d2e 100644
--- a/src/views/quality_detection_temp/edit.vue
+++ b/src/views/quality_detection_temp/edit.vue
@@ -1,8 +1,7 @@
-
-
-
- {{ item.name }}
- x
-
-
-
+
@@ -55,31 +54,9 @@
-
-
-
-
@@ -98,43 +75,15 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { qualitydetectiontempAdd, qualitydetectiontempEdit, qualitydetectiontempDetail } from '@/api/quality_detection_temp'
-import { toChinesNum } from "@/utils/util";
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
-import configs from "@/config"
import useUserStore from "@/stores/modules/user";
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
-const formDataannex = reactive([])
const list1 = reactive([])
const list2 = reactive([])
const project_name = ref('')
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
-// 上传文件
-const handleAvatarSuccess_four = (
- response,
- uploadFile
-) => {
- if (response.code == 0) {
- ElMessage.error(response.msg);
- return;
- }
- formDataannex.push(
- { uri: response.data.uri, name: response.data.name }
-
- );
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => {
- formDataannex.splice(index, 1)
-}
defineProps({
dictData: {
type: Object as PropType>,
@@ -194,19 +143,6 @@ const formRules = reactive({
// 获取详情
const setFormData = async (data: Record) => {
- if (data.file && data.file.length > 0) {
-
- const arry1 = data.file.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
- }
-
-
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
@@ -214,7 +150,7 @@ const setFormData = async (data: Record) => {
}
}
if (data.dept_id) {
- getlist1(data.dept_id
+ getlist1(data.org_id
)
}
@@ -232,8 +168,6 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- formData.file = formDataannex.map((item) => item.uri)
-
await formRef.value?.validate()
diff --git a/src/views/quality_detection_temp/index.vue b/src/views/quality_detection_temp/index.vue
index 675c8eb..9da8d36 100644
--- a/src/views/quality_detection_temp/index.vue
+++ b/src/views/quality_detection_temp/index.vue
@@ -37,20 +37,14 @@
-
-
+
@@ -60,10 +54,10 @@
@click="handleDelete(row.id)">
删除
-
-
+
@@ -73,7 +67,8 @@
-
-
+
- {{ item.name }}
- x
-
-
-
-
-
-
-
-
- {{ formData.org_name }}
-
-
-
-
-
-
- {{ formData.dept_name
-
- }}
-
-
-
-
-
- {{ formData.name
- }}
-
-
-
-
-
- {{ formData.type
- }}
-
-
-
-
- {{ formData.publish_dep
-
- }}
-
-
-
-
- {{ formData.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/quality_supervise/edit.vue b/src/views/quality_supervise/edit.vue
index c318a01..8222e79 100644
--- a/src/views/quality_supervise/edit.vue
+++ b/src/views/quality_supervise/edit.vue
@@ -1,8 +1,7 @@
-
-
-
- {{ item.name }}
- x
-
-
-
+
@@ -56,25 +55,7 @@
-
-
-
@@ -96,45 +77,15 @@ import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { qualitysuperviseAdd, qualitysuperviseEdit, qualitysuperviseDetail } from '@/api/quality_supervise'
-import { toChinesNum } from "@/utils/util";
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
-import configs from "@/config"
import useUserStore from "@/stores/modules/user";
-const protype = reactive([])
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
-const active = ref(0)
-const formDataannex = reactive([])
const list1 = reactive([])
const list2 = reactive([])
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
const showDialog = ref(false)
const project_name = ref('')
-// 上传文件
-const handleAvatarSuccess_four = (
- response,
- uploadFile
-) => {
- if (response.code == 0) {
- ElMessage.error(response.msg);
- return;
- }
- formDataannex.push(
- { uri: response.data.uri, name: response.data.name }
-
- );
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => {
- formDataannex.splice(index, 1)
-}
defineProps({
dictData: {
type: Object as PropType>,
@@ -200,18 +151,6 @@ const formRules = reactive({
// 获取详情
const setFormData = async (data: Record) => {
- if (data.file && data.file.length > 0) {
-
- const arry1 = data.file.map((item: any, index: any) => {
- return {
- name: `文件${index + 1}`,
- uri: item
- };
- });
- Object.assign(formDataannex, arry1)
-
- }
-
project_name.value = data.project_name;
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
@@ -220,8 +159,7 @@ const setFormData = async (data: Record) => {
}
}
if (data.dept_id) {
- getlist1(data.dept_id
- )
+ getlist1(data.org_id)
}
@@ -237,11 +175,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- formData.file = formDataannex.map((item) => item.uri)
-
await formRef.value?.validate()
-
-
const data = { ...formData }
mode.value == 'edit'
? await qualitysuperviseEdit(data)
diff --git a/src/views/quality_supervise/index.vue b/src/views/quality_supervise/index.vue
index d8544e7..7aa6194 100644
--- a/src/views/quality_supervise/index.vue
+++ b/src/views/quality_supervise/index.vue
@@ -32,29 +32,11 @@
-
-
-
-
-
+
@@ -64,9 +46,9 @@
@click="handleDelete(row.id)">
删除
-
+
@@ -77,7 +59,8 @@
-
-
+
- {{ item.name }}
- x
-
-
-
-
- 文件{{ i + 1 }}查看
-
-
- 暂无文件
-
-
-
-
-
-
- 文件{{ index + 1 }}查看
-
-
- 暂无附件
-
+
-
-
- 文件{{ index + 1 }}查看
-
-
-
- 暂无文件
-
+
-
+
@@ -9,8 +8,7 @@
+ :rules="[{ required: true, message: '不可为空', trigger: 'change' }]" @click="showDialog = true">
@@ -35,8 +33,8 @@
-
@@ -56,8 +54,8 @@
-
@@ -75,8 +73,7 @@
-
+
@@ -124,27 +121,9 @@
-
-
-
+
@@ -159,9 +138,7 @@
-
-
-
-
-
- {{ item.name }}
- x
-
-