diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue index 629b33c..2300f4c 100644 --- a/src/views/customer/advice/adviceEdit.vue +++ b/src/views/customer/advice/adviceEdit.vue @@ -51,7 +51,7 @@ const companyInfo: SimpleCompany = reactive({ customerName: '', // 公司名称 customerNo: '', // 客户编号 - customerId: '', // 客户id + id: '', // 客户id grade: '', // 履约评级 gradeName: '', // 履约评级 companySize: '', // 公司规模 @@ -121,12 +121,13 @@ const item = select as SimpleCompany companyInfo.customerName = item.customerName companyInfo.customerNo = item.customerNo - companyInfo.customerId = item.customerId + companyInfo.id = item.id companyInfo.gradeName = item.gradeName companyInfo.companySizeName = item.companySizeName companyInfo.businessSizeName = item.businessSizeName companyInfo.evaluationName = item.evaluationName dataForm.value.customerNo = item.customerNo + dataForm.value.customerId = item.id } // 打印表单 const printObj = ref({ @@ -154,8 +155,6 @@ if (dataForm.value.id) { updateAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } @@ -164,8 +163,6 @@ else { addAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue index 629b33c..2300f4c 100644 --- a/src/views/customer/advice/adviceEdit.vue +++ b/src/views/customer/advice/adviceEdit.vue @@ -51,7 +51,7 @@ const companyInfo: SimpleCompany = reactive({ customerName: '', // 公司名称 customerNo: '', // 客户编号 - customerId: '', // 客户id + id: '', // 客户id grade: '', // 履约评级 gradeName: '', // 履约评级 companySize: '', // 公司规模 @@ -121,12 +121,13 @@ const item = select as SimpleCompany companyInfo.customerName = item.customerName companyInfo.customerNo = item.customerNo - companyInfo.customerId = item.customerId + companyInfo.id = item.id companyInfo.gradeName = item.gradeName companyInfo.companySizeName = item.companySizeName companyInfo.businessSizeName = item.businessSizeName companyInfo.evaluationName = item.evaluationName dataForm.value.customerNo = item.customerNo + dataForm.value.customerId = item.id } // 打印表单 const printObj = ref({ @@ -154,8 +155,6 @@ if (dataForm.value.id) { updateAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } @@ -164,8 +163,6 @@ else { addAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts index b08f85b..a8bf311 100644 --- a/src/views/customer/advice/advice_interface.ts +++ b/src/views/customer/advice/advice_interface.ts @@ -40,9 +40,10 @@ // 公司简易 export interface SimpleCompany { + id: string // 客户id customerName: string // 公司名称 customerNo: string // 客户编号 - customerId: string // 客户id + grade: string // 履约评级 gradeName: string // 履约评级 companySizeName: string // 公司规模 businessSizeName: string // 业务规模 diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue index 629b33c..2300f4c 100644 --- a/src/views/customer/advice/adviceEdit.vue +++ b/src/views/customer/advice/adviceEdit.vue @@ -51,7 +51,7 @@ const companyInfo: SimpleCompany = reactive({ customerName: '', // 公司名称 customerNo: '', // 客户编号 - customerId: '', // 客户id + id: '', // 客户id grade: '', // 履约评级 gradeName: '', // 履约评级 companySize: '', // 公司规模 @@ -121,12 +121,13 @@ const item = select as SimpleCompany companyInfo.customerName = item.customerName companyInfo.customerNo = item.customerNo - companyInfo.customerId = item.customerId + companyInfo.id = item.id companyInfo.gradeName = item.gradeName companyInfo.companySizeName = item.companySizeName companyInfo.businessSizeName = item.businessSizeName companyInfo.evaluationName = item.evaluationName dataForm.value.customerNo = item.customerNo + dataForm.value.customerId = item.id } // 打印表单 const printObj = ref({ @@ -154,8 +155,6 @@ if (dataForm.value.id) { updateAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } @@ -164,8 +163,6 @@ else { addAdvice(dataForm.value).then((res) => { if (res.code === 200) { - dataForm.value.id = res.data.id - dataForm.value.customerNo = res.data.customerNo ElMessage.success('已保存') $router.go(-1) } diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts index b08f85b..a8bf311 100644 --- a/src/views/customer/advice/advice_interface.ts +++ b/src/views/customer/advice/advice_interface.ts @@ -40,9 +40,10 @@ // 公司简易 export interface SimpleCompany { + id: string // 客户id customerName: string // 公司名称 customerNo: string // 客户编号 - customerId: string // 客户id + grade: string // 履约评级 gradeName: string // 履约评级 companySizeName: string // 公司规模 businessSizeName: string // 业务规模 diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue index f7fd689..33e63c8 100644 --- a/src/views/measure/measureDept/components/templatePage.vue +++ b/src/views/measure/measureDept/components/templatePage.vue @@ -66,7 +66,7 @@ columns: [ { text: '科室编号', value: 'organizeNo', align: 'center' }, { text: '科室名称', value: 'organizeName', align: 'center' }, - { text: '专业', value: 'meterMajor', align: 'center' }, + { text: '计量专业', value: 'meterMajorName', align: 'center' }, { text: '负责人', value: 'director', align: 'center' }, { text: '技术职务', value: 'technologyJobName', align: 'center' }, { text: '行政职务', value: 'administrationJobName', align: 'center' }, @@ -79,7 +79,7 @@ columns: [ { text: '工程组编号', value: 'organizeNo', align: 'center' }, { text: '工程组名', value: 'organizeName', align: 'center' }, - { text: '计量专业', value: 'meterMajor', align: 'center' }, + { text: '计量专业', value: 'meterMajorName', align: 'center' }, { text: '负责人', value: 'director', align: 'center' }, { text: '联系方式', value: 'phone', align: 'center' }, { text: '所属科室', value: 'pDeptName', align: 'center' },