diff --git a/src/api/productManagement/workorder_online.js b/src/api/productManagement/workorder_online.js index 5f9a237..a04dc69 100644 --- a/src/api/productManagement/workorder_online.js +++ b/src/api/productManagement/workorder_online.js @@ -12,6 +12,15 @@ export function getWorkoderList(query) { }) } +// 导出函数，获取工单列表 +export function getWorkoderList_piliang(query) { + // 发送get请求，获取工单列表 + return request({ + url: '/mes/pro/workorder_v2/getWorkoderList_piliang', + method: 'get', + params: query, + }) +} // 导出函数，发起在线请求 export function startOnline(id) { diff --git a/src/api/qualityManagement/firstFQC.js b/src/api/qualityManagement/firstFQC.js index 240918a..be1e1c8 100644 --- a/src/api/qualityManagement/firstFQC.js +++ b/src/api/qualityManagement/firstFQC.js @@ -1,7 +1,9 @@ import request from '@/utils/request' import { downFile } from '@/utils/request' +// 导出函数GetcheckItemTable，用于获取检查项表格 export function GetcheckItemTable(query) { + // 返回请求，请求地址为/mes/qc/FQC/getcheckItemTable，请求方法为get，参数为query return request({ url: '/mes/qc/FQC/getcheckItemTable', method: 'get', @@ -9,3 +11,44 @@ export function GetcheckItemTable(query) { }) } + + + +// 导出函数getcurrent_workorder，用于获取当前工单 +export function getcurrent_workorder(query) { + + // 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder，请求方法为get，参数为query + return request({ + url: '/mes/qc/FQC/getcurrentWorkorder', + method: 'get', + params: query, + }) + +} + + +// 导出函数get_next_current_workorder，用于获取下一个当前工单 +export function get_next_current_workorder(query) { + + // 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query + return request({ + url: '/mes/qc/FQC/getcurrentWorkorder_next', + method: 'get', + params: query, + }) + +} + + + + +export function get_previous_current_workorder(query) { + + // 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query + return request({ + url: '/mes/qc/FQC/getcurrentWorkorder_previous', + method: 'get', + params: query, + }) + +} diff --git a/src/permission.js b/src/permission.js index db2d5ea..8b2c75f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo',"/firstFQC"] //白名单 +const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo',"/firstFQC","/thirtyFQC"] //白名单 router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/utils/request.js b/src/utils/request.js index 9feebbe..f2d9afc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -68,9 +68,7 @@ service.interceptors.response.use( type: 'error', }) return Promise.reject(res.data) - } else if (code == 210) { - this.$notify.error('新增失败（null）,联系技术人员') - } else { + } else { //返回标准 code/msg/data字段 return res.data } diff --git a/src/views/kanbanManagement/tuzhuangworkshop2.vue b/src/views/kanbanManagement/tuzhuangworkshop2.vue new file mode 100644 index 0000000..b533066 --- /dev/null +++ b/src/views/kanbanManagement/tuzhuangworkshop2.vue @@ -0,0 +1,160 @@ + + + + + + \ No newline at end of file diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue index a3b7514..322694e 100644 --- a/src/views/productManagement/workorder2.vue +++ b/src/views/productManagement/workorder2.vue @@ -141,7 +141,7 @@ /> - + @@ -176,23 +176,23 @@ > - - - diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index c263eda..f9f92ec 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -8,7 +8,7 @@
打磨
报废
-
+
抛光
打磨
报废
@@ -83,38 +83,60 @@
-
-
工单id:{{ ProductSituationForm.workorderid }}
-
-
-
产品名称：{{ ProductSituationForm.productName }}
-
-
-
左右:{{ ProductSituationForm.direction }}
-
-
-
颜色:{{ ProductSituationForm.color }}
-
+ +
+ 工单号:{{ CurrentWorkorder.clientWorkorder }} + + 下一个工单 + 上一个工单 + +
+ 本工单完成 + + + + + + + -
-
班组: {{ ProductSituationForm.team }}
-
+ + + + + + -
-
投入数:{{ ProductSituationForm.inputNum }}
-
-
-
一次合格数:{{ ProductSituationForm.inputNum }}
-
-
-
一次合格率:{{ ProductSituationForm.inputNum }}
-
-
-
打磨数:{{ ProductSituationForm.inputNum }}
-
-
-
报废数:{{ ProductSituationForm.inputNum }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + +
产品描述{{ CurrentWorkorder.productDescription }}零件号{{ CurrentWorkorder.finishedPartNumber }}
规格{{ CurrentWorkorder.specifications }}颜色{{ CurrentWorkorder.colour }}
班组 + {{ CurrentWorkorder.team }} + 投入数{{ CurrentWorkorder.previousNumber }}
一次合格数{{ calculate_firstPassNumber }}一次合格率{{ calculate_firstPassRate }}%
打磨数{{ calculate_polisheNumber }}报废数{{ calculate_scrapNumber }}
抛光数{{ calculate_defectNumber }}
+
@@ -132,7 +154,12 @@ @@ -450,17 +661,9 @@ export default { font-family: Arial, sans-serif; font-size: 1rem; text-align: center; - margin-top: 40px; -} -.f_item { - margin-top: 10px; - margin-left: 20px; -} -.f_name { - color: #409eff; - font-family: Arial, sans-serif; - font-size: 1.2rem; + margin-top: 50px; } + .context { margin: 0.5em 1em; font-size: 0.8rem; @@ -469,11 +672,43 @@ export default { width: 100%; height: 100%; text-align: center; + position: relative; + .number { + font-size: 2rem; + text-align: center; + color: red; + font-weight: bold; + position: absolute; + bottom: 5px; + width: 100%; + } } -.number { - font-size: 1.2rem; - text-align: center; - color: red; - font-weight: bold; + +.dataStatistics { + .title { + font-size: 1.2rem; + font-weight: bold; + color: #303133; + } + table { + border-collapse: collapse; + width: 100%; + } + + th, + td { + border: 1px solid #000; + padding: 8px; + text-align: left; + font-size: 0.7rem; + } + + th { + background-color: #409eff; + color: #fff; + } + ::v-deep .el-button { + float: right; + } }