From 7dbc5d41f1c270bf51b19ee75001f061ed890f42 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 16 Mar 2026 18:44:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/processManagement/procepssPlanning.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index 18c2b7ca..107d4357 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -243,7 +243,6 @@ export default { sortable: true, search: false, overHidden: true, - width: 140, headerAlign: 'center', align: 'center', }, From 4d32578db0aa4a5e7acc7c020b2b651c86bdbe23 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 17 Mar 2026 14:43:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=E5=92=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/taskCope/index.js | 9 +- src/api/workCheck/index.js | 20 ++ src/api/workReport/index.js | 32 ++ src/router/views/index.js | 23 +- .../processMainte/dsPartBasicInfo.vue | 283 ++++++++------- .../processManagement/taskProcessing.vue | 10 +- .../workReportingManagement/workRecord.vue | 327 ++++++++++++++++++ .../basic/equipmentCapacity.vue | 19 +- src/views/wel/components/quickAccess.vue | 10 +- .../{wel => zhgd-work}/taskCope/index.vue | 89 +++-- src/views/zhgd-work/workCheck/index.vue | 265 ++++++++++++++ src/views/zhgd-work/workReport/index.vue | 294 ++++++++++++++++ 12 files changed, 1207 insertions(+), 174 deletions(-) create mode 100644 src/api/workCheck/index.js create mode 100644 src/api/workReport/index.js create mode 100644 src/views/productionManagement/workReportingManagement/workRecord.vue rename src/views/{wel => zhgd-work}/taskCope/index.vue (76%) create mode 100644 src/views/zhgd-work/workCheck/index.vue create mode 100644 src/views/zhgd-work/workReport/index.vue diff --git a/src/api/taskCope/index.js b/src/api/taskCope/index.js index 4484a373..21e0f9a2 100644 --- a/src/api/taskCope/index.js +++ b/src/api/taskCope/index.js @@ -4,16 +4,17 @@ import request from '@/axios'; // 工序任务接收 export const workPlanReceive = (data) => { return request({ - url: '/produceMonitor/workPlanReceive', + url: '/blade-desk/produceMonitor/workPlanReceive', method: 'post', - data: data, + params: data, }); }; // 根据流程卡号查询订单信息 -export const loadNotReceived = (cardNo) => { +export const loadNotReceived = (params) => { return request({ - url: '/produceMonitor/loadNotReceived/' + cardNo, + url: '/blade-desk/prMakeRec/loadNotReceived', method: 'get', + params:params }); }; \ No newline at end of file diff --git a/src/api/workCheck/index.js b/src/api/workCheck/index.js new file mode 100644 index 00000000..b1c1ac99 --- /dev/null +++ b/src/api/workCheck/index.js @@ -0,0 +1,20 @@ +import request from '@/axios'; + +// 工序检验 流程卡号查询 /pdaLoad/loadProTest/{cardNo} +export const loadProTest = (params) => { + return request({ + url: `/blade-desk/pdaLoad/loadProTest/${params.cardNo}`, + method: 'get', + // params:params + }); +}; + +// 工序检验提交 +export const saveProCheck = (data) => { + return request({ + url: '/blade-desk/pdaLoad/saveProCheck', + method: 'post', + data: data, + }); +}; + diff --git a/src/api/workReport/index.js b/src/api/workReport/index.js new file mode 100644 index 00000000..6e5952e7 --- /dev/null +++ b/src/api/workReport/index.js @@ -0,0 +1,32 @@ +import request from '@/axios'; + +// 报工查询 +export const loadCurrentWp = (params) => { + return request({ + url: '/blade-desk/prMakeRec/loadCurrentWp', + method: 'get', + params:params + }); +}; + +// 报工提交 +export const saveMakeRec = (data) => { + return request({ + url: '/blade-desk/prMakeRec/saveMakeRec', + method: 'post', + data:data + }); +}; + +// 报工记录 +export const queryMakeRec = (current, size, params) => { + return request({ + url: '/blade-desk/prMakeRec/queryMakeRec', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; diff --git a/src/router/views/index.js b/src/router/views/index.js index a915f3db..da50f9df 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -37,7 +37,7 @@ export default [ }, { path: '/taskCope', - component: () => import(/* webpackChunkName: "page" */ '@/views/wel/taskCope/index.vue'), + component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/taskCope/index.vue'), name: '工序接收', meta: { keepAlive: true, @@ -45,6 +45,27 @@ export default [ isAuth: false, }, }, + // workReport + { + path: '/workReport', + component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'), + name: '工序报工', + meta: { + keepAlive: true, + isTab: false, + isAuth: false, + }, + }, + { + path: '/workCheck', + component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'), + name: '工序检验', + meta: { + keepAlive: true, + isTab: false, + isAuth: false, + }, + }, // { // path: 'search', // name: '菜单搜索', diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue index 2f02e348..5d5c691a 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ :disabled="disabled"--> - + - - - + + + 单 双 - 否 + 否 - + 是 否 - + + - + - + - - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + @@ -213,7 +191,7 @@ - + @@ -263,7 +241,7 @@ - + @@ -287,7 +265,7 @@ - + - +
- 镀金标识 + 镀金标识 荧光检热处理检验喷码 { return item.partCode == this.formData.partCode; @@ -695,10 +679,65 @@ export default { this.formData.goldMark = true; } } - this.formData.isClassCake = true + this.formData.isClassCake = true; }); }, + sinTerChange(v) { + if (v) { + this.notSinTer = false; + // this.rules = this.rules2; + // this.$set(this.rules, 'craftWay', [this.$validation.required]); + // if (!this.formData.expirationPeriod && this.formData.expirationPeriod == '') { + // this.$set(this.formData, 'expirationPeriod', 9999); + // } + // if (!this.formData.advanceRemind && this.formData.advanceRemind == '') { + // this.$set(this.formData, 'advanceRemind', 10); + // } + // if (!this.formData.area && this.formData.area == '') { + // this.$set(this.formData, 'area', 1); + // } + } else { + this.notSinTer = true; + if (this.notGlassCake) { + // this.rules = this.rules1; + // if (!this.childPage) { + // this.$set(this.rules, 'lettering', [this.$validation.required]); + // } + } else { + // this.$set(this.rules, 'craftWay', []); + } + } + }, + glassCakeChange(value) { + if (value) { + this.notGlassCake = false; + // this.$set(this.rules, 'lettering', []); + // this.areaText = '粉重'; + // this.rules = this.rules2; + // if (!this.formData.expirationPeriod && this.formData.expirationPeriod == '') { + // this.$set(this.formData, 'expirationPeriod', 9999); + // } + // if (!this.formData.advanceRemind && this.formData.advanceRemind == '') { + // this.$set(this.formData, 'advanceRemind', 10); + // } + // if (!this.formData.area && this.formData.area == '') { + // this.$set(this.formData, 'area', 1); + // } + // this.$set(this.rules, 'craftWay', []); + } else { + this.notGlassCake = true; + // this.areaText = this.$t('global.area'); + // if (this.notSinTer) { + // this.rules = this.rules1; + // } + // if (!this.childPage) { + // this.$set(this.rules, 'lettering', [this.$validation.required]); + // } + // this.$set(this.rules, 'craftWay', [this.$validation.required]); + } + }, + //有效期切换 periodOfValidityFn(value) { if (value == 2) { diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue index 0a0b5e7c..d5864436 100644 --- a/src/views/processManagement/taskProcessing.vue +++ b/src/views/processManagement/taskProcessing.vue @@ -21,11 +21,12 @@ - + @@ -160,6 +168,15 @@ export default { disabled: true, // display:false, }, + { + label: '设备型号', + prop: 'equipNameType', + search: false, + sortable: true, + span: 12, + width: 120, + disabled: true, + }, // { // label: '设备编码', // prop: 'equipCode', diff --git a/src/views/wel/components/quickAccess.vue b/src/views/wel/components/quickAccess.vue index 650dac18..72c9f1ce 100644 --- a/src/views/wel/components/quickAccess.vue +++ b/src/views/wel/components/quickAccess.vue @@ -26,17 +26,17 @@ + \ No newline at end of file diff --git a/src/views/zhgd-work/workReport/index.vue b/src/views/zhgd-work/workReport/index.vue new file mode 100644 index 00000000..3ba6060a --- /dev/null +++ b/src/views/zhgd-work/workReport/index.vue @@ -0,0 +1,294 @@ + + + \ No newline at end of file From 1f5fb923d0e954785546b434c3960bed64d051ef Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 17 Mar 2026 15:21:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhgd-work/workCheck/index.vue | 28 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/views/zhgd-work/workCheck/index.vue b/src/views/zhgd-work/workCheck/index.vue index 2c83a5f3..4e29ceb9 100644 --- a/src/views/zhgd-work/workCheck/index.vue +++ b/src/views/zhgd-work/workCheck/index.vue @@ -120,9 +120,9 @@ @@ -147,6 +147,8 @@