From ca00e21e0350a86d841a1c42ca2c007408b07a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Sat, 20 Jul 2024 17:31:19 +0800 Subject: [PATCH] 1.111 --- src/api/jhzx/pc.js | 2 +- src/api/jhzx/sygd.js | 2 +- src/views/jhzx/qfxqSH.vue | 6 +-- src/views/jhzx/symxCX.vue | 2 +- src/views/jhzx/ydjhzxCX.vue | 1 + src/views/jhzx/ydjhzxGL.vue | 6 ++- src/views/jhzx/ydjhzxXF.vue | 1 + src/views/jhzxgl/components/YppTq.vue | 2 + src/views/jhzxgl/yppGL.vue | 7 +++- src/views/sjzx/bzzzgl.vue | 58 +++++++++++++++------------ 10 files changed, 51 insertions(+), 36 deletions(-) diff --git a/src/api/jhzx/pc.js b/src/api/jhzx/pc.js index 0a77e36..8abf738 100644 --- a/src/api/jhzx/pc.js +++ b/src/api/jhzx/pc.js @@ -4,7 +4,7 @@ export function 排产(data) {return request({url: '/sygdpc/pc', method: 'get',p export function 获取排产结果(data) {return request({url: '/sygdpc/sygdjh', method: 'get',params:data})} -export function 生成三月滚动(data) {return request({url: '/sygdpc/createSygdjh', method: 'get',params:data})} +export function 生成月度计划(data) {return request({url: '/sygdpc/createSygdjh', method: 'get',params:data})} export function getCdAll() {return request({url: '/sygdpc/getCdAll', method: 'get'})} export function saveGxcd(data) {return request({url: '/sygdpc/saveGxcd', method: 'post', data})} export function removeGxcd(data) {return request({url: '/sygdpc/removeGxcd', method: 'post', data})} diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js index bfc49a0..2672310 100644 --- a/src/api/jhzx/sygd.js +++ b/src/api/jhzx/sygd.js @@ -12,7 +12,7 @@ export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'po export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})} export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})} export function tjydjh(data) {return request({url: '/dmYdjh/tj', method: 'post', data})} -export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', data})} +export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', params:data})} export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post', data})} //采购计划到货情况 diff --git a/src/views/jhzx/qfxqSH.vue b/src/views/jhzx/qfxqSH.vue index abd146e..c66a8a4 100644 --- a/src/views/jhzx/qfxqSH.vue +++ b/src/views/jhzx/qfxqSH.vue @@ -77,14 +77,10 @@ highlight-hover-row show-overflow show-header-overflow - + :scroll-y="{enabled: true}" > - - - - diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index c5de62c..1f05045 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -62,7 +62,7 @@
月度计划排产 - 生成月度计划 + 生成月度计划 汇总
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue index ec8b716..968596d 100644 --- a/src/views/jhzx/ydjhzxGL.vue +++ b/src/views/jhzx/ydjhzxGL.vue @@ -956,7 +956,11 @@ export default { this.$message.warning('请先查询需要汇总的信息！'); return } - hz(this.list).then((res) => { + const data={ + from:this.queryParam.yf, + to:XEUtils.toDateString(XEUtils.getWhatMonth(this.queryParam.yf,0,'last'),'yyyy/MM/dd') + } + hz(data).then((res) => { if (res.data) { this.list2=res.data.tzjhList this.list3=res.data.dhList diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue index 35badd5..e36ed14 100644 --- a/src/views/jhzx/ydjhzxXF.vue +++ b/src/views/jhzx/ydjhzxXF.vue @@ -995,6 +995,7 @@ export default { return; } } + console.log(this.queryParam) ydjhxf(this.checkedList).then(res => { if (res.success) { this.initList() diff --git a/src/views/jhzxgl/components/YppTq.vue b/src/views/jhzxgl/components/YppTq.vue index 567445d..1e04400 100644 --- a/src/views/jhzxgl/components/YppTq.vue +++ b/src/views/jhzxgl/components/YppTq.vue @@ -103,6 +103,7 @@ export default { fan:'1' }, projectData:[], + projectData1:[], monthList:[], list: [], checkedList: [], @@ -241,6 +242,7 @@ export default { initProject(){ getCzplBase({}).then(res=>{ this.projectData=res.data.cbbm + this.projectData1=res.data.cbbm }) }, cellClickEvent({row}){ diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue index ea26788..39296fe 100644 --- a/src/views/jhzxgl/yppGL.vue +++ b/src/views/jhzxgl/yppGL.vue @@ -11,7 +11,7 @@ v-model="request.dcCh" placeholder="船号" style="height: 28px; - line-height: 28px; width: 150px;" + line-height: 28px; width: 140px;" suffix-icon="vxe-icon--search" @keyup="keyupEvent4" @focus="focusEvent4" @@ -22,6 +22,7 @@ { this.projectData=res.data.cbbm + this.projectData1=res.data.cbbm }) }, cellClickEvent({row}){ @@ -383,7 +386,9 @@ export default { this.$refs.xDown4.showPanel() }, keyupEvent4(){ + console.log(this.request.dcCh) if (this.request.dcCh) { + console.log(this.request.dcCh) this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1) } else { this.projectData = this.projectData1.slice(0) diff --git a/src/views/sjzx/bzzzgl.vue b/src/views/sjzx/bzzzgl.vue index eb0001e..414b5c1 100644 --- a/src/views/sjzx/bzzzgl.vue +++ b/src/views/sjzx/bzzzgl.vue @@ -2,17 +2,6 @@
- 所属公司： - - - - 班组编码： - 班组名称： 班组分类： @@ -46,7 +35,7 @@ ref="bzxxTable" :show-overflow-tooltip="true" :data="c_yhxxTableData.slice((currentPage-1)*pageSize,currentPage*pageSize)" - height="calc(100% - 60px - 35px)" + height="calc(100% - 80px - 35px)" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" width="100%" @@ -63,24 +52,17 @@ - - - - - - - - - - - - + + + + + + + 所属班组： + + + + + 人员编码： + + + + 人员姓名： + + + + @@ -222,6 +221,8 @@ export default { components: { tbfilter }, data() { return { + selectedPerson:{}, + addPersonVisible:false, defaultHeight: { height: '100%' }, @@ -291,6 +292,11 @@ export default { }) }, methods: { + bzPersonAdd(e,row){ + this.selectedPerson=row + this.addPersonVisible=true + e.preventDefault() + }, showFilter(column) { this.$refs.tbFilter.showFilter(column) }, @@ -299,7 +305,7 @@ export default { this.$set(this.columnFilter, property, vals) }, getHeight() { - this.defaultHeight.height = window.innerHeight - 140 + 'px' + this.defaultHeight.height = window.innerHeight - 170 + 'px' }, handleSizeChange(val) { this.pageSize = val