|
@@ -49,7 +49,7 @@
|
|
|
<view class="item ww10">序号</view>
|
|
<view class="item ww10">序号</view>
|
|
|
<view class="item ww30">数量</view>
|
|
<view class="item ww30">数量</view>
|
|
|
<view class="item ww50">条码</view>
|
|
<view class="item ww50">条码</view>
|
|
|
- <view class="item ww10"></view>
|
|
|
|
|
|
|
+ <view class="item ww10 jsColor" @click="calculation()">计算</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
|
<view class="table">
|
|
<view class="table">
|
|
@@ -176,17 +176,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ </view>
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ <SearchPopup mode="center" v-if='show'>
|
|
|
|
|
+ <template v-slot:list>
|
|
|
|
|
+ <view class="search_list">
|
|
|
|
|
|
|
|
- </view>
|
|
|
|
|
|
|
+ <u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
|
|
|
|
|
|
|
|
|
|
+ <u-form-item label="外包装数:" class="required-form" borderBottom prop="assetType">
|
|
|
|
|
+ <input class="uni-input" v-model="formData.wPackNum" style="width: 280rpx;" placeholder="外包装数"></input> / {{splitList[0].unit}}
|
|
|
|
|
+ </u-form-item>
|
|
|
|
|
+
|
|
|
|
|
+ </u-form>
|
|
|
|
|
+
|
|
|
|
|
+ </view>
|
|
|
|
|
+ </template>
|
|
|
|
|
|
|
|
|
|
+ <template v-slot:operate>
|
|
|
|
|
+ <view class="operate_box rx-bc">
|
|
|
|
|
+ <u-button size="small" class="u-reset-button" @click="calculationClose()">
|
|
|
|
|
+ 取消
|
|
|
|
|
+ </u-button>
|
|
|
|
|
|
|
|
|
|
+ <u-button type="success" size="small" class="u-reset-button" @click="calculationReset()">
|
|
|
|
|
+ 重置
|
|
|
|
|
+ </u-button>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ <u-button type="success" size="small" class="u-reset-button" @click="calculationSave()">
|
|
|
|
|
+ 确定
|
|
|
|
|
+ </u-button>
|
|
|
|
|
+
|
|
|
|
|
+ </view>
|
|
|
|
|
+ </template>
|
|
|
|
|
+
|
|
|
|
|
+ </SearchPopup>
|
|
|
|
|
+
|
|
|
</view>
|
|
</view>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -201,7 +231,11 @@
|
|
|
packingReportRepeat,
|
|
packingReportRepeat,
|
|
|
getPackingReportRepeat
|
|
getPackingReportRepeat
|
|
|
} from '@/api/pda/workOrder.js'
|
|
} from '@/api/pda/workOrder.js'
|
|
|
|
|
+ import SearchPopup from '../../components/searchPopup.vue'
|
|
|
export default {
|
|
export default {
|
|
|
|
|
+ components: {
|
|
|
|
|
+ SearchPopup
|
|
|
|
|
+ },
|
|
|
props: {
|
|
props: {
|
|
|
objData: {
|
|
objData: {
|
|
|
type: Object,
|
|
type: Object,
|
|
@@ -235,7 +269,14 @@
|
|
|
temporaryNum: 0,
|
|
temporaryNum: 0,
|
|
|
temporaryCount: 0,
|
|
temporaryCount: 0,
|
|
|
temporaryList: [],
|
|
temporaryList: [],
|
|
|
- packTwoList: []
|
|
|
|
|
|
|
+ packTwoList: [],
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ show: false,
|
|
|
|
|
+ formData: {
|
|
|
|
|
+ wPackNum: null,
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -456,6 +497,44 @@
|
|
|
}
|
|
}
|
|
|
return packInfo
|
|
return packInfo
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
|
|
+ calculation() {
|
|
|
|
|
+ this.show = true
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ calculationSave() {
|
|
|
|
|
+ let count = this.splitList.filter(item => item.check != 1).length;
|
|
|
|
|
+
|
|
|
|
|
+ if (this.formData.wPackNum <= count) {
|
|
|
|
|
+ for (let i = 0; i < this.formData.wPackNum; i++) {
|
|
|
|
|
+ this.splitList[i].check = 1
|
|
|
|
|
+ }
|
|
|
|
|
+ this.handleCheck(0, 0)
|
|
|
|
|
+ this.calculationClose()
|
|
|
|
|
+
|
|
|
|
|
+ } else {
|
|
|
|
|
+ uni.showToast({
|
|
|
|
|
+ icon: 'none',
|
|
|
|
|
+ title: '外包装数超出内包装条数'
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ calculationClose() {
|
|
|
|
|
+ this.show = false
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ calculationReset() {
|
|
|
|
|
+
|
|
|
|
|
+ this.formData.wPackNum = null
|
|
|
|
|
+ this.splitList.forEach(f => {
|
|
|
|
|
+ f.check = null
|
|
|
|
|
+ })
|
|
|
|
|
+ this.temporaryList = []
|
|
|
|
|
+ this.show = false
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
}
|
|
}
|
|
|
</script>
|
|
</script>
|
|
@@ -617,6 +696,11 @@
|
|
|
width: 30%;
|
|
width: 30%;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ .jsColor {
|
|
|
|
|
+ color: $theme-color;
|
|
|
|
|
+ font-size: 20rpx;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.head {
|
|
.head {
|
|
@@ -693,4 +777,22 @@
|
|
|
.z_list {
|
|
.z_list {
|
|
|
max-height: 500rpx;
|
|
max-height: 500rpx;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ .search_list {
|
|
|
|
|
+ min-height: 100rpx;
|
|
|
|
|
+ width: 80vw;
|
|
|
|
|
+
|
|
|
|
|
+ /deep/ .baseForm {
|
|
|
|
|
+ padding: 0 20rpx;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ .operate_box {
|
|
|
|
|
+ padding: 10rpx 32rpx;
|
|
|
|
|
+
|
|
|
|
|
+ /deep/ .u-button {
|
|
|
|
|
+ width: 30%;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
</style>
|
|
</style>
|