lilei il y a 2 ans
Parent
commit
f639fdaa1b

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1663558984646
+  "version": 1663654281807
 }

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -16,7 +16,7 @@
               <a-tooltip placement="right">
                 <template slot="title">
                   <p>待结金额:指客户已经扫码从数字货架取走配件,但还没有结算</p>
-                  <p>冻结金额:指客户已经下单,但还没有从数字货架取走配件</p>
+                  <!-- <p>冻结金额:指客户已经下单,但还没有从数字货架取走配件</p> -->
                 </template>
                 <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
               </a-tooltip>
@@ -28,9 +28,9 @@
               <a-descriptions-item label="待结金额">
                 <span>{{ total && toThousands(total.waitSettleAmount,2) }}</span>
               </a-descriptions-item>
-              <a-descriptions-item label="冻结金额">
+              <!-- <a-descriptions-item label="冻结金额">
                 <span>{{ total && toThousands(total.freezeAmount,2) }}</span>
-              </a-descriptions-item>
+              </a-descriptions-item> -->
               <a-descriptions-item label="可用额度">
                 <span>{{ total && toThousands(total.usableAmount,2) }}</span>
               </a-descriptions-item>

+ 2 - 2
src/views/numsGoodsShelves/shelfOrder/detail.vue

@@ -16,8 +16,8 @@
               <a-descriptions-item label="下单时间">{{ detailData&&detailData.orderDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="下单人员">{{ detailData&&detailData.orderPersonName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="订单状态"> {{ detailData&&detailData.billStateDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="VIN">{{ detailData&&detailData.vin || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="车型">{{ detailData&&detailData.vehicleModel || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="VIN" v-if="detailData&&detailData.vin">{{ detailData&&detailData.vin || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="车型" v-if="detailData&&detailData.vehicleModel">{{ detailData&&detailData.vehicleModel || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>