Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

mycomponents/balance/recommendBalance.vue

@@ -1,14 +1,14 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="uni-flex uni-row space-between uni-inline-item">
+		<view class="uni-flex uni-row space-between ">
-			<view class="uni-flex uni-row  uni-inline-item">
+			<view class="uni-flex uni-row  ">
-				<view style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+				<view class="center" style=" width: 20px;color: #32C1E8;">
 					推荐
 				</view>
-				<view>
+				<view class="center">
-					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+					<!-- <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> -->
 					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+					<!-- <location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location> -->
 				</view>
 			</view>
 			<view>

mycomponents/job/jobBottom.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="uni-flex uni-row  u-col-center">
 				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
-				<text>{{formatDate(dataContent.createTime)}}</text>
+				<text class="center">{{formatDate(dataContent.createTime)}}</text>
 			</view>
 		</view>
 	</view>

pages/issue/coms/comIssueDetailCard.vue

@@ -35,12 +35,11 @@
 										<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
 											:right-options="scanOptions">
 											<handle-balance style='margin-left: 40px;' :detail="record" 
-												:isShowLocation="false" :isShowBatch="batch.packingNumber!=''">
+												:isShowLocation="false" :isShowBatch="batch.packingNumber!=null">
 											</handle-balance>
 										</uni-swipe-action-item>
 									</uni-swipe-action>
 								</view>
-								<u-line />
 							</view>
 						</view>
 					</view>

pages/issue/coms/comIssueJobCard.vue

@@ -1,11 +1,11 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
  		<view class="task_item">
+			<view class="task_text">
+				申请单号  {{dataContent.requestNumber}}
+			</view>
  			<view class="task_text">
- 				物品代码 : {{dataContent.itemCode}}
+ 				车间  {{dataContent.workShopCode}}
- 			</view>
- 			<view class="task_text">
- 				需求库位 : {{dataContent.toLocationCode}}
  			</view>
  		</view>
  	</job-com-main-card>

pages/issue/coms/comScanIssuePack.vue

@@ -13,7 +13,7 @@
 						margin-right: 20rpx;
 						padding:20rpx;
 						border-radius: 8rpx;">
-						<view class="uni-center" style="width: 25%; ">
+						<view class="uni-center">
 							位置 :
 						</view>
 						<view class="" style="width: 75%;padding: 0rpx">
@@ -140,8 +140,8 @@
 				scanOptions: {},
 				editItem: {},
 				positionInfo: "请选择位置",
-				positionList:[],
+				positionList: [],
-				defaultValueList:[]
+				defaultValueList: []
 			}
 		},
 		created() {
@@ -154,12 +154,12 @@
 		},
 		methods: {
 			openScanPopup(content, jobcontent) {
-				debugger
 				this.issueRecord = [];
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				this.positionInfo =this.jobContent.workShopCode+"-"+this.jobContent.subList[0].productionLineCode+"-"+this.jobContent.subList[0].workStationCode
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
 				this.$refs.popup.open('bottom');
 			},
 
@@ -171,7 +171,6 @@
 			},
 
 			initData() {
-				debugger
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
@@ -237,19 +236,19 @@
 
 						getBalanceByManagementPrecision(result.label, that.fromLocationCode, balanceRes => {
 							if (balanceRes.success) {
-								if (balanceRes.Data.length == 0) {
+								if (balanceRes.data.list.length == 0) {
 									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
 										res => {
 											this.packGetFocus();
 										})
-								} else if (balanceRes.Data.length == 1) {
+								} else if (balanceRes.data.list.length == 1) {
-									let balance = balanceRes.Data[0];
+									let balance = balanceRes.data.list[0];
 									this.afterGetBalance(result.label, balance);
 								} else {
-									this.showBalanceSelect(balanceRes.Data);
+									this.showBalanceSelect(balanceRes.data.list);
 								}
 							} else {
-								this.showErrorMessage(balanceRes.message);
+								this.showErrorMessage(balanceRes.message.message);
 							}
 							uni.hideLoading();
 						});
@@ -274,16 +273,18 @@
 							if (batch.Records == undefined) {
 								batch.Records = [];
 							}
+
 							let record = batch.Records.find(r => r.packingNumber == packingCode);
 							if (record == undefined) {
-								//有推荐箱码
+
-								if (batch.Recommends != undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
 										that.addRecord(batch, label, balance)
 									} else {
 										//允许修改箱码
-										if (this.jobContent.AllowModifyPackingNumber) {
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
 											that.addRecord(batch, label, balance);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',

pages/issue/job/issueDetail.vue

@@ -176,12 +176,15 @@
 			submit() {
 				//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
 				//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
-				var isOutIn = getApp().globalData.feed_configList.filter(
+				// var isOutIn = getApp().globalData.feed_configList.filter(
-					res => {
+				// 	res => {
-						if (res.name == 'feed_isOutIn') {
+				// 		if (res.name == 'feed_isOutIn') {
-							return res;
+				// 			return res;
-						}
+				// 		}
-					});
+				// 	});
+				
+				
+				
 
 				this.dataContent.itemCodeList.forEach(res => {
 					if (res.handleQty > res.recommendQty) {

pages/issue/js/issue.js

@@ -1,4 +1,4 @@
-export function getDataSource(list,subList) {
+export function getDataSource(list, subList) {
 	for (var i = 0; i < subList.length; i++) {
 		let detail = subList[i];
 		var location = list.find(r =>
@@ -37,7 +37,7 @@ export function createDetailInfo(location, detail) {
 				let batch = createBatchInfo(detail);
 				location.Batchs.push(batch);
 			} else {
-				batch.recommends.push(detail);
+				batch.Recommends.push(detail);
 			}
 		}
 	}
@@ -47,8 +47,8 @@ export function createItemInfo(detail) {
 	let item = {
 		itemCode: detail.itemCode,
 		itemName: detail.itemName,
-		productionLineCode:detail.productionLineCode,
+		productionLineCode: detail.productionLineCode,
-		workStationCode:detail.workStationCode,
+		workStationCode: detail.workStationCode,
 		stdPackQty: detail.stdPackQty,
 		stdPackUnit: detail.stdPackUnit,
 		qty: detail.qty,
@@ -81,15 +81,14 @@ export function createBatchInfo(detail) {
 		qty: detail.qty,
 		uom: detail.uom,
 		handleQty: 0,
-		// Recommends: [detail],
+		Recommends: [],
-		// Records: []
+		Records: []
 	}
 
 	//推荐到了箱码和批次
-	if (detail.packingNumber != '') {
+	if (detail.packingNumber != '' && detail.packingNumber != null) {
-		batch.Recommends = [detail];
+		batch.Recommends.push(detail);
 	}
-
 	return batch;
 }
 

static/config.json

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