root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2024-08-21 17:36:10 +08:00
parent a30c3724bd 2e7f9c98e4
commit 007705aaba
1 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lms/nladmin-ui/src/views/wms/produceScreen/index.vue
View File

@@ -185,17 +185,6 @@
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">设备工序</el-col>
<el-col :span="18"><input v-model="emptyObj.regin_code" type="text" class="p-value" disabled></el-col>
<!-- <el-col :span="18" class="select-wraper">
<el-select v-model="val2" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
class="option-wraper"
/>
</el-select>
</el-col> -->
</el-row>
</div>
<el-row v-show="type === 3" class="pop-btns">
@@ -222,17 +211,6 @@
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">设备工序</el-col>
<el-col :span="18"><input v-model="sendObj.regin_code" type="text" class="p-value" disabled></el-col>
<!-- <el-col :span="18" class="select-wraper">
<el-select v-model="val2" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
class="option-wraper"
/>
</el-select>
</el-col> -->
</el-row>
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">载具编码</el-col>
@@ -265,17 +243,6 @@
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">设备工序</el-col>
<el-col :span="18"><input v-model="backObj.regin_code" type="text" class="p-value" disabled></el-col>
<!-- <el-col :span="18" class="select-wraper">
<el-select v-model="val2" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
class="option-wraper"
/>
</el-select>
</el-col> -->
</el-row>
</div>
<el-row v-show="type === 5" class="pop-btns">
@@ -312,8 +279,6 @@ export default {
backObj: {},
val1: '',
options1: [],
val2: '',
options2: [],
check1: false,
check2: false
}
@@ -331,7 +296,6 @@ export default {
crudProduceScreen.regionList().then(res => {
this.machineData = [...res.content]
this.show = true
this.options2 = [...res.content]
})
} else if (type === 2 && name in this.pointState) {
crudProduceScreen.regionOrder(this.pkObj.value, this.pointState[name]).then(res => {
@@ -345,13 +309,11 @@ export default {
} else if (type === 3 && name in this.pointState) {
this.emptyObj = {}
this.val1 = ''
// this.val2 = ''
this.show = true
this.emptyObj.device_code = this.pointState[name]
this.emptyObj.regin_code = this.pkObj.value
} else if (type === 4 && name in this.pointState) {
this.sendObj = {}
// this.val2 = ''
this.check1 = false
this.check2 = false
this.show = true
@@ -362,7 +324,6 @@ export default {
this.sendObj.regin_code = this.pkObj.value
} else if (type === 5 && name in this.pointState) {
this.backObj = {}
// this.val2 = ''
this.show = true
this.backObj.material_qty = null
this.backObj.device_code = this.pointState[name]
@@ -401,12 +362,7 @@ export default {
this.$message.error('请选择托盘类型！')
return
}
// if (!this.val2) {
// this.$message.error('请选择设备工序！')
// return
// }
this.emptyObj.vehicle_type = this.val1
// this.emptyObj.regin_code = this.val2
crudProduceScreen.callEmp(this.emptyObj).then(res => {
this.$message(res.msg)
})
@@ -421,15 +377,10 @@ export default {
this.$message.error('请输入合格数量！')
return
}
// if (!this.val2) {
// this.$message.error('请选择设备工序！')
// return
// }
if (this.sendObj.vehicle_code === '') {
this.$message.error('请输入载具编码！')
return
}
// this.sendObj.regin_code = this.val2
this.sendObj.has_report = this.check1
this.sendObj.target_region_code = this.check2
crudProduceScreen.sendMater(this.sendObj).then(res => {
@@ -442,11 +393,6 @@ export default {
this.$message.error('请输入物料数量！')
return
}
// if (!this.val2) {
// this.$message.error('请选择设备工序！')
// return
// }
// this.backObj.regin_code = this.val2
crudProduceScreen.sendVehicle(this.backObj).then(res => {
this.$message(res.msg)
})