diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index 1c64a98e..e7183df8 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -397,4 +397,30 @@ export function getCoilStatisticsList(params) { method: 'get', params, }) +} + +/** + * 查询原料材质与钢卷类型不匹配的钢卷 + */ +export function listMismatchedItemCoil(params) { + return request({ + url: '/wms/materialCoil/queryMaterialMismatchCoils', + method: 'get', + timeout: 600000, + params + }) +} + +/** + * 修复原料材质与钢卷类型不匹配的钢卷 + */ +export function fixMismatchedItemCoil(coilId) { + return request({ + url: '/wms/materialCoil/fixMaterialMismatch', + method: 'put', + timeout: 600000, + params: { + coilId + } + }) } \ No newline at end of file diff --git a/klp-ui/src/utils/attendanceRequest.js b/klp-ui/src/utils/attendanceRequest.js new file mode 100644 index 00000000..062a291f --- /dev/null +++ b/klp-ui/src/utils/attendanceRequest.js @@ -0,0 +1,32 @@ +import axios from 'axios' +import { Notification, MessageBox, Message } from 'element-ui' + +const request = axios.create({ + baseURL: 'http://140.143.206.120:18000', + timeout: 5000 +}) + +// 响应拦截器 +request.interceptors.response.use(res => { + if (res.data.status == 'success') { + return res.data + } else { + Message({ message: res.data.message || '同步失败', type: 'error' }) + } + }, + error => { + console.log('err' + error) + let { message } = error; + if (message == "Network Error") { + message = "后端接口连接异常"; + } else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + Message({ message: message, type: 'error', duration: 5 * 1000 }) + return Promise.reject(error) + } +) + +export default request \ No newline at end of file diff --git a/klp-ui/src/views/crm/saleman/index.vue b/klp-ui/src/views/crm/saleman/index.vue index a6b0eac1..47b95b08 100644 --- a/klp-ui/src/views/crm/saleman/index.vue +++ b/klp-ui/src/views/crm/saleman/index.vue @@ -1,164 +1,91 @@ diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 11b59098..668920f1 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -40,10 +40,15 @@ - + + 全部 + 未发货【{{ unshippedCount }}】 + 已发货【{{ shippedCount }}】 + + @@ -61,12 +66,12 @@ 导出 - + @@ -803,7 +808,7 @@ export default { parentCoilNos: undefined, itemId: undefined, itemIds: undefined, - status: undefined, + status: '', updateTime: undefined, orderBy: false, ...this.querys, @@ -1201,6 +1206,9 @@ export default { listBoundCoil({ ...query, status: 1 }).then(res => { this.shippedCount = res.total; }) + getCoilStatisticsList(query).then(res => { + this.statistics = res.data || []; + }) return; } listMaterialCoil(query).then(response => { diff --git a/klp-ui/src/views/wms/coil/views/typeError.vue b/klp-ui/src/views/wms/coil/views/typeError.vue index c95c2153..4776f764 100644 --- a/klp-ui/src/views/wms/coil/views/typeError.vue +++ b/klp-ui/src/views/wms/coil/views/typeError.vue @@ -1,17 +1,17 @@