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

派工单

Browse Source
master
xhj 11 months ago
parent ce19c3b739
commit c0fa19d1bb
7 changed files with 692 additions and 240 deletions
Show Stats Download Patch File Download Diff File

3
src/api/jhzxgl/pgd.js
Unescape View File

@ -49,6 +49,7 @@ export function saveQgjhPg(data) {return request({url: '/pgdQgjh/saveQgjhPg', me
export function saveQgjhPgBack(data) {return request({url: '/pgdQgjh/saveQgjhPgBack', method: 'post', data})} export function saveQgjhPgBack(data) {return request({url: '/pgdQgjh/saveQgjhPgBack', method: 'post', data})}
export function saveQmPgdJs(data) {return request({url: '/pgdQmjh/saveQmPgdJs', method: 'post', data})}
export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method: 'post', data})} export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method: 'post', data})}
export function saveQmPgdXd(data) {return request({url: '/pgdQmjh/saveQmPgdXd', method: 'post', data})} 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 saveQmPgdXdBack(data) {return request({url: '/pgdQmjh/saveQmPgdXdBack', method: 'post', data})}
@ -65,6 +66,7 @@ export function savePkPgdXd(data) {return request({url: '/pgdPkjh/savePkPgdXd',
export function savePkPgdXdBack(data) {return request({url: '/pgdPkjh/savePkPgdXdBack', 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 savePkPgdFk(data) {return request({url: '/pgdPkjh/savePkPgdFk', method: 'post', data})}
export function savePkFk(data) {return request({url: '/pgdPkjh/savePkFk', method: 'post', data})} export function savePkFk(data) {return request({url: '/pgdPkjh/savePkFk', method: 'post', data})}
export function savePkPgdJs(data) {return request({url: '/pgdPkjh/savePkPgdJs', method: 'post', data})}
export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})} export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})}
@ -72,6 +74,7 @@ export function saveDmPgdXd(data) {return request({url: '/pgdDmjh/saveDmPgdXd',
export function saveDmPgdXdBack(data) {return request({url: '/pgdDmjh/saveDmPgdXdBack', 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 saveDmPgdFk(data) {return request({url: '/pgdDmjh/saveDmPgdFk', method: 'post', data})}
export function saveDmFk(data) {return request({url: '/pgdDmjh/saveDmFk', method: 'post', data})} export function saveDmFk(data) {return request({url: '/pgdDmjh/saveDmFk', method: 'post', data})}
export function saveDmPgdJs(data) {return request({url: '/pgdDmjh/saveDmPgdJs', method: 'post', data})}

291
src/views/jhzxgl/dmjhD.vue
Unescape View File

@ -6,7 +6,19 @@
<el-form :inline="true" label-width="60px" label-position="left"> <el-form :inline="true" label-width="60px" label-position="left">
<el-row> <el-row>
<el-col :span="22"> <el-col :span="18">
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="船号:"> <el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer > <vxe-pulldown ref="xDown4" transfer >
@ -53,37 +65,56 @@
</el-col> </el-col>
<el-col :span="2"> <el-col :span="6">
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button> <el-button type="success" @click="initList">查询</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="14" >
<el-form-item label="状态:"> <el-col :span="20" >
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
> <span style="width:6%" >班组:</span>
</el-option> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
</el-select> <el-option
</el-form-item> v-for="item in this.dictData.bmbm"
</el-col> :key="item.bm"
<el-col :span="6" style="text-align: right;"> :label="item.bmsm"
<el-form-item > :value="item.bm"
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable /> >
<el-button type="info" @click="plClick">批量</el-button> </el-option>
</el-form-item> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
<el-option
v-for="item in this.dictData.gxry"
:key="item.dlzh"
:label="item.dlzh"
:value="item.dlzh"
>
</el-option>
</el-select>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<span style="width:6%" >反馈人员:</span>
<el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />
<span style="width:6%" >反馈日期:</span>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col> </el-col>
<el-col :span="4" > <el-col :span="4" >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="saveclick">反馈</el-button> <el-button type="success" @click="slpgclick">派工</el-button>
<el-button type="success" @click="xdClick">接收</el-button> <el-button type="success" @click="xdClick">接收</el-button>
<el-button type="success" @click="Choice">取自</el-button> <el-button type="success" @click="saveclick">反馈</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -106,7 +137,7 @@
highlight-current-row highlight-current-row
:data="list" :data="list"
:scroll-y="{enabled: true}" :scroll-y="{enabled: true}"
:edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}" :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-overflow show-header-overflow
@ -121,29 +152,21 @@
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
<GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
</el-container> </el-container>
</template> </template>
<script> <script>
import { import {
getDmPgd, saveDmPgdXd,getDmPgd,getPgdBase,saveDmPgdFk,saveDmPgdJs,saveDmPgdXdBack
saveDmPgdFk,
saveDmPgdXd,
saveDmPgdXdBack,
getPgdBase
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'DmjhD', name:'PwjhD',
components: {GxsqAdd},
data() { data() {
return { return {
queryParam: { queryParam: {
@ -160,15 +183,26 @@ export default {
}, },
{ {
value: "02", value: "02",
label: "下达", label: "派工",
}, },
{ {
value: "09", value: "03",
label: "接收",
},
{
value: "04",
label: "反馈", label: "反馈",
}, },
], ],
inParam:{
slry:'',
slks:'',
sljs:'',
dw:'',
scry:'',
scdw:''
},
list: [], list: [],
flag:false,
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{}, dictData:{},
@ -183,10 +217,18 @@ export default {
}, },
}, },
], ],
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'lsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 120, { field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -293,60 +335,73 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmry', title: '打磨人员', width: 120, // { field: 'dmry', title: '打磨人员', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'dmksrq', title: '打磨开始日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'dmjsrq', title: '打磨结束日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dscry', title: '生产人员', width: 100,editRender: { name: 'input' },
{ field: 'dmksrq', title: '打磨开始日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmjsrq', title: '打磨结束日期', width: 120, { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
{ field: 'dmZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmBzry', title: '编制人', width: 120, { field: 'dmFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmBzrq', title: '编制日期', width: 120, { field: 'dmFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmXfry', title: '下发人', width: 120, { field: 'dmBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmXfrq', title: '下发日期', width: 120, { field: 'dmBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmFkry', title: '反馈人', width: 120, { field: 'dmXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmFkrq', title: '反馈日期', width: 120, { field: 'dmXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
}
@ -366,14 +421,7 @@ export default {
}, },
methods: { methods: {
Choice() {
this.$refs.gxsqAdd.show()
},
callback(obj, inputFive) {
// this.loadData()
},
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -385,26 +433,70 @@ export default {
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)
} }
}, },
ztChange(){
this.list=[]
},
bzClick(){
console.log(this.dictData.gxry)
console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
console.log(this.dictData.gxry)
},
updates2(){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].dscdw = this.inParam.scdw
selectRecords[i].dscry = this.inParam.scry
activeRowMethod({ row, rowIndex }){
if(row.zt==="01"){ }
return true this.$refs.xGrid.updateData(this.list)
}else{
return false
} }
}, },
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
if(type==='1'){
selectRecords[i].slksrq = this.inParam.slks
}else if (type==='2'){
selectRecords[i].dmFkry = this.inParam.slry
selectRecords[i].dmFkrq = this.inParam.sljs
}
}
this.$refs.xGrid.updateData(this.list)
}
},
activeRowMethod({ row, rowIndex }){
// if(row.zt==="01"){
// return true
// }else{
// return false
// }
return true;
},
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data)
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
@ -421,45 +513,53 @@ export default {
}, },
saveclick(){ saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords()
if(obj.length===0){ if(this.queryParam.zt!=='03'){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return return
} }
let obj=this.$refs.xGrid.getCheckboxRecords()
// if(obj.length===0){
// this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
// return
// }
saveDmPgdFk(obj).then(res=>{ saveDmPgdFk(obj).then(res=>{
if(res.success){ if(res.success){
this.initList() this.initList()
} }
}) })
}, },
xdClick(){
slpgclick(){
// if(this.queryParam.zt!=="01"){
// return
// }
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){ if(obj.length===0){
return return
} }
if(this.queryParam.zt==='02'){ if(this.queryParam.zt==='02'){
this.$confirm('取消下达？', '提示', { this.$confirm('取消派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
saveDmPgdXdBack(obj).then(res=>{ saveDmPgdXdBack(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '取消下达成功', type: 'success' }) this.$message({ message: '取消派工成功', type: 'success' })
this.initList() this.initList()
} }
}) })
}) })
}else { }else if (this.queryParam.zt==='01') {
this.$confirm('下达？', '提示', { this.$confirm('派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
saveDmPgdXd(obj).then(res=>{ saveDmPgdXd(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList() this.initList()
} }
}) })
@ -468,6 +568,47 @@ export default {
} }
},
xdClick(){
if(this.queryParam.zt!=="02"){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){
return
}
// if(this.queryParam.zt==='03'){
// this.$confirm('取消接收？', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() =>{
// saveQgPgdXdBack(obj).then(res=>{
// if(res.success){
// this.$message({ message: '取消下达成功', type: 'success' })
// this.initList()
// }
// })
//
// })
// }else {
this.$confirm('接收？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveDmPgdJs(obj).then(res=>{
if(res.success){
this.$message({ message: '接收成功', type: 'success' })
this.initList()
}
})
})
// }
}, },
initList() { initList() {
if (this.queryParam.dcch === '') { if (this.queryParam.dcch === '') {

309
src/views/jhzxgl/pkjhD.vue
Unescape View File

@ -6,7 +6,19 @@
<el-form :inline="true" label-width="60px" label-position="left"> <el-form :inline="true" label-width="60px" label-position="left">
<el-row> <el-row>
<el-col :span="22"> <el-col :span="18">
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="船号:"> <el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer > <vxe-pulldown ref="xDown4" transfer >
@ -53,37 +65,56 @@
</el-col> </el-col>
<el-col :span="2"> <el-col :span="6">
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button> <el-button type="success" @click="initList">查询</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="14" >
<el-form-item label="状态:"> <el-col :span="20" >
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
> <span style="width:6%" >班组:</span>
</el-option> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
</el-select> <el-option
</el-form-item> v-for="item in this.dictData.bmbm"
</el-col> :key="item.bm"
<el-col :span="6" style="text-align: right;"> :label="item.bmsm"
<el-form-item > :value="item.bm"
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable /> >
<el-button type="info" @click="plClick">批量</el-button> </el-option>
</el-form-item> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
<el-option
v-for="item in this.dictData.gxry"
:key="item.dlzh"
:label="item.dlzh"
:value="item.dlzh"
>
</el-option>
</el-select>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<span style="width:6%" >反馈人员:</span>
<el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />
<span style="width:6%" >反馈日期:</span>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col> </el-col>
<el-col :span="4" > <el-col :span="4" >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="saveclick">反馈</el-button> <el-button type="success" @click="slpgclick">派工</el-button>
<el-button type="success" @click="xdClick">接收</el-button> <el-button type="success" @click="xdClick">接收</el-button>
<el-button type="success" @click="Choice">取自</el-button> <el-button type="success" @click="saveclick">反馈</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -106,7 +137,7 @@
highlight-current-row highlight-current-row
:data="list" :data="list"
:scroll-y="{enabled: true}" :scroll-y="{enabled: true}"
:edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}" :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-overflow show-header-overflow
@ -121,29 +152,21 @@
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
<GxsqAddpk ref="gxsqAdd" @callback="callback" :flag="flag"/>
</el-container> </el-container>
</template> </template>
<script> <script>
import { import {
getPkPgd, savePkPgdJs,savePkPgdXd,savePkPgdXdBack,getPkPgd,savePkPgdFk,getPgdBase
savePkPgdXd,
savePkPgdFk,
savePkPgdXdBack,
getPgdBase
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import GxsqAddpk from '@/views/jhzxgl/components/GxsqAddpk'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'PkjhD', name:'PwjhD',
components: {GxsqAddpk},
data() { data() {
return { return {
queryParam: { queryParam: {
@ -160,15 +183,26 @@ export default {
}, },
{ {
value: "02", value: "02",
label: "下达", label: "派工",
}, },
{ {
value: "09", value: "03",
label: "接收",
},
{
value: "04",
label: "反馈", label: "反馈",
}, },
], ],
inParam:{
slry:'',
slks:'',
sljs:'',
dw:'',
scry:'',
scdw:''
},
list: [], list: [],
flag:false,
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{}, dictData:{},
@ -183,10 +217,18 @@ export default {
}, },
}, },
], ],
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'lsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 120, { field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -301,58 +343,75 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
//
// { field: 'pkry', title: '坡口人员', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'pkksrq', title: '坡口开始日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'pkjsrq', title: '坡口结束日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'pkry', title: '坡口人员', width: 120, { field: 'pscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkksrq', title: '坡口开始日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pscry', title: '生产人员', width: 100,editRender: { name: 'input' },
{ field: 'pkjsrq', title: '坡口结束日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'fkry', title: '派工人员', width: 100,
{ field: 'pkZt', title: '状态', width: 120, // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'fkrq', title: '派工日期', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'pjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
{ field: 'pkBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
{ field: 'pkBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
{ field: 'pkXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkXfrq', title: '下发日期', width: 120, // { field: 'pkFkyy', title: '反馈原因', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'pkBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkFkry', title: '反馈人', width: 120, { field: 'pkBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkFkrq', title: '反馈日期', width: 120, { field: 'pkXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pkFkyy', title: '反馈原因', width: 120, { field: 'pkXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -364,10 +423,6 @@ export default {
] ]
} }
}, },
@ -382,14 +437,7 @@ export default {
}, },
methods: { methods: {
Choice() {
this.$refs.gxsqAdd.show()
},
callback(obj, inputFive) {
// this.loadData()
},
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -401,26 +449,70 @@ export default {
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)
} }
}, },
ztChange(){
this.list=[]
},
bzClick(){
console.log(this.dictData.gxry)
console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
console.log(this.dictData.gxry)
},
updates2(){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].pscdw = this.inParam.scdw
selectRecords[i].pscry = this.inParam.scry
activeRowMethod({ row, rowIndex }){
if(row.zt==="01"){ }
return true this.$refs.xGrid.updateData(this.list)
}else{
return false
} }
}, },
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
if(type==='1'){
selectRecords[i].slksrq = this.inParam.slks
}else if (type==='2'){
selectRecords[i].pkFkry = this.inParam.slry
selectRecords[i].pkFkrq = this.inParam.sljs
}
}
this.$refs.xGrid.updateData(this.list)
}
},
activeRowMethod({ row, rowIndex }){
// if(row.zt==="01"){
// return true
// }else{
// return false
// }
return true;
},
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data)
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
@ -430,52 +522,60 @@ export default {
let selectRecords = this.$refs.xGrid.getCheckboxRecords() let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){ if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) { for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].pkFkyy = this.queryParam.fkyy selectRecords[i].fkyy = this.queryParam.fkyy
} }
this.$refs.xGrid.updateData(this.list) this.$refs.xGrid.updateData(this.list)
} }
}, },
saveclick(){ saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords()
if(obj.length===0){ if(this.queryParam.zt!=='03'){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return return
} }
let obj=this.$refs.xGrid.getCheckboxRecords()
// if(obj.length===0){
// this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
// return
// }
savePkPgdFk(obj).then(res=>{ savePkPgdFk(obj).then(res=>{
if(res.success){ if(res.success){
this.initList() this.initList()
} }
}) })
}, },
xdClick(){
slpgclick(){
// if(this.queryParam.zt!=="01"){
// return
// }
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){ if(obj.length===0){
return return
} }
if(this.queryParam.zt==='02'){ if(this.queryParam.zt==='02'){
this.$confirm('取消下达？', '提示', { this.$confirm('取消派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
savePkPgdXdBack(obj).then(res=>{ savePkPgdXdBack(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '取消下达成功', type: 'success' }) this.$message({ message: '取消派工成功', type: 'success' })
this.initList() this.initList()
} }
}) })
}) })
}else { }else if (this.queryParam.zt==='01') {
this.$confirm('下达？', '提示', { this.$confirm('派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
savePkPgdXd(obj).then(res=>{ savePkPgdXd(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList() this.initList()
} }
}) })
@ -484,6 +584,47 @@ export default {
} }
},
xdClick(){
if(this.queryParam.zt!=="02"){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){
return
}
// if(this.queryParam.zt==='03'){
// this.$confirm('取消接收？', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() =>{
// saveQgPgdXdBack(obj).then(res=>{
// if(res.success){
// this.$message({ message: '取消下达成功', type: 'success' })
// this.initList()
// }
// })
//
// })
// }else {
this.$confirm('接收？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
savePkPgdJs(obj).then(res=>{
if(res.success){
this.$message({ message: '接收成功', type: 'success' })
this.initList()
}
})
})
// }
}, },
initList() { initList() {
if (this.queryParam.dcch === '') { if (this.queryParam.dcch === '') {

8
src/views/jhzxgl/pwjhD.vue
Unescape View File

@ -228,7 +228,10 @@ export default {
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'pwlsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 100, { field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -482,6 +485,9 @@ export default {
}, },
saveclick(){ saveclick(){
if(this.queryParam.zt!=='03'){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
// if(obj.length===0){ // if(obj.length===0){
// this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' }) // this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })

8
src/views/jhzxgl/qgjhD.vue
Unescape View File

@ -230,7 +230,10 @@ export default {
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'qglsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 100, { field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -552,6 +555,9 @@ export default {
}, },
saveclick(){ saveclick(){
if(this.queryParam.zt!=='03'){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
// if(obj.length===0){ // if(obj.length===0){
// this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' }) // this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })

308
src/views/jhzxgl/qmjhD.vue
Unescape View File

@ -6,7 +6,19 @@
<el-form :inline="true" label-width="60px" label-position="left"> <el-form :inline="true" label-width="60px" label-position="left">
<el-row> <el-row>
<el-col :span="22"> <el-col :span="18">
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="船号:"> <el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer > <vxe-pulldown ref="xDown4" transfer >
@ -53,37 +65,56 @@
</el-col> </el-col>
<el-col :span="2"> <el-col :span="6">
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button> <el-button type="success" @click="initList">查询</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="14" >
<el-form-item label="状态:"> <el-col :span="20" >
<el-select v-model="queryParam.zt" placeholder="状态" >
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
> <span style="width:6%" >班组:</span>
</el-option> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
</el-select> <el-option
</el-form-item> v-for="item in this.dictData.bmbm"
</el-col> :key="item.bm"
<el-col :span="6" style="text-align: right;"> :label="item.bmsm"
<el-form-item > :value="item.bm"
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable /> >
<el-button type="info" @click="plClick">批量</el-button> </el-option>
</el-form-item> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
<el-option
v-for="item in this.dictData.gxry"
:key="item.dlzh"
:label="item.dlzh"
:value="item.dlzh"
>
</el-option>
</el-select>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<span style="width:6%" >反馈人员:</span>
<el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />
<span style="width:6%" >反馈日期:</span>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col> </el-col>
<el-col :span="4" > <el-col :span="4" >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="saveclick">反馈</el-button> <el-button type="success" @click="slpgclick">派工</el-button>
<el-button type="success" @click="xdClick">接收</el-button> <el-button type="success" @click="xdClick">接收</el-button>
<el-button type="success" @click="Choice">取自</el-button> <el-button type="success" @click="saveclick">反馈</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -106,7 +137,7 @@
highlight-current-row highlight-current-row
:data="list" :data="list"
:scroll-y="{enabled: true}" :scroll-y="{enabled: true}"
:edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}" :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-overflow show-header-overflow
@ -121,29 +152,22 @@
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
<GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
</el-container> </el-container>
</template> </template>
<script> <script>
import { import {
getQmPgd,
saveQmPgdFk,
saveQmPgdXd, saveQmPgdXd,
saveQmPgdXdBack, saveQmPgdXdBack,saveQmPgdJs,saveQmPgdFk,getQmPgd,getPgdBase
getPgdBase
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'QmjhD', name:'PwjhD',
components: {GxsqAdd},
data() { data() {
return { return {
queryParam: { queryParam: {
@ -160,15 +184,26 @@ export default {
}, },
{ {
value: "02", value: "02",
label: "下达", label: "派工",
},
{
value: "03",
label: "接收",
}, },
{ {
value: "09", value: "04",
label: "反馈", label: "反馈",
}, },
], ],
inParam:{
slry:'',
slks:'',
sljs:'',
dw:'',
scry:'',
scdw:''
},
list: [], list: [],
flag:false,
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{}, dictData:{},
@ -183,11 +218,18 @@ export default {
}, },
}, },
], ],
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'lsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 120, { field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -286,62 +328,81 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgry', title: '曲加工人员', width: 120, // { field: 'qjgry', title: '曲加工人员', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'qjgksrq', title: '曲加工开始日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
{ field: 'qjgksrq', title: '曲加工开始日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'fkry', title: '派工人员', width: 100,
{ field: 'qjgjsrq', title: '曲加工结束日期', width: 120, // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'fkrq', title: '派工日期', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'qjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
{ field: 'qjgZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgBzry', title: '编制人', width: 120, { field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgBzrq', title: '编制日期', width: 120, { field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgBzry', title: '编制人', width: 120,
{ field: 'qjgXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgXfrq', title: '下发日期', width: 120, { field: 'qjgBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkry', title: '反馈人', width: 120, { field: 'qjgXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkrq', title: '反馈日期', width: 120, { field: 'qjgXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'qjgFkyy', title: '反馈原因', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
@ -360,13 +421,12 @@ export default {
}, },
methods: { methods: {
Choice() { syncXiaochi(){
this.$refs.gxsqAdd.show() syncXiaochi().then(res=>{
}, if (res.success){
callback(obj, inputFive) { this.initList()
}
// this.loadData() })
}, },
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
@ -379,26 +439,70 @@ export default {
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)
} }
}, },
ztChange(){
this.list=[]
},
bzClick(){
console.log(this.dictData.gxry)
console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
console.log(this.dictData.gxry)
},
updates2(){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].qscdw = this.inParam.scdw
selectRecords[i].qscry = this.inParam.scry
activeRowMethod({ row, rowIndex }){ }
if(row.qjgZt==="01"){ this.$refs.xGrid.updateData(this.list)
return true
}else{
return false
} }
}, },
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
if(type==='1'){
selectRecords[i].slksrq = this.inParam.slks
}else if (type==='2'){
selectRecords[i].qjgFkry = this.inParam.slry
selectRecords[i].qjgFkrq = this.inParam.sljs
}
}
this.$refs.xGrid.updateData(this.list)
}
},
activeRowMethod({ row, rowIndex }){
// if(row.zt==="01"){
// return true
// }else{
// return false
// }
return true;
},
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data)
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
@ -408,52 +512,59 @@ export default {
let selectRecords = this.$refs.xGrid.getCheckboxRecords() let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){ if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) { for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].qjgFkyy = this.queryParam.fkyy selectRecords[i].fkyy = this.queryParam.fkyy
} }
this.$refs.xGrid.updateData(this.list) this.$refs.xGrid.updateData(this.list)
} }
}, },
saveclick(){ saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords() if(this.queryParam.zt!=='03'){
if(obj.length===0){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return return
} }
let obj=this.$refs.xGrid.getCheckboxRecords()
// if(obj.length===0){
// this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
// return
// }
saveQmPgdFk(obj).then(res=>{ saveQmPgdFk(obj).then(res=>{
if(res.success){ if(res.success){
this.initList() this.initList()
} }
}) })
}, },
xdClick(){
slpgclick(){
if(this.queryParam.zt!=="01"){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){ if(obj.length===0){
return return
} }
if(this.queryParam.zt==='02'){ if(this.queryParam.zt==='02'){
this.$confirm('取消下达？', '提示', { this.$confirm('取消派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
saveQmPgdXdBack(obj).then(res=>{ saveQmPgdXdBack(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '取消下达成功', type: 'success' }) this.$message({ message: '取消派工成功', type: 'success' })
this.initList() this.initList()
} }
}) })
}) })
}else { }else {
this.$confirm('下达？', '提示', { this.$confirm('派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() =>{ }).then(() =>{
saveQmPgdFk(obj).then(res=>{ saveQmPgdXd(obj).then(res=>{
if(res.success){ if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList() this.initList()
} }
}) })
@ -462,6 +573,47 @@ export default {
} }
},
xdClick(){
if(this.queryParam.zt!=="02"){
return
}
let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){
return
}
// if(this.queryParam.zt==='03'){
// this.$confirm('取消接收？', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() =>{
// saveQgPgdXdBack(obj).then(res=>{
// if(res.success){
// this.$message({ message: '取消下达成功', type: 'success' })
// this.initList()
// }
// })
//
// })
// }else {
this.$confirm('接收？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQmPgdJs(obj).then(res=>{
if(res.success){
this.$message({ message: '接收成功', type: 'success' })
this.initList()
}
})
})
// }
}, },
initList() { initList() {
if (this.queryParam.dcch === '') { if (this.queryParam.dcch === '') {

5
src/views/jhzxgl/sljhD.vue
Unescape View File

@ -235,7 +235,10 @@ export default {
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'sllsh', title: '流水号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 100, { field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },

Write Preview
Loading…
Cancel
Save