|
|
|
|
@ -7,6 +7,7 @@ |
|
|
|
|
@close="closeDialog" |
|
|
|
|
@open="open" |
|
|
|
|
fullscreen |
|
|
|
|
class="content-box" |
|
|
|
|
> |
|
|
|
|
<el-form :inline="true" v-model="submitForm"> |
|
|
|
|
<el-form-item label="银钾系数" prop="coefficient" v-if="searchForm.materalType == 2"> |
|
|
|
|
@ -23,21 +24,26 @@ |
|
|
|
|
</el-form-item> --> |
|
|
|
|
</el-form> |
|
|
|
|
<el-tag type="primary" style="width: 100%; display: block; line-height: 22px" |
|
|
|
|
>选择{{selectionList.length}}个订单 合计：物料需求量：{{this.totalNum}}克</el-tag |
|
|
|
|
>选择{{ selectionList.length }}个订单 合计：物料需求量：{{ this.totalNum }}克</el-tag |
|
|
|
|
> |
|
|
|
|
<div style="border: 1px solid #ccc; padding: 20px 0px"> |
|
|
|
|
<div> |
|
|
|
|
<el-form :inline="true" v-model="searchForm" label-width="90px"> |
|
|
|
|
<el-form-item label="作业中心" prop="wcId"> |
|
|
|
|
<el-select style="width: 182px" v-model="searchForm.wcId" placeholder="请选择作业中心"> |
|
|
|
|
<el-option v-for="item in workList" :key="item.id" :label="item.wcName" :value="item.id"></el-option> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in workList" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.wcName" |
|
|
|
|
:value="item.id" |
|
|
|
|
></el-option> |
|
|
|
|
<!-- <el-option label="作业中心二" value="2"></el-option> --> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="物料类型" prop="materalType"> |
|
|
|
|
<el-radio-group v-model="searchForm.materalType" @input="changeType"> |
|
|
|
|
<el-radio :label="1">金钾</el-radio> |
|
|
|
|
<el-radio :label="2">银钾</el-radio> |
|
|
|
|
<el-radio :label="1">金钾（04-05-023）</el-radio> |
|
|
|
|
<el-radio :label="2">银钾（04-05-024）</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item> |
|
|
|
|
@ -48,7 +54,13 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
<el-table :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :loading="loading"> |
|
|
|
|
<el-table |
|
|
|
|
:data="tableData" |
|
|
|
|
@selection-change="handleSelectionChange" |
|
|
|
|
ref="multipleTable" |
|
|
|
|
:loading="loading" |
|
|
|
|
:height="tableHeight" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="selection"></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="计划单号" |
|
|
|
|
@ -56,7 +68,12 @@ |
|
|
|
|
width="150" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column label="生产订单号" prop="yoCode" width="150" align="center"></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="生产订单号" |
|
|
|
|
prop="yoCode" |
|
|
|
|
width="150" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="零件号" |
|
|
|
|
width="150" |
|
|
|
|
@ -69,7 +86,13 @@ |
|
|
|
|
prop="partName" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column label="物料编码" width="150" prop="plateGoodsCode" align="center"></el-table-column> |
|
|
|
|
<!-- <el-table-column label="物料编码" width="150" prop="plateGoodsCode" align="center"></el-table-column> --> |
|
|
|
|
<el-table-column |
|
|
|
|
label="流程卡号" |
|
|
|
|
prop="cardNo" |
|
|
|
|
width="80" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="生产标识" |
|
|
|
|
prop="productIdent" |
|
|
|
|
@ -112,7 +135,12 @@ |
|
|
|
|
prop="quota2" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column label="计划下达时间" prop="releaseDate" width="150" align="center"></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="计划下达时间" |
|
|
|
|
prop="releaseDate" |
|
|
|
|
width="150" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
|
|
|
|
|
<!-- <el-table-column label="计划生产时间" prop="createTime" align="center"></el-table-column> --> |
|
|
|
|
</el-table> |
|
|
|
|
@ -140,7 +168,12 @@ |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getListlistNoFinished,getAddRequireList,getWorkCenter,add } from '@/api/productionManagement/coatingMaterial'; |
|
|
|
|
import { |
|
|
|
|
getListlistNoFinished, |
|
|
|
|
getAddRequireList, |
|
|
|
|
getWorkCenter, |
|
|
|
|
add, |
|
|
|
|
} from '@/api/productionManagement/coatingMaterial'; |
|
|
|
|
export default { |
|
|
|
|
props: { |
|
|
|
|
showDialog: { |
|
|
|
|
@ -159,23 +192,41 @@ export default { |
|
|
|
|
tableData: [], |
|
|
|
|
totalNum: null, |
|
|
|
|
selectionList: [], |
|
|
|
|
workList:[] |
|
|
|
|
workList: [], |
|
|
|
|
tableHeight: 0, |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
console.log('11111111111') |
|
|
|
|
this.submitForm = {} |
|
|
|
|
this.searchForm = { |
|
|
|
|
console.log('11111111111'); |
|
|
|
|
this.submitForm = {}; |
|
|
|
|
this.searchForm = { |
|
|
|
|
materalType: 1, |
|
|
|
|
} |
|
|
|
|
this.tableData = [] |
|
|
|
|
this.getWorkCenterList() |
|
|
|
|
}; |
|
|
|
|
this.tableData = []; |
|
|
|
|
this.getWorkCenterList(); |
|
|
|
|
window.addEventListener('resize', this.calculateTableHeight); |
|
|
|
|
// 初始计算 |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.calculateTableHeight(); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
beforeDestroy() { |
|
|
|
|
window.removeEventListener('resize', this.calculateTableHeight); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
getWorkCenterList() { |
|
|
|
|
getWorkCenter().then((res) => { |
|
|
|
|
this.workList = res.data.data |
|
|
|
|
}) |
|
|
|
|
calculateTableHeight() { |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
const rightContainer = document.querySelector('.content-box'); |
|
|
|
|
if (!rightContainer) return; |
|
|
|
|
const containerHeight = rightContainer.offsetHeight; |
|
|
|
|
this.tableHeight = |
|
|
|
|
containerHeight - 51 - 80 - 42 - 20 - 84 -20; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getWorkCenterList() { |
|
|
|
|
getWorkCenter().then(res => { |
|
|
|
|
this.workList = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 切换金钾/银钾类型 |
|
|
|
|
changeType(val) { |
|
|
|
|
@ -188,17 +239,21 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 点击查询按钮 |
|
|
|
|
async onSearch() { |
|
|
|
|
if (!this.searchForm.wcId) { |
|
|
|
|
this.$message.warning('请选择作业中心'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.loading = true; |
|
|
|
|
try { |
|
|
|
|
// const params = { ...this.submitForm, ...this.query }; |
|
|
|
|
console.log('params', this.searchForm); |
|
|
|
|
let params = { |
|
|
|
|
...this.searchForm, |
|
|
|
|
overHalfMon:this.searchForm.overHalfMon ? 1 : 0, |
|
|
|
|
current:1, |
|
|
|
|
size:99999 |
|
|
|
|
} |
|
|
|
|
const res = await getAddRequireList( params); |
|
|
|
|
overHalfMon: this.searchForm.overHalfMon ? 1 : 0, |
|
|
|
|
current: 1, |
|
|
|
|
size: 99999, |
|
|
|
|
}; |
|
|
|
|
const res = await getAddRequireList(params); |
|
|
|
|
this.tableData = res.data.data.records; |
|
|
|
|
// if (res && res.code === 200) { |
|
|
|
|
// this.data = res.data?.data?.records || []; |
|
|
|
|
@ -207,7 +262,7 @@ export default { |
|
|
|
|
// console.warn('查询失败:', '未知错误'); |
|
|
|
|
// } |
|
|
|
|
} finally { |
|
|
|
|
this.loading = false; |
|
|
|
|
this.loading = false; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 多选 |
|
|
|
|
@ -220,11 +275,11 @@ export default { |
|
|
|
|
} |
|
|
|
|
var total = eval(strarr.join('+')); |
|
|
|
|
this.totalNum = total ? total.toFixed(2) : 0; |
|
|
|
|
console.log('total-----------',total) |
|
|
|
|
console.log('total-----------', total); |
|
|
|
|
this.submitForm.goodsQuantity = total ? total.toFixed(2) : 0; |
|
|
|
|
}, |
|
|
|
|
closeDialog(val) { |
|
|
|
|
this.$emit('closeDialog',val); |
|
|
|
|
this.$emit('closeDialog', val); |
|
|
|
|
}, |
|
|
|
|
submit() { |
|
|
|
|
// this.submitForm |
|
|
|
|
@ -234,39 +289,40 @@ export default { |
|
|
|
|
// list: this.selectionList, |
|
|
|
|
// }; |
|
|
|
|
// console.log(form); |
|
|
|
|
let plateCodeArr = this.selectionList.map(item => item.plateGoodsCode) |
|
|
|
|
let plateCode = [...new Set(plateCodeArr)].join(',') |
|
|
|
|
let plateCodeArr = this.selectionList.map(item => item.plateGoodsCode); |
|
|
|
|
let plateCode = [...new Set(plateCodeArr)].join(','); |
|
|
|
|
let params = { |
|
|
|
|
assayContent:{ |
|
|
|
|
wcId:this.searchForm.wcId, |
|
|
|
|
plateGoodsCode:plateCode, |
|
|
|
|
goodsDemand:this.totalNum, |
|
|
|
|
assayContent: { |
|
|
|
|
wcId: this.searchForm.wcId, |
|
|
|
|
plateGoodsCode: plateCode, |
|
|
|
|
goodsDemand: this.totalNum, |
|
|
|
|
// coefficient: this.searchForm.materalType == 2 && this.searchForm.coefficient ? this.searchForm.coefficient : 0 |
|
|
|
|
}, |
|
|
|
|
detailList:this.selectionList.map(item =>{ |
|
|
|
|
return {yoId :item.id} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(this.searchForm.materalType != 2){ |
|
|
|
|
detailList: this.selectionList.map(item => { |
|
|
|
|
return { yoId: item.id }; |
|
|
|
|
}), |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
if (this.searchForm.materalType != 2) { |
|
|
|
|
// const { coefficient, ...validData } = params; |
|
|
|
|
console.log('params------------',params) |
|
|
|
|
add(params).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('新增成功') |
|
|
|
|
this.closeDialog(true) |
|
|
|
|
console.log('params------------', params); |
|
|
|
|
add(params).then(res => { |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
this.$message.success('新增成功'); |
|
|
|
|
this.closeDialog(true); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
params.assayContent.coefficient = this.searchForm.coefficient ? this.searchForm.coefficient : 0 |
|
|
|
|
add(params).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('新增成功') |
|
|
|
|
this.closeDialog(true) |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
params.assayContent.coefficient = this.searchForm.coefficient |
|
|
|
|
? this.searchForm.coefficient |
|
|
|
|
: 0; |
|
|
|
|
add(params).then(res => { |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
this.$message.success('新增成功'); |
|
|
|
|
this.closeDialog(true); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
}; |
|
|
|
|
|
zhangdi
1 month ago