diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue new file mode 100644 index 0000000..4058fb9 --- /dev/null +++ b/src/views/measure/price/priceAdd.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue new file mode 100644 index 0000000..4058fb9 --- /dev/null +++ b/src/views/measure/price/priceAdd.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index 136f0a8..bf927da 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -112,6 +112,7 @@ getSoucreListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue new file mode 100644 index 0000000..4058fb9 --- /dev/null +++ b/src/views/measure/price/priceAdd.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index 136f0a8..bf927da 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -112,6 +112,7 @@ getSoucreListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue index a2f21a5..949e8e8 100644 --- a/src/views/measure/train/plan.vue +++ b/src/views/measure/train/plan.vue @@ -158,7 +158,6 @@ } const handelClick = (text: string) => {} const handleSelectionChange = (e: any) => { - console.log(e, '666') checkoutList.value = e } const add = () => { @@ -185,6 +184,7 @@ getListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue new file mode 100644 index 0000000..4058fb9 --- /dev/null +++ b/src/views/measure/price/priceAdd.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index 136f0a8..bf927da 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -112,6 +112,7 @@ getSoucreListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue index a2f21a5..949e8e8 100644 --- a/src/views/measure/train/plan.vue +++ b/src/views/measure/train/plan.vue @@ -158,7 +158,6 @@ } const handelClick = (text: string) => {} const handleSelectionChange = (e: any) => { - console.log(e, '666') checkoutList.value = e } const add = () => { @@ -185,6 +184,7 @@ getListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts index 6524e67..2769c7a 100644 --- a/src/views/measure/train/plan_interface.ts +++ b/src/views/measure/train/plan_interface.ts @@ -37,9 +37,9 @@ createTime: string deptName: string director: string - effectiveCompany: string + logNo: string planName: string - planNo: string + trainName: string remark: string trainAddress: string trainContent: string diff --git a/src/api/system/price.ts b/src/api/system/price.ts new file mode 100644 index 0000000..ddee1a1 --- /dev/null +++ b/src/api/system/price.ts @@ -0,0 +1,62 @@ +import request from '../index' +const prefix = '/price' + +// 价格列表查询 +export function getPriceList(data: object) { + return request({ + url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} +// 价格列表新增 +export function getPriceAddList(data: object) { + return request({ + url: `${prefix}/addMeterPrice`, + method: 'post', + data, + }) +} + +// 获取下拉框 +export function getTypeSelect(code: string) { + return request({ + url: `/sys/dict/code/${code}`, + method: 'get', + }) +} + +// 获取详情信息 +export function getQueryPriceInfo(data: object) { + return request({ + url: `${prefix}/queryPriceInfo`, + method: 'post', + data, + }) +} + +// 修改编辑 +export function getUpdatePriceInfo(data: object) { + return request({ + url: `${prefix}/updatePriceInfo`, + method: 'post', + data, + }) +} + +// 删除列表 +export function getDeletePrice(data: object) { + return request({ + url: `${prefix}/deletePrice`, + method: 'post', + data, + }) +} +// 上传文件 +export function uploadPrice(data: FormData) { + return request({ + url: `${prefix}/batchImportPrice`, + method: 'post', + data, + }) +} diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index adf4bb1..0d3858c 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,5 +1,234 @@ + + + + diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue index 092edc3..9827d37 100644 --- a/src/views/measure/price/list.vue +++ b/src/views/measure/price/list.vue @@ -1,3 +1,383 @@ + + + + diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts new file mode 100644 index 0000000..86a6f2c --- /dev/null +++ b/src/views/measure/price/list_interface.ts @@ -0,0 +1,25 @@ +export interface IlistQuery { + checkType: string + // model: string + priceItem: string + priceName: string + priceNo: string + priceType: string + limit: number + offset: number +} + +export interface IlistType { + priceNo: string + priceName: string + checkType: string + model: string + priceType: string + priceItem: string + price: string + operatorDiscountPermission: string + directorDiscountPermission: string + priceStandard: string + createTime: string +} + diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue new file mode 100644 index 0000000..4058fb9 --- /dev/null +++ b/src/views/measure/price/priceAdd.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index 136f0a8..bf927da 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -112,6 +112,7 @@ getSoucreListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue index a2f21a5..949e8e8 100644 --- a/src/views/measure/train/plan.vue +++ b/src/views/measure/train/plan.vue @@ -158,7 +158,6 @@ } const handelClick = (text: string) => {} const handleSelectionChange = (e: any) => { - console.log(e, '666') checkoutList.value = e } const add = () => { @@ -185,6 +184,7 @@ getListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } }) diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts index 6524e67..2769c7a 100644 --- a/src/views/measure/train/plan_interface.ts +++ b/src/views/measure/train/plan_interface.ts @@ -37,9 +37,9 @@ createTime: string deptName: string director: string - effectiveCompany: string + logNo: string planName: string - planNo: string + trainName: string remark: string trainAddress: string trainContent: string diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue index 56b2ec7..7649153 100644 --- a/src/views/measure/train/trainLog.vue +++ b/src/views/measure/train/trainLog.vue @@ -68,7 +68,7 @@ width: '120', }, { - text: '培训对象', + text: '培训时间', value: 'trainPerson', width: '120', }, @@ -112,17 +112,17 @@ }) if (checkoutList.value.length <= 0) { exportExcel({ - json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })), - name: '培训计划', - titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'], + json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })), + name: '培训记录', + titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'], sheetName: 'sheet1', }) } else { exportExcel({ - json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })), - name: '培训计划', - titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'], + json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })), + name: '培训记录', + titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'], sheetName: 'sheet1', }) } @@ -146,7 +146,6 @@ } const handelClick = (text: string) => {} const handleSelectionChange = (e: any) => { - console.log(e, '666') checkoutList.value = e } const add = () => { @@ -173,6 +172,7 @@ getListDelete({ id: deleteId.value }).then((res) => { if (res.code === 200) { isPopconfirmShow.value = false + ElMessage.success('删除成功') fetchData(true) } })