解包管理
This commit is contained in:
x
@@ -45,15 +45,6 @@
|
||||
<search-box v-model="val2"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">人工转运</span>
|
||||
</view>
|
||||
<view class="relative zd-col-24">
|
||||
<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
|
||||
<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
@@ -61,30 +52,21 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>工单号</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<th>批次号</th>
|
||||
<th>工单状态</th>
|
||||
<th>开工人</th>
|
||||
<th>创建者</th>
|
||||
<th>计划重量</th>
|
||||
<th>实际重量</th>
|
||||
<th>计划量</th>
|
||||
<th>实际量</th>
|
||||
<th>重量</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<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.material_name}}</td>
|
||||
<!-- <td>{{e.workorder_status}}</td> -->
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.workorder_status_name}}</td>
|
||||
<td>{{e.operator}}</td>
|
||||
<td>{{e.create_name}}</td>
|
||||
<td>{{e.plan_weight}}</td>
|
||||
<td>{{e.real_weight}}</td>
|
||||
<td>{{e.plan_qty}}</td>
|
||||
<td>{{e.real_qty}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -94,7 +76,55 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2}" @tap="seachList">查询工单</button>
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2 || !this.val3 || !this.val2 || !this.pkId}" @tap="xlconfirm">确认出桶</button>
|
||||
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !this.index2 || !this.val3 || !this.val2 || !this.pkId}" @tap="xlconfirm">确认出桶</button> -->
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2 || !this.val3 || !this.val2 || !this.pkId}" @tap="handleSubmit">确认出桶</button>
|
||||
</view>
|
||||
<!-- 弹窗：层级最高，不会被覆盖 -->
|
||||
<view class="dialog" v-if="showDialog">
|
||||
<!-- 第一行：转运类型（不换行） -->
|
||||
<view class="form-line">
|
||||
<text class="label no-wrap">转运类型：</text>
|
||||
<view class="radio-group">
|
||||
<view class="radio-item" :class="{active: selectType === '0'}" @click="selectType = '0'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '0'"></view></view>
|
||||
<text class="text">人工转运</text>
|
||||
</view>
|
||||
<view class="radio-item" :class="{active: selectType === '1'}" @click="selectType = '1'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '1'"></view></view>
|
||||
<text class="text">AGV转运</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 第二行：库位信息（带下拉箭头） -->
|
||||
<view class="form-line">
|
||||
<text class="label no-wrap">库位信息：</text>
|
||||
<view class="select-box" @click="openSelect">
|
||||
<text class="select-text">{{ selectStructName || '请选择' }}</text>
|
||||
<!-- 下拉箭头 -->
|
||||
<view class="arrow-down"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 按钮组 -->
|
||||
<view class="btn-group">
|
||||
<button class="btn cancel" @click="closeDialog">取消</button>
|
||||
<button class="btn save" @click="save">保存</button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 库位选择弹窗（最高层级） -->
|
||||
<view class="select-popup" v-if="showSelect" @click="showSelect = false">
|
||||
<view class="select-content" @click.stop>
|
||||
<view
|
||||
class="select-item"
|
||||
v-for="item in structList"
|
||||
:key="item.struct_code"
|
||||
@click="selectStruct(item)"
|
||||
>
|
||||
{{ item.struct_name }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -102,7 +132,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {regionList, pointList, getWeight, jbGetVehicleCode, getOrderList, downMaterial} from '@/utils/getData4.js'
|
||||
import {regionList, pointList, getWeight, jbGetVehicleCode, getOrderList, downMaterial, structListByWorkId} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -127,7 +157,6 @@
|
||||
dupWeight: '',
|
||||
orgWeight: '',
|
||||
standError: '',
|
||||
isChecked: false,
|
||||
disabled: false,
|
||||
statusMap: {
|
||||
'1': '未生产',
|
||||
@@ -145,7 +174,18 @@
|
||||
},
|
||||
totalCount: 0,
|
||||
pageNum: 1,
|
||||
pageSize: 100
|
||||
pageSize: 100,
|
||||
showDialog: false,
|
||||
selectType: '0',
|
||||
showSelect: false,
|
||||
selectStructName: '',
|
||||
selectStructCode: '',
|
||||
// structList: [
|
||||
// { struct_code: 'A01', struct_name: 'A区01库位' },
|
||||
// { struct_code: 'A02', struct_name: 'A区02库位' },
|
||||
// { struct_code: 'B01', struct_name: 'B区01库位' },
|
||||
// ]
|
||||
structList: []
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
@@ -156,6 +196,32 @@
|
||||
this._pointList('DDJBQ')
|
||||
},
|
||||
methods: {
|
||||
closeDialog() {
|
||||
this.showDialog = false
|
||||
},
|
||||
save() {
|
||||
this.xlconfirm()
|
||||
this.showDialog = false
|
||||
},
|
||||
handleSubmit () {
|
||||
if (!this.index2 || !this.val3 || !this.val2 || !this.pkId) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
this.showDialog = true
|
||||
},
|
||||
openSelect() {
|
||||
if (!this.pkId) {
|
||||
return
|
||||
}
|
||||
this._structListByWorkId()
|
||||
this.showSelect = true
|
||||
},
|
||||
selectStruct(item) {
|
||||
this.selectStructCode = item.struct_code
|
||||
this.selectStructName = item.struct_name
|
||||
this.showSelect = false
|
||||
},
|
||||
handleBlur () {
|
||||
if (this.val3) {
|
||||
if (this.val3 < 0) {
|
||||
@@ -190,6 +256,12 @@
|
||||
// })
|
||||
}
|
||||
},
|
||||
async _structListByWorkId () {
|
||||
let res = await structListByWorkId(this.pkId)
|
||||
if (res.code === '200') {
|
||||
this.structList = res.data
|
||||
}
|
||||
},
|
||||
async _regionList () {
|
||||
try {
|
||||
let res = await regionList()
|
||||
@@ -282,10 +354,12 @@
|
||||
this.index2 = ''
|
||||
this.val2 = ''
|
||||
this.val3 = ''
|
||||
this.isChecked = false
|
||||
this.dataList = []
|
||||
this.pageNum = 1
|
||||
this.pkId = ''
|
||||
this.selectStructName = ''
|
||||
this.selectStructCode = ''
|
||||
this.structList = []
|
||||
},
|
||||
async _getWeight () {
|
||||
if (!this.index2) {
|
||||
@@ -364,8 +438,7 @@
|
||||
},
|
||||
async _downMaterial () {
|
||||
try {
|
||||
let check = this.isChecked ? '1' : '0'
|
||||
let res = await downMaterial(this.pkId, 'DDJBQ', this.val3, this.index2, this.val1, this.val2, check)
|
||||
let res = await downMaterial(this.pkId, 'DDJBQ', this.val3, this.index2, this.val1, this.val2, this.selectType, this.selectStructCode, this.selectStructName)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
@@ -382,10 +455,139 @@
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
setWStatus () {
|
||||
this.isChecked = !this.isChecked
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="stylus" scoped>
|
||||
/* 弹窗最高层级 永远在最上层 */
|
||||
.dialog {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 90%;
|
||||
max-width: 650rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
z-index: 9999 !important; /* 最高层级 */
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.form-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 30rpx 40rpx;
|
||||
}
|
||||
.label {
|
||||
font-size: 30rpx;
|
||||
width: 140rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.no-wrap {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* 单选样式 */
|
||||
.radio-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.radio-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 50rpx;
|
||||
}
|
||||
.circle {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
border: 2rpx solid #ccc;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
.dot {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
background: #007aff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.radio-item.active .circle {
|
||||
border-color: #007aff;
|
||||
}
|
||||
.text {
|
||||
font-size: 30rpx;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* 下拉框 + 箭头 */
|
||||
.select-box {
|
||||
flex: 1;
|
||||
padding: 20rpx;
|
||||
border: 2rpx solid #eee;
|
||||
border-radius: 10rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.select-text {
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
}
|
||||
/* 下拉箭头 */
|
||||
.arrow-down {
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 8rpx solid transparent;
|
||||
border-right: 8rpx solid transparent;
|
||||
border-top: 10rpx solid #999;
|
||||
}
|
||||
|
||||
/* 库位选择弹层（比主弹窗更高） */
|
||||
.select-popup {
|
||||
position: fixed;
|
||||
top: 0; left: 0; right: 0; bottom: 0;
|
||||
background: rgba(0,0,0,0.2);
|
||||
z-index: 99999 !important;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.select-content {
|
||||
width: 70%;
|
||||
max-width: 500rpx;
|
||||
background: #fff;
|
||||
border-radius: 12rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
.select-item {
|
||||
padding: 28rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: center;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
/* 按钮 */
|
||||
.btn-group {
|
||||
display: flex;
|
||||
border-top: 1rpx solid #eee;
|
||||
}
|
||||
.btn {
|
||||
flex: 1;
|
||||
height: 90rpx;
|
||||
line-height: 90rpx;
|
||||
font-size: 30rpx;
|
||||
border: none;
|
||||
background: #fff;
|
||||
}
|
||||
.cancel {
|
||||
border-right: 1rpx solid #eee;
|
||||
color: #666;
|
||||
}
|
||||
.save {
|
||||
color: #007aff;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -35,26 +35,21 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>工单号</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<!-- <th>工单状态</th> -->
|
||||
<th>批次号</th>
|
||||
<th>工单状态</th>
|
||||
<th>开工人</th>
|
||||
<th>创建者</th>
|
||||
<th>计划量</th>
|
||||
<th>实际量</th>
|
||||
<th>重量</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<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.material_name}}</td>
|
||||
<!-- <td>{{e.workorder_status}}</td> -->
|
||||
<!-- <td>{{e.workorder_status_name}}</td> -->
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.workorder_status_name}}</td>
|
||||
<td>{{e.operator}}</td>
|
||||
<td>{{e.create_name}}</td>
|
||||
<td>{{e.plan_qty}}</td>
|
||||
<td>{{e.real_qty}}</td>
|
||||
<td>{{e.plan_weight}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -64,7 +59,30 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2}" @tap="seachList">查询工单</button>
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index || !this.index2 || !this.val1 || !this.pkId}" @tap="_jbReturnMaterial">解包退料</button>
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index || !this.index2 || !this.val1 || !this.pkId}" @tap="handleSubmit">解包退料</button>
|
||||
</view>
|
||||
<!-- 弹窗（无遮罩） -->
|
||||
<view class="dialog" v-if="showDialog">
|
||||
<!-- 转运类型：横排不换行 -->
|
||||
<view class="form-line">
|
||||
<text class="label">转运类型：</text>
|
||||
<view class="radio-group">
|
||||
<view class="radio-item" :class="{active: selectType === '0'}" @click="selectType = '0'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '0'"></view></view>
|
||||
<text class="text">人工转运</text>
|
||||
</view>
|
||||
<view class="radio-item" :class="{active: selectType === '1'}" @click="selectType = '1'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '1'"></view></view>
|
||||
<text class="text">AGV转运</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 按钮组 -->
|
||||
<view class="btn-group">
|
||||
<button class="btn cancel" @click="closeDialog">取消</button>
|
||||
<button class="btn save" @click="save">保存</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -92,6 +110,8 @@
|
||||
pkId: '',
|
||||
pkObj: {},
|
||||
disabled: false,
|
||||
showDialog: false, // 控制弹窗显示
|
||||
selectType: '0', // 选中的类型
|
||||
statusMap: {
|
||||
'1': '未开始',
|
||||
'3': '生产中',
|
||||
@@ -117,6 +137,22 @@
|
||||
this._regionList()
|
||||
},
|
||||
methods: {
|
||||
// 关闭弹窗
|
||||
closeDialog() {
|
||||
this.showDialog = false
|
||||
},
|
||||
// 保存并关闭
|
||||
save() {
|
||||
this._jbReturnMaterial()
|
||||
this.showDialog = false
|
||||
},
|
||||
handleSubmit () {
|
||||
if (!this.index || !this.index2 || !this.val1 || !this.pkId) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
this.showDialog = true
|
||||
},
|
||||
async _regionList () {
|
||||
try {
|
||||
let res = await regionList()
|
||||
@@ -222,12 +258,8 @@
|
||||
},
|
||||
async _jbReturnMaterial () {
|
||||
this.disabled = true
|
||||
if (!this.index || !this.index2 || !this.val1 || !this.pkId) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await jbReturnMaterial(this.index, this.index2, this.val1, this.pkId)
|
||||
let res = await jbReturnMaterial(this.index, this.index2, this.val1, this.pkId, this.selectType)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
@@ -248,3 +280,98 @@
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="stylus" scoped>
|
||||
/* 弹窗：居中 + 无遮罩 */
|
||||
.dialog {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 90%;
|
||||
max-width: 600rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
z-index: 100;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 转运类型行 */
|
||||
.form-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 40rpx;
|
||||
padding-top: 50rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 30rpx;
|
||||
width: 150rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* 单选组：横排 + 不换行 */
|
||||
.radio-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.radio-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 50rpx;
|
||||
}
|
||||
|
||||
/* 单选圆圈 */
|
||||
.circle {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
border: 2rpx solid #ccc;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
.dot {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
background: #007aff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.radio-item.active .circle {
|
||||
border-color: #007aff;
|
||||
}
|
||||
|
||||
.text {
|
||||
font-size: 30rpx;
|
||||
white-space: nowrap; /* 强制不换行 */
|
||||
}
|
||||
|
||||
/* 底部按钮 */
|
||||
.btn-group {
|
||||
display: flex;
|
||||
border-top: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
.btn {
|
||||
flex: 1;
|
||||
height: 90rpx;
|
||||
line-height: 90rpx;
|
||||
font-size: 30rpx;
|
||||
border: none;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.cancel {
|
||||
border-right: 1rpx solid #eee;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.save {
|
||||
color: #007aff;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -27,30 +27,21 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>工单号</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<th>批次号</th>
|
||||
<th>工单状态</th>
|
||||
<th>开工人</th>
|
||||
<th>创建者</th>
|
||||
<th>计划重量</th>
|
||||
<th>实际重量</th>
|
||||
<th>计划量</th>
|
||||
<th>实际量</th>
|
||||
<th>重量</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<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.material_name}}</td>
|
||||
<!-- <td>{{e.workorder_status}}</td> -->
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.workorder_status_name}}</td>
|
||||
<td>{{e.operator}}</td>
|
||||
<td>{{e.create_name}}</td>
|
||||
<td>{{e.plan_weight}}</td>
|
||||
<td>{{e.real_weight}}</td>
|
||||
<td>{{e.plan_qty}}</td>
|
||||
<td>{{e.real_qty}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -60,9 +51,32 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index2}" @tap="seachList">查询工单</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index2 || !pkId}" @tap="_callMaterial">开工</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index2 || !pkId}" @tap="handleSubmit">开工</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index2}" @tap="_callMaterialFinish">上料完成</button>
|
||||
</view>
|
||||
<!-- 弹窗（无遮罩） -->
|
||||
<view class="dialog" v-if="showDialog">
|
||||
<!-- 转运类型：横排不换行 -->
|
||||
<view class="form-line">
|
||||
<text class="label">转运类型：</text>
|
||||
<view class="radio-group">
|
||||
<view class="radio-item" :class="{active: selectType === '0'}" @click="selectType = '0'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '0'"></view></view>
|
||||
<text class="text">人工转运</text>
|
||||
</view>
|
||||
<view class="radio-item" :class="{active: selectType === '1'}" @click="selectType = '1'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '1'"></view></view>
|
||||
<text class="text">AGV转运</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 按钮组 -->
|
||||
<view class="btn-group">
|
||||
<button class="btn cancel" @click="closeDialog">取消</button>
|
||||
<button class="btn save" @click="save">保存</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -88,6 +102,8 @@
|
||||
pkId: '',
|
||||
pkObj: {},
|
||||
disabled: false,
|
||||
showDialog: false, // 控制弹窗显示
|
||||
selectType: '0', // 选中的类型
|
||||
statusMap: {
|
||||
'1': '未开始',
|
||||
'3': '生产中',
|
||||
@@ -113,6 +129,22 @@
|
||||
this._regionList()
|
||||
},
|
||||
methods: {
|
||||
// 关闭弹窗
|
||||
closeDialog() {
|
||||
this.showDialog = false
|
||||
},
|
||||
// 保存并关闭
|
||||
save() {
|
||||
this._callMaterial()
|
||||
this.showDialog = false
|
||||
},
|
||||
handleSubmit () {
|
||||
if (!this.index2 || !this.pkId) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
this.showDialog = true
|
||||
},
|
||||
// 获取状态名称
|
||||
getStatusName (status) {
|
||||
return this.statusMap[status] || ''
|
||||
@@ -204,12 +236,8 @@
|
||||
},
|
||||
async _callMaterial () {
|
||||
this.disabled = true
|
||||
if (!this.index2 || !this.pkId) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await callMaterial(this.pkId, this.index2, this.index)
|
||||
let res = await callMaterial(this.pkId, this.index2, this.index, this.selectType)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
@@ -255,3 +283,98 @@
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="stylus" scoped>
|
||||
/* 弹窗：居中 + 无遮罩 */
|
||||
.dialog {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 90%;
|
||||
max-width: 600rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
z-index: 100;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 转运类型行 */
|
||||
.form-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 40rpx;
|
||||
padding-top: 50rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 30rpx;
|
||||
width: 150rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* 单选组：横排 + 不换行 */
|
||||
.radio-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.radio-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 50rpx;
|
||||
}
|
||||
|
||||
/* 单选圆圈 */
|
||||
.circle {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
border: 2rpx solid #ccc;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
.dot {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
background: #007aff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.radio-item.active .circle {
|
||||
border-color: #007aff;
|
||||
}
|
||||
|
||||
.text {
|
||||
font-size: 30rpx;
|
||||
white-space: nowrap; /* 强制不换行 */
|
||||
}
|
||||
|
||||
/* 底部按钮 */
|
||||
.btn-group {
|
||||
display: flex;
|
||||
border-top: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
.btn {
|
||||
flex: 1;
|
||||
height: 90rpx;
|
||||
line-height: 90rpx;
|
||||
font-size: 30rpx;
|
||||
border: none;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.cancel {
|
||||
border-right: 1rpx solid #eee;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.save {
|
||||
color: #007aff;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
@@ -80,7 +80,31 @@
|
||||
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-11 button-primary" @tap="_getInBillList">刷新</button>
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !checkedArr.length}" @tap="_zwConfirmIn">提交</button>
|
||||
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !checkedArr.length}" @click="showDialog = true" @tap="_zwConfirmIn">提交</button> -->
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !checkedArr.length}" @tap="handleSubmit">提交</button>
|
||||
</view>
|
||||
<!-- 弹窗（无遮罩） -->
|
||||
<view class="dialog" v-if="showDialog">
|
||||
<!-- 转运类型：横排不换行 -->
|
||||
<view class="form-line">
|
||||
<text class="label">转运类型：</text>
|
||||
<view class="radio-group">
|
||||
<view class="radio-item" :class="{active: selectType === '0'}" @click="selectType = '0'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '0'"></view></view>
|
||||
<text class="text">人工转运</text>
|
||||
</view>
|
||||
<view class="radio-item" :class="{active: selectType === '1'}" @click="selectType = '1'">
|
||||
<view class="circle"><view class="dot" v-if="selectType === '1'"></view></view>
|
||||
<text class="text">AGV转运</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 按钮组 -->
|
||||
<view class="btn-group">
|
||||
<button class="btn cancel" @click="closeDialog">取消</button>
|
||||
<button class="btn save" @click="save">保存</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -112,7 +136,9 @@
|
||||
pkId: '',
|
||||
currentData: {},
|
||||
flag: false,
|
||||
disabled: false
|
||||
disabled: false,
|
||||
showDialog: false, // 控制弹窗显示
|
||||
selectType: '0' // 选中的类型
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
@@ -123,6 +149,22 @@
|
||||
this._getInBillList()
|
||||
},
|
||||
methods: {
|
||||
// 关闭弹窗
|
||||
closeDialog() {
|
||||
this.showDialog = false
|
||||
},
|
||||
// 保存并关闭
|
||||
save() {
|
||||
this._zwConfirmIn()
|
||||
this.showDialog = false
|
||||
},
|
||||
handleSubmit () {
|
||||
if (!this.checkedArr.length) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
this.showDialog = true
|
||||
},
|
||||
// async _getPlate () {
|
||||
// try {
|
||||
// let res = await getPlate(this.val1)
|
||||
@@ -182,20 +224,17 @@
|
||||
async _zwConfirmIn () {
|
||||
this.disabled = true
|
||||
this.checkedArr = this.dataList.filter(el => el.checked === true)
|
||||
if (!this.checkedArr.length) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
// 去掉checked字段再上传
|
||||
this.checkedArr.forEach(item => delete item.checked);
|
||||
let res = await zwConfirmIn(this.checkedArr)
|
||||
let res = await zwConfirmIn(this.checkedArr, this.selectType)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
this.clearUp()
|
||||
this._getInBillList()
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
@@ -217,5 +256,98 @@
|
||||
// background-color: transparent;
|
||||
// color: #fff;
|
||||
}
|
||||
/* 弹窗：居中 + 无遮罩 */
|
||||
.dialog {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 90%;
|
||||
max-width: 600rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
z-index: 100;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 转运类型行 */
|
||||
.form-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 40rpx;
|
||||
padding-top: 50rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 30rpx;
|
||||
width: 150rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* 单选组：横排 + 不换行 */
|
||||
.radio-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.radio-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 50rpx;
|
||||
}
|
||||
|
||||
/* 单选圆圈 */
|
||||
.circle {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
border: 2rpx solid #ccc;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
.dot {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
background: #007aff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.radio-item.active .circle {
|
||||
border-color: #007aff;
|
||||
}
|
||||
|
||||
.text {
|
||||
font-size: 30rpx;
|
||||
white-space: nowrap; /* 强制不换行 */
|
||||
}
|
||||
|
||||
/* 底部按钮 */
|
||||
.btn-group {
|
||||
display: flex;
|
||||
border-top: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
.btn {
|
||||
flex: 1;
|
||||
height: 90rpx;
|
||||
line-height: 90rpx;
|
||||
font-size: 30rpx;
|
||||
border: none;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.cancel {
|
||||
border-right: 1rpx solid #eee;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.save {
|
||||
color: #007aff;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -149,9 +149,9 @@ export const getOrderList = (pcode, flag) => request({
|
||||
data: {point_code: pcode, flag: flag}
|
||||
})
|
||||
// 开工
|
||||
export const callMaterial = (wid, pcode, area) => request({
|
||||
export const callMaterial = (wid, pcode, area, type) => request({
|
||||
url:'api/pda/jb/callMaterial',
|
||||
data: {workorder_id: wid, point_code: pcode, area: area}
|
||||
data: {workorder_id: wid, point_code: pcode, area: area, type: type}
|
||||
})
|
||||
// 上料完成
|
||||
export const callMaterialFinish = (wid, pcode, area) => request({
|
||||
@@ -166,9 +166,14 @@ export const getWeight = (pcode, wid) => request({
|
||||
data: {point_code: pcode, workorder_id: wid}
|
||||
})
|
||||
// 下料
|
||||
export const downMaterial = (wid, area, weight, pcode, tcode, lcode, type) => request({
|
||||
export const downMaterial = (wid, area, weight, pcode, tcode, lcode, type, scode, sname) => request({
|
||||
url:'api/pda/jb/downMaterial',
|
||||
data: {workorder_id: wid, area: area, weight: weight, point_code: pcode, tp_code: tcode, lt_code: lcode, type: type}
|
||||
data: {workorder_id: wid, area: area, weight: weight, point_code: pcode, tp_code: tcode, lt_code: lcode, type: type, struct_code: scode, struct_name: sname}
|
||||
})
|
||||
// 库位信息下拉框，获取库位列表
|
||||
export const structListByWorkId = (wid) => request({
|
||||
url:'api/pda/schPoint/structListByWorkId',
|
||||
data: {workorder_id: wid}
|
||||
})
|
||||
// 获取解包点位的托盘编码
|
||||
export const jbGetVehicleCode = (pcode) => request({
|
||||
@@ -200,9 +205,9 @@ export const jbEmptyTakeOut = (pcode) => request({
|
||||
|
||||
// 解包退料
|
||||
// 解包退料
|
||||
export const jbReturnMaterial = (area, pcode, tpcode, wid) => request({
|
||||
export const jbReturnMaterial = (area, pcode, tpcode, wid, type) => request({
|
||||
url:'api/pda/jb/jbReturnMaterial',
|
||||
data: {area: area, point_code: pcode, tp_code: tpcode, workorder_id: wid}
|
||||
data: {area: area, point_code: pcode, tp_code: tpcode, workorder_id: wid, type: type}
|
||||
})
|
||||
|
||||
// 人车安全
|
||||
@@ -224,9 +229,9 @@ export const getAllIntoRegionMembers = (rcode) => request({
|
||||
|
||||
// 来料入库
|
||||
// 来料入库接口
|
||||
export const zwConfirmIn = (plist) => request({
|
||||
export const zwConfirmIn = (plist, type) => request({
|
||||
url:'api/pda/iosIn/zwConfirmIn',
|
||||
data: {param_list: plist}
|
||||
data: {param_list: plist, type: type}
|
||||
})
|
||||
// 获取单据下拉清单
|
||||
export const getFormDataList = (date) => request({
|
||||
|
||||
Reference in New Issue
Block a user