修改发料任务

pages/issue/job/issueDetail.vue

@@ -10,9 +10,11 @@
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view v-for="(toLocation, index) in detailSource">					
+				<view v-for="(toLocation, index) in detailSource">
-					<work-station :workshopCode="jobContent.workShopCode" :productionLineCode="toLocation.productionLineCode"
+					<work-station :workshopCode="jobContent.workShopCode"
-						:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"></work-station>
+						:productionLineCode="toLocation.productionLineCode"
+						:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode">
+					</work-station>
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>
@@ -285,19 +287,19 @@
 						item.Locations.forEach(fromLocation => {
 							fromLocation.Batchs.forEach(batch => {
 								let subItem = batch.detail;
-								if(subItem!=undefined){
+								if (subItem != undefined) {
 									subItem.recordList = [];
 									if (batch.Records.length > 0) {
 										batch.Records.forEach(r => {
 											let record = {};
 											record.handleQty = r.qty;
-											
+
 											record.fromPackingNumber = r
 												.packingNumber;
 											record.fromBatch = r.batch;
 											record.fromContainerNumber = r
 												.ContainerNumber;
-											
+
 											record.toContainerNumber = r
 												.ContainerNumber;
 											record.toInventoryStatus = r
@@ -305,19 +307,29 @@
 											record.toLocationCode = subItem
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
-									
+
+											let single_price = r.balance
+												.singlePrice == null ? 0 : r
+												.balance
+												.singlePrice;
+
+											record.singlePrice = single_price;
+											record.amount = single_price * r.qty;
+
 											//使用在途库不改变管理模式
-											if (this.jobContent.useOnTheWayLocation ==
+											if (this.jobContent
+												.useOnTheWayLocation ==
 												'TRUE') {
 												record.toPackingNumber = r
 													.packingNumber;
 												record.toBatch = r.batch;
 											} else {
-												var info = getPackingNumberAndBatch(
+												var info =
-													this.managementList, r
+													getPackingNumberAndBatch(
-													.itemCode,
+														this.managementList, r
-													r.packingNumber, r
+														.itemCode,
-													.batch);
+														r.packingNumber, r
+														.batch);
 												record.toPackingNumber = info
 													.packingNumber;
 												record.toBatch = info.batch;

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"value": "http://192.168.0.179:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",