diff --git a/App.vue b/App.vue
index 901f3ff..0086657 100644
--- a/App.vue
+++ b/App.vue
@@ -32,6 +32,7 @@
 </script>
 
 <style lang="scss">
+	@import '@/uni_modules/uni-scss/index.scss';
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import '@/static/scss/index.scss'
 </style>
\ No newline at end of file
diff --git a/pages/traceability-product/delivery/deliveryEdit.vue b/pages/traceability-product/delivery/deliveryEdit.vue
index 01ed06c..a9ea287 100644
--- a/pages/traceability-product/delivery/deliveryEdit.vue
+++ b/pages/traceability-product/delivery/deliveryEdit.vue
@@ -233,11 +233,6 @@
 				} finally {}
 			},
 
-			// 获取销售类型
-			getSalesChange(e) {
-				this.formData.salesType = e.detail.value[0].value
-			},
-
 			// 获取当前客户Id
 			getCustomChange(e) {
 				this.currenCustomer = e.detail.value
diff --git a/pages/traceability-product/delivery/index.vue b/pages/traceability-product/delivery/index.vue
index 3ef1aeb..d86acfd 100644
--- a/pages/traceability-product/delivery/index.vue
+++ b/pages/traceability-product/delivery/index.vue
@@ -11,33 +11,39 @@
 		<!-- 页面 列表 -->
 		<view class="v-pages-list v-container m-t-regular">
 			<u-list @scrolltolower="scrolltolower">
-				<view class="v-pages-list-item" v-for="item in listData" :key="item.id">
+				<view class="v-pages-list-item" v-for="(item,index) in listData" :key="item.id">
 					<!-- 页面 卡片 -->
 					<view class="v-card">
 						<!-- 卡片 内容 -->
 						<view class="v-card-content">
 							<!-- 卡片 上部 -->
 							<view class="v-card-top row">
-								<!-- 卡片 图片 -->
-								<image src="../../static/test/pic.jpg" class="v-card-image"></image>
 								<!-- 卡片 信息 -->
-								<view class="v-card-info col">
-									<view class="v-card-title row"><text
-											class="name col">{{item.processingName}}</text><text class="tip"
-											v-if="item.speciesName">{{item.speciesName}}</text>
+								<view class="v-card-info">
+									<view class="v-card-title row">
+										<text class="name col">{{item.processingName}}</text>
 									</view>
-									<view class="v-card-state m-t-mini"><text class="state">{{item.sourceType}}</text>
+									<view class="v-card-state m-t-mini">
+										<text class="state secondary"
+											v-if="item.speciesName">{{item.speciesName}}</text>
+										<dict-tag class="state primary" type="source_type" :value="item.sourceType" />
 									</view>
+									<view class="v-card-code"><text
+											class="iconfont icon-code m-r-small"></text>{{item.traceabilityCode}}</view>
 								</view>
 							</view>
 							<!-- 卡片 下部 -->
 							<view class="v-card-bot">
-								<view class="v-card-small-item" v-for="(cell,i) in item.recordList" :key="i">
-									<view class="v-page-form small row  m-t-small">
-										<view class="v-form-item col-12"><text class="label">配送人:</text><text
-												class="content">{{cell.deliveryMan}}</text></view>
-										<view class="v-form-item col-12"><text class="label">接收人:</text><text
-												class="content">{{formatData(cell.receivedMan)}}</text></view>
+								<view class="v-card-small-item" @click="openPopup(index)">
+									<view class="v-card-small-box row v-page-form small">
+										<view class="v-form-item col">
+											<uni-icons type="calendar" size="14"></uni-icons>
+											<text
+												class="content m-r-small">{{getFormat(item.recordList[0].deliveryTime)}}
+											</text>
+											配送
+										</view>
+										<view class="record"><text class="btn">配送记录</text></view>
 									</view>
 								</view>
 							</view>
@@ -47,6 +53,39 @@
 				<u-loadmore :status="status" />
 			</u-list>
 		</view>
+		<!-- 记录 弹框 -->
+		<uni-popup ref="popup">
+			<view class="popup-content v-container">
+				<view class="close" @click="closePopup">
+					<uni-icons type="close" size="30"></uni-icons>
+				</view>
+				<view class="v-card">
+					<view class="v-popup-title"><text>{{RecordName}}</text> 配送记录</view>
+					<view class="v-card-small-item" v-for="(item,index) in RecordData" :key="index">
+						<view class="v-card-small-box row v-page-form small">
+							<view class="col-10">
+								<view class="time">{{getFormat(item.deliveryTime)}}</view>
+								<view class="name delivery"><text>{{formatData(item.deliveryMan)}}</text></view>
+							</view>
+							<view class="col-4">
+								<view class="line">
+									<image src="@/static/images/icon_delivery.svg"></image>
+								</view>
+							</view>
+							<view class="col-10">
+								<view class="time">{{getFormat(item.receivedTime)}}</view>
+								<view class="name received"><text>{{formatData(item.receivedMan)}}</text></view>
+							</view>
+							<view class="v-form-item col-24 m-t-mini">
+								<text class="label">配送公司：</text>
+								<text class="content">{{formatData(item.logisticsName)}}</text>
+							</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 
 	</view>
 </template>
@@ -54,11 +93,16 @@
 <script>
 	import * as ProductApi from "@/api/traceability/deliveryrecord"
 	import mix from '@/utils/mix.js'
-
+	import DictTag from "@/components/DictTag/index"
 	export default {
+		components: {
+			DictTag
+		},
 		data() {
 			return {
 				listData: [],
+				RecordName: null,
+				RecordData: [],
 				loadMoreStatus: 'loadmore',
 				queryParams: {
 					pageNo: 1,
@@ -70,7 +114,7 @@
 		},
 		watch: {
 			"queryParams.processingName"(newV, oldV) {
-				if(newV==""){
+				if (newV == "") {
 					this.go_clear()
 				}
 			}
@@ -96,6 +140,19 @@
 				} finally {}
 			},
 
+			// 打开 弹窗
+			openPopup(index) {
+				console.log(this.listData[index])
+				this.RecordName = this.listData[index].processingName
+				this.RecordData = this.listData[index].recordList
+				this.$refs.popup.open()
+			},
+
+			// 关闭 弹窗
+			closePopup() {
+				this.$refs.popup.close()
+			},
+
 			//触底加载
 			scrolltolower() {
 				if (this.loadMoreStatus == 'loading' || this.loadMoreStatus == 'nomore') {
@@ -103,8 +160,8 @@
 				}
 				this.queryParams.pageNo++;
 				this.getListData()
-			},			
-			
+			},
+
 			//确定搜索
 			search(res) {
 				this.queryParams.pageNo = 1
@@ -112,7 +169,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//清除搜索
 			clear(res) {
 				this.queryParams = {
@@ -124,7 +181,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//取消搜索
 			cancel(res) {
 				this.queryParams = {
diff --git a/pages/traceability-product/index.vue b/pages/traceability-product/index.vue
index e9dfc2b..6d88539 100644
--- a/pages/traceability-product/index.vue
+++ b/pages/traceability-product/index.vue
@@ -26,7 +26,7 @@
 									</view>
 									<view class="v-card-state m-t-mini">
 										<text class="state secondary" v-if="item.speciesName">{{item.speciesName}}</text>
-										<dict-tag class="stateprimary" type="source_type" :value="item.sourceType" />
+										<dict-tag class="state primary" type="source_type" :value="item.sourceType" />
 									</view>
 									<view class="v-card-code"><text
 											class="iconfont icon-code m-r-small"></text>{{item.traceabilityCode}}</view>
diff --git a/pages/traceability-product/loss/index.vue b/pages/traceability-product/loss/index.vue
index 79924b1..2de91b6 100644
--- a/pages/traceability-product/loss/index.vue
+++ b/pages/traceability-product/loss/index.vue
@@ -11,33 +11,38 @@
 		<!-- 页面 列表 -->
 		<view class="v-pages-list v-container m-t-regular">
 			<u-list @scrolltolower="scrolltolower">
-				<view class="v-pages-list-item" v-for="item in listData" :key="item.id">
+				<view class="v-pages-list-item" v-for="(item,index) in listData" :key="item.id">
 					<!-- 页面 卡片 -->
 					<view class="v-card">
 						<!-- 卡片 内容 -->
 						<view class="v-card-content">
 							<!-- 卡片 上部 -->
-							<view class="v-card-top row">								
+							<view class="v-card-top row">
 								<!-- 卡片 信息 -->
 								<view class="v-card-info col">
-									<view class="v-card-title row"><text
-											class="name col">{{item.processingName}}</text>
+									<view class="v-card-title row">
+										<text class="name col">{{item.processingName}}</text>
 									</view>
 									<view class="v-card-state m-t-mini">
-										<text class="state">{{item.speciesName}}</text>
-										<text class="state">{{item.sourceType}}</text>
+										<text class="state secondary"
+											v-if="item.speciesName">{{item.speciesName}}</text>
+										<dict-tag class="state primary" type="source_type" :value="item.sourceType" />
 									</view>
+									<view class="v-card-code"><text
+											class="iconfont icon-code m-r-small"></text>{{item.traceabilityCode}}</view>
 								</view>
 							</view>
 							<!-- 卡片 下部 -->
 							<view class="v-card-bot">
-								<view class="v-card-small-item" v-for="(cell,i) in item.damagedList" :key="i">
-									<view class="v-page-form small row  m-t-small">
-										<view class="v-form-item col-10"><text class="label">报损日期:</text><text
-												class="content">{{getData(cell.createTime)}}</text></view>
-										<view class="col-2"></view>
-										<view class="v-form-item col-10"><text class="label">报损类型:</text><text
-												class="content">{{cell.lossType}}</text></view>
+								<view class="v-card-small-item" @click="openPopup(index)">
+									<view class="v-card-small-box row v-page-form small">
+										<view class="v-form-item col">
+											<uni-icons type="calendar" size="14"></uni-icons>
+											<text
+												class="content m-r-small">{{getData(item.damagedList[0].createTime)}}</text>
+											报损
+										</view>
+										<view class="record"><text class="btn">报损记录</text></view>
 									</view>
 								</view>
 							</view>
@@ -48,17 +53,53 @@
 			</u-list>
 		</view>
 
+		<!-- 记录 弹框 -->
+		<uni-popup ref="popup">
+			<view class="popup-content v-container">
+				<view class="close" @click="closePopup">
+					<uni-icons type="close" size="30"></uni-icons>
+				</view>
+				<view class="v-card">
+					<view class="v-popup-title"><text>{{RecordName}}</text> 报损记录</view>
+					<view class="v-card-small-item" v-for="(item,index) in RecordData" :key="index">
+						<view>
+							<uni-icons type="calendar" class="text-primary m-r-small" size="14"></uni-icons>
+							<text class="content">{{getData(item.createTime)}}</text>
+						</view>
+						<view class="v-card-small-box v-page-form small row m-t-small">
+							<view class="v-form-item col-12">
+								<text class="label">报损类型：</text>
+								<dict-tag class="state primary" type="loss_type" :value="String(item.lossType)" />
+							</view>
+							<view class="v-form-item col-12">
+								<text class="label">报损数量：</text>
+								<text class="content">{{item.productLoss}}公斤</text>
+							</view>
+							<view class="v-form-item col-24 m-t-mini">
+								<text class="label">报损原因：</text>
+								<text class="content">{{formatData(item.lossReason)}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import * as ProductApi from "@/api/traceability/loss"
 	import mix from '@/utils/mix.js'
-
+	import DictTag from "@/components/DictTag/index"
 	export default {
+		components: {
+			DictTag
+		},
 		data() {
 			return {
 				listData: [],
+				RecordName: null,
+				RecordData: [],
 				loadMoreStatus: 'loadmore',
 				queryParams: {
 					pageNo: 1,
@@ -70,7 +111,7 @@
 		},
 		watch: {
 			"queryParams.processingName"(newV, oldV) {
-				if(newV==""){
+				if (newV == "") {
 					this.go_clear()
 				}
 			}
@@ -93,7 +134,19 @@
 						this.loadMoreStatus = 'loadmore';
 					}
 				} finally {}
-			},			
+			},
+
+			// 打开 弹窗
+			openPopup(index) {
+				this.RecordName = this.listData[index].processingName
+				this.RecordData = this.listData[index].damagedList
+				this.$refs.popup.open()
+			},
+			
+			// 关闭 弹窗
+			closePopup() {
+				this.$refs.popup.close()
+			},
 
 			//触底加载
 			scrolltolower() {
@@ -102,8 +155,8 @@
 				}
 				this.queryParams.pageNo++;
 				this.getListData()
-			},			
-			
+			},
+
 			//确定搜索
 			search(res) {
 				this.queryParams.pageNo = 1
@@ -111,7 +164,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//清除搜索
 			clear(res) {
 				this.queryParams = {
@@ -123,7 +176,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//取消搜索
 			cancel(res) {
 				this.queryParams = {
@@ -136,7 +189,7 @@
 				this.getListData()
 			},
 		}
-		
+
 	}
 </script>
 
diff --git a/pages/traceability-product/sales/index.vue b/pages/traceability-product/sales/index.vue
index 46a8fb6..904ceee 100644
--- a/pages/traceability-product/sales/index.vue
+++ b/pages/traceability-product/sales/index.vue
@@ -11,35 +11,39 @@
 		<!-- 页面 列表 -->
 		<view class="v-pages-list v-container m-t-regular">
 			<u-list @scrolltolower="scrolltolower">
-				<view class="v-pages-list-item" v-for="item in listData" :key="item.id">
+				<view class="v-pages-list-item" v-for="(item,index) in listData" :key="item.id">
 					<!-- 页面 卡片 -->
 					<view class="v-card">
 						<!-- 卡片 内容 -->
 						<view class="v-card-content">
 							<!-- 卡片 上部 -->
 							<view class="v-card-top row">
-								<!-- 卡片 图片 -->
-								<image src="../../static/test/pic.jpg" class="v-card-image"></image>
 								<!-- 卡片 信息 -->
-								<view class="v-card-info col">
-									<view class="v-card-title row"><text
-											class="name col">{{item.processingName}}</text><text class="tip"
-											v-if="item.speciesName">{{item.speciesName}}</text>
+								<view class="v-card-info">
+									<view class="v-card-title row">
+										<text class="name col">{{item.processingName}}</text>
 									</view>
-									<view class="v-card-state m-t-mini"><text class="state">{{item.sourceType}}</text>
+									<view class="v-card-state m-t-mini">
+										<text class="state secondary"
+											v-if="item.speciesName">{{item.speciesName}}</text>
+										<dict-tag class="state primary" type="source_type" :value="item.sourceType" />
 									</view>
+									<view class="v-card-code"><text
+											class="iconfont icon-code m-r-small"></text>{{item.traceabilityCode}}</view>
 								</view>
 							</view>
 							<!-- 卡片 下部 -->
 							<view class="v-card-bot">
-								<view class="v-card-small-item" v-for="(cell,i) in item.salesRecordsList" :key="i">
-									<view class="v-page-form small row  m-t-small">
-										<view class="v-form-item col-12"><text class="label">销售类型:</text><text
-												class="content">{{cell.salesType}}</text></view>
-										<view class="v-form-item col-12"><text class="label">销售数量:</text><text
-												class="content">{{formatData(cell.salesType)}}</text></view>
-										<view class="v-form-item col-12"><text class="label">销售日期:</text><text
-												class="content">{{getFormat(cell.createTime)}}</text></view>
+								<view class="v-card-small-item" @click="openPopup(index)">
+									<view class="v-card-small-box row v-page-form small">
+										<view class="v-form-item col">
+											<uni-icons type="calendar" size="14"></uni-icons>
+											<text
+												class="content m-r-small">{{getFormat(item.salesRecordsList[0].createTime)}}
+											</text>
+											销售
+										</view>
+										<view class="record"><text class="btn">销售记录</text></view>
 									</view>
 								</view>
 							</view>
@@ -50,18 +54,57 @@
 			</u-list>
 		</view>
 
+		<!-- 记录 弹框 -->
+		<uni-popup ref="popup">
+			<view class="popup-content v-container">
+				<view class="close" @click="closePopup">
+					<uni-icons type="close" size="30"></uni-icons>
+				</view>
+				<view class="v-card">
+					<view class="v-popup-title"><text>{{RecordName}}</text> 销售记录</view>
+					<view class="v-card-small-item" v-for="(item,index) in RecordData" :key="index">
+						<view>
+							<uni-icons type="calendar" class="text-primary m-r-small" size="14"></uni-icons>
+							<text class="content">{{getFormat(item.createTime)}}</text>
+						</view>
+						<view class="v-card-small-box v-page-form small row m-t-small">
+							<view class="v-form-item col-12">
+								<text class="label">销售类型：</text>
+								<dict-tag class="state primary" type="sales_type" :value="String(item.salesType)" />
+							</view>
+							<view class="v-form-item col-12">
+								<text class="label">销售数量：</text>
+								<text class="content">{{formatNumber(item.salesNumber)}}公斤</text>
+							</view>
+							<view class="v-form-item col-24 m-t-mini">
+								<text class="label">销售金额：</text>
+								<text class="content">{{formatData(item.salesVolume)}}元</text>
+							</view>
+							<view class="v-form-item col-24 m-t-mini">
+								<text class="label">客户名称：</text>
+								<text class="content">{{formatData(item.logisticsName)}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import * as ProductApi from "@/api/traceability/salerecord"
 	import mix from '@/utils/mix.js'
-
+	import DictTag from "@/components/DictTag/index"
 	export default {
+		components: {
+			DictTag
+		},
 		data() {
 			return {
-				keyword: null,
 				listData: [],
+				RecordName: null,
+				RecordData: [],
 				loadMoreStatus: 'loadmore',
 				queryParams: {
 					pageNo: 1,
@@ -73,7 +116,7 @@
 		},
 		watch: {
 			"queryParams.processingName"(newV, oldV) {
-				if(newV==""){
+				if (newV == "") {
 					this.go_clear()
 				}
 			}
@@ -88,7 +131,7 @@
 				this.loadMoreStatus = 'loading';
 				try {
 					const res = await ProductApi.getSaleRecordPage(this.queryParams)
-					this.listData = [...this.listData, ...res?.data?.list];					
+					this.listData = [...this.listData, ...res?.data?.list];
 					this.queryParams.total = res?.data?.total;
 					if (this.queryParams.pageNo * this.queryParams.pageSize >= this.queryParams.total) {
 						this.loadMoreStatus = 'nomore';
@@ -97,7 +140,20 @@
 					}
 				} finally {}
 			},
-			
+
+			// 打开 弹窗
+			openPopup(index) {
+				console.log(this.listData[index])
+				this.RecordName = this.listData[index].processingName
+				this.RecordData = this.listData[index].salesRecordsList
+				this.$refs.popup.open()
+			},
+
+			// 关闭 弹窗
+			closePopup() {
+				this.$refs.popup.close()
+			},
+
 			//触底加载
 			scrolltolower() {
 				if (this.loadMoreStatus == 'loading' || this.loadMoreStatus == 'nomore') {
@@ -105,8 +161,8 @@
 				}
 				this.queryParams.pageNo++;
 				this.getListData()
-			},			
-			
+			},
+
 			//确定搜索
 			search(res) {
 				this.queryParams.pageNo = 1
@@ -114,7 +170,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//清除搜索
 			clear(res) {
 				this.queryParams = {
@@ -126,7 +182,7 @@
 				this.listData = []
 				this.getListData()
 			},
-			
+
 			//取消搜索
 			cancel(res) {
 				this.queryParams = {
diff --git a/static/scss/v-layout.scss b/static/scss/v-layout.scss
index 6f91c8b..4525969 100644
--- a/static/scss/v-layout.scss
+++ b/static/scss/v-layout.scss
@@ -41,7 +41,9 @@ $v-muted: #dddddd;
 .text-secondary {
 	color: $v-secondary;
 }
-.text-muted {color: $v-muted}
+.text-muted {
+	color: $v-muted;
+}
 .v-primary-btn {
 	font-size: 12px;
 	height: 20px;
@@ -155,22 +157,22 @@ $v-muted: #dddddd;
 	border-width: 1px;
 	border-style: solid;
 	border-color: transparent;
-	 .v-card-select{
+	.v-card-select {
 		display: none;
 		position: absolute;
 		top: -1px;
-		right: -1px;		
-		width: 16px;		
+		right: -1px;
+		width: 16px;
 		height: 16px;
-		}
+	}
 	&.active {
 		box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.05);
 		border-color: rgba(20, 193, 113, 1);
 		.v-card-select {
-		display: block;		
-	}
+			display: block;
+		}
 	}
-	
+
 	.v-card-top {
 		padding-bottom: 4px;
 
@@ -241,13 +243,17 @@ $v-muted: #dddddd;
 			padding: 1px 10px;
 			font-size: 12px;
 			border-radius: 4px;
-			&.primary{color: $v-primary;
-			background-color: rgba($v-primary, 0.1);
-			border: 1px solid rgba($v-primary, 0.1);}
-			
-			&.secondary{color: $v-secondary;
-			background-color: rgba($v-secondary, 0.1);
-			border: 1px solid rgba($v-secondary, 0.1);}
+			&.primary {
+				color: $v-primary;
+				background-color: rgba($v-primary, 0.1);
+				border: 1px solid rgba($v-primary, 0.1);
+			}
+
+			&.secondary {
+				color: $v-secondary;
+				background-color: rgba($v-secondary, 0.1);
+				border: 1px solid rgba($v-secondary, 0.1);
+			}
 		}
 
 		.state + .state {
@@ -260,6 +266,77 @@ $v-muted: #dddddd;
 	height: 70px;
 	border-radius: 5px;
 }
+
+.v-card-small-item {
+	&:not(:last-child) {
+		margin-bottom: 20px;
+	}
+	.v-card-small-box {
+		padding: 10px;
+		background-color: rgba(0, 0, 0, 0.03);
+		border-radius: 8px;
+		.time {
+			font-size: 13px;
+			text-align: center;
+			font-family: DIN Alternate;
+		}
+		.line{text-align: center;  image{width: 30px;height: 15px;}}
+		.name {
+			font-size: 12px;
+			text-align: center;
+
+			&.delivery {
+				text:before {
+					content: '配';
+					padding: 2px;
+					margin-right: 5px;
+					background-color: rgba($v-primary, 0.05);					
+					color: rgba($v-primary, 1);
+				}
+			}
+			&.received {
+				text:before {
+					content: '收';
+					padding: 2px;
+					margin-right: 5px;
+					background-color: rgba($v-secondary, 0.05);					
+					color: rgba($v-secondary, 1);
+				}
+			}
+		}
+		.record {
+			font-size: 12px;
+			.btn {
+				padding: 2px 8px;
+				border: 1px solid rgba(0, 0, 0, 0.08);
+				border-radius: 20px;
+			}
+		}
+	}
+}
+.popup-content {
+	position: relative;
+	.close {
+		position: absolute;
+		right: 20px;
+		top: 5px;
+		z-index: 9;
+		:before {
+			color: rgba(0, 0, 0, 0.4);
+		}
+	}
+	.v-popup-title {
+		text-align: center;
+		margin-bottom: 20px;
+		text {
+			margin-right: 10px;
+			font-size: 18px;
+			font-weight: 600;
+		}
+		color: $v-primary;
+	}
+}
+
 .v-form {
 	.v-form-item {
 		position: relative;
diff --git a/utils/mix.js b/utils/mix.js
index b4eecb8..652d94f 100644
--- a/utils/mix.js
+++ b/utils/mix.js
@@ -1,46 +1,52 @@
 export default {
-	 methods: {
-		     /** 时间戳处理 */
-		     getData(timestamp) {
-		       let date = new Date(parseInt(timestamp))
-		       let Year = date.getFullYear()
-		       let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
-		       let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
-		       let GMT = Year + '-' + Moth + '-' + Day
-		       return GMT
-		     },
-			 
-			     /** 时间戳处理 */
-			     getData(timestamp) {
-			       let date = new Date(parseInt(timestamp))				   
-			       let Year = date.getFullYear()
-			       let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
-			       let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
-			       let GMT = Year + '-' + Moth + '-' + Day
-			       return GMT
-			     },
-			 
-			     /** 日期格式化 */
-			     getFormat(timestamp) {					
-			       if (timestamp == undefined || timestamp == null) {
-			         return undefined
-			       } else {
-			         let dataArray = timestamp.split('-')
-			         let Year = dataArray[0]
-			         let Moth = dataArray[1]
-			         let Day = dataArray[2].substring(0, 2)
-			         let GMT = Year + '-' + Moth + '-' + Day
-			         return GMT
-			       }
-			     },
-			 
-			  /** 空字符串 */
-			     formatData(value) {
-			       if (value == undefined || value == null || value == '' || value == "" && value != '0' && value != 0) {
-			         return '--'
-			       } else {
-			         return value
-			       }
-			     },
-	 }
+	methods: {
+		/** 时间戳处理 */
+		getData(timestamp) {
+			if (timestamp == undefined || timestamp == null) {
+				return "--"
+			} else {
+				let date = new Date(parseInt(timestamp))
+				let Year = date.getFullYear()
+				let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+				let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
+				let GMT = Year + '-' + Moth + '-' + Day
+				return GMT
+			}
+		},
+
+		/** 日期格式化 */
+		getFormat(timestamp) {
+			if (timestamp == undefined || timestamp == null) {
+				return undefined
+			} else {
+				let dataArray = timestamp.split('-')
+				let Year = dataArray[0]
+				let Moth = dataArray[1]
+				let Day = dataArray[2].substring(0, 2)
+				let GMT = Year + '-' + Moth + '-' + Day
+				return GMT
+			}
+		},
+
+		formatData(value) {
+			if (value == '0' && value == 0) {
+				return value
+			} else {
+
+				if (value == undefined || value == null || value == '' || value == '') {
+					return '--'
+				} else {
+					return value
+				}
+			}
+		},
+
+		formatNumber(value) {
+			if (value == undefined || value == null || value == '') {
+				return '0'
+			} else {
+				return value
+			}
+		}
+	}
 }
\ No newline at end of file