Răsfoiți Sursa

采购等优化

shish 2 ani în urmă
părinte
comite
bca33dd7cb

+ 4 - 1
ghsApp/src/admin/billing/result.vue

@@ -164,9 +164,12 @@ export default {
         }
         let actPrice = this.detailInfo.actPrice ? parseFloat(this.detailInfo.actPrice) : 0
         this.title = this.customName+' '+this.detailInfo.addTime.substr(5,11)+' ¥'+actPrice
+        if(this.detailInfo.payTime!='0000-00-00 00:00:00'){
+          this.title = this.customName+' '+this.detailInfo.payTime.substr(5,11)+' ¥'+actPrice
+        }
         if(this.detailInfo.tkPrice && Number(this.detailInfo.tkPrice)>0){
           this.title = this.title+' 已退¥'+parseFloat(this.detailInfo.tkPrice)
-		}
+		    }
       }
     },
     //发货

+ 3 - 4
ghsApp/src/admin/home/components/OrderItem.vue

@@ -22,10 +22,9 @@
             <view>{{ item.sendNum }}</view>
         </view>
         <view class="order-info_box">
-            <view>创建:</view>
-            <view>
-              {{ item.addTime?item.addTime.substr(5,11):'' }}
-            </view>
+            <view>日期:</view>
+            <view v-if="item.payTime!='0000-00-00 00:00:00'">{{ item.payTime?item.payTime.substr(5,11):'' }}</view>
+            <view v-else>{{ item.addTime?item.addTime.substr(5,11):'' }}</view>
         </view>
         <view class="order-info_box">
             <view>单号:</view>

+ 3 - 0
ghsApp/src/admin/home/order.vue

@@ -211,6 +211,9 @@ export default {
       let actPrice = info.actPrice ? parseFloat(info.actPrice) : 0
       let customName = info.customName ? info.customName : ''
       let title = customName+' '+info.addTime.substr(5,11)+' ¥'+actPrice
+      if(info.payTime!='0000-00-00 00:00:00'){
+        title = customName+' '+info.payTime.substr(5,11)+' ¥'+actPrice
+      }
       if(info.tkPrice && Number(info.tkPrice)>0){
           title = title+' 已退¥'+parseFloat(info.tkPrice)
 			}

+ 3 - 0
ghsApp/src/pagesOrder/detail.vue

@@ -1054,6 +1054,9 @@ export default {
 				let customName = this.detailInfo.customName ? this.detailInfo.customName : ''
 				let actPrice = this.detailInfo.actPrice ? parseFloat(this.detailInfo.actPrice) : 0
 				this.title = customName+' '+this.detailInfo.addTime.substr(5,11)+' ¥'+actPrice
+				if(this.detailInfo.payTime!='0000-00-00 00:00:00'){
+					this.title = customName+' '+this.detailInfo.payTime.substr(5,11)+' ¥'+actPrice
+				}
 				if(this.detailInfo.tkPrice && Number(this.detailInfo.tkPrice)>0){
 					this.title = this.title+' 已退¥'+parseFloat(this.detailInfo.tkPrice)
 				}

+ 2 - 1
hdApp/src/pagesPurchase/orderItem.vue

@@ -18,7 +18,8 @@
       <view class="item-info">
         <view class="info-row">
           <text class="info-label"> 日期:</text>
-          <text class="info-value">{{ info.addTime ? info.addTime.substring(5, 16) : '' }}</text>
+          <text class="info-value" v-if="info.payTime!='0000-00-00 00:00:00'">{{ info.payTime ? info.payTime.substring(5, 16) : '' }}</text>
+          <text class="info-value" v-else>{{ info.addTime ? info.addTime.substring(5, 16) : '' }}</text>
         </view>
         <view class="info-row">
           <text class="info-label"> 单号:</text>

+ 2 - 2
hdApp/src/pagesPurchase/purDetails.vue

@@ -33,9 +33,9 @@
           <view>采购门店:</view>
           <view>{{ detailInfo.customName ? detailInfo.customName : '' }}</view>
         </view>
-        <view class="order-info_box">
+        <view class="order-info_box" v-if="detailInfo.payTime!='0000-00-00 00:00:00'">
           <view>订单日期:</view>
-          <view>{{ detailInfo.updateTime ? detailInfo.updateTime.substring(5, 16) : '' }}</view>
+          <view>{{ detailInfo.payTime ? detailInfo.payTime.substring(5, 16) : '' }}</view>
         </view>
         <view class="order-info_box">
           <view>订单编号:</view>