diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index 70ca6f4..a32f0f6 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -1,12 +1,18 @@ - + diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index 70ca6f4..a32f0f6 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -1,12 +1,18 @@ - + diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 0c79867..5ac5e8c 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -593,7 +593,7 @@ - + 上传 diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index 70ca6f4..a32f0f6 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -1,12 +1,18 @@ - + diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 0c79867..5ac5e8c 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -593,7 +593,7 @@ - + 上传 diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue index ea81bd0..450f9d9 100644 --- a/src/views/tested/document/list/edit.vue +++ b/src/views/tested/document/list/edit.vue @@ -213,7 +213,7 @@ - + {{ '上传' }} diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index 70ca6f4..a32f0f6 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -1,12 +1,18 @@ - + diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 0c79867..5ac5e8c 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -593,7 +593,7 @@ - + 上传 diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue index ea81bd0..450f9d9 100644 --- a/src/views/tested/document/list/edit.vue +++ b/src/views/tested/document/list/edit.vue @@ -213,7 +213,7 @@ - + {{ '上传' }} diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue index b5c12c6..6e1db7b 100644 --- a/src/views/tested/subpackage/certificate/components/edit.vue +++ b/src/views/tested/subpackage/certificate/components/edit.vue @@ -308,7 +308,7 @@ - + {{ '上传' }} diff --git a/.env.development b/.env.development index 52b6555..35bd2f1 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -VITE_APP_API_BASEURL = http://111.198.10.15:21611 -# VITE_APP_API_BASEURL = http://192.168.8.107:5909 +# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..0127d2f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://192.168.8.107:5909" } diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts new file mode 100644 index 0000000..1baa09a --- /dev/null +++ b/src/api/eqpt/MeasurementBusiness/opinion.ts @@ -0,0 +1,21 @@ +/** + * 委托方意见登记表相关接口 + */ +import request from '@/api/index' + +// 列表 +export function getListPage(data: object) { + return request({ + url: '/resource/customer/suggestForm/listPage', + method: 'post', + data, + }) +} +// // 详情 +// export function editSurveyForm(data: object) { +// return request({ +// url: '/resource/customer/questionnaire/submit', +// method: 'post', +// data, +// }) +// } diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts index 2f7c763..a33b1c7 100644 --- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts +++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts @@ -11,8 +11,8 @@ data, }) } -// 详情 -export function editSurveyForm(data: object) { +// 提交 +export function submitSurveyForm(data: object) { return request({ url: '/resource/customer/questionnaire/submit', method: 'post', diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue index 4e5fc6e..5db864b 100644 --- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue +++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue @@ -4,6 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' +import { getUserDept } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -18,9 +19,30 @@ // 对话框类型：create,update const dialogStatus = ref('create') const ruleForm = ref({ + appealUserId: '', + appealUserName: '', + approvalStatus: '', + approvalStatusName: '', + createTime: '', + createUserId: '', + createUserName: '', + customerDeptId: '', + customerDeptName: '', + customerId: '', + customerName: '', + decisionItem: '', + formName: '', + formNo: '', + id: '', + labCode: '', + processId: '', + remark: '', + suggestContent: '', + taskId: '', + updateTime: '', }) // 表单 const rules = ref({ - // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }], + appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }], }) // 表单验证规则 // 弹窗初始化 const initDialog = () => { @@ -30,10 +52,16 @@ const data = JSON.parse($route.query.row as string) ruleForm.value = data } - if ($route.params.type === 'update') { + if ($route.params.type === 'update' || $route.params.type === 'create') { + ruleForm.value.formName = '委托方意见登记表' ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间 - // ruleForm.value.createUserId = userStore.id - // ruleForm.value.createUserName = userStore.name + ruleForm.value.createUserId = userStore.id + ruleForm.value.createUserName = userStore.name + // 获取当前用户所在单位 + getUserDept().then((res) => { + ruleForm.value.companyId = res.data.id + ruleForm.value.companyName = res.data.fullName + }) } } onMounted(() => { @@ -93,13 +121,13 @@ - - + + - - + + @@ -115,18 +143,18 @@ - - + + - - + + - - + + @@ -138,7 +166,7 @@ diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index 70ca6f4..a32f0f6 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -1,12 +1,18 @@ - + diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 0c79867..5ac5e8c 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -593,7 +593,7 @@ - + 上传 diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue index ea81bd0..450f9d9 100644 --- a/src/views/tested/document/list/edit.vue +++ b/src/views/tested/document/list/edit.vue @@ -213,7 +213,7 @@ - + {{ '上传' }} diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue index b5c12c6..6e1db7b 100644 --- a/src/views/tested/subpackage/certificate/components/edit.vue +++ b/src/views/tested/subpackage/certificate/components/edit.vue @@ -308,7 +308,7 @@ - + {{ '上传' }} diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index e76cf07..db7fd5e 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -7,7 +7,7 @@ import capacityTable from './capacityTable.vue' import certificateTable from './certificateTable.vue' import ApprovalDialog from './ApprovalDialog.vue' -import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhoto from '@/views/tested/device/info/components/showPhoto.vue' import { editBtn, submitBtn } from '@/utils/applyBtns' import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' @@ -340,7 +340,7 @@ fd.append('multipartFile', event.target.files[0]) uploadApi(fd).then((res) => { if (res.code === 200) { - ruleForm.value.attachments = res.data[0] + ruleForm.value.attachments = ruleForm.value.attachments ? `${ruleForm.value.attachments},${res.data[0]}` : res.data[0] ElMessage.success('文件上传成功') loading.close() } @@ -552,7 +552,7 @@ - + 上传