app更新订单添加数量、客户首页统计、根据数量打印订单标签

common/downApp.js

@@ -10,7 +10,6 @@ export function checkUpdateApp() {
 				success: check => {
 					if (check.statusCode == 200 && check.data.code == 0 && check.data.data) {
 						let data = check.data.data;
-						console.log('data', data);
 						let version = widgetinfo.version,
 							appVersion = data.buildVersion,
 							appName = widgetinfo.name,

components/x-form.vue

@@ -1,31 +1,31 @@
 <template>
 	<!-- 表单 -->
 	<view style="margin: 0rpx 20rpx 0rpx 30rpx;">
-		<u--form :model="model" :rules="rules" labelPosition="left" ref="uForm" labelWidth="70">
+		<u-form :model="model" :rules="rules" labelPosition="left" ref="uForm" labelWidth="70">
 			<view v-for="(item,index) in list" :key="index">
 				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
-					v-if="item.type == 'input'">
+					v-if="item.type == 'input' && customerName(item)">
 					<view class="card_form_item">
-						<u--input v-model="model[`${item.field}`]" :disabled="item.disabled ? true : false"
-							:placeholder="item.placeholder"></u--input>
+						<u-input v-model="model[`${item.field}`]" :disabled="item.disabled ? true : false"
+							:placeholder="item.placeholder"></u-input>
 					</view>
 				</u-form-item>
 				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
 					v-else-if="item.type == 'select'">
 					<view class="card_form_item">
-						<u--input :placeholder="item.placeholder" suffixIcon="arrow-down"
-							v-model="model[`${item.field}`]" @focus="change(item)"></u--input>
+						<u-input :placeholder="item.placeholder" suffixIcon="arrow-down"
+							v-model="model[`${item.field}`]" @focus="change(item)"></u-input>
 					</view>
 				</u-form-item>
 				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
 					v-else-if="item.type == 'textarea'">
 					<view class="card_form_item">
-						<u--textarea v-model="model[`${item.field}`]" autoHeight
-							:placeholder="item.placeholder"></u--textarea>
+						<u-textarea v-model="model[`${item.field}`]" autoHeight
+							:placeholder="item.placeholder"></u-textarea>
 					</view>
 				</u-form-item>
 			</view>
-		</u--form>
+		</u-form>
 		<u-picker :defaultIndex="findIndex(model[fieldType], columns[0])" :show="show" :columns="columns"
 			keyName="label" @confirm="confirm($event, fieldType)" @cancel="cancel"></u-picker>
 	</view>
@@ -66,6 +66,20 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		methods: {
+			customerName(value) {
+				var userInfo = this.$cache.getCache('userInfo')
+				if (userInfo.userType == 'customer') {
+					if (value.field != 'customerName') {
+						if (value.type == 'input') {
+							return true
+						}
+					}
+				} else {
+					if (value.type == 'input') {
+						return true
+					}
+				}
+			},
 			change(e) {
 				this.columns = []
 				this.fieldType = e.field

components/x-orderManagement.vue

@@ -5,27 +5,36 @@
 				<view class="waybill_title">运单号:<span>{{item.waybillNo}}</span></view>
 				<span class="card_state" :style="{color:getState(item.status)}">{{orderStatus(item.status)}}</span>
 			</view>
-			<view class="card_specification">
-				<view class="specification_title">
-					<u-tag :text="item.temperatureInterval" plain size="mini" type="success"
-						@click="goOrderDetails(item)"></u-tag>
-				</view>
-				<view class="specification_title">
-					<u-tag :text="item.deliveryCondition" plain size="mini" type="primary"
-						@click="goOrderDetails(item)"></u-tag>
-				</view>
-				<view class="specification_title">
-					<u-tag :text="item.cargoType" plain size="mini" type="warning"
-						@click="goOrderDetails(item)"></u-tag>
+			<view class="space_between">
+				<view class="card_specification">
+					<view class="specification_title">
+						<u-tag :text="item.temperatureInterval" plain size="mini" type="success"
+							@click="goOrderDetails(item)"></u-tag>
+					</view>
+					<view class="specification_title">
+						<u-tag :text="item.deliveryCondition" plain size="mini" type="primary"
+							@click="goOrderDetails(item)"></u-tag>
+					</view>
+					<view class="specification_title">
+						<u-tag :text="item.cargoType" plain size="mini" type="warning"
+							@click="goOrderDetails(item)"></u-tag>
+					</view>
 				</view>
+				<view style="font-size: 28rpx;">x{{item.quantity}}</view>
 			</view>
 			<view class="title_ordermang"><span>收货地址:</span>{{item.consigneeAddressDetails}}</view>
 			<view class="title_ordermang"><span>收货电话:</span>{{item.consigneeAddressPhone}}</view>
 			<view class="title_ordermang"><span>下单时间:</span>{{item.orderTime}}</view>
-			<view class="btn_printil"
-				v-if="item.status == 2 && userInfo.userType === 'sys' || item.status == 3 && userInfo.userType === 'sys'"
-				@click.stop="printBarCode(item)">
-				<u-button size="small" type="primary" text="打印条码"></u-button>
+			<view style="display: flex;">
+				<view class="btn_printil markd10" v-if="item.status == 1 || item.status == 2 || item.status == 3"
+					@click.stop="modifyOrder(item)">
+					<u-button size="small" type="warning" text="修改订单"></u-button>
+				</view>
+				<view class="btn_printil markd10"
+					v-if="item.status == 2 && userInfo.userType === 'sys' || item.status == 3 && userInfo.userType === 'sys'"
+					@click.stop="printBarCode(item)">
+					<u-button size="small" type="primary" text="打印条码"></u-button>
+				</view>
 			</view>
 			<view class="btn_printil" v-if="item.status == 8 && userInfo.userType == 'sys'"
 				@click.stop="humidityRecording(item)">
@@ -70,6 +79,13 @@
 					url: '/pages/order/quantum?waybillNo=' + value.waybillNo + '&printType=record'
 				});
 			},
+			// 修改订单
+			modifyOrder(value) {
+				this.$cache.setCache('orderDetails', value)
+				uni.redirectTo({
+					url: '/pages/order/addWaybill?title=修改订单&type=2'
+				});
+			},
 			// 订单详情
 			goOrderDetails(value) {
 				this.$cache.setCache('orderDetails', value)
@@ -196,6 +212,15 @@
 	}
 
 	.btn_printil {
-		margin-top: 20rpx;
+		flex: 1;
+		margin-top: 10px;
+	}
+
+	.markd10:nth-child(1) {
+		margin: 10px 10rpx 0px 0rpx;
+	}
+
+	.markd10:nth-child(2) {
+		margin: 10px 0rpx 0px 10rpx;
 	}
 </style>

components/x-statistics.vue

@@ -63,27 +63,27 @@
 					value: null,
 				}],
 				list2: [{
-					sign: 0,
-					id: 'detailsil',
-					title: '全部',
-					icon: 'icon-cheliangxinxi',
-					color: '#4bc7fc',
-					value: null,
-				}, {
 					sign: 2,
 					id: 'truck',
 					title: '未装车',
-					icon: 'icon-fankudengji',
+					icon: 'icon-xiehuofei',
 					color: '#fece56',
 					value: null,
 				}, {
 					sign: 4,
 					id: 'signfor',
 					title: '已装车',
-					icon: 'icon-yidaoda',
+					icon: 'icon-yizhuangche',
 					color: '#9ddd54',
 					value: null,
 				}, {
+					sign: 6,
+					id: 'detailsil',
+					title: '已下车',
+					icon: 'icon-xiehuo',
+					color: '#4bc7fc',
+					value: null,
+				}, {
 					sign: 8,
 					id: 'add',
 					title: '已签收',
@@ -92,28 +92,28 @@
 					value: null,
 				}],
 				list3: [{
-					sign: 0,
+					sign: [0],
 					id: 'detailsil',
 					title: '全部',
 					icon: 'icon-cheliangxinxi',
 					color: '#4bc7fc',
 					value: null,
 				}, {
-					sign: 1,
+					sign: [1, 2, 3],
 					id: 'truck',
 					title: '未发货',
 					icon: 'icon-weifahuo',
 					color: '#fece56',
 					value: null,
 				}, {
-					sign: 2,
+					sign: [4, 5, 6, 7],
 					id: 'signfor',
 					title: '已发货',
 					icon: 'icon-yifahuo',
 					color: '#9ddd54',
 					value: null,
 				}, {
-					sign: 3,
+					sign: [8],
 					id: 'add',
 					title: '已签收',
 					icon: 'icon-qianshou_fill',
@@ -133,8 +133,16 @@
 			}
 			for (let key in this.orderStatistics) {
 				this.list.forEach((item, index) => {
-					if (key == item.sign) {
-						item.value = this.orderStatistics[key]
+					if (this.userType == 3) {
+						if (item.sign.indexOf(Number(key)) == -1) {
+							// console.log(key, 13)
+						} else {
+							item.value += this.orderStatistics[key]
+						}
+					} else {
+						if (key == item.sign) {
+							item.value = this.orderStatistics[key]
+						}
 					}
 				})
 			}
@@ -146,9 +154,14 @@
 		methods: {
 			// 订单页面
 			goOrder(index) {
+				let num = index
+				// console.log(this.userType,123)
+				if (this.userType == 2) {
+					num = num + 1
+				}
 				if (this.token) {
 					uni.navigateTo({
-						url: '/pages/order/index?current=' + index
+						url: '/pages/order/index?current=' + num
 					});
 				} else {
 					uni.$u.toast('请先登录')

manifest.json

@@ -2,8 +2,8 @@
     "name" : "冷链物流",
     "appid" : "__UNI__92DFF97",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/index.vue

@@ -120,7 +120,7 @@
 						});
 					} else if (value.id == 'add') {
 						uni.navigateTo({
-							url: '/pages/order/addWaybill'
+							url: '/pages/order/addWaybill?title=添加订单&type=1'
 						});
 					} else if (value.id == 'details') {
 						uni.navigateTo({

pages/mine/index.vue

@@ -136,12 +136,12 @@
 						colorBg: '#fece56',
 						bgColor: 'linear-gradient(to right, #f3d485, #fece56)',
 					},
-					// {
-					// 	title: '已下车',
-					// 	icon: 'icon-xiehuo',
-					// 	colorBg: '#9ddd54',
-					// 	bgColor: 'linear-gradient(to right, #b9f377, #9ddd54)',
-					// }, 
+					{
+						title: '已下车',
+						icon: 'icon-xiehuo',
+						colorBg: '#9ddd54',
+						bgColor: 'linear-gradient(to right, #b9f377, #9ddd54)',
+					}, 
 					{
 						title: '已签收',
 						icon: 'icon-qianshou_fill',

pages/order/addWaybill.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 添加运单 -->
 	<view>
-		<u-navbar title="添加运单" autoBack placeholder></u-navbar>
+		<u-navbar :title="headline" autoBack placeholder></u-navbar>
 		<view class="title_waybill">寄件人:</view>
 		<x-form ref="sender" :list="list" :model="senderModel" :rules="rules"></x-form>
 		<view class="title_waybill">收件人:</view>
@@ -10,7 +10,7 @@
 		<x-form ref="goods" :list="goodsList" :model="goodsModel" :rules="goodsRules"></x-form>
 		<view style="width: 100%;height: 150rpx;"></view>
 		<view class="btn_print" @click="printWaybill">
-			<u-button type="primary" text="添加运单"></u-button>
+			<u-button type="primary" :text="headline"></u-button>
 		</view>
 	</view>
 </template>
@@ -38,6 +38,7 @@
 					temperatureInterval: '',
 					deliveryCondition: '',
 					cargoType: '',
+					quantity: '',
 					remark: '',
 					customerName: '',
 				},
@@ -78,6 +79,29 @@
 				list: pickupRulesil(),
 				goodsList: formRules(),
 				userInfo: {},
+				headline: '添加运单',
+				type: 1,
+			}
+		},
+		onLoad(value) {
+			this.headline = value.title
+			this.type = Number(value.type)
+			if (this.type == 2) {
+				var orderList = this.$cache.getCache('orderDetails')
+				// console.log(orderList, 77)
+				this.senderModel.name = orderList.senderAddressName
+				this.senderModel.phone = orderList.senderAddressPhone
+				this.senderModel.address = orderList.senderAddressDetails
+				this.recipientsModel.name = orderList.consigneeAddressName
+				this.recipientsModel.phone = orderList.consigneeAddressPhone
+				this.recipientsModel.address = orderList.consigneeAddressDetails
+				this.goodsModel.temperatureInterval = orderList.temperatureInterval
+				this.goodsModel.deliveryCondition = orderList.deliveryCondition
+				this.goodsModel.cargoType = orderList.cargoType
+				this.goodsModel.quantity = orderList.quantity
+				this.goodsModel.remark = orderList.remark
+				this.goodsModel.customerName = orderList.customerName
+				this.goodsModel.id = orderList.id
 			}
 		},
 		mounted() {
@@ -85,7 +109,7 @@
 			this.userInfo = userInfo
 		},
 		methods: {
-			// 打印运单
+			// tianjia运单
 			async printWaybill() {
 				let flag = await this.$refs['sender'].validateForm();
 				let flag1 = await this.$refs['recipients'].validateForm();
@@ -100,28 +124,51 @@
 						consigneeAddressDetails: this.recipientsModel.address,
 						...this.goodsModel,
 					}
+					params.quantity = Number(params.quantity)
 					uni.showLoading();
-					if (this.userInfo.userType == 'sys') {
-						this.$api.post('/api/waybill/applet', params).then(res => {
-							if (res.code == 200) {
-								uni.redirectTo({
-									url: '/pages/order/index'
-								});
-							} else {
-								uni.$u.toast('添加失败')
-							}
-							uni.hideLoading();
-						}).catch(() => {
-							uni.hideLoading();
-						})
+					if (this.type == 1) {
+						// 添加订单
+						if (this.userInfo.userType == 'sys') {
+							this.$api.post('/api/waybill/applet', params).then(res => {
+								if (res.code == 200) {
+									uni.redirectTo({
+										url: '/pages/order/index'
+									});
+								} else {
+									uni.$u.toast('添加失败')
+								}
+								uni.hideLoading();
+							}).catch(() => {
+								uni.hideLoading();
+							})
+						} else {
+							delete params.customerName
+							this.$api.post('/api/waybill/customer', params).then(res => {
+								if (res.code == 200) {
+									uni.redirectTo({
+										url: '/pages/order/index'
+									});
+								} else {
+									uni.$u.toast('添加失败')
+								}
+								uni.hideLoading();
+							}).catch(() => {
+								uni.hideLoading();
+							})
+						}
 					} else {
-						this.$api.post('/api/waybill/customer', params).then(res => {
+						// 修改订单
+						if (this.userInfo.userType != 'sys') {
+							delete params.customerName
+						}
+						this.$api.put('/api/waybill', params).then(res => {
 							if (res.code == 200) {
+								// uni.$u.toast(res.msg)
 								uni.redirectTo({
 									url: '/pages/order/index'
 								});
 							} else {
-								uni.$u.toast('添加失败')
+								uni.$u.toast('修改失败')
 							}
 							uni.hideLoading();
 						}).catch(() => {

pages/order/index.vue

@@ -40,10 +40,10 @@
 						id: 4,
 						name: '已装车'
 					},
-					/* {
+					{
 						id: 6,
 						name: '已下车'
-					}, */
+					},
 					{
 						id: 8,
 						name: '已签收'

pages/order/orderDetails.vue

@@ -33,6 +33,12 @@
 						<u-tag :text="orderList.cargoType" plain size="mini" type="warning"></u-tag>
 					</view>
 				</view>
+				<view class="title_claim">
+					<span>数量:</span>
+					<view style="width: auto;font-size: 28rpx;">
+						{{orderList.quantity}}
+					</view>
+				</view>
 				<view class="title_claim"><span>备注:</span>{{orderList.remark}}</view>
 			</view>
 			<view class="card_humiture1" v-if="orderList.status == 8">

pages/order/quantum.vue

@@ -11,7 +11,10 @@
 				<u-button style="width: 200rpx;" size="small" type="warning" :text="searchTitle"
 					@click="openBluetoothAdapter(searchType)"></u-button>
 			</view>
-			<view class="waybill_num">运单号: {{waybillNo}}</view>
+			<view class="space_between">
+				<view class="waybill_num">运单号: {{waybillNo}}</view>
+				<view style="font-size: 28rpx;margin-top: 20rpx;">x{{waybillList.quantity}}</view>
+			</view>
 			<view class="waybill_numil" v-if="printType == 'record'">请选择运单温湿度时间段</view>
 			<view class="card_waybill" v-for="(item,index) in timeQuantumList" :key="index" @click="selectChange(item)">
 				<x-checkbox :label="item.title" :isChecked="item.isChecked"></x-checkbox>
@@ -71,6 +74,7 @@
 		onLoad(value) {
 			const arr = this.$cache.getCache('commodity')
 			this.waybillList = JSON.parse(arr)
+			console.log(this.waybillList, 14)
 			var userInfo = this.$cache.getCache('userInfo')
 			this.userInfo = userInfo
 			if (value.printType == 'barCode') {
@@ -255,7 +259,7 @@
 				})
 			},
 			// 配对设备打印
-			getPrint(value) {
+			async getPrint(value) {
 				this.deviceId = this.matchingUnit.deviceId
 				this.serviceId = this.matchingUnit.serviceId
 				this.characteristicId = this.matchingUnit.characteristicId
@@ -275,53 +279,72 @@
 						}
 						return newStr;
 					}
+					const shippingAddress = (addres) => {
+						let title;
+						if (addres.length < 16) {
+							title = addres + ' \n'
+						} else {
+							title = addres
+						}
+						return title
+					}
 					let printerJobs = new PrinterJobs();
 					let codeValue = this.waybillNo
 					const ENV = require('../../.env.js')
-					let logistics = ENV.APP_LINK_URL +  '/WaybillInquiry?waybillNo=' + codeValue
+					let logistics = ENV.APP_LINK_URL + '/WaybillInquiry?waybillNo=' + codeValue
 					let code128 = getCode128(codeValue);
-					printerJobs
-						.setSize(1, 1)
-						.setAlign('LT')
-						.print('#' + this.userInfo.dept.name)
-						.setAlign('CT')
-						.printBarcode(code128)
-						.setSize(1, 1)
-						.setAlign('LT')
-						.text('  ')
-						.text(codeValue + ' \n')
-						.print(printerUtil.fillLine())
-						.setAlign('LT')
-						.setSize(1, 2)
-						.setSize(2, 1)
-						.setBold()
-						.text('收:')
-						.setSize(1, 1)
-						.setBold(false)
-						.text(' ' + showFirstName(this.waybillList.senderAddressName))
-						.text(' ' + this.waybillList.senderAddressPhone.substr(0, 3) + "****" + this.waybillList
-							.senderAddressPhone.substr(7) + ' \n')
-						.print('       ' + this.waybillList.senderAddressDetails)
-						.print(printerUtil.fillLine())
-						.setSize(1, 2)
-						.setSize(2, 1)
-						.setBold()
-						.text('寄:')
-						.setSize(1, 1)
-						.setBold(false)
-						.text(' ' + showFirstName(this.waybillList.consigneeAddressName))
-						.text(' ' + this.waybillList.consigneeAddressPhone.substr(0, 3) + "****" + this.waybillList
-							.consigneeAddressPhone.substr(7) + ' \n')
-						.print('       ' + this.waybillList.consigneeAddressDetails)
-						.print(printerUtil.fillLine())
-						.text('备注:')
-						.text('货物类型：' + this.waybillList.cargoType + ' \n')
-						.print('     温度需求：' + this.waybillList.temperatureInterval)
-						.print('     配送要求：' + this.waybillList.deliveryCondition)
-						.setAlign('CT')
-						.printQrcode(logistics)
-						.print('扫码查询物流温湿度信息 \n')
-						.println();
+					let numArr = []
+					for (var i = 0; i < this.waybillList.quantity; i++) {
+						let numa = i + 1
+						numArr.push(numa)
+					}
+					numArr.forEach((numitem, indexnum) => {
+						printerJobs
+							.setSize(1, 1)
+							.setAlign('LT')
+							.print('#' + this.userInfo.dept.name)
+							.print(numitem + '/' + this.waybillList.quantity)
+							.setAlign('CT')
+							.printBarcode(code128)
+							.setSize(1, 1)
+							.setAlign('LT')
+							.text('  ')
+							.text(codeValue + ' \n')
+							// .print(printerUtil.fillLine())
+							.setAlign('LT')
+							.setSize(1, 2)
+							.setSize(2, 1)
+							.setBold()
+							.text('收:')
+							.setSize(1, 1)
+							.setBold(false)
+							.text(' ' + showFirstName(this.waybillList.senderAddressName))
+							.text(' ' + this.waybillList.senderAddressPhone.substr(0, 3) + "****" + this
+								.waybillList
+								.senderAddressPhone.substr(7) + ' \n')
+							.print(shippingAddress(this.waybillList.senderAddressDetails))
+							// .print(printerUtil.fillLine())
+							.setSize(1, 2)
+							.setSize(2, 1)
+							.setBold()
+							.text('寄:')
+							.setSize(1, 1)
+							.setBold(false)
+							.text(' ' + showFirstName(this.waybillList.consigneeAddressName))
+							.text(' ' + this.waybillList.consigneeAddressPhone.substr(0, 3) + "****" + this
+								.waybillList
+								.consigneeAddressPhone.substr(7) + ' \n')
+							.print(shippingAddress(this.waybillList.consigneeAddressDetails))
+							.print(printerUtil.fillLine())
+							.text('备注:')
+							.text('货物类型：' + this.waybillList.cargoType + ' \n')
+							.print('     温度需求：' + this.waybillList.temperatureInterval)
+							.print('     配送要求：' + this.waybillList.deliveryCondition)
+							.setAlign('CT')
+							.printQrcode(logistics)
+							.print('扫码查询物流温湿度信息 \n')
+							.println()
+					})
 					let buffer = printerJobs.buffer();
 					this.printbuffs(buffer);
 				} else {
@@ -341,7 +364,7 @@
 						// console.log(item,123)
 						const exists = this.checkboxValue.some(Tid => Tid === item.id);
 						if (item.isChecked) {
-							printerJobs
+							// printerJobs
 							// .print('设备号：' + item.sn)
 							// .print('标识名：' + item.title)
 							// .print('开始时间：' + item.startTime)

pages/order/waybill.js

@@ -43,6 +43,10 @@ export const formRules = () => {
 			{
 				label: '医药整车',
 				value: '医药整车',
+			},
+			{
+				label: '零担物流',
+				value: '零担物流',
 			}
 		],
 	}, {
@@ -73,6 +77,12 @@ export const formRules = () => {
 			}
 		],
 	}, {
+		field: 'quantity',
+		label: '数量',
+		placeholder: '请输入数量',
+		type: 'input',
+		required: true,
+	}, {
 		field: 'remark',
 		label: '备注',
 		placeholder: '备注',
@@ -151,7 +161,7 @@ export const printList = () => {
 		isChecked: true,
 		endTime: '2024-04-24 15:31:18',
 		startTime: '2024-04-24 15:31:18'
-	},{
+	}, {
 		arr: [{
 			arr: [
 				[{
@@ -195,5 +205,5 @@ export const printList = () => {
 		isChecked: true,
 		endTime: '2024-04-24 15:31:18',
 		startTime: '2024-04-24 15:31:18'
-	},]
+	}, ]
 }