修改发货

src/pages/deliver/coms/comDeliverJobCard.vue

@@ -1,50 +1,56 @@
 <template>
- 	<job-com-main-card :dataContent="dataContent">
+	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+		<view class="task_item">
- 			<view class="task_text">
+			<!-- <view class="task_text">
  				<view class="">
  					申请单号 : {{dataContent.requestNumber}}
  				</view>
- 			</view>
+ 			</view> -->
-
+
- 			<view class="task_text">
+			<view class="task_text">
- 				<view class="">
+				<view class="">
- 					发货计划单号 : {{dataContent.deliverPlanNumber}}
+					发货计划单号 : {{dataContent.deliverPlanNumber}}
- 				</view>
+				</view>
- 			</view>
+			</view>
-
+
- 			<view class="task_text">
+			<view class="task_text">
- 				<view class="">
+				<view class="">
- 					客户代码 : {{dataContent.customerCode}}
+					发货类型 : {{dataContent.deliverType}}
- 				</view>
+				</view>
- 			</view>
+			</view>
- 		</view>
+
- 	</job-com-main-card>
+			<view class="task_text">
- </template>
+				<view class="">
-
+					客户代码 : {{dataContent.customerCode}}
- <script>
+				</view>
- 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+			</view>
- 	export default {
+		</view>
- 		components: {
+	</job-com-main-card>
- 			jobComMainCard,
+</template>
- 		},
+
- 		data() {
+<script>
- 			return {};
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
- 		},
+	export default {
-
+		components: {
- 		props: {
+			jobComMainCard,
- 			dataContent: {
+		},
- 				type: Object,
+		data() {
- 				default: {}
+			return {};
- 			},
+		},
- 		},
+
-
+		props: {
- 		methods: {
+			dataContent: {
-
+				type: Object,
- 		}
+				default: {}
- 	}
+			},
- </script>
+		},
-
+
- <style lang="scss">
+		methods: {
-
+
- </style>
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

src/pages/deliver/job/deliverDetail.vue

@@ -7,17 +7,20 @@
 			<view class="header_item">
 				申请单号：{{jobContent.requestNumber}}
 			</view>
+ 
 			<u-line color="#D8D8D8"></u-line>
 			<view class="cen_card" style="padding: 5rpx;">
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
-						<view class="text_lightblue">客户代码</view>
+						<view class="text_lightblue">发货类型</view>
-						<view>{{jobContent.customerCode}}</view>
+						<view>{{jobContent.deliverType}}</view>
 					</view>
+					
 					<view class="cell_info">
-						<view class="text_lightblue">客户寄售库</view>
+						<view class="text_lightblue">客户代码</view>
-						<view>{{toLocationCode}}</view>
+						<view>{{jobContent.customerCode}}</view>
 					</view>
+
 					<view class="cell_info">
 						<view class="text_lightblue">目标库位</view>
 						<view>{{toLocationCode}}</view>
@@ -106,7 +109,7 @@
 				scanOptions: [],
 				status: "",
 				toLocationCode: "",
-				jobStatus:""
+				jobStatus: ""
 			};
 		},
 
@@ -138,7 +141,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeDeliverJob(this.id).then(res => {
 						uni.navigateBack();
@@ -180,7 +183,7 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.jobStatus = res.data.status;
-							
+
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
 							that.toLocationCode = that.subList[0].toLocationCode
@@ -281,7 +284,7 @@
 										record.supplierCode = r.supplierCode;
 
 										//使用在途库不改变管理模式
-										if (this.toLocationCode ==null) {
+										if (this.toLocationCode == null) {
 											record.toPackingNumber = r
 												.packingNumber;
 											record.toBatch = r.batch;
@@ -462,4 +465,4 @@
 	// 	border-bottom-width: 1px;
 	// 	border-bottom-color: #ebeef5;
 	// }
-</style>
+</style>

src/static/config.js

@@ -1,5 +1,5 @@
 let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
-// let request_url = "http://192.168.0.113:12080/admin-api"
+// let request_url = "http://192.168.0.128:12080/admin-api"
 
 let isDevelopment = true