部分页面功能修改

common/style/layout.styl

@@ -519,4 +519,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	width 70%
 	height 4rpx
 	background-color #fff
+}
+.del-icon {
+	right 32px
 }

common/style/reset.css

@@ -27,6 +27,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .relative {
 	position: relative;
 }
+.absolute {
+	position: absolute;
+}
 .hide {
 	display: none;
 }

pages/outbound/bill-out-store.vue

@@ -32,16 +32,6 @@
 						<uni-data-select v-model="currentData.product_area" :localdata="options2"></uni-data-select>
 					</view>
 				</view>
-				<view v-if="required" class="zd-row">
-					<view class="zd-col-10">
-						<span class="filter_label">关联用料清单编码</span>
-					</view>
-					<view class="zd-col-14">
-						<search-box
-						v-model="code"
-						/>
-					</view>
-				</view>
 			</view>
 			<view v-if="JSON.stringify(currentData) !== '{}'" class="grid-wraper">
 				<view class="slide_new">
@@ -84,7 +74,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-primary" @tap="toEmpty">返回</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || (required && !code)}" :disabled="disabled" @tap="_outStorageConfirm">出库确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageConfirm">出库确认</button>
 		</view>
 	</view>
 </template>
@@ -108,9 +98,7 @@
 				index1: '',
 				options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
 				allCheck: false,
-				formTypeName: '',
+				formTypeName: ''
-				required: false,
-				code: ''
 			};
 		},
 		onLoad (options) {
@@ -120,11 +108,6 @@
 			if (this.$store.getters.publicObj !== '') {
 				this.currentData = this.$store.getters.publicObj
 				this._outStorageOrder()
-				if (this.currentData.form_type === 'STK_TransferDirect' || this.currentData.form_type === 'ka7c19edf9d4b4b39b8cc4a06802163b0' || this.currentData.form_type === 'STK_MisDelivery') {
-					this.required = true
-				} else {
-					this.required = false
-				}
 				this.dataList = [...this.currentData.children]
 				this.dataList.map(el => {
 					this.$set(el, 'now_assign_qty', el.qty)
@@ -192,12 +175,12 @@
 			},
 			async _outStorageConfirm () {
 				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}' || (this.required && !this.code)) {
+				if (JSON.stringify(this.currentData) === '{}') {
 					this.disabled = false
 					return
 				}
 				let arr = this.dataList.filter(el => el.checked === true)
-				let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1, prd_ppbom_no: this.code})
+				let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1})
 				try {
 					let res = await outStorageConfirm(obj)
 					if (res.code === '200') {

pages/outbound/pick-confirm-2nd.vue

@@ -14,21 +14,11 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
-					<view class="zd-col-8">
-						<span class="filter_label">货架编号</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_takeConfirm">扫码取货确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeConfirm">扫码取货确认</button>
 		</view>
 	</view>
 </template>
@@ -46,7 +36,6 @@
 			return {
 				title: '',
 				val1: '',
-				val2: '',
 				disabled: false
 			};
 		},
@@ -56,17 +45,16 @@
 		methods: {
 			toEmpty () {
 				this.val1 = ''
-				this.val2 = ''
 				this.disabled = false
 			},
 			async _takeConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.val2) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await takeConfirm(this.val1, this.val2)
+					let res = await takeConfirm(this.val1)
 					if (res.code === '200') {
 						this.toEmpty()
 					}

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

@@ -19,12 +19,13 @@
 					<view class="zd-col-8">
 						<span class="filter_label">出库单据编号</span>
 					</view>
-					<view class="zd-col-16 zd-row">
+					<view class="zd-col-16 zd-row relative">
 						<view class="filter_num">{{editValue.toString()}}</view>
 						<search-box
 						v-model="val2"
 						@handleChange="handleChange2"
 						/>
+						<uni-icons v-show="editValue.length > 0" class="absolute del-icon" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -217,6 +218,12 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			toDel () {
+				this.editValue = []
+				this.selectedNum = null
+				this.dataList = []
+				this.checkData = []
 			}
 		}
 	}

utils/getData2.js

@@ -239,9 +239,9 @@ export const ctuOutConfirm = (scode, bcode, arr) => request({
 /**
  * 二楼取货确认
  */
-export const takeConfirm = (scode, bcode) => request({
+export const takeConfirm = (scode) => request({
 	url:'api/pda/outStorage/takeConfirm',
-	data: {site_code: scode, shelf_code: bcode}
+	data: {site_code: scode}
 })
 /**
  * 二楼货架绑定