修改二楼货架绑定、二楼生产出库

pages/outbound/produce-out-store-2nd.vue

@@ -19,25 +19,26 @@
 					<view class="zd-col-8">
 						<span class="filter_label">出库单据编号</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-16 zd-row">
+						<view class="filter_num">{{editValue.toString()}}</view>
 						<search-box
 						v-model="val2"
 						@handleChange="handleChange2"
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
+				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">可选物料数</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input">{{selectedNum !== null ? (9 - selectedNum) : null}}</span>
-					</view>
 					<view class="zd-col-8">
 						<span class="filter_label">已选物料数</span>
 					</view>
 					<view class="zd-col-4">
-						<span class="filter_input">{{selectedNum}}</span>
+						<span class="filter_input" style="font-size: 34rpx; color: #ff6a00; font-weight: 700;">{{selectedNum}}</span>
+					</view>
+					<view class="zd-col-8">
+						<span class="filter_label">可选物料数</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 34rpx; color: #4e6ef2; font-weight: 700;">{{selectedNum !== null ? (9 - selectedNum) : null}}</span>
 					</view>
 				</view>
 			</view>
@@ -53,19 +54,23 @@
 								<th>数量</th>
 								<th>单位</th>
 								<th>单据编码</th>
+								<th>载具号</th>
 								<th>批次号</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td v-show="e.status === '1'" @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td>
-								<td v-show="e.status !== '1'"><uni-icons type="smallcircle-filled" size="24" color="#fff"></uni-icons></td>
+									<uni-icons v-show="e.status === '1'" @tap="toCheck(e)" :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons>
+									<uni-icons v-show="e.status !== '1'" type="smallcircle-filled" size="24" color="#fff"></uni-icons>
+								</td>
 								<td class="td_3">{{e.material_name}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_status}}</td>
 								<td>{{e.qty}}</td>
 								<td>{{e.unit_name}}</td>
 								<td>{{e.prd_ppbom_no}}</td>
+								<td>{{e.vehicle_code}}</td>
 								<td>{{e.pcsn}}</td>
 							</tr>
 						</tbody>
@@ -94,6 +99,7 @@
 				title: '',
 				val1: '',
 				val2: '',
+				editValue: [], // 出库单据编号集合
 				selectedNum: null, // 已选物料数
 				dataList: [],
 				disabled: false,
@@ -109,23 +115,37 @@
 			},
 			// 产线站点编码验证
 			async _queryTargetPoint (e) {
-				let res = await queryTargetPoint(e)
+				try {
-				if (res.code === '200') {
+					let res = await queryTargetPoint(e)
-					uni.showToast({
+					if (res.code === '200') {
-						title: res.msg,
+						uni.showToast({
-						icon: 'none'
+							title: res.msg,
-					})
+							icon: 'none'
-					this.val1 = res.site_code
+						})
-				} else {
+						this.val1 = res.site_code
-					uni.showToast({
+					} else {
-						title: res.msg,
+						uni.showToast({
-						icon: 'none'
+							title: res.msg,
-					})
+							icon: 'none'
+						})
+						this.val1 = ''
+					}
+				} catch (e) {
 					this.val1 = ''
 				}
 			},
 			handleChange2 (e) {
-				this._getCtuOrderList(e)
+				if (this.editValue.indexOf(e) === -1) {
+				  this._getCtuOrderList(e)
+				} else {
+					uni.showToast({
+						title: '出库单据编号已存在',
+						icon: 'none'
+					})
+				}
+				setTimeout(() => {
+					this.val2 = null
+				}, 300)
 			},
 			async _getCtuOrderList (e) {
 				try {
@@ -143,6 +163,9 @@
 						this.dataList = [...this.dataList, ...res.content]
 						let arr = this.dataList.filter(el => el.checked === true)
 						this.checkData = arr
+						if (res.data !== null) {
+							this.editValue.push(res.data)
+						}
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -173,6 +196,7 @@
 				this.dataList = []
 				this.disabled = false
 				this.checkData = []
+				this.editValue = []
 			},
 			async _ctuOutConfirm () {
 				this.disabled = true
@@ -181,7 +205,7 @@
 					return
 				}
 				try {
-					let res = await ctuOutConfirm(this.val1, this.val2, this.checkData)
+					let res = await ctuOutConfirm(this.val1, this.editValue.toString(), this.checkData)
 					if (res.code === '200') {
 						this.clearUp()
 					}

pages/outbound/shelf-bind-2nd.vue

@@ -51,9 +51,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
-			<button v-if="dataList.length > 0 && dataList[0].lock_type === '0'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">绑定</button>
+			<button v-if="dataList.length > 0 && dataList[0].lock_type === '00'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">绑定</button>
-			<button v-if="dataList.length > 0 && dataList[0].lock_type === '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">解绑</button>
+			<button v-else class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">解绑</button>
-			<button v-if="!dataList.length" class="zd-col-16 button-primary button-info">绑定 / 解绑</button>
 		</view>
 	</view>
 </template>
@@ -87,6 +86,7 @@
 			},
 			async _getPointStatus (e) {
 				let res = await getPointStatus(e)
+				this.dataList = []
 				this.dataList.push(res)
 			},
 			toEmpty () {

utils/mork2.js

@@ -240,6 +240,7 @@ export const structattrPage = () => {
 export const getCtuOrderList = () => {
 	let res = {
 		"code": "200",
+		data: '3',
 		content: [{material_name: '1', status: '1'}, {material_name: '2', status: '1'}, {material_name: '3', status: '1'}, {material_name: '4', status: '1'}, {material_name: '5', status: '1'}, {material_name: '6', status: '1'}, {material_name: '7', status: '1'}, {material_name: '8', status: '1'}, {material_name: '9', status: '0'}, {material_name: '10', status: '1'}]
 	}
 	return res

vuex/modules/user.js

@@ -1,6 +1,6 @@
 import * as types from '../types'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.49:8099' : 'http://192.168.10.49:8099'
 const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,