From 91184501d5e90908da33e7c91e27d68f3d4375b4 Mon Sep 17 00:00:00 2001 From: xhj Date: Fri, 29 Dec 2023 14:12:04 +0800 Subject: [PATCH] pgd --- src/api/jhzxgl/pgd.js | 9 + src/views/jhzxgl/components/GxsqAdd.vue | 167 +++---- src/views/jhzxgl/components/GxsqAdddm.vue | 552 ++++++++++++++++++++++ src/views/jhzxgl/components/GxsqAddpk.vue | 552 ++++++++++++++++++++++ src/views/jhzxgl/dhqdFK.vue | 24 +- src/views/jhzxgl/dmjhD.vue | 35 +- src/views/jhzxgl/dmjhFK.vue | 119 ++--- src/views/jhzxgl/pkjhD.vue | 54 ++- src/views/jhzxgl/pkjhFK.vue | 96 ++-- src/views/jhzxgl/pwjhFK.vue | 52 +- src/views/jhzxgl/qgjhFK.vue | 66 ++- src/views/jhzxgl/qmjhD.vue | 89 ++-- src/views/jhzxgl/qmjhFK.vue | 135 +++--- src/views/jhzxgl/sljhFK.vue | 57 ++- src/views/jhzxgl/tzjhFK.vue | 24 +- 15 files changed, 1578 insertions(+), 453 deletions(-) create mode 100644 src/views/jhzxgl/components/GxsqAdddm.vue create mode 100644 src/views/jhzxgl/components/GxsqAddpk.vue diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js index 589c518..de7522f 100644 --- a/src/api/jhzxgl/pgd.js +++ b/src/api/jhzxgl/pgd.js @@ -20,6 +20,7 @@ export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', me export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})} export function saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})} export function saveSljhPgdFk(data) {return request({url: '/pgdSljh/saveSljhPgdFk', method: 'post', data})} +export function saveSljhFk(data) {return request({url: '/pgdSljh/saveSljhFk', method: 'post', data})} @@ -27,12 +28,14 @@ export function getPwPgd(data) {return request({url: '/pgdPwjh/getPwPgd', method export function savePwPgdXd(data) {return request({url: '/pgdPwjh/savePwPgdXd', method: 'post', data})} export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdXdBack', method: 'post', data})} export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})} +export function savePwFk(data) {return request({url: '/pgdPwjh/savePwFk', method: 'post', data})} export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})} export function saveQgPgdXd(data) {return request({url: '/pgdQgjh/saveQgPgdXd', method: 'post', data})} export function saveQgPgdXdBack(data) {return request({url: '/pgdQgjh/saveQgPgdXdBack', method: 'post', data})} export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk', method: 'post', data})} +export function saveQgdFk(data) {return request({url: '/pgdQgjh/saveQgdFk', method: 'post', data})} @@ -41,6 +44,10 @@ export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method export function saveQmPgdXd(data) {return request({url: '/pgdQmjh/saveQmPgdXd', method: 'post', data})} export function saveQmPgdXdBack(data) {return request({url: '/pgdQmjh/saveQmPgdXdBack', method: 'post', data})} export function saveQmPgdFk(data) {return request({url: '/pgdQmjh/saveQmPgdFk', method: 'post', data})} +export function saveQmFk(data) {return request({url: '/pgdQmjh/saveQmFk', method: 'post', data})} +export function selectQmByQgAndJh(data) {return request({url: '/pgdQmjh/selectQmByQgAndJh', method: 'post', data})} +export function insertQmList(data) {return request({url: '/pgdQmjh/insertQmList', method: 'post', data})} +export function removeQmList(data) {return request({url: '/pgdQmjh/removeQmList', method: 'post', data})} @@ -48,12 +55,14 @@ export function getPkPgd(data) {return request({url: '/pgdPkjh/getPkPgd', method export function savePkPgdXd(data) {return request({url: '/pgdPkjh/savePkPgdXd', method: 'post', data})} export function savePkPgdXdBack(data) {return request({url: '/pgdPkjh/savePkPgdXdBack', method: 'post', data})} export function savePkPgdFk(data) {return request({url: '/pgdPkjh/savePkPgdFk', method: 'post', data})} +export function savePkFk(data) {return request({url: '/pgdPkjh/savePkFk', method: 'post', data})} export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})} export function saveDmPgdXd(data) {return request({url: '/pgdDmjh/saveDmPgdXd', method: 'post', data})} export function saveDmPgdXdBack(data) {return request({url: '/pgdDmjh/saveDmPgdXdBack', method: 'post', data})} export function saveDmPgdFk(data) {return request({url: '/pgdDmjh/saveDmPgdFk', method: 'post', data})} +export function saveDmFk(data) {return request({url: '/pgdDmjh/saveDmFk', method: 'post', data})} diff --git a/src/views/jhzxgl/components/GxsqAdd.vue b/src/views/jhzxgl/components/GxsqAdd.vue index c6ef8be..404a138 100644 --- a/src/views/jhzxgl/components/GxsqAdd.vue +++ b/src/views/jhzxgl/components/GxsqAdd.vue @@ -52,6 +52,10 @@ + + 曲标识 + + @@ -114,7 +118,7 @@ import {getZHBM, getBMBM} from "@/utils/rpkj"; import {mapGetters} from 'vuex' - import {getPgdBase, getQgPgd} from "@/api/jhzxgl/pgd"; + import {getPgdBase, getQgPgd, insertQmList, selectQmByQgAndJh} from "@/api/jhzxgl/pgd"; export default { name: 'GxsqAdd', @@ -129,27 +133,67 @@ { type: 'seq', width: 40, title: '序号' }, - { field: 'czbh', title: '船号', width: 100, + { field: 'lczbh', title: '船号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pl', title: '批量', width: 100, + { field: 'lpl', title: '批量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fd', title: '分段', width: 100, + { field: 'lfd', title: '分段', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], + { field: 'lzl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ltlth', title: '套料图号', width: 100,formatter: ['dictFormat','ZLLB'], + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lptblx', title: '配套表类型', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljbh', title: '零件编号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lljgg', title: '零件规格', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lljcz', title: '零件材质', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lwpfl', title: '物品分类', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljldw', title: '计量单位', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lsl', title: '数量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'lqfxqrqxz', title: '前方需求小组期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], + { field: 'lqfxqrqdz', title: '前方需求大组期', width: 100,formatter: ['dictFormat','CLlQ'], + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'gylx', title: '工艺类型', width: 100,formatter: ['dictFormat','CLlQ'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -314,8 +358,10 @@ dcch:'', pl:'', fd:'', - fkyy:'', - zt:'01' + qbs:true, + pkbs:false, + dmbs:false, + lx:'q', }, projectData:[], projectData1:[], @@ -371,14 +417,16 @@ show() { this.dialogVisible = true - this.baseSeacrh() + // this.baseSeacrh() }, qdClick(){ let obj = this.$refs.xGrid.getCheckboxRecords() if (obj.length === 0) { return } - + insertQmList({'list':obj,'lx':'q'}).then(res=>{ + this.initList() + }) }, plChange() { @@ -386,103 +434,6 @@ if (obj.length === 0) { return } - if (this.inputListAdd.bydd === '') { - this.$message({message: '报验地点不能为空', type: 'error'}) - return - } - if(this.queryParamAdd.project.indexOf('MSD')!==-1){ - - }else{ - if (this.inputListAdd.inspContent === '') { - this.$message({message: '检验内容不能为空', type: 'error'}) - return - } - } - - // if(this.inputListAdd.wpsCode===''){ - // this.$message({ message: '焊接方法不能为空', type: 'error' }) - // return - // } - // if(this.inputListAdd.Sqrq===''){ - // this.$message({ message: '申请日期不能为空', type: 'error' }) - // return - // } - for (let i = 0; i < obj.length; i++) { - let rows = this.$refs.xGrid.getRowSeq(obj[i]) - // if(obj[i].sc==null||obj[i].hdsl===''){ - // this.$message({ message: '第'+rows+'行焊点数量不能为空', type: 'error' }) - // return - // } - // if(obj[i].hgbh==null||obj[i].hgbh===''){ - // this.$message({ message: '第'+rows+'行焊工编号不能为空', type: 'error' }) - // return - // } - // if(obj[i].hgmc==null||obj[i].hgmc===''){ - // this.$message({ message: '第'+rows+'行焊工姓名不能为空', type: 'error' }) - // return - // } - - - } - - let qcObjc = []; - for (let i = 0; i < obj.length; i++) { - console.log(obj[i]) - // 判断施工单位？？？？ - let dept = ''; - if(this.queryParamAdd.project.indexOf('MSD')!==-1){ - - if(obj[i].blockNo===''||obj[i].blockNo===undefined || obj[i].blockNo===null){ - this.inputListAdd.inspContent=obj[i].stName - }else{ - this.inputListAdd.inspContent=obj[i].blockNo+'段'+obj[i].stName - } - - } - let a = - { - 'sqrq': this.inputListAdd.Sqrq, - 'grdType':obj[i].grdType, - 'grdLevel':obj[i].grdLevel, - 'inspContent': this.inputListAdd.inspContent, - 'inspCode': this.queryParamAdd.byxm, - 'bydd': this.inputListAdd.bydd, - 'status': '01', - 'qtyUnit': "根", - 'departCode': "02", - 'bzry': this.name, - 'bzrq': XEUtils.toDateString(new Date(), 'yyyy/MM/dd'), - 'project': obj[i].project, - 'ph': obj[i].ph, - 'kh': obj[i].kh, - 'dwgNo': obj[i].dwgNo, - 'itemNo': obj[i].itemNo, - 'itemName': '管子', - 'itemSpec': obj[i].itemSpec, - 'itemGrd': obj[i].itemGrd, - 'itemXh': obj[i].itemXh, - 'zzcd': obj[i].itemZzcd, - 'itemQty': obj[i].itemQty, - 'bympa': obj[i].bympa, - 'stCode': obj[i].stCode, - 'stName': obj[i].stName, - 'treatment': obj[i].treatment, - 'paintCode': obj[i].paintCode, - 'gczjh': obj[i].gczsh, - 'mpid': obj[i].id, - 'sxbh': obj[i].sxbh, - 'stbh': obj[i].stbh, - // 'scDept':this.queryParamAdd.byxm=="0202"?this.inputListAdd.scDept:obj[i].scDept, - - 'scDept': this.queryParamAdd.byxm == "0202"?(obj[i].byDept===undefined||obj[i].byDept===''||obj[i].byDept===null?obj[i].scDept:obj[i].byDept):obj[i].scDept, - 'cjbs': this.queryParamAdd.byxm == "0202" ? obj[i].bybsCode : obj[i].jybsCode, - 'ipspSpec': 'P', - - } - - - qcObjc.push(a); - } console.log(qcObjc) if (qcObjc.length != 0) { insertqcInspection(qcObjc).then(res => { @@ -517,7 +468,7 @@ this.$message.warning('选择船只编号') return } - getQgPgd(this.queryParam).then((res) => { + selectQmByQgAndJh(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { this.$refs.xGrid.loadData(this.list) diff --git a/src/views/jhzxgl/components/GxsqAdddm.vue b/src/views/jhzxgl/components/GxsqAdddm.vue new file mode 100644 index 0000000..5c3ac56 --- /dev/null +++ b/src/views/jhzxgl/components/GxsqAdddm.vue @@ -0,0 +1,552 @@ + + + + + diff --git a/src/views/jhzxgl/components/GxsqAddpk.vue b/src/views/jhzxgl/components/GxsqAddpk.vue new file mode 100644 index 0000000..23bfc8f --- /dev/null +++ b/src/views/jhzxgl/components/GxsqAddpk.vue @@ -0,0 +1,552 @@ + + + + + diff --git a/src/views/jhzxgl/dhqdFK.vue b/src/views/jhzxgl/dhqdFK.vue index f6f0aef..f3b090f 100644 --- a/src/views/jhzxgl/dhqdFK.vue +++ b/src/views/jhzxgl/dhqdFK.vue @@ -73,18 +73,18 @@ - - - - 批量 - - - - - 反馈 - 接收 - - + + + + + + + + + + + + diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue index b246a44..13c0689 100644 --- a/src/views/jhzxgl/dmjhD.vue +++ b/src/views/jhzxgl/dmjhD.vue @@ -127,10 +127,10 @@