xiaoning
/
gjerp_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
xhj 8 months ago
parent ae7ffa3549 bb592bf087
commit 67715a9ba0
28 changed files with 86 additions and 66 deletions
Show Stats Download Patch File Download Diff File

10
src/views/jhzx/qfxqwh.vue
Unescape View File

@ -8,7 +8,7 @@
<vxe-pulldown ref="xDown4" transfer > <vxe-pulldown ref="xDown4" transfer >
<template #default> <template #default>
<vxe-input <vxe-input
v-model="queryParam.dcch" v-model="queryParam.dcCh"
placeholder="船号" placeholder="船号"
style="height: 28px; style="height: 28px;
line-height: 28px; width: 150px;" line-height: 28px; width: 150px;"
@ -122,7 +122,7 @@ export default {
data() { data() {
return { return {
queryParam: { queryParam: {
dcch:'', dcCh:'',
xzglxq:'', xzglxq:'',
zt:'0' zt:'0'
}, },
@ -269,15 +269,15 @@ export default {
return cellValue return cellValue
}, },
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcCh = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
}, },
focusEvent4() { focusEvent4() {
this.$refs.xDown4.showPanel() this.$refs.xDown4.showPanel()
}, },
keyupEvent4() { keyupEvent4() {
if (this.queryParam.dcch) { if (this.queryParam.dcCh) {
this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1) this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcCh.toUpperCase()) > -1)
} else { } else {
this.projectData = this.projectData1.slice(0) this.projectData = this.projectData1.slice(0)
} }

4
src/views/jhzx/symxCX.vue
Unescape View File

@ -61,8 +61,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="月度计划编制" name="first"> <el-tab-pane label="月度计划编制" name="first">
<div class="mytable"> <div class="mytable">
<el-button type="success" @click="paichan">月度计划排产</el-button> <!-- <el-button type="success" @click="paichan">月度计划排产</el-button>-->
<!-- <el-button type="success" @click="confirmModal">月度计划排产</el-button>--> <el-button type="success" @click="confirmModal">月度计划排产</el-button>
<el-button type="success" @click="creatYdjh">生成月度计划</el-button> <el-button type="success" @click="creatYdjh">生成月度计划</el-button>
<el-button type="success" @click="symxhz">汇总</el-button> <el-button type="success" @click="symxhz">汇总</el-button>
<el-button type="success" @click="uploadExcel" > <el-button type="success" @click="uploadExcel" >

8
src/views/jhzx/zrcWH.vue
Unescape View File

@ -152,7 +152,7 @@ export default {
}, },
isupload:'02', isupload:'02',
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmZrcjh/upload', uploadAction: process.env.VUE_APP_BASE_API + '/zrcAndPlb/upload',
list: [], list: [],
height: "500px", height: "500px",
tableColumn: [ tableColumn: [
@ -926,6 +926,12 @@ export default {
// 上传excel // 上传excel
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
if (!this.request.dcCh){
this.$message.error('请选择船号')
return false
}
this.uploadAction+= `?dcCh=${this.request.dcCh}`
// 文件类型 // 文件类型
const isType = file.type === 'application/vnd.ms-excel' const isType = file.type === 'application/vnd.ms-excel'
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'

8
src/views/zyjhzx/components/Drawer.vue
Unescape View File

@ -29,16 +29,16 @@ export default {
handleSelect(key){ handleSelect(key){
switch (key){ switch (key){
case '抛丸': case '抛丸':
this.$router.push(`/pwpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`) this.$router.push(`/pwpg?zyq=${this.$route.query.zyq}&zyType=0&deviceId=${this.$route.query.deviceId}`)
break; break;
case '理料': case '理料':
this.$router.push(`/llfk?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`) this.$router.push(`/llfk?zyq=${this.$route.query.zyq}&zyType=0&deviceId=${this.$route.query.deviceId}`)
break; break;
case '划线': case '划线':
this.$router.push(`/hxpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`) this.$router.push(`/hxpg?zyq=${this.$route.query.zyq}&zyType=0&deviceId=${this.$route.query.deviceId}`)
break; break;
case '切割': case '切割':
this.$router.push(`/qgpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`) this.$router.push(`/qgpg?zyq=${this.$route.query.zyq}&zyType=0&deviceId=${this.$route.query.deviceId}`)
break; break;
} }
} }

8
src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
Unescape View File

@ -60,7 +60,7 @@ export default {
let ycldwInfo=null let ycldwInfo=null
for (const dw of this.dw) { for (const dw of this.dw) {
for (const info of dw.list) { for (const info of dw.list) {
if (data.dcCh===info.czbh&&data.dcPl!==info.pl&&data.dcFd!==info.fd&&data.tzbh!==info.tlth){ if (data.dcCh===info.czbh&&data.dcPl===info.pl&&data.dcFd===info.fd&&data.tzbh===info.tlth){
ycldwInfo=info ycldwInfo=info
break break
} }
@ -78,19 +78,19 @@ export default {
}).then(res=>{ }).then(res=>{
if (res.success){ if (res.success){
window.localStorage.removeItem('zyjh') window.localStorage.removeItem('zyjh')
this.initData(data.pwry,'41') this.initData(data.pwry,'51')
} }
}) })
}, },
initData(worker,zt){ initData(worker,zt){
getDw({type:'llj'}).then(res=>{ getDw({type:'llj'}).then(res=>{
this.gridOptions.ycldw=res.data this.gridOptions.ycldw=res.data
}) getPgd({user:worker,zt:zt,field:'hxry'}).then(res=>{
getPgd2({user:worker}).then(res=>{
this.list=res.data this.list=res.data
this.gridOptions.data=res.data this.gridOptions.data=res.data
this.setExt('workers',this.$props.workers) this.setExt('workers',this.$props.workers)
}) })
})
}, },
getCurrentData(){ getCurrentData(){
const data= this.$refs.hxPgd.getCurrentRecord() const data= this.$refs.hxPgd.getCurrentRecord()

10
src/views/zyjhzx/hxianfkui/comps/baifang.js
Unescape View File

@ -67,10 +67,16 @@ const baifang=function (option={}) {
}) })
let _index=0 let _index=0
let touchingFlag=false; let touchingFlag=false;
group.on('mousedown touchstart',function (evt){ group.on('mousedown touchstart',function ({evt}){
const layer=this.parent.parent.parent const layer=this.parent.parent.parent
const {clientX:_x,clientY:_y}=evt
let x=_x,y=_y
if (evt.type==='touchstart'){
x=evt.targetTouches[0].clientX
y=evt.targetTouches[0].clientY
}
touchingFlag=true touchingFlag=true
const {x,y}=evt.evt
setTimeout(()=>{ setTimeout(()=>{
const moving=this.isDragging() const moving=this.isDragging()
if (!moving){ if (!moving){

2
src/views/zyjhzx/hxianfkui/comps/dw.js
Unescape View File

@ -129,7 +129,7 @@ export default function (width,height,callback){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

2
src/views/zyjhzx/hxianfkui/comps/pgdTable.js
Unescape View File

@ -33,8 +33,6 @@ export default function () {
return '' return ''
} }
const dwFormat=function ({cellValue}){ const dwFormat=function ({cellValue}){
console.log(cellValue)
console.log(options.ycldw)
for (const item of options.ycldw) { for (const item of options.ycldw) {
if (cellValue===(item.id+"")){ if (cellValue===(item.id+"")){
for (const it of ycldw){ for (const it of ycldw){

2
src/views/zyjhzx/hxianfkui/index.vue
Unescape View File

@ -185,7 +185,7 @@ export default {
const titel=drawTitle(this.width,this.height,this.title) const titel=drawTitle(this.width,this.height,this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111) console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })

2
src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue
Unescape View File

@ -80,7 +80,7 @@ export default {
this.initData() this.initData()
}, },
checkboxAll({checked}) { checkboxAll({checked}) {
const worker = this.$props.worker const worker = this.$props.worker()
if (!worker) { if (!worker) {
this.$message.warning('请选择操作人') this.$message.warning('请选择操作人')
return; return;

2
src/views/zyjhzx/hxianpgong/comps/dw.js
Unescape View File

@ -88,7 +88,7 @@ export default function (width,height){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

2
src/views/zyjhzx/hxianpgong/index.vue
Unescape View File

@ -119,7 +119,7 @@ export default {
const titel=drawTitle(this.width,this.height,this.title) const titel=drawTitle(this.width,this.height,this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111) console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })

2
src/views/zyjhzx/lliaofkui/comps/dw.js
Unescape View File

@ -122,7 +122,7 @@ export default function (width,height,callback){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

17
src/views/zyjhzx/lliaofkui/index.vue
Unescape View File

@ -85,20 +85,21 @@ export default {
this.$message.warning('短号有重复,请使用全工单号重新派工!!!') this.$message.warning('短号有重复,请使用全工单号重新派工!!!')
return return
} }
let index=0
for (const item of this.sljhItemList) { for (const item of this.sljhItemList) {
if (item.djh===data.djh||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){ if (item.djh===data.djh||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
if (!!this.currentDw.tzbh&&item.kw===this.currentDw.tzbh){ if (!!this.currentDw.tzbh&&item.kw===this.currentDw.tzbh){
const tmpZxData={ const tmpZxData={
id:item.id, id:item.id,
lldw:this.currentDw.id, lldw:this.currentDw.id,
llcs:this.dw[that.currentDwIndex].list.length+1, llcs:this.dw[this.currentDwIndex].list.length+1,
llfkry:this.getCurrentWorker()?.userCode llfkry:this.getCurrentWorker()?.userCode
} }
const data={ const data={
ydjh:tmpZxData, ydjh:tmpZxData,
ydid:item.id, ydid:item.id,
dwId:this.currentDw.id, dwId:this.currentDw.id,
ceng:this.dw[that.currentDwIndex].list.length+1, ceng:this.dw[this.currentDwIndex].list.length+1,
czbh:item.dcCh, czbh:item.dcCh,
pl:item.dcPl, pl:item.dcPl,
fd:item.dcFd, fd:item.dcFd,
@ -115,14 +116,15 @@ export default {
shangLiao(data).then(res=>{}) shangLiao(data).then(res=>{})
this.sljhItemList.splice(this.getAttr('index'),1) this.sljhItemList.splice(index,1)
this.sljhGroup.destroyChildren() this.sljhGroup.destroyChildren()
this.drawSljhItem(that.sljhItemList) this.drawSljhItem(this.sljhItemList)
}else{ }else{
that.$message.warning(`理料垛位错误,请放入${that.kwNameFormat(item.kw)}所在垛位`) this.$message.warning(`理料垛位错误,请放入${this.kwNameFormat(item.kw)}所在垛位`)
} }
break break
} }
index++
} }
} }
}, },
@ -209,8 +211,6 @@ export default {
that.initPgd(list[i]) that.initPgd(list[i])
}) })
qyGroup.on('mousedown touchstart',function ({evt}){ qyGroup.on('mousedown touchstart',function ({evt}){
console.log(111)
console.log(evt)
const worker=that.currentWorker; const worker=that.currentWorker;
if (!that.canSl||!worker){ if (!that.canSl||!worker){
return return
@ -373,8 +373,7 @@ export default {
const titel=drawTitle(this.width,this.height,this.title) const titel=drawTitle(this.width,this.height,this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })
this.layer.add(titel) this.layer.add(titel)

2
src/views/zyjhzx/lliaopgong/comps/dw.js
Unescape View File

@ -88,7 +88,7 @@ export default function (width,height){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

4
src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
Unescape View File

@ -60,9 +60,11 @@ export default {
methods:{ methods:{
baogong(tmpArr,data){ baogong(tmpArr,data){
let ycldwInfo=null let ycldwInfo=null
console.log(data)
console.log(this.dw)
for (const dw of this.dw) { for (const dw of this.dw) {
for (const info of dw.list) { for (const info of dw.list) {
if (data.dcCh===info.czbh&&data.dcPl!==info.pl&&data.dcFd!==info.fd&&data.tzbh!==info.tlth){ if (data.dcCh===info.czbh&&data.dcPl===info.pl&&data.dcFd===info.fd&&data.tzbh===info.tlth){
ycldwInfo=info ycldwInfo=info
break break
} }

10
src/views/zyjhzx/pwanfkui/comps/baifang.js
Unescape View File

@ -68,10 +68,16 @@ const baifang=function (option={}) {
}) })
let _index=0 let _index=0
let touchingFlag=false; let touchingFlag=false;
group.on('mousedown touchstart',function (evt){ group.on('mousedown touchstart',function ({evt}){
const layer=this.parent.parent.parent const layer=this.parent.parent.parent
const {clientX:_x,clientY:_y}=evt
let x=_x,y=_y
if (evt.type==='touchstart'){
x=evt.targetTouches[0].clientX
y=evt.targetTouches[0].clientY
}
touchingFlag=true touchingFlag=true
const {x,y}=evt.evt
setTimeout(()=>{ setTimeout(()=>{
const moving=this.isDragging() const moving=this.isDragging()
if (!moving){ if (!moving){

3
src/views/zyjhzx/pwanfkui/index.vue
Unescape View File

@ -185,8 +185,7 @@ export default {
const titel=drawTitle(this.width,this.height,this.title) const titel=drawTitle(this.width,this.height,this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })
this.layer.add(titel) this.layer.add(titel)

2
src/views/zyjhzx/pwanpgong/comps/dw.js
Unescape View File

@ -80,7 +80,7 @@ export default function (width,height){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${item.name}\n${item.list.length}张`, text:`${item.name}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

3
src/views/zyjhzx/pwanpgong/index.vue
Unescape View File

@ -105,8 +105,7 @@ export default {
const titel=drawTitle(this.width,this.height,this.title) const titel=drawTitle(this.width,this.height,this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })
this.layer.add(titel) this.layer.add(titel)

16
src/views/zyjhzx/qgefkui/comps/QgePgd.vue
Unescape View File

@ -65,18 +65,18 @@ export default {
}, },
methods: { methods: {
baogong(tmpArr,data){ baogong(tmpArr,data){
console.log(data)
let ycldwInfo=null let ycldwInfo=null
for (const dw of this.dw) { for (const dw of this.dw) {
for (const info of dw.list) { for (const info of dw.list) {
if (data.dcCh===info.czbh&&data.dcPl!==info.pl&&data.dcFd!==info.fd&&data.tzbh!==info.tlth){ if (data.dcCh===info.czbh&&data.dcPl===info.pl&&data.dcFd===info.fd&&data.tzbh===info.tlth){
ycldwInfo=info ycldwInfo=info
break break
} }
} }
} }
if (!ycldwInfo){ if (!ycldwInfo){
this.$message.warning(`理料垛位上板材与记录不符,需查验后再进行报工!`) ycldwInfo={}
return;
} }
zx({ zx({
field:'qgfkrq', field:'qgfkrq',
@ -86,21 +86,21 @@ export default {
}).then(res=>{ }).then(res=>{
if (res.success){ if (res.success){
window.localStorage.removeItem('zyjh') window.localStorage.removeItem('zyjh')
this.initData(data.pwry,'51') this.initData(data.qgry,'61')
} }
}) })
}, },
initData(worker, zt) { initData(worker, zt) {
getDw({type:'llj'}).then(res=>{
this.gridOptions.ycldw=res.data
})
this.currentWorker=worker this.currentWorker=worker
this.zt=zt this.zt=zt
getPgd2({user: worker}).then(res => { getDw({type:'llj'}).then(res=>{
this.gridOptions.ycldw=res.data
getPgd({user:worker,zt:zt,field:'qgry'}).then(res => {
this.list=res.data this.list=res.data
this.gridOptions.data = res.data this.gridOptions.data = res.data
this.setExt('workers',this.$props.workers) this.setExt('workers',this.$props.workers)
}) })
})
}, },
getCurrentData() { getCurrentData() {
const data = this.$refs.qgpgd.getCurrentRecord() const data = this.$refs.qgpgd.getCurrentRecord()

10
src/views/zyjhzx/qgefkui/comps/baifang.js
Unescape View File

@ -67,10 +67,16 @@ const baifang=function (option={}) {
}) })
let _index=0 let _index=0
let touchingFlag=false; let touchingFlag=false;
group.on('mousedown touchstart',function (evt){ group.on('mousedown touchstart',function ({evt}){
const layer=this.parent.parent.parent const layer=this.parent.parent.parent
const {clientX:_x,clientY:_y}=evt
let x=_x,y=_y
if (evt.type==='touchstart'){
x=evt.targetTouches[0].clientX
y=evt.targetTouches[0].clientY
}
touchingFlag=true touchingFlag=true
const {x,y}=evt.evt
setTimeout(()=>{ setTimeout(()=>{
const moving=this.isDragging() const moving=this.isDragging()
if (!moving){ if (!moving){

2
src/views/zyjhzx/qgefkui/comps/dw.js
Unescape View File

@ -130,7 +130,7 @@ export default function (width,height,callback){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

1
src/views/zyjhzx/qgefkui/comps/pgdTable.js
Unescape View File

@ -19,7 +19,6 @@ export default function () {
} }
const nameFormat=function ({cellValue}){ const nameFormat=function ({cellValue}){
console.log(ext)
const workers=ext.workers const workers=ext.workers
for (const item of workers) { for (const item of workers) {
if(item.userCode===cellValue){ if(item.userCode===cellValue){

2
src/views/zyjhzx/qgefkui/index.vue
Unescape View File

@ -190,7 +190,7 @@ export default {
const titel = drawTitle(this.width, this.height, this.title) const titel = drawTitle(this.width, this.height, this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111) console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })

2
src/views/zyjhzx/qgepgong/comps/QgePgd.vue
Unescape View File

@ -105,7 +105,7 @@ export default {
this.initData() this.initData()
}, },
checkboxAll({checked}) { checkboxAll({checked}) {
const worker = this.$props.worker const worker = this.$props.worker()
if (!worker) { if (!worker) {
this.$message.warning('请选择操作人') this.$message.warning('请选择操作人')
return; return;

2
src/views/zyjhzx/qgepgong/comps/dw.js
Unescape View File

@ -88,7 +88,7 @@ export default function (width,height){
y:0, y:0,
width: width, width: width,
height: height, height: height,
fill:'black', fill:'white',
text:`${formatName()}\n${item.list.length}张`, text:`${formatName()}\n${item.list.length}张`,
align:'center', align:'center',
verticalAlign:'middle', verticalAlign:'middle',

2
src/views/zyjhzx/qgepgong/index.vue
Unescape View File

@ -120,7 +120,7 @@ export default {
const titel = drawTitle(this.width, this.height, this.title) const titel = drawTitle(this.width, this.height, this.title)
const that=this const that=this
titel.on('click touch',function (){ titel.on('click tap',function (){
console.log(111) console.log(111)
that.$refs.drawer.show() that.$refs.drawer.show()
}) })

Write Preview
Loading…
Cancel
Save