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..ea8c2a58 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -8,365 +8,495 @@ ref="testForm" :model="formData" :rules="rules" - label-width="120px" + label-width="90px" label-position="right" :validate-on-rule-change="false" class="vd-form-three" > - - - - - - - - - - - - - - - - - - - - - - - - - - 单 - 双 - 否 - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - +
子件信息
@@ -672,20 +802,32 @@ export default { if (this.data.length > 0) { this.data.forEach(item => { item.$cellEdit = true; - item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串） - // if (item.sinTerType == 1 && item.partName.indexOf('A1') > -1) { - // item.isElectroplating = '1'; - // } + if (item.area < 0) { + item.totalArea = 0; + } else { + item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串） + } }); } this.partType = res.data.data.dsPartEntity.isSintering == '1' ? '烧结' : '热表'; + // this.partType = '烧结'; + if (this.formData.sinTerType == 3) { + this.formData.glassCake = true; + } else if (this.formData.sinTerType == 5) { + this.formData.sinTer = true; + } else { + this.formData.glassCake = false; + this.formData.sinTer = false; + } + this.sinTerChange(this.formData.sinTer); + this.glassCakeChange(this.formData.glassCake); + + const craftWay = this.formData.craftWay; + if (craftWay.indexOf('涂色标') !== -1 || craftWay.indexOf('涂色带') !== -1) { + this.formData.markingsTest = true; + } - // if (res.data.data.dsPartEntity.isGlassCake === '0') { - this.formData.isGlassCake = false; - // } else { - // this.formData.isGlassCake = true; - // } // 如果当前零件号在局部镀金列表里面 镀金标识禁用 this.getLocallyPlatedPartList(); let selPart = this.locallyPlatedData.filter(item => { return item.partCode == this.formData.partCode; @@ -695,10 +837,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/components/processMainte/dsPartIndex.vue b/src/views/processManagement/components/processMainte/dsPartIndex.vue index 5bc7f279..9b8adb8a 100644 --- a/src/views/processManagement/components/processMainte/dsPartIndex.vue +++ b/src/views/processManagement/components/processMainte/dsPartIndex.vue @@ -33,10 +33,6 @@ import dsPartBasicInfo from './dsPartBasicInfo.vue'; import dsCraftPage from './dsCraft.vue' import processPlanning from './processPlanning.vue' -import { - getPartDetail,getModelList -} from '@/api/processManagement/taskProcessing'; - export default { name: 'DsPartIndex', components: { diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index 18c2b7ca..3fb196fc 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -233,7 +233,7 @@ export default { sortable: true, search: false, overHidden: true, - width: 120, + headerAlign: 'center', align: 'center', }, @@ -243,9 +243,9 @@ export default { sortable: true, search: false, overHidden: true, - width: 140, headerAlign: 'center', align: 'center', + width: 120, }, ], }, diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue index 09fa676e..8eee0914 100644 --- a/src/views/processManagement/sinTer/index.vue +++ b/src/views/processManagement/sinTer/index.vue @@ -82,7 +82,6 @@ export default { height: 'auto', calcHeight: 32, tip: false, - size: 'medium', simplePage: true, searchShow: true, searchMenuSpan: 6, @@ -183,7 +182,7 @@ export default { if (this.form.zijian != '') { this.isComponentOpen = false; this.isSubOpen = true; - getSinteringPart({ partCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => { + getSinteringPart({ bPartCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => { this.data = res.data.data; }); } else if (this.form.bujian != '') { diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue index 132a83d5..7d293f8c 100644 --- a/src/views/processManagement/taskDispatch.vue +++ b/src/views/processManagement/taskDispatch.vue @@ -220,13 +220,13 @@ export default { return; } this.updateRow = this.selectionList; - this.selectionList.forEach(item => { - if (item.children && item.children.length > 0) { - item.children.forEach(element => { - this.updateRow.push(element); - }); - } - }); + // this.selectionList.forEach(item => { + // if (item.children && item.children.length > 0) { + // item.children.forEach(element => { + // this.updateRow.push(element); + // }); + // } + // }); // console.log(5555, this.updateRow); this.setCrewOpen = true; this.title = '批量分派'; @@ -234,28 +234,25 @@ export default { // 设置班组人员 setCrew(row) { this.updateRow = [row]; - if (row.children.length > 0) { - row.children.forEach(element => { - this.updateRow.push(element); - }); - } + // if (row.children.length > 0) { + // row.children.forEach(element => { + // this.updateRow.push(element); + // }); + // } // console.log(999999, this.updateRow); this.setCrewOpen = true; this.title = '分派'; }, // 设置班组人员弹框关闭 setCrewOpeSancel(isRefresh) { - // if (isRefresh) { - // this.$refs.myTable.load(); - // } this.setCrewOpen = false; - this.onLoad(this.page); + this.onLoad(this.page,this.query); }, // 重置 searchReset() { this.query = {}; this.parentId = 0; - this.onLoad(this.page); + this.onLoad(this.page,this.query); }, // 搜索 searchChange(params, done) { diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue index 0a0b5e7c..76355033 100644 --- a/src/views/processManagement/taskProcessing.vue +++ b/src/views/processManagement/taskProcessing.vue @@ -21,16 +21,17 @@ @@ -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