This commit is contained in:
2023-07-03 10:26:28 +08:00
parent 7094e2c48a
commit 9c981e4f9b
2 changed files with 97 additions and 33 deletions

View File

@@ -43,18 +43,18 @@
<div class="search-item">
<div class="search-label">物料</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input">
<input type="text" class="filter-input" v-model="val1">
</div>
</div>
<div class="search-item">
<div class="search-label">载具号</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input">
<input type="text" class="filter-input" v-model="val2">
</div>
</div>
<div class="search-item flexend">
<button class="button button--primary">查询</button>
<button class="button button--primary">强制确认</button>
<button class="button button--primary" @click="_outgetAll">查询</button>
<button class="button button--primary" :disabled="disabled1" @click="_inconfirm">强制确认</button>
</div>
</div>
</div>
@@ -78,20 +78,24 @@
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in [1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7]" :key="i">
<td>1</td>
<td>10001</td>
<td>执行中</td>
<td>清洗入库</td>
<td>030301010031</td>
<td>碳化钨粉ZW300</td>
<td>1000</td>
<td>1000</td>
<td>1000</td>
<td>1001</td>
<td>1-1-1</td>
<td>2023-06-12</td>
<td>admin</td>
<tr v-for="(e, i) in dataList" :key="i" :class="{'selected_icon': pkId === e.bill_code}" @click="toRadio(e)">
<td>{{i + 1}}</td>
<td>{{e.bill_code}}</td>
<td>{{e.bill_status}}</td>
<td v-if="e.bill_status === '10'">生成</td>
<td v-if="e.bill_status === '20'">分配中</td>
<td v-if="e.bill_status === '30'">分配完</td>
<td v-if="e.bill_status === '99'">完成</td>
<td>{{e.bill_type}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.total_qty}}</td>
<td>{{e.unit_weight}}</td>
<td>{{e.storagevehicle_code}}</td>
<td>{{e.point_code}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_name}}</td>
</tr>
</tbody>
</table>
@@ -100,16 +104,65 @@
</template>
<script>
import { outgetAll, inconfirm } from '../../../config/getData1.js'
export default {
data () {
return {
val1: '',
val2: '',
options1: [],
value1: '',
date: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
options2: [],
value2: '',
options3: [],
value3: ''
dataList: [{bill_code: '030301010031'}],
pkId: '',
pkObj: {},
disabled1: false
}
},
created () {
this._outgetAll()
},
methods: {
// 查询
async _outgetAll () {
let res = await outgetAll(this.value1, this.date, this.value2, this.val1, this.val2)
this.dataList = [...res.data]
},
toRadio (e) {
this.pkId = this.pkId === e.bill_code ? '' : e.bill_code
this.pkObj = this.pkId === e.bill_code ? e : {}
},
toSure () {
this.$router.push('/finishedinstore')
},
clear () {
this.value1 = ''
this.value2 = ''
this.pkId = ''
this.pkObj = {}
},
close () {
this.$router.push('/finishedinstore')
},
async _inconfirm () {
this.disabled1 = true
if (!this.pkId) {
this.toast('请选择一行')
this.disabled1 = false
return
}
try {
let res = await inconfirm(this.pkObj)
this.toast(res.message)
this.disabled1 = false
this.pkId = ''
this.pkObj = {}
this._outgetAll()
} catch (e) {
this.disabled1 = false
}
}
}
}

View File

@@ -41,23 +41,17 @@
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-label">载具号</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input">
</div>
</div>
<div class="search-item">
<div class="search-label">备注</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input">
<input type="text" class="filter-input" v-model="val1">
</div>
</div>
<div class="search-item_2 flexend">
<button class="button button--primary">确认入库</button>
<button class="button button--primary">作业查询</button>
<button class="button button--primary" @click="toInConfirm">确认入库</button>
<button class="button button--primary" @click="toSearch">作业查询</button>
<button class="button button--primary" @click="toAddBillMater">添加单据物料</button>
<button class="button button--primary">删除一行</button>
<button class="button button--primary" @click="toDel">删除一行</button>
</div>
</div>
</div>
@@ -77,7 +71,7 @@
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" :class="{'selected_icon': pkId === e.material_code}" @click="toRadio(e)">
<td>i</td>
<td>{{i + 1}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.sale_qty}}</td>
@@ -93,7 +87,7 @@
</template>
<script>
import { getBcpStor, getBillType, getPoint } from '../../../config/getData1.js'
import { getBcpStor, getBillType, getPoint, confirmIn } from '../../../config/getData1.js'
export default {
data () {
return {
@@ -105,7 +99,8 @@ export default {
value3: '',
dataList: [{material_code: '030301010031'}],
pkId: '',
pkObj: {}
pkObj: {},
disabled1: false
}
},
beforeRouteLeave (to, from, next) {
@@ -137,12 +132,28 @@ export default {
let res = await getPoint()
this.options3 = [...res.data]
},
toInConfirm () {
this._confirmIn()
},
async _confirmIn () {
try {
let res = await confirmIn(this.value1, this.value2, this.value3, this.val1, this.dataList)
this.toast(res.message)
} catch (e) {
}
},
toAddBillMater () {
this.$router.push('/selectfinishedmater')
},
toSearch () {
this.$router.push('/finishedinstoresearch')
},
toRadio (e) {
this.pkId = this.pkId === e.material_code ? '' : e.material_code
this.pkObj = this.pkId === e.material_code ? e : {}
},
toDel () {
console.log('del')
}
}
}