合并

src/components/Assembly/logistics.vue

@@ -1,19 +1,18 @@
 <template>
 	<div>
-		<el-input style="width: 100%;" :readonly="true" :value="value"></el-input>
+		{{propValueChange}}
 	</div>
 </template>
 <script lang="ts">
 	import { Component, Prop, Vue, Watch, Mixins } from "vue-property-decorator";
 	@Component
-	export default class Logistics extends Vue {
+	export default class Logistics2 extends Vue {
 		@Prop()
 		propValue : any
-		value : any = ''
-		@Watch('propValue')
-		propValueChange(v : any) {
+		value : any
+		get propValueChange() {
 			// 0、创建；5、已分派；10、已派车；15、已提货；20、已发运；30、已送达；35、已回单；-1、已撤回；-2、取消
-			switch (v) {
+			switch (this.propValue) {
 				case 0:
 					this.value = '创建'
 					break;
@@ -41,9 +40,16 @@
 				case -2:
 					this.value = '取消'
 					break;
+				case 'ONE':
+					this.value = '逐单发货'
+					break;
+				case 'MORE':
+					this.value = '打包发货'
+					break;
 			}
+			return this.value;
 		};
-		created() {}
+		created() { }
 	}
 </script>
 

src/components/Assembly/logistics2.vue

@@ -1,18 +1,19 @@
 <template>
 	<div>
-		{{propValueChange}}
+		<el-input style="width: 100%;" :readonly="true" :value="value"></el-input>
 	</div>
 </template>
 <script lang="ts">
 	import { Component, Prop, Vue, Watch, Mixins } from "vue-property-decorator";
 	@Component
-	export default class Logistics2 extends Vue {
+	export default class Logistics extends Vue {
 		@Prop()
 		propValue : any
-		value : any
-		get propValueChange() {
+		value : any = ''
+		@Watch('propValue')
+		propValueChange(v : any) {
 			// 0、创建；5、已分派；10、已派车；15、已提货；20、已发运；30、已送达；35、已回单；-1、已撤回；-2、取消
-			switch (this.propValue) {
+			switch (v) {
 				case 0:
 					this.value = '创建'
 					break;
@@ -40,8 +41,13 @@
 				case -2:
 					this.value = '取消'
 					break;
+				case 'ONE':
+					this.value = '逐单发货'
+					break;
+				case 'MORE':
+					this.value = '打包发货'
+					break;
 			}
-			return this.value;
 		};
 		created() { }
 	}

src/views/audit/logistics/index.vue

@@ -20,6 +20,7 @@
 	import { getPageData, getSingleData } from '@/api/delivery';
 	import Logistics from "@/components/Assembly/logistics.vue";
 	import Logistics2 from "@/components/Assembly/logistics2.vue";
+	
 	@Component
 	export default class myLogistics extends Vue {
 		timeNum = 0;
@@ -72,9 +73,10 @@
 					isDetail: true,
 					fixed: 'left'
 				}, {
+					width: 200,
 					title: '发货类型',
 					field: 'shippingType',
-					width: 200,
+					component: Logistics,
 				},
 				{
 					width: 200,
@@ -90,7 +92,7 @@
 					width: 200,
 					title: '发货单状态',
 					field: 'tmsOrderStatus',
-					component: Logistics2,
+					component: Logistics,
 				},
 				{
 					width: 200,
@@ -122,41 +124,41 @@
 					title: '发货省',
 					field: 'tmsShipmentProvince',
 				},
-				{
-					width: 200,
-					title: '发货省编码',
-					field: 'tmsShipmentProvinceNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '发货省编码',
+				// 	field: 'tmsShipmentProvinceNo',
+				// },
 				{
 					width: 200,
 					title: '发货市',
 					field: 'tmsShipmentCity',
 				},
-				{
-					width: 200,
-					title: '发货市编码',
-					field: 'tmsShipmentCityNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '发货市编码',
+				// 	field: 'tmsShipmentCityNo',
+				// },
 				{
 					width: 200,
 					title: '发货区（县）',
 					field: 'tmsShipmentRegion',
 				},
-				{
-					width: 200,
-					title: '发货区（县）编码',
-					field: 'tmsShipmentRegionNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '发货区（县）编码',
+				// 	field: 'tmsShipmentRegionNo',
+				// },
 				{
 					width: 200,
 					title: '发货街道',
 					field: 'tmsShipmentStreet',
 				},
-				{
-					width: 200,
-					title: '发货街道编码',
-					field: 'tmsShipmentStreetNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '发货街道编码',
+				// 	field: 'tmsShipmentStreetNo',
+				// },
 				{
 					width: 200,
 					title: '发货地址',
@@ -192,41 +194,41 @@
 					title: '收货省',
 					field: 'tmsUnloadingProvince',
 				},
-				{
-					width: 200,
-					title: '收货省编码',
-					field: 'tmsUnloadingProvinceNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '收货省编码',
+				// 	field: 'tmsUnloadingProvinceNo',
+				// },
 				{
 					width: 200,
 					title: '收货市',
 					field: 'tmsUnloadingCity',
 				},
-				{
-					width: 200,
-					title: '收货市编码',
-					field: 'tmsUnloadingCityNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '收货市编码',
+				// 	field: 'tmsUnloadingCityNo',
+				// },
 				{
 					width: 200,
 					title: '收货区（县）',
 					field: 'tmsUnloadingRegion',
 				},
-				{
-					width: 200,
-					title: '收货区（县）编码',
-					field: 'tmsUnloadingRegionNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '收货区（县）编码',
+				// 	field: 'tmsUnloadingRegionNo',
+				// },
 				{
 					width: 200,
 					title: '收货街道',
 					field: 'tmsUnloadingStreet',
 				},
-				{
-					width: 200,
-					title: '收货街道编码',
-					field: 'tmsUnloadingStreetNo',
-				},
+				// {
+				// 	width: 200,
+				// 	title: '收货街道编码',
+				// 	field: 'tmsUnloadingStreetNo',
+				// },
 				{
 					width: 200,
 					title: '收货地址',
@@ -269,12 +271,12 @@
 				},
 				{
 					width: 200,
-					title: '货物总重量',
+					title: '货物总重量(kg)',
 					field: 'tmsTotalWeight',
 				},
 				{
 					width: 200,
-					title: '货物总体积',
+					title: '货物总体积(m³)',
 					field: 'tmsTotalVolume',
 				},
 				{
@@ -332,7 +334,7 @@
 						span: 6,
 						label: '发货类型',
 						prop: 'shippingType',
-						component: 'by-input',
+						component: Logistics2,
 					},
 					{
 						span: 6,
@@ -353,7 +355,7 @@
 						span: 6,
 						label: '发货单状态',
 						prop: 'tmsOrderStatus',
-						component: Logistics,
+						component: Logistics2,
 					},
 					{
 						span: 6,
@@ -590,15 +592,17 @@
 				[
 					{
 						span: 6,
-						label: '货物总重量',
+						label: '货物总重量(kg)',
 						prop: 'tmsTotalWeight',
 						component: 'by-input',
+						labelWidth: '110px',
 					},
 					{
 						span: 6,
-						label: '货物总体积',
+						label: '货物总体积(m³)',
 						prop: 'tmsTotalVolume',
 						component: 'by-input',
+						labelWidth: '110px',
 					},
 					{
 						span: 6,
@@ -698,12 +702,12 @@
 				},
 				{
 					width: 180,
-					title: '重量',
+					title: '重量（g）',
 					field: 'tmsWeight',
 				},
 				{
 					width: 180,
-					title: '体积',
+					title: '体积（cm³）',
 					field: 'tmsVolume',
 				},
 				]