From 5905ee63df667d09fffe67dac7f899ff9e3287ed Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Sun, 1 Feb 2026 17:44:22 +0800
Subject: [PATCH] change

---
 pages/hdyy/ccgl/kn-hepan.vue      |   4 --
 pages/hdyy/ccgl/sh-instore.vue    |   4 --
 pages/hdyy/ccgl/zj-instore.vue    |   4 --
 pages/hdyy/ccgl/zj-outstore.vue   |   4 --
 pages/hdyy/scgl/by-callmater.vue  |   6 +-
 pages/hdyy/scgl/by-xialiao.vue    |  10 +--
 pages/hdyy/scgl/cm-xialiao.vue    |   4 --
 pages/hdyy/scgl/cp-chuliao.vue    |   4 --
 pages/hdyy/scgl/cz-callmater.vue  |   4 --
 pages/hdyy/scgl/fs-callmater.vue  |   4 --
 pages/hdyy/scgl/fs-xialiao.vue    |  75 ++++++++++++++--------
 pages/hdyy/scgl/lt-callmater.vue  |   4 --
 pages/hdyy/scgl/lt-weight.vue     |   4 --
 pages/hdyy/scgl/nbz-callmater.vue |   4 --
 pages/hdyy/scgl/point-quhuo.vue   |   4 --
 pages/hdyy/scgl/py-callmater.vue  |   4 --
 pages/hdyy/scgl/sc-chuliao.vue    |   4 --
 pages/hdyy/scgl/sl-huiku.vue      |   4 --
 pages/hdyy/scgl/tp-callmater.vue  |   4 --
 pages/hdyy/scgl/yjg-chuliao.vue   |   4 --
 pages/hdyy/scgl/yp-xialiao.vue    |  16 ++---
 pages/hdyy/scgl/zl-callmater.vue  |   4 --
 pages/hdyy/tygn/kc-query.vue      | 103 ++++++++++++++++++++++++++++--
 pages/hdyy/tygn/mater-save.vue    |   4 --
 pages/hdyy/wbc/material.vue       |  10 ++-
 pages/hdyy/wrcdj/wrc-load.vue     |   8 +--
 pages/hdyy/wrcdj/wrc-unload.vue   |   8 +--
 pages/hdyy/zpgl/mater-zudai.vue   |  42 ++++++------
 pages/hdyy/zpgl/mater-zutong.vue  |  12 ++--
 29 files changed, 192 insertions(+), 174 deletions(-)

diff --git a/pages/hdyy/ccgl/kn-hepan.vue b/pages/hdyy/ccgl/kn-hepan.vue
index 979c25b..fdb970e 100644
--- a/pages/hdyy/ccgl/kn-hepan.vue
+++ b/pages/hdyy/ccgl/kn-hepan.vue
@@ -63,8 +63,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 							</tr>
 						</thead>
@@ -79,8 +77,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/ccgl/sh-instore.vue b/pages/hdyy/ccgl/sh-instore.vue
index e31f213..e1bdec7 100644
--- a/pages/hdyy/ccgl/sh-instore.vue
+++ b/pages/hdyy/ccgl/sh-instore.vue
@@ -48,8 +48,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -63,8 +61,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/ccgl/zj-instore.vue b/pages/hdyy/ccgl/zj-instore.vue
index 3adc703..330e36b 100644
--- a/pages/hdyy/ccgl/zj-instore.vue
+++ b/pages/hdyy/ccgl/zj-instore.vue
@@ -51,8 +51,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -66,8 +64,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.material_type_id}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/ccgl/zj-outstore.vue b/pages/hdyy/ccgl/zj-outstore.vue
index b65a5ca..91959f0 100644
--- a/pages/hdyy/ccgl/zj-outstore.vue
+++ b/pages/hdyy/ccgl/zj-outstore.vue
@@ -41,8 +41,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 							</tr>
 						</thead>
@@ -57,8 +55,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.material_type_id}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/by-callmater.vue b/pages/hdyy/scgl/by-callmater.vue
index a246e2c..063f96b 100644
--- a/pages/hdyy/scgl/by-callmater.vue
+++ b/pages/hdyy/scgl/by-callmater.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 料桶叫料 -->
+		<!-- 包衣叫料 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -50,8 +50,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -67,8 +65,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/by-xialiao.vue b/pages/hdyy/scgl/by-xialiao.vue
index e9c79ea..b3e9683 100644
--- a/pages/hdyy/scgl/by-xialiao.vue
+++ b/pages/hdyy/scgl/by-xialiao.vue
@@ -40,7 +40,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>袋号</th>
+								<th>桶号</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>批号</th>
@@ -48,8 +48,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -57,7 +55,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.bag_code}}</td>
+								<td>{{e.bucket_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
@@ -77,7 +73,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">确认出料</button>
 			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
 		</view>
 	</view>
diff --git a/pages/hdyy/scgl/cm-xialiao.vue b/pages/hdyy/scgl/cm-xialiao.vue
index 9c0cc31..9cd7d38 100644
--- a/pages/hdyy/scgl/cm-xialiao.vue
+++ b/pages/hdyy/scgl/cm-xialiao.vue
@@ -48,8 +48,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
diff --git a/pages/hdyy/scgl/cp-chuliao.vue b/pages/hdyy/scgl/cp-chuliao.vue
index 701288b..94e5184 100644
--- a/pages/hdyy/scgl/cp-chuliao.vue
+++ b/pages/hdyy/scgl/cp-chuliao.vue
@@ -37,8 +37,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -54,8 +52,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
diff --git a/pages/hdyy/scgl/cz-callmater.vue b/pages/hdyy/scgl/cz-callmater.vue
index e46aae1..9b37f40 100644
--- a/pages/hdyy/scgl/cz-callmater.vue
+++ b/pages/hdyy/scgl/cz-callmater.vue
@@ -49,8 +49,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/fs-callmater.vue b/pages/hdyy/scgl/fs-callmater.vue
index a81e216..760287e 100644
--- a/pages/hdyy/scgl/fs-callmater.vue
+++ b/pages/hdyy/scgl/fs-callmater.vue
@@ -49,8 +49,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/fs-xialiao.vue b/pages/hdyy/scgl/fs-xialiao.vue
index 5d94887..39efd15 100644
--- a/pages/hdyy/scgl/fs-xialiao.vue
+++ b/pages/hdyy/scgl/fs-xialiao.vue
@@ -4,16 +4,6 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">当前点位</span>
-					</view>
-					<view class="zd-col-24 filter_select">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">载具</span>
@@ -33,6 +23,24 @@
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">目的区域</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -48,9 +56,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
-								<th>点位</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,9 +70,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
-								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
@@ -76,8 +78,8 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_preProcessingDown">出料</button>
 		</view>
 	</view>
 </template>
@@ -85,7 +87,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	import {queryPointInDownload, getGroupInfo, preProcessingDown} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -94,6 +96,13 @@
 		data() {
 			return {
 				title: '',
+				options: [
+					{text: '物料室原料区', value: 'WYL01'},
+					{text: '批料室主存区', value: 'PZC01'},
+					{text: '粉碎室1区', value: 'FSSQ01'},
+					{text: '粉碎室2区', value: 'FSSQ02'}
+				],
+				index: '',
 				val1: '',
 				val2: '',
 				num: null,
@@ -103,26 +112,40 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			// this._queryPointInDownload()
 		},
 		methods: {
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
-				this.num = null
+				this.index = ''
+				this.num = ''
 				this.dataList = []
 				this.disabled = false
 			},
+			async _queryPointInDownload () {
+				try {
+					let res = await queryPointInDownload()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options = []
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
 			selectChange (e) {
 				this.index = e
 			},
 			handleChange (e) {
 				if (e) {
-					this._getGroupBucketInfo()
+					this._getGroupInfo()
 				}
 			},
-			async _getGroupBucketInfo () {
+			async _getGroupInfo () {
 				try {
-					let res = await getGroupBucketInfo(this.val1)
+					let res = await getGroupInfo(this.val1)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
@@ -133,14 +156,14 @@
 					this.dataList = []
 				}
 			},
-			async _productionLine (type) {
+			async _preProcessingDown () {
 				this.disabled = true
-				if (!this.val1 || !this.val2) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await productionLine(this.val1, this.val2, type)
+					let res = await preProcessingDown(this.val1, this.val2, this.index)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/hdyy/scgl/lt-callmater.vue b/pages/hdyy/scgl/lt-callmater.vue
index a246e2c..8844f6f 100644
--- a/pages/hdyy/scgl/lt-callmater.vue
+++ b/pages/hdyy/scgl/lt-callmater.vue
@@ -50,8 +50,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -67,8 +65,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/lt-weight.vue b/pages/hdyy/scgl/lt-weight.vue
index ea644ec..a6c37ca 100644
--- a/pages/hdyy/scgl/lt-weight.vue
+++ b/pages/hdyy/scgl/lt-weight.vue
@@ -54,8 +54,6 @@
 								<th>物料名称</th>
 								<th>批号</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>目的点位</th>
 							</tr>
 						</thead>
@@ -69,8 +67,6 @@
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td><input type="text" class="sin_input" v-model="e.station"></td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/nbz-callmater.vue b/pages/hdyy/scgl/nbz-callmater.vue
index ea10c86..84f3eff 100644
--- a/pages/hdyy/scgl/nbz-callmater.vue
+++ b/pages/hdyy/scgl/nbz-callmater.vue
@@ -50,8 +50,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -67,8 +65,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/point-quhuo.vue b/pages/hdyy/scgl/point-quhuo.vue
index 40c7d19..95a654b 100644
--- a/pages/hdyy/scgl/point-quhuo.vue
+++ b/pages/hdyy/scgl/point-quhuo.vue
@@ -51,8 +51,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -68,8 +66,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
diff --git a/pages/hdyy/scgl/py-callmater.vue b/pages/hdyy/scgl/py-callmater.vue
index d89d020..680cdc3 100644
--- a/pages/hdyy/scgl/py-callmater.vue
+++ b/pages/hdyy/scgl/py-callmater.vue
@@ -49,8 +49,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/sc-chuliao.vue b/pages/hdyy/scgl/sc-chuliao.vue
index 4c7be48..85a64af 100644
--- a/pages/hdyy/scgl/sc-chuliao.vue
+++ b/pages/hdyy/scgl/sc-chuliao.vue
@@ -48,8 +48,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
diff --git a/pages/hdyy/scgl/sl-huiku.vue b/pages/hdyy/scgl/sl-huiku.vue
index c0020ff..96672f9 100644
--- a/pages/hdyy/scgl/sl-huiku.vue
+++ b/pages/hdyy/scgl/sl-huiku.vue
@@ -38,8 +38,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>点位</th>
 								<th>载具</th>
 							</tr>
@@ -55,8 +53,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
diff --git a/pages/hdyy/scgl/tp-callmater.vue b/pages/hdyy/scgl/tp-callmater.vue
index 3634a46..120573d 100644
--- a/pages/hdyy/scgl/tp-callmater.vue
+++ b/pages/hdyy/scgl/tp-callmater.vue
@@ -49,8 +49,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/yjg-chuliao.vue b/pages/hdyy/scgl/yjg-chuliao.vue
index b26fa7d..d36c0c6 100644
--- a/pages/hdyy/scgl/yjg-chuliao.vue
+++ b/pages/hdyy/scgl/yjg-chuliao.vue
@@ -56,8 +56,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -72,8 +70,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/scgl/yp-xialiao.vue b/pages/hdyy/scgl/yp-xialiao.vue
index 806cad3..71eaefc 100644
--- a/pages/hdyy/scgl/yp-xialiao.vue
+++ b/pages/hdyy/scgl/yp-xialiao.vue
@@ -40,34 +40,26 @@
 						<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>
-								<th>点位</th>
 								<th>载具</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.bag_code}}</td>
+								<td>{{e.bucket_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.qty}}</td>
 								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
-								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
@@ -77,8 +69,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+			<button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">出料</button>
+			<!-- <button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button> -->
 		</view>
 	</view>
 </template>
diff --git a/pages/hdyy/scgl/zl-callmater.vue b/pages/hdyy/scgl/zl-callmater.vue
index 4541187..19a5f10 100644
--- a/pages/hdyy/scgl/zl-callmater.vue
+++ b/pages/hdyy/scgl/zl-callmater.vue
@@ -49,8 +49,6 @@
 								<th>单位</th>
 								<th>供应商</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -65,8 +63,6 @@
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
diff --git a/pages/hdyy/tygn/kc-query.vue b/pages/hdyy/tygn/kc-query.vue
index ad8bddf..0b73425 100644
--- a/pages/hdyy/tygn/kc-query.vue
+++ b/pages/hdyy/tygn/kc-query.vue
@@ -53,8 +53,6 @@
 								<th>数量</th>
 								<th>单位</th>
 								<th>类别</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>入库时间</th>
 								<th>载具</th>
 							</tr>
@@ -69,8 +67,6 @@
 								<td>{{e.canuse_qty}}</td>
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.insert_time}}</td>
 								<td>{{e.storagevehicle_code}}</td>
 							</tr>
@@ -79,6 +75,10 @@
 				</view>
 			</view>
 		</view>
+		<view class="zd-row submit-bar" v-if="index1 === 'ZZC01'">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-22 button-primary" :class="{'button-info': !val1 ||  !pcsn  || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="labelPrint">打印</button>
+		</view>
 	</view>
 </template>
 
@@ -100,7 +100,9 @@
 				index1: 'WYL01',
 				val1: '',
 				val2: '',
-				dataList: []
+				num: null,
+				dataList: [],
+				disabled: false
 			};
 		},
 		onLoad (options) {
@@ -138,6 +140,97 @@
 				} catch (e) {
 					this.dataList = []
 				}
+			},
+			labelPrint () {
+				this.disabled1 = true
+				if (!this.val1 || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bucket_code: this.val1, bucket_weight: this.weight})
+				this.toPrint(data)
+			},
+			toPrint (row) {
+				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
+				}
+				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+				// 打印纸张大小设置https://www.it610.com/article/2094844.html
+				LODOP.PRINT_INIT('')
+				LODOP.SET_PRINT_PAGESIZE(1, '94mm', '119mm', '')
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '92mm', '117mm', 0, 1)
+				LODOP.ADD_PRINT_TEXT('2.88mm', '35.4mm', '32.65mm', '5.95mm', '中 美 华 东 制 药')
+				LODOP.ADD_PRINT_TEXT('6.56mm', '22.33mm', '62.02mm', '5.69mm', 'Zhongmei Huadong Pharmaceutical')
+				LODOP.ADD_PRINT_TEXT('10.45mm', '13.86mm', '98mm', '7.01mm', '周 转 物 料 卡 Turnover Material Card')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 11)
+				LODOP.ADD_PRINT_TEXT('15.48mm', '5.13mm', '93.24mm', '5.69mm', '依据《状态标识牌的有关规定》（QA-SMP-B005）制定此记录')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('19.45mm', '5.13mm', '128.69mm', '7.01mm', 'Establish this record according to “SMP for status signboard”')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('22.89mm', '5.13mm', '27.62mm', '4.37mm', '(QA-SMP-B005)')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('26.86mm', '5.13mm', '66.78mm', '4.37mm', '记录编号 Record No.: ' + this.recordNo + '')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '_' + row.material_code)
+				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ' + row.bucket_code + '')
+				LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ' + row.bucket_weight + '')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '4.47mm', '41.65mm', '5.69mm', '净 重 Net Weight: ')
+				LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '操 作 日 期 Operation Date: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '有 效 期 至 Expiry Date: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('69.22mm', '5mm', '22.07mm', '5.69mm', '用 于 产 品')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('73.71mm', '5mm', '11.22mm', '5.69mm', 'Used')
+				LODOP.ADD_PRINT_TEXT('73.71mm', '17.44mm', '8.57mm', '5.69mm', 'in')
+				LODOP.ADD_PRINT_TEXT('77.68mm', '5mm', '16.77mm', '5.69mm', 'Product')
+				LODOP.ADD_PRINT_TEXT('69.45mm', '28.28mm', '23.65mm', '5.69mm', '名 称 Name: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('76.23mm', '28.28mm', '31.86mm', '5.69mm', '规 格 Strength: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('83.98mm', '5.27mm', '51.17mm', '5.69mm', '操 作 人 Operator: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('92.21mm', '5.27mm', '48mm', '5.69mm', '复 核 人 Reviewer: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('99.7mm', '5.27mm', '39.26mm', '5.69mm', '备 注 Remarks:')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_LINE(114, 11, 114, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(136, 11, 136, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(171, 11, 171, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(209, 11, 209, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(231, 11, 231, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(254, 11, 254, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(282, 97, 282, 360, 0, 0)
+
+				LODOP.ADD_PRINT_LINE(309, 11, 309, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(339, 11, 339, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(370, 11, 370, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(397, 11, 397, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(309, 96, 254, 96, 0, 1)
+				LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bucket_code)
+
+				LODOP.PRINT()// 打印
+				// LODOP.PREVIEW()// 预览
+				// LODOP.PRINT_DESIGN()
+				uni.showToast({
+					title: '操作成功',
+					icon: 'none'
+				})
+				this.disabled1 = false
 			}
 		}
 	}
diff --git a/pages/hdyy/tygn/mater-save.vue b/pages/hdyy/tygn/mater-save.vue
index bf1e824..0ae6599 100644
--- a/pages/hdyy/tygn/mater-save.vue
+++ b/pages/hdyy/tygn/mater-save.vue
@@ -21,8 +21,6 @@
 							<tr>
 								<th>物料编码</th>
 								<th>物料名称</th>
-								<th>规格</th>
-								<th>型号</th>
 								<th>类别</th>
 								<th>计量单位</th>
 							</tr>
@@ -31,8 +29,6 @@
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_code === pkId}" @tap="toCheck(e)">
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.class_name}}</td>
 								<td>{{e.unit_name}}</td>
 							</tr>
diff --git a/pages/hdyy/wbc/material.vue b/pages/hdyy/wbc/material.vue
index 8ab388b..78ce233 100644
--- a/pages/hdyy/wbc/material.vue
+++ b/pages/hdyy/wbc/material.vue
@@ -21,20 +21,18 @@
 							<tr>
 								<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" :class="{'checked': e.material_code === pkId}" @tap="toCheck(e)">
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.unit_name}}</td>
+								<td>{{e.quality_code}}</td>
+								<td>{{e.supp_name}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/wrcdj/wrc-load.vue b/pages/hdyy/wrcdj/wrc-load.vue
index bb7f674..52e09ec 100644
--- a/pages/hdyy/wrcdj/wrc-load.vue
+++ b/pages/hdyy/wrcdj/wrc-load.vue
@@ -34,14 +34,14 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
 								<td>{{i+1}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
 								<td>{{e.unit_name}}</td>
+								<td>{{e.task_code}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/wrcdj/wrc-unload.vue b/pages/hdyy/wrcdj/wrc-unload.vue
index 59457d8..dc55c5f 100644
--- a/pages/hdyy/wrcdj/wrc-unload.vue
+++ b/pages/hdyy/wrcdj/wrc-unload.vue
@@ -38,10 +38,10 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
 								<td>{{i+1}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.unit_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.task_code}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index 4510ba5..2a9377e 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -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') {
 					// 原料、辅料、内包材
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index bb363ad..84d96d0 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -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
 				}