lilei пре 3 година
родитељ
комит
33f19c851c

+ 5 - 3
pages/digitalShelf/choosePartResult.vue

@@ -12,7 +12,7 @@
 					<view class="button-group">
 						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码取货</button>
 						<button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键取货</button>
-						<button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button>
+						<!-- <button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button> -->
 					</view>
 				</view>
 			</view>
@@ -71,7 +71,10 @@
 							</view>
 							<view class="item-head">
 								<text>{{item.productCode}}</text>
-								<text class="item-no">{{item.shelfPlaceCode}}</text>
+								<span class="item-no" v-if="item.billState == 'WAIT_AUDIT'">待审核</span>
+								<span class="item-no" v-if="item.billState == 'AUDIT_REJECT'">审核不通过</span>
+								<span class="item-no" v-if="item.billState == 'WAIT_OUT_WAREHOUSE'">待收货</span>
+								<span class="item-no" v-if="item.billState == 'FINISH'">已完结</span>
 							</view>
 						</view>
 					</view>
@@ -103,7 +106,6 @@
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findBySnShelfOrder, takeGoods } from '@/api/shelf'
-	import { clzConfirm } from '@/libs/tools.js'
 	export default {
 	   name: 'choosePartResult',
 	   components: {

+ 1 - 3
pages/digitalShelf/orderDetail.vue

@@ -105,7 +105,6 @@
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findBySnShelfOrder, cancelShelfOrder } from '@/api/shelf.js'
-	import { clzConfirm } from '@/libs/tools.js'
 	import clipboard from "@/js_sdk/dc-clipboard/clipboard.js"
 	export default {
 	   name: 'orderDetail-digitalShel',
@@ -202,7 +201,7 @@
 		  // 确认取消取货单
 		  deleteRow () {
 		    let _this = this
-		    clzConfirm({
+		    uni.showModal({
 		  		title: '提示',
 		  		content: '确认取消取货单吗?',
 		  		success: (ret) => {
@@ -285,7 +284,6 @@
 			}
 		}
 		.contHead {
-			background-color: white;
 			.statusH{
 				> view{
 					padding: 10upx 12%;

+ 1 - 2
pages/digitalShelf/orderList.vue

@@ -60,7 +60,6 @@
 <script>
 	import carNo from '@/components/carNo.vue'
 	import { getShelfOrderList, cancelShelfOrder, shelfGetTotalWaitQty } from '@/api/shelf.js'
-	import { clzConfirm } from '@/libs/tools.js'
 	import clipboard from "@/js_sdk/dc-clipboard/clipboard.js"
 	import moment from 'moment'
 	export default {
@@ -226,7 +225,7 @@
 			// 确认取消取货单
 			deleteRow (params,index) {
 			  let _this = this
-			  clzConfirm({
+			  uni.showModal({
 					title: '提示',
 					content: '确认取消订单吗?',
 					success: (ret) => {

+ 4 - 6
pages/digitalShelf/scanBarcode/scanBarcode.vue

@@ -56,7 +56,6 @@
 
 <script>
 import { findBySnShelfOrder, outShelfOrder, scanConfirmShelfOrder } from '@/api/shelf.js'
-import { clzConfirm, urlToObj } from '@/libs/tools.js'
 export default {
 	data() {
 		return {
@@ -88,12 +87,11 @@ export default {
 	methods: {
 		// 扫码
 		scanCode(){
+			const _this = this
 			// 允许从相机和相册扫码
 			uni.scanCode({
 				success: function (res) {
-					console.log('条码类型:' + res.scanType);
-					console.log('条码内容:' + res.result);
-					this.scanResult(res.result)
+					_this.scanResult(res.result)
 				}
 			});
 		},
@@ -105,7 +103,7 @@ export default {
 				  this.partList = res.data.shelfOrderDetailList
 				  // 此单已全部扫码,是否确认取货
 				  if(this.hasScanFinish){
-					  clzConfirm({
+					  uni.showModal({
 					  	title: '扫码成功',
 					  	content: '此单已全部扫码,是否确认取货?',
 					  	success: (ret) => {
@@ -138,7 +136,7 @@ export default {
 		},
 		confimInfo(msg,type){
 			const _this = this
-			clzConfirm({
+			uni.showModal({
 				title: type?'扫码成功':'扫码失败',
 				content: msg,
 				confirmText:'继续扫码',

+ 1 - 2
pages/digitalShelf/stockPut.vue

@@ -51,7 +51,6 @@
 
 <script>
 	import { getShelfReplenishBilllList } from '@/api/shelf'
-	import { clzConfirm } from '@/libs/tools.js'
 	import clipboard from "@/js_sdk/dc-clipboard/clipboard.js"
 	import moment from 'moment'
 	export default {
@@ -209,7 +208,7 @@
 			// 立即入库
 			toPut (params,index) {
 			  let _this = this
-			  clzConfirm({
+			  uni.showModal({
 					title: '提示',
 					content: '确认立即入库?',
 					success: (ret) => {

+ 0 - 1
pages/digitalShelf/stockPutDetail.vue

@@ -63,7 +63,6 @@
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findShelfReplenishBill } from '@/api/shelf.js'
-	import { clzConfirm } from '@/libs/tools.js'
 	import clipboard from "@/js_sdk/dc-clipboard/clipboard.js"
 	export default {
 	   name: 'orderDetail-digitalShel',

+ 14 - 10
pages/digitalShelf/tempOrderList/orderDetail.vue

@@ -145,21 +145,26 @@
 				  if(res.status == 200){
 					  this.info = res.data
 					  this.partList = res.data.detailList || []
-					  if(this.info.billState == 'WAIT'){
-						  this.statusText = '待取货'
+					  if(this.info.billState == 'WAIT_AUDIT'){
+						  this.statusText = '待审核'
 						  this.statusIcon = 'hourglass-half-fill'
-						  this.statusMessage = '请及时安排,以免逾期'
-					  }
-					  if(this.info.billState == 'FINISH'){
-						  this.statusText = '已取货'
-						  this.statusIcon = 'checkmark-circle'
 						  this.statusMessage = ''
 					  }
-					  if(this.info.billState == 'CLOSE'){
-						  this.statusText = '已取消'
+					  if(this.info.billState == 'AUDIT_REJECT'){
+						  this.statusText = '审核不通过'
 						  this.statusIcon = 'close-circle'
 						  this.statusMessage = ''
 					  }
+					  if(this.info.billState == 'WAIT_OUT_WAREHOUSE'){
+						  this.statusText = '待收货'
+						  this.statusIcon = 'hourglass-half-fill'
+						  this.statusMessage = ''
+					  }
+					  if(this.info.billState == 'FINISH'){
+						  this.statusText = '已完结'
+						  this.statusIcon = 'checkmark-circle'
+						  this.statusMessage = ''
+					  }
 				  }
 			  })
 		  },
@@ -236,7 +241,6 @@
 			}
 		}
 		.contHead {
-			background-color: white;
 			.statusH{
 				> view{
 					padding: 10upx 12%;

+ 4 - 2
pages/digitalShelf/tempOrderList/tempOrderList.vue

@@ -41,7 +41,10 @@
 										 {{item.totalQty}}件商品
 									 </view>
 									 <view style="text-align: right;">
-										 {{tabList[current]['dispName']}}
+										 <span v-if="item.billState == 'WAIT_AUDIT'">待审核</span>
+										 <span v-if="item.billState == 'AUDIT_REJECT'">审核不通过</span>
+										 <span v-if="item.billState == 'WAIT_OUT_WAREHOUSE'">待收货</span>
+										 <span v-if="item.billState == 'FINISH'">已完结</span>
 									 </view>
 								 </view>
 							 </view>
@@ -59,7 +62,6 @@
 <script>
 	import carNo from '@/components/carNo.vue'
 	import { getShelfTempBillList, shelfGetTotalWaitQty } from '@/api/shelf.js'
-	import { clzConfirm } from '@/libs/tools.js'
 	import clipboard from "@/js_sdk/dc-clipboard/clipboard.js"
 	import moment from 'moment'
 	export default {