Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/logistics/index.vue

@@ -9,16 +9,11 @@
 </template>
 <script lang="ts">
 	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-	// import Parent from "@/components/Parent/Parent";
 	import api from "@/api/currency";
-	import Assembly from "@/components/Assembly/material.vue";
 	@Component
-	export default class Brand extends Vue {
+	export default class Logistics extends Vue {
 		timeNum = 0;
 		timer : any = null
-		popTitle : any = ''
-		radio : any = 0
-		dialogFormVisible : boolean = false
 		config : any = {
 			attr:{
 				calculateH:true
@@ -30,13 +25,12 @@
 				columns: [
 					[{
 						span: 6,
-						label: '名称',
-						prop: 'name',
+						label: '发货单单号',
+						prop: 'tmsOrderNo',
 						component: 'by-input',
-						labelWidth: '70px',
 						compConfig: {
 							attr: {
-								placeholder: '请输入名称',
+								placeholder: '请输入发货单单号',
 								clearable: true
 							},
 						},
@@ -55,26 +49,258 @@
 					align: 'left',
 				},
 				columns: [{
-					title: '名称',
-					field: 'name',
-					isDetail: true,
-					width: 300,
+					title: '发货单单号',
+					field: 'tmsOrderNo',
+					width: 200,
 				}, {
-					title: '简称',
-					field: 'shortName',
-					width: 300,
+					title: '发货类型',
+					field: 'shippingType',
+					width: 200,
 				},
 				{
-					width: 500,
+					width: 200,
+					title: '订单类型',
+					field: 'orderType',
+				},
+				{
+					width: 200,
+					title: 'TMS平台业务单号',
+					field: 'tmsClientOrderNo',
+				},
+				{
+					width: 200,
+					title: '发货单状态',
+					field: 'tmsOrderStatus',
+				},
+				{
+					width: 200,
+					title: '开单时间',
+					field: 'tmsBillingDate',
+				},
+				{
+					width: 200,
+					title: '业务员',
+					field: 'tmsBusinessMan',
+				},
+				{
+					width: 200,
+					title: '业务员手机号',
+					field: 'tmsBusinessPhone',
+				},
+				{
+					width: 200,
+					title: '运输方式',
+					field: 'tmsTransportMethod',
+				},
+				{
+					width: 200,
+					title: '发货单位',
+					field: 'tmsShipmentCompanyName',
+				},
+				{
+					width: 200,
+					title: '发货省',
+					field: 'tmsShipmentProvince',
+				},
+				{
+					width: 200,
+					title: '发货省编码',
+					field: 'tmsShipmentProvinceNo',
+				},
+				{
+					width: 200,
+					title: '发货市',
+					field: 'tmsShipmentCity',
+				},
+				{
+					width: 200,
+					title: '发货市编码',
+					field: 'tmsShipmentCityNo',
+				},
+				{
+					width: 200,
+					title: '发货区（县）',
+					field: 'tmsShipmentRegion',
+				},
+				{
+					width: 200,
+					title: '发货区（县）编码',
+					field: 'tmsShipmentRegionNo',
+				},
+				{
+					width: 200,
+					title: '发货街道',
+					field: 'tmsShipmentStreet',
+				},
+				{
+					width: 200,
+					title: '发货街道编码',
+					field: 'tmsShipmentStreetNo',
+				},
+				{
+					width: 200,
+					title: '发货地址',
+					field: 'tmsShipmentAddress',
+				},
+				{
+					width: 200,
+					title: '发货人',
+					field: 'tmsShipmentConsignor',
+				},
+				{
+					width: 200,
+					title: '发货人联系方式',
+					field: 'tmsShipmentContacts',
+				},
+				{
+					width: 200,
+					title: '发货点经度',
+					field: 'tmsShipmentLng',
+				},
+				{
+					width: 200,
+					title: '发货点纬度',
+					field: 'tmsShipmentLat',
+				},
+				{
+					width: 200,
+					title: '收货单位',
+					field: 'tmsUnloadingCompanyName',
+				},
+				{
+					width: 200,
+					title: '收货省',
+					field: 'tmsUnloadingProvince',
+				},
+				{
+					width: 200,
+					title: '收货省编码',
+					field: 'tmsUnloadingProvinceNo',
+				},
+				{
+					width: 200,
+					title: '收货市',
+					field: 'tmsUnloadingCity',
+				},
+				{
+					width: 200,
+					title: '收货市编码',
+					field: 'tmsUnloadingCityNo',
+				},
+				{
+					width: 200,
+					title: '收货区（县）',
+					field: 'tmsUnloadingRegion',
+				},
+				{
+					width: 200,
+					title: '收货区（县）编码',
+					field: 'tmsUnloadingRegionNo',
+				},
+				{
+					width: 200,
+					title: '收货街道',
+					field: 'tmsUnloadingStreet',
+				},
+				{
+					width: 200,
+					title: '收货街道编码',
+					field: 'tmsUnloadingStreetNo',
+				},
+				{
+					width: 200,
+					title: '收货地址',
+					field: 'tmsUnloadingAddress',
+				},
+				{
+					width: 200,
+					title: '收货人',
+					field: 'tmsUnloadingConsignor',
+				},
+				{
+					width: 200,
+					title: '收货人联系方式',
+					field: 'tmsUnloadingContacts',
+				},
+				{
+					width: 200,
+					title: '收货点经度',
+					field: 'tmsUnloadingLng',
+				},
+				{
+					width: 200,
+					title: '收货点纬度',
+					field: 'tmsUnloadingLat',
+				},
+				{
+					width: 200,
+					title: '要求提货时间',
+					field: 'tmsDeliveryDate',
+				},
+				{
+					width: 200,
+					title: '要求送达时间',
+					field: 'tmsArrivalDate',
+				},
+				{
+					width: 200,
+					title: '货物总数量',
+					field: 'tmsTotalQuantity',
+				},
+				{
+					width: 200,
+					title: '货物总重量，单位kg',
+					field: 'tmsTotalWeight',
+				},
+				{
+					width: 200,
+					title: '货物总体积，单位立方米',
+					field: 'tmsTotalVolume',
+				},
+				{
+					width: 200,
+					title: '承运商名称',
+					field: 'tmsCarrierName',
+				},
+				{
+					width: 200,
+					title: '承运商id',
+					field: 'tmsCarrierInfoId',
+				},
+				{
+					width: 200,
+					title: '上游规则id',
+					field: 'tmsRuleUpId',
+				},
+				{
+					width: 200,
+					title: '车型要求',
+					field: 'tmsNeedCarType',
+				},
+				{
+					width: 200,
+					title: '货物信息',
+					field: 'tmsGoodsInfos',
+				},
+				{
+					width: 200,
 					title: '备注',
-					field: 'remark',
+					field: 'tmsRemark',
+				},
+				{
+					width: 200,
+					title: '司机姓名',
+					field: 'tmsDriverName',
+				},
+				{
+					width: 200,
+					title: '司机号码',
+					field: 'tmsDriverPhone',
 				},
 				{
-					width: 80,
-					title: '状态',
-					field: 'status',
-					align: 'center',
-					component: Assembly,
+					width: 200,
+					title: '派车时间',
+					field: 'tmsDispatchTime',
 				},
 				]
 			},
@@ -95,7 +321,7 @@
 			}
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
-			this.getPageList(query);
+			// this.getPageList(query);
 		}
 		getPageList(query : any) {
 			let loading = this.$loading({ target: '.main-container' });