缠膜叫料

pages/hdyy/scgl/cm-callmater.vue

@@ -4,26 +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-6">
-						<span class="filter_label">物料编码</span>
-					</view>
-					<view class="zd-col-13">
-						<search-box v-model="materialData.material_code"/>
-					</view>
-					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">批号</span>
-					</view>
-					<view class="zd-col-14 filter_select">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">要料点</span>
@@ -35,48 +15,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<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" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
-								<td>{{i+1}}</td>
-								<td>{{e.struct_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.vehicle_code}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
 		</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': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
 		</view>
 	</view>
 </template>
@@ -84,7 +26,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	import {confirmCallMaterial} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,68 +35,26 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				num: null,
-				index: '',
-				val1: '',
 				val2: '',
-				materialData: {},
-				pkId: '',
-				pkObj: {},
-				dataList: [],
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
-		onShow () {
-			if (this.$store.getters.publicObj !== '') {
-				this.materialData = this.$store.getters.publicObj
-				this.$store.dispatch('setPublicObj', '')
-			}
-		},
 		methods: {
-			toCheck (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
-			},
-			toJump (name) {
-				uni.navigateTo({
-					url: `/pages/hdyy/wbc/${name}`
-				})
-			},
 			toEmpty () {
-				this.val1 = ''
+				this.val2 = ''
-				this.num = null
-				this.dataList = []
-				this.checkedArr = []
-				this.allCheck = false
 				this.disabled = false
 			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _getStockGroupInfo () {
-				try {
-					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
-					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
-					} else {
-						this.dataList = []
-					}
-				} catch (e) {
-					this.dataList = []
-				}
-			},
 			async _confirmCallMaterial () {
 				this.disabled = true
-				if (!this.val2 || !this.pkId) {
+				if (!this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					let res = await confirmCallMaterial(this.val2, '')
 					if (res) {
 						uni.showToast({
 							title: res.message,

pages/hdyy/scgl/cm-xialiao.vue

@@ -77,8 +77,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-22 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
 		</view>
 	</view>
 </template>

pages/hdyy/scgl/fs-xialiao.vue

@@ -77,8 +77,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-22 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
-			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
 		</view>
 	</view>
 </template>