显示年份

ghsApp/src/admin/billing/affirm.vue

@@ -173,7 +173,7 @@
 
               <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 2">
                 <view class="tui-title">记账</view>
-                <view class="tui-input" style="color:#3385ff;">客户要欠款的，选记账</view>
+                <view class="tui-input" style="color:#3385ff;">客户要赊账欠款的，选记账</view>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
@@ -275,7 +275,7 @@
               <tui-list-cell class="line-cell" :hover="false" v-show="form.sendType == 3">
                 <div class="tui-title">配送物流</div>
                 <input type="text" placeholder="请填写物流" style="width:260upx;" v-model="form.wlName" placeholder-class="tui-placeholder" />
-                <button class="admin-button-com mini-btn default" @click="getMyWl" style="margin-left:10upx;height:70upx;line-height:46upx">选择物流</button>
+                <button class="admin-button-com mini-btn default" @click="getMyWl" style="margin-left:10upx;height:70upx;line-height:46upx">选物流</button>
               </tui-list-cell>
 
               <view v-show="displaySendCost == true">

ghsApp/src/pagesOrder/detail.vue

@@ -70,15 +70,15 @@
 					<view>取货号码：</view>
 					<view>{{ detailInfo.sendNum }}</view>
 				</view>
-				<view class="order-info_box">
-					<view>创建日期：</view>
-					<view>{{ detailInfo.addTime?detailInfo.addTime.substr(5,11):'' }}</view>
+			<view class="order-info_box">
+				<view>创建日期：</view>
+				<view>{{ formatDateDisplay(detailInfo.addTime) }}</view>
+			</view>
+			<view class="order-info_box" v-if="detailInfo.payStatus == 1">
+				<view>账单日期：</view>
+				<view>
+					{{ formatDateDisplay(detailInfo.payTime) }}
 				</view>
-				<view class="order-info_box" v-if="detailInfo.payStatus == 1">
-					<view>账单日期：</view>
-					<view>
-						{{ detailInfo.payTime?detailInfo.payTime.substr(5,11):'' }}
-					</view>
 					<view class="price">
 						<button @click="openPicker" class="admin-button-com default">修改</button>
 					</view>
@@ -738,6 +738,19 @@ export default {
 		}
 	},
 	methods: {
+		// 格式化日期显示，如果不是当年则显示年份
+		formatDateDisplay(dateStr) {
+			if (!dateStr) return ''
+			const currentYear = new Date().getFullYear()
+			const dateYear = parseInt(dateStr.substr(0, 4))
+			
+			// 如果是当年，只显示月日时间 (从位置2开始截取11个字符: MM-DD HH:mm)
+			if (currentYear === dateYear) {
+				return dateStr.substr(5, 11)
+			}
+			// 如果不是当年，显示年月日时间 (从位置2开始截取14个字符: YYYY-MM-DD HH:)
+			return dateStr.substr(2, 14)
+		},
 		toggleFinanceInfo() {
 			this.showFinanceInfo = !this.showFinanceInfo
 		},