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

src/api/request2.js

@@ -2304,9 +2304,9 @@ export function productDismantleRecordSubmit(params) {
  */
 export function productDismantleJobClose(params) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/refusal?id="+params,
+		url: baseApi + "/wms/purchasereceipt-job-main/refusal",
-		method: "put",
+		method: "post",
-		data: {},
+		data: params,
 	});
 }
 

src/mycomponents/balance/balance.vue

@@ -9,7 +9,10 @@
 				<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
 				</to-location>
 			</view>
+			<view class="uni-flex" style="flex-direction: column;">
 				<view class="uni-flex uni-row center">
+
+
 					<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
 						:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
 					<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
@@ -19,10 +22,19 @@
 						:isShowStatus='isShowStatus'>
 					</compare-qty>
 
+
 					<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 						<text style="font-size: 30rpx;color: #2979ff;  width: 20px;" @click="copy">复制</text>
 					</view>
 				</view>
+				<view class="" v-if="dataContent.inventoryStatus">
+					<move-status :fromInventoryStatus="dataContent.inventoryStatus">
+					</move-status>
+				</view>
+
+			</view>
+
+
 
 		</view>
 		<!-- <u-line></u-line> -->
@@ -38,6 +50,7 @@
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import config from '@/static/config.js'
+	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
 
 	export default {
 		components: {
@@ -48,6 +61,7 @@
 			qty,
 			recommendQty,
 			compareQty,
+			moveStatus
 		},
 
 		data() {

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -14,6 +14,13 @@
 						@change="switchChange"></u-switch>
 				</view>
 			</view>
+			<view class="" v-if="operation=='reject'">
+				<uni-section title="拒收原因" type="line">
+					<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
+				</uni-section>
+
+			</view>
+
 			<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
 				:isShowEdit="false"></required-location>
 			<view class='split_line'></view> -->
@@ -135,8 +142,9 @@
 				isAllReceived: false,
 				operation: '',
 				scanedPackingNumber: '',
-				status:'',
+				status: '',
-				switchCode:''
+				switchCode: '',
+				reasonText: ""
 			};
 		},
 
@@ -151,7 +159,7 @@
 
 		},
 
-		onShow(){
+		onShow() {
 			if (this.id != undefined) {
 				//新建的任务自动接收
 				if (this.status == "1") {
@@ -242,7 +250,9 @@
 											s.scaned = true
 											s.cancleScanedHiht = true
 
-											s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
+											s.copyContent = "HPQ;V1.0;I" + s.itemCode +
+												";P" + s.packingNumber + ";B" + s.batch +
+												";Q" + s.qty
 											this.$refs.scanPopup.simulateScan(s);
 											this.scanedPackingNumber = ''
 										}
@@ -275,7 +285,7 @@
 						if (itemDetail.length == 0) {
 							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
 						} else {
-							if (!itemDetail[0].cancleScanedHiht&&itemDetail[0].scaned) {
+							if (!itemDetail[0].cancleScanedHiht && itemDetail[0].scaned) {
 								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
 							} else {
 								itemDetail.forEach(item => {
@@ -322,7 +332,7 @@
 								if (isExit == undefined) {
 									this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
 								} else {
-									if (!isExit.cancleScanedHiht&&isExit.scaned) {
+									if (!isExit.cancleScanedHiht && isExit.scaned) {
 										this.showMessage("箱码【" + packingNumber + "】已经扫描")
 									} else {
 										isExit.scaned = true
@@ -340,7 +350,8 @@
 										scanedLength++;
 									}
 								})
-								if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+								if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail
+									.packList.length) {
 									this.showMessage("箱码【" + packingNumber + "】已经扫描")
 								} else {
 									itemDetail.scaned = true;
@@ -440,13 +451,21 @@
 			},
 
 			reject() {
+				if(!this.reasonText){
+					this.showMessage("请输入拒收原因")
+					return;
+				}
 				this.$refs.comMessage.showQuestionMessage('是否要拒收任务<br>[' + this.jobContent.asnNumber + ']?', res => {
 					if (res) {
 						uni.showLoading({
 							title: "提交中....",
 							mask: true
 						});
-						productDismantleJobClose(this.id).then(res => {
+						var params = {
+							id: this.id,
+							refuseReason: this.reasonText
+						}
+						productDismantleJobClose(params).then(res => {
 							console.log('拒收', res)
 							if (res.data) {
 								navigateBack(1)
@@ -481,11 +500,11 @@
 
 							if (res.data) {
 								let isCheckPrint = getSwitchInfoByCode(this.switchCode)
-								if(!isCheckPrint){
+								if (!isCheckPrint) {
 									uni.hideLoading()
 
 									this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data.number)
-								}else{
+								} else {
 									uni.showLoading({
 										title: "提交成功,将跳转到打印页面",
 										mask: true
@@ -512,26 +531,32 @@
 											pageSize: 1000,
 										}).then(res1 => {
 											timerCount = timerCount + 1
-											if (res1.data && res1.data.list && res1.data
+											if (res1.data && res1.data.list && res1
+												.data
 												.list.length && (res1.data.total >= res
 													.data.detailCount)) {
 												uni.hideLoading()
 												clearInterval(timer1)
 												const dataParams = {
-													toLocationCode: res1.data.list[0]
+													toLocationCode: res1.data.list[
+															0]
 														.toLocationCode,
-													number: res1.data.list[0].number,
+													number: res1.data.list[0]
-													creator: res1.data.list[0].creator,
+														.number,
+													creator: res1.data.list[0]
+														.creator,
 													createTime: res1.data.list[0]
 														.createTime,
 													ids: res1.data.list.map(item =>
-														item.masterId).join(',')
+														item.masterId).join(
+														',')
 												}
 												console.log(dataParams)
 												uni.redirectTo({
 													url: '/pages/pointPutawayJob/index?data=' +
 														encodeURIComponent(JSON
-															.stringify(dataParams))
+															.stringify(
+																dataParams))
 												})
 											}
 										})

src/pages/unPlanned/record/issueRecord.vue

@@ -13,7 +13,7 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index"
 								@removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true"
-								@removePack="removePack">
+								@removePack="removePack" :isShowToLocation="false">
 							</record-com-detail-card>
 						</view>
 						<view class='split_line'></view>
@@ -151,7 +151,7 @@
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
-					newDetail.inventoryStatus ="OK";
+					// newDetail.inventoryStatus ="OK";
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {