root/hht-xzhy-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
xiangxy
2025-09-10 10:38:03 +08:00
parent 336cf4455e
commit 6f7e10fa3f
12 changed files with 800 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
pages/Material/tuiku-confirm.vue
View File

@@ -11,33 +11,33 @@
<view class="zd-col-24 filter_select">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<view class="zd-col-6">
<span class="filter_label filter_input_disabled">所属机台</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
<view class="zd-col-18">
<input type="text" class="filter_input filter_input_disabled" v-model="val2" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<view class="zd-col-6">
<span class="filter_label filter_input_disabled">工单</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
<view class="zd-col-18">
<input type="text" class="filter_input filter_input_disabled" v-model="val3" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-8">
<span class="filter_label">剩余物料(KG)</span>
<view class="zd-col-6">
<span class="filter_label">剩余物料</span>
</view>
<view class="zd-col-16">
<NumberInput v-model="qty" />
<input type="number" v-model="val4" class="filter_input">
</view>
<view class="zd-col-2"><span class="filter_unit">KG</span></view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
@@ -48,7 +48,7 @@
<th>序号</th>
<th>物料编码</th>
<th>物料名称</th>
<th>批号</th>
<th>批次</th>
<th>重量(kg)</th>
<th>生产日期</th>
<th>供应商编码</th>
@@ -62,31 +62,29 @@
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
<tr v-for="(e, i) in dataList" :key="i">
<td>{{i+1}}</td>
<td>{{e.task_type}}</td>
<td>{{e.task_code}}</td>
<td>{{e.vehicle_code}}</td>
<td>{{e.status}}</td>
<td>{{e.point_code1}}</td>
<td>{{e.point_code2}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.create_time}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.qty}}</td>
<td>{{e.produce_time}}</td>
<td>{{e.supp_code}}</td>
<td>{{e.supp_name}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_model}}</td>
<td>{{e.quality_time_day}}</td>
<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
<td>{{e.bake_num}}</td>
</tr>
</tbody>
</table>
</view>
</view>
<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认退回</button>
<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val3 || !val4}" :disabled="disabled" @tap="_returnConfirm">确认退回</button>
</view>
</view>
</template>
@@ -94,7 +92,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {schBaseTask, saveCheckTask} from '@/utils/getData2.js'
import {getOutGroupInfo, returnConfirm} from '@/utils/getData1.js'
export default {
components: {
NavBar,
@@ -103,21 +101,12 @@
data() {
return {
title: '',
materialData: {},
val1: '',
qty: '',
currentData: {},
val2: '',
val3: '',
val4: '',
dataList: [],
pkId: '',
reload: false,
status: 'more',
contentText: {
contentdown: '查看更多',
contentrefresh: '加载中',
contentnomore: '没有更多'
},
totalCount: 0,
pageNum: 1,
pageSize: 10,
disabled: false
};
},
@@ -125,69 +114,45 @@
this.title = options.title
},
methods: {
handleChange (e) {
if (e) {
this.searchList()
}
},
searchList () {
this.dataList = []
this.pageNum = 1
this._schBaseTask()
this._getOutGroupInfo()
},
async _schBaseTask () {
let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
if (res.code === '200') {
this.totalCount = res.totalElements
if (res.totalElements > 0) {
const dataMap = res.content
this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
this.reload = false
async _getOutGroupInfo () {
try {
let res = await getOutGroupInfo(this.val1)
if (res && res.data.length > 0) {
this.val2 = res.data.bom_code
this.val3 = res.data.device_code
this.dataList = [...res.data.data]
} else {
this.dataList = []
}
if (this.totalCount == this.dataList.length) {
this.reload = false
this.status = 'noMore'
}
} catch (e) {
this.dataList = []
}
},
onReachBottom () {
if (this.totalCount > this.dataList.length) {
this.status = 'loading'
setTimeout(() => {
this.pageNum++
this._schBaseTask()
}, 1000)
} else { //停止加载
this.status = 'noMore'
}
clearUp () {
this.val1 = ''
this.val2 = ''
this.index = ''
this.dataList = []
this.disabled = false
},
toCheck (e) {
this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
},
async toSure (status) {
async _returnConfirm () {
this.disabled = true
if (!this.pkId) {
if (!this.val1 || !this.val3 || !this.val4) {
this.disabled = false
return
}
try {
let res = await saveCheckTask(this.pkId, status)
if (res.code === '200') {
this.index = ''
this.val1 = ''
this.dataList = []
this.pkId = ''
let res = await returnConfirm(this.val1, this.val3, this.val4)
if (res) {
uni.showToast({
title: res.desc,
icon: 'none'
})
} else {
uni.showToast({
title: res.desc,
title: res.message,
icon: 'none'
})
this.clearUp()
}
this.disabled = false
} catch (e) {