This commit is contained in:
2026-01-08 10:56:44 +08:00
parent e733b759fe
commit afc569e771
17 changed files with 569 additions and 459 deletions

View File

@@ -82,17 +82,20 @@
</view>
<view class="zd-row submit-bar">
<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">组袋并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">确认组袋</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="toZdPrint">组袋并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_confirmBagAssembly">确认组袋</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
</view>
</view>
</template>
<script>
import {getCLodop} from '@/utils/CLodopfuncs.js'
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {packConfirmReturn} from '@/utils/getData3.js'
import {getDate} from '@/utils/utils.js'
const currentDate = getDate({format: true})
import {confirmBagAssembly} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -102,6 +105,7 @@
return {
title: '',
val1: '',
date: currentDate,
materialData: {},
suppData: {},
num: '',
@@ -125,6 +129,12 @@
}
},
methods: {
handlePrintConfirm() {
// 处理打印逻辑
let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
this.showCustomDialog = false
this.toPrint(data)
},
toJump (name) {
uni.navigateTo({
url: `/pages/hdyy/wbc/${name}`
@@ -141,14 +151,17 @@
this.disabled = false
this.disabled1 = false
},
async _packConfirmReturn () {
toZdPrint () {
this._confirmBagAssembly()
},
async _confirmBagAssembly () {
this.disabled = true
if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
if (!this.val1 || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
this.disabled = false
return
}
try {
let res = await packConfirmReturn(this.val1, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.num, this.mark)
let res = await confirmBagAssembly(this.val1, this.materialData.material_id, this.suppData.supp_code, this.num, this.pcsn)
if (res) {
uni.showToast({
title: res.message,
@@ -160,6 +173,80 @@
} catch (e) {
this.disabled = false
}
},
// async _printDelete (data) {
// try {
// let res = await printDelete(data)
// if (res) {
// // console.log('success')
// }
// } catch (e) {
// // console.log('error')
// }
// },
labelPrint () {
this.disabled1 = true
if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
this.disabled1 = false
return
}
// this.showCustomDialog = true
let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
this.toPrint(data)
},
toPrint (data) {
let iparr = this.$store.getters.printUrl.split(":")
let printUrl = iparr[1].slice(2)
let LODOP = getCLodop();
if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
uni.showToast({
title: '当前配置ip' + printUrl + '网络不通,请检查',
icon: 'none',
duration: 5000
})
this.disabled1 = false
return
}
// 按次打印
for (let i = 0; i < this.printCount; i++) {
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
LODOP.SET_LICENSES('浙江省烟草专卖局(公司)', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
// 更换为打印服务器ip 不需要加前缀
LODOP.PRINT_INIT(null, printUrl);
// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
LODOP.SET_PRINTER_INDEX(-1);
// 设置打印纸大小
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 8)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
)
LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码:' + data.material_code)
LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称:' + data.material_name)
LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格:' + data.material_spec)
LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号:' + data.material_model)
LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)' + data.quality_time)
LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期:' + data.produce_time)
LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商:' + data.supp_name)
LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数:' + data.bake_num)
LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号:' + data.pcsn)
LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准:' + data.execution_stand)
LODOP.PRINT();
// LODOP.PREVIEW()
}
// 烘干出库且需要删除的 调用删除接口
if (data.out_type === '1004' && data.is_need_delete === '1') {
// this.printDelete(data)
}
uni.showToast({
title: '操作成功',
icon: 'none'
})
this.disabled1 = false
}
}
}

View File

@@ -38,14 +38,14 @@
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{i+1}}</td>
<td>{{e.code}}</td>
<td>{{e.bag_code}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.leibie}}</td>
<td>{{e.class_name}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.qty}}</td>
<td>{{e.unit}}</td>
<td>{{e.gys}}</td>
<td>{{e.qty_unit_name}}</td>
<td>{{e.supp_name}}</td>
</tr>
</tbody>
</table>
@@ -54,7 +54,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认组盘</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_confirmPalletAssembly">确认组盘</button>
</view>
</view>
</template>
@@ -62,7 +62,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
import {getBagAssembly, confirmPalletAssembly} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -71,8 +71,6 @@
data() {
return {
title: '',
options: [],
index: '',
val1: '',
dataList: [],
// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -81,7 +79,6 @@
},
onLoad (options) {
this.title = options.title
this._queryPointInDownload()
},
methods: {
toScanAdd () {
@@ -156,24 +153,9 @@
this.dataList = []
this.disabled = false
},
async _queryPointInDownload () {
async _getBagAssembly () {
try {
let res = await queryPointInDownload()
if (res) {
this.options = res.data
} else {
this.options = []
}
} catch (e) {
this.options = []
}
},
selectChange (e) {
this.index = e
},
async _queryPointInDtl () {
try {
let res = await queryPointInDtl(this.val1)
let res = await getBagAssembly(this.val1)
if (res && res.data.length > 0) {
this.dataList = [...res.data]
} else {
@@ -183,14 +165,14 @@
this.dataList = []
}
},
async _packInConfirm () {
async _confirmPalletAssembly () {
this.disabled = true
if (!this.val1 || !this.index || !this.dataList.length) {
if (!this.val1 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await packInConfirm(this.val1, this.index, this.dataList)
let res = await confirmPalletAssembly(this.val1, this.dataList)
if (res) {
uni.showToast({
title: res.message,

View File

@@ -17,7 +17,7 @@
<span class="filter_label">桶自重</span>
</view>
<view class="zd-col-16">
<NumberInput v-model="qty" />
<NumberInput v-model="weight" />
</view>
<view class="zd-col-2"><span class="filter_unit">KG</span></view>
</view>
@@ -74,18 +74,21 @@
</view>
<view class="zd-row submit-bar">
<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">组桶并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_packConfirmReturn">确认组桶</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZtPrint">组桶并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_confirmBucketAssembly">确认组桶</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !num || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
</view>
</view>
</template>
<script>
import {getCLodop} from '@/utils/CLodopfuncs.js'
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
import {packConfirmReturn} from '@/utils/getData3.js'
import {getDate} from '@/utils/utils.js'
const currentDate = getDate({format: true})
import {confirmBucketAssembly} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -96,9 +99,10 @@
return {
title: '',
val1: '',
date: currentDate,
materialData: {},
qty: '',
num: '',
weight: '',
num: null,
unit: 'KG',
disabled: false,
disabled1: false,
@@ -115,6 +119,12 @@
}
},
methods: {
handlePrintConfirm() {
// 处理打印逻辑
let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
this.showCustomDialog = false
this.toPrint(data)
},
toJump (name) {
uni.navigateTo({
url: `/pages/hdyy/wbc/${name}`
@@ -125,19 +135,22 @@
this.index1 = ''
this.materialData = {}
this.pcsn = ''
this.num = ''
this.num = null
this.unit = 'KG'
this.disabled = false
this.disabled1 = false
},
async _packConfirmReturn () {
toZtPrint () {
this._confirmBucketAssembly()
},
async _confirmBucketAssembly () {
this.disabled = true
if (!this.val1 || JSON.stringify(this.materialData) === '{}') {
if (!this.val1 || !this.weight || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}') {
this.disabled = false
return
}
try {
let res = await packConfirmReturn(this.val1, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.pcsn, this.num, this.mark)
let res = await confirmBucketAssembly(this.val1, this.weight, this.num, this.pcsn, this.materialData.material_id)
if (res) {
uni.showToast({
title: res.message,
@@ -149,6 +162,80 @@
} catch (e) {
this.disabled = false
}
},
// async _printDelete (data) {
// try {
// let res = await printDelete(data)
// if (res) {
// // console.log('success')
// }
// } catch (e) {
// // console.log('error')
// }
// },
labelPrint () {
this.disabled1 = true
if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
this.disabled1 = false
return
}
// this.showCustomDialog = true
let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
this.toPrint(data)
},
toPrint (data) {
let iparr = this.$store.getters.printUrl.split(":")
let printUrl = iparr[1].slice(2)
let LODOP = getCLodop();
if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
uni.showToast({
title: '当前配置ip' + printUrl + '网络不通,请检查',
icon: 'none',
duration: 5000
})
this.disabled1 = false
return
}
// 按次打印
for (let i = 0; i < this.printCount; i++) {
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
LODOP.SET_LICENSES('浙江省烟草专卖局(公司)', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
// 更换为打印服务器ip 不需要加前缀
LODOP.PRINT_INIT(null, printUrl);
// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
LODOP.SET_PRINTER_INDEX(-1);
// 设置打印纸大小
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 8)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
)
LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码:' + data.material_code)
LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称:' + data.material_name)
LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格:' + data.material_spec)
LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号:' + data.material_model)
LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)' + data.quality_time)
LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期:' + data.produce_time)
LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商:' + data.supp_name)
LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数:' + data.bake_num)
LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号:' + data.pcsn)
LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准:' + data.execution_stand)
LODOP.PRINT();
// LODOP.PREVIEW()
}
// 烘干出库且需要删除的 调用删除接口
if (data.out_type === '1004' && data.is_need_delete === '1') {
// this.printDelete(data)
}
uni.showToast({
title: '操作成功',
icon: 'none'
})
this.disabled1 = false
}
}
}