This commit is contained in:
2026-02-01 17:44:22 +08:00
parent b8edf4b1a0
commit 5905ee63df
29 changed files with 192 additions and 174 deletions

View File

@@ -41,19 +41,26 @@
</view>
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label">供应商编</span>
<span class="filter_label filter_input_disabled">质量代</span>
</view>
<view class="zd-col-13">
<search-box v-model="suppData.supp_code"/>
<view class="zd-col-18">
<input type="text" v-model="materialData.quality_code" class="filter_input filter_input_disabled" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label filter_input_disabled">供应商编码</span>
</view>
<view class="zd-col-18">
<input type="text" v-model="materialData.supp_name" class="filter_input filter_input_disabled" disabled>
</view>
<button class="mini-btn" type="primary" @tap="toJump2('supplier?title=供应商维护')">查询</button>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label filter_input_disabled">供应商名称</span>
</view>
<view class="zd-col-18">
<input type="text" v-model="suppData.supp_name" class="filter_input filter_input_disabled" disabled>
<input type="text" v-model="materialData.supp_name" class="filter_input filter_input_disabled" disabled>
</view>
</view>
<view class="zd-row border-bottom">
@@ -84,9 +91,9 @@
</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 || !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>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZdPrint">组袋并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_confirmBagAssembly">确认组袋</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !pcsn || !num || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
</view>
</view>
</template>
@@ -110,7 +117,6 @@
recordNo: '',
date: currentDate,
materialData: {},
suppData: {},
num: '',
unit: 'KG',
disabled: false,
@@ -127,10 +133,6 @@
this.materialData = this.$store.getters.publicObj
this.$store.dispatch('setPublicObj', '')
}
if (this.$store.getters.formData !== '') {
this.suppData = this.$store.getters.formData
this.$store.dispatch('setFormData', '')
}
},
methods: {
async _queryRecordNo () {
@@ -156,16 +158,10 @@
url: `/pages/hdyy/wbc/${name}`
})
},
toJump2 (name) {
uni.navigateTo({
url: `/pages/hdyy/tygn/${name}`
})
},
toEmpty () {
this.val1 = ''
this.index1 = ''
this.materialData = {}
this.suppData = {}
this.pcsn = ''
this.num = ''
this.unit = 'KG'
@@ -178,12 +174,12 @@
},
async _confirmBagAssembly () {
this.disabled = true
if (!this.val1 || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
if (!this.val1 || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}') {
this.disabled = false
return
}
try {
let res = await confirmBagAssembly(this.val1, this.materialData.material_id, this.suppData.supp_code, this.num, this.pcsn)
let res = await confirmBagAssembly(this.val1, this.materialData.material_id, this.materialData.supp_code, this.num, this.pcsn)
if (res) {
uni.showToast({
title: res.message,
@@ -208,11 +204,11 @@
// },
labelPrint () {
this.disabled1 = true
if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
if (!this.val1 || JSON.stringify(this.materialData) === '{}') {
this.disabled1 = false
return
}
let row = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bag_code: this.val1})
let row = Object.assign({}, this.materialData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bag_code: this.val1})
const class_code = row.class_code
if (class_code === 'YL001' || class_code === 'FL001' || class_code === 'NBC001') {
// 原料、辅料、内包材

View File

@@ -56,10 +56,10 @@
</view>
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label">数量</span>
<span class="filter_label filter_input_disabled">数量</span>
</view>
<view class="zd-col-18">
<input type="number" v-model="num" class="filter_input">
<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
</view>
</view>
<view class="zd-row border-bottom">
@@ -74,9 +74,9 @@
</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 || !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>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="toZtPrint">组桶并打印</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled" @tap="_confirmBucketAssembly">确认组桶</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !weight || !pcsn || JSON.stringify(materialData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
</view>
</view>
</template>
@@ -151,7 +151,7 @@
},
async _confirmBucketAssembly () {
this.disabled = true
if (!this.val1 || !this.weight || !this.num || !this.pcsn || JSON.stringify(this.materialData) === '{}') {
if (!this.val1 || !this.weight || !this.pcsn || JSON.stringify(this.materialData) === '{}') {
this.disabled = false
return
}