change

pages/outbound/line-callmater.vue

@@ -36,22 +36,22 @@
 							<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" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
 								<td>{{e.material_name}}</td>
 								<td>{{e.qty}}</td>
+								<td>{{e.material_spec}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.material_spec}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -195,6 +195,12 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.pkId = ''
+				this.pkObj = {}
+				this.dataList = []
 			}
 		}
 	}

pages/outbound/line-transfer.vue

@@ -14,6 +14,16 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">起点点位</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">站点类型</span>
@@ -24,7 +34,7 @@
 				</view>
 				<view class="zd-row border-bottom" v-show="index !== '2'">
 					<view class="zd-col-7">
-						<span class="filter_label">目标站点</span>
+						<span class="filter_label">终点站点</span>
 					</view>
 					<view class="zd-col-17">
 						<input type="text" class="filter_input" v-model="val2">
@@ -60,6 +70,7 @@
 			return {
 				title: '',
 				val1: '',
+				val3: '',
 				val2: '',
 				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
 				index: '',
@@ -104,12 +115,12 @@
 			},
 			async _transferConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val3 || !this.val1 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await transferConfirm(this.val1, this.val2, this.index2)
+					let res = await transferConfirm(this.val3, this.val1, this.val2, this.index2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,

pages/outbound/quhuo-confirm.vue

@@ -84,7 +84,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id || (this.isChecked && !this.index)}" :disabled="disabled" @tap="_confirm('1')">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id || (this.isChecked && !this.index)}" :disabled="disabled" @tap="_confirm('1')">确认</button>
 		</view>
 	</view>
 </template>