Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

ccjgmwz 3 years ago
parent
commit
b05ebbe658
2 changed files with 304 additions and 98 deletions
  1. 303 97
      components/uview-ui/libs/util/area.js
  2. 1 1
      pageD/warehousings/warehousings.vue

File diff suppressed because it is too large
+ 303 - 97
components/uview-ui/libs/util/area.js


+ 1 - 1
pageD/warehousings/warehousings.vue

@@ -97,7 +97,7 @@
 				<view class="c-row b-b">
 					<text class="tit">入库日期</text>
 					
-					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=''?WarehouseInOutInfo.inOutDate:time1}}</view>
+					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=null?WarehouseInOutInfo.inOutDate:time1}}</view>
 					<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 					
 				</view>

Some files were not shown because too many files changed in this diff