This commit is contained in:
2025-07-31 09:41:17 +08:00
parent 1939e4efa6
commit b96685546a
6 changed files with 239 additions and 44 deletions

View File

@@ -21,12 +21,14 @@
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<view class="zd-col-6">
<span class="filter_label">物料重量</span>
</view>
<view class="zd-col-17">
<view class="zd-col-12">
<!-- <search-box v-model="code" @handleChange="handleChange1" @handleDel="handleDel1" /> -->
<input type="text" class="filter_input" v-model="val3">
</view>
<button class="mini-btn" type="primary" size="mini" @tap="toSearch">获取重量</button>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
@@ -78,8 +80,8 @@
<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-6 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
<button class="zd-col-11 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
</view>
</view>
</template>
@@ -103,6 +105,8 @@
id: '',
code: '',
val1: '',
val2: '',
val3: '',
dataList: [],
pkId: '',
pkObj: {},

View File

@@ -62,8 +62,8 @@
<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-6 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
<button class="zd-col-11 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认下料</button>
</view>
</view>
</template>

View File

@@ -37,15 +37,15 @@
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
<td>{{e.material_name}}</td>
<td>{{e.qty}}</td>
<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.workorder_id}">
<td>{{e.workorder_code}}</td>
<td>{{e.material_code}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.qty_unit_name}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_name}}</td>
<td>{{e.workorder_status}}</td>
<td>{{e.operator}}</td>
<td>{{e.create_name}}</td>
<td>{{e.plan_qty}}</td>
<td>{{e.real_qty}}</td>
</tr>
</tbody>
</table>
@@ -54,8 +54,8 @@
<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-6 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">开工</button>
<button class="zd-col-11 button-primary" @tap="seachList">查询工单</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !index2 || !pkId}" @tap="_callMaterial">开工</button>
</view>
</view>
</template>
@@ -63,7 +63,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.js'
import {regionList, pointList, getOrderList, callMaterial} from '@/utils/getData4.js'
export default {
components: {
NavBar,
@@ -99,12 +99,12 @@
this.id = options.id
},
created () {
this._getRegion()
this._regionList()
},
methods: {
async _getRegion () {
async _regionList () {
try {
let res = await getRegion('YZHJ')
let res = await regionList()
if (res) {
this.options = res
} else {
@@ -114,20 +114,33 @@
this.options = []
}
},
async _pointList (e) {
try {
let res = await pointList(e)
if (res) {
this.options2 = res
} else {
this.options2 =[]
}
} catch (e) {
this.options2 = []
}
},
selectChange (e) {
this.index = e
this._pointList(e)
},
selectChange2 (e) {
this.index = e
this.index2 = e
},
seachList () {
this.dataList = []
this.pageNum = 1
this.pkId = ''
this._linegetMaterialDtl()
this._getOrderList()
},
async _linegetMaterialDtl () {
let res = await linegetMaterialDtl(this.index)
async _getOrderList () {
let res = await getOrderList(this.index2, '1')
if (res.code === '200') {
this.dataList = res.data
// this.totalCount = res.totalElements
@@ -149,24 +162,28 @@
this.status = 'loading'
setTimeout(() => {
this.pageNum++
this._linegetMaterialDtl()
this._getOrderList()
}, 1000)
} else { //停止加载
this.status = 'noMore'
}
},
toChek (e) {
this.pkId = this.pkId === e.group_id ? '' : e.group_id
this.pkObj = this.pkId === e.group_id ? e : {}
this.pkId = this.pkId === e.workorder_id ? '' : e.workorder_id
this.pkObj = this.pkId === e.workorder_id ? e : {}
},
async _callMaterialConfirm () {
clearUp () {
this.pkId = ''
this.pkObj = {}
},
async _callMaterial () {
this.disabled = true
if (!this.dataList.length) {
if (!index2 || !pkId) {
this.disabled = false
return
}
try {
let res = await callMaterialConfirm(this.index, this.pkObj)
let res = await callMaterial(this.pkId, this.index2, this.index)
if (res.code === '200') {
uni.showToast({
title: res.message,

View File

@@ -27,8 +27,8 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('1')">检查站点</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('0')">确认放置</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('1')">检查站点</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('0')">确认放置</button>
</view>
</view>
</template>