库存明细

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-tag.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/dorpdownSelect.wxml

@@ -1 +1 @@
-<view class="select-bg_bx data-v-75f05ae4"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-75f05ae4','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e">{{''+(menuObjActive?menuObjActive:getMyShopInfo.shopName)+''}}<block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-75f05ae4"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-75f05ae4" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-75f05ae4" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-75f05ae4"><view class="title data-v-75f05ae4">{{menuObj.titleChild}}</view><view class="item-child_box data-v-75f05ae4"><block wx:for="{{menuObj.list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><button data-event-opts="{{[['tap',[['changeItem',['$0'],[[['menuObj.list','',index]]]]]]]}}" class="{{['data-v-75f05ae4','admin-button-com','mini-btn',selectItemId===item.id?'blue':'default']}}" bindtap="__e">{{''+item.name+''}}</button></block></view></view><block wx:if="{{typeSelect===1}}"><view class="select-item-box data-v-75f05ae4"><view class="title data-v-75f05ae4">其他时间选择</view><view class="item-child_box data-v-75f05ae4"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-75f05ae4" bindtap="__e">自定义</view></view></view></block></block></view></block></view>
+<view class="select-bg_bx data-v-fb733c2e"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-fb733c2e','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e"><block wx:if="{{typeTime}}"><text class="data-v-fb733c2e">{{selectItemId?menuObjActive:menuObj.title}}</text></block><block wx:else><text class="data-v-fb733c2e">{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text></block><block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-fb733c2e"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-fb733c2e" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-fb733c2e" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-fb733c2e"><view class="title data-v-fb733c2e">{{menuObj.titleChild}}</view><view class="item-child_box data-v-fb733c2e"><block wx:for="{{menuObj.list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><button data-event-opts="{{[['tap',[['changeItem',['$0'],[[['menuObj.list','',index]]]]]]]}}" class="{{['data-v-fb733c2e','admin-button-com','mini-btn',selectItemId===item.id?'blue':'default']}}" bindtap="__e">{{''+item.name+''}}</button></block></view></view><block wx:if="{{typeSelect===1}}"><view class="select-item-box data-v-fb733c2e"><view class="title data-v-fb733c2e">其他时间选择</view><view class="item-child_box data-v-fb733c2e"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-fb733c2e" bindtap="__e">自定义</view></view></view></block></block></view></block></view>

ghsApp/dist/build/mp-weixin/components/module/dorpdownSelect.wxss

@@ -1 +1 @@
-.select-bg_bx .select-title.data-v-75f05ae4{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-75f05ae4{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-75f05ae4{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-75f05ae4{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-75f05ae4{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-75f05ae4{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-75f05ae4{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-75f05ae4{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 0 20rpx;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-flow:wrap;flex-flow:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-75f05ae4{margin-bottom:20rpx;padding:18rpx 50rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-75f05ae4{width:100%}
+.select-bg_bx .select-title.data-v-fb733c2e{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-fb733c2e{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-fb733c2e{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-fb733c2e{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-fb733c2e{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-fb733c2e{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-fb733c2e{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-fb733c2e{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 0 20rpx;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-flow:wrap;flex-flow:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-fb733c2e{margin-bottom:20rpx;padding:18rpx 50rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-fb733c2e{width:100%}

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/src/components/module/dorpdownSelect.vue

@@ -2,7 +2,10 @@
     <view class="select-bg_bx">
 
         <view v-if="isShowTit" @click="switchCut" :class="['select-title',dropdownShow?'select_corlor':'']">
-            {{menuObjActive?menuObjActive:getMyShopInfo.shopName}}
+            <!--{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}-->
+            <!--{{selectItemId?menuObjActive:''}}-->
+														<text v-if="typeTime">{{selectItemId?menuObjActive:menuObj.title}}</text>
+														<text v-else>{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text>
 <!--            {{getMyShopInfo?getMyShopInfo.shopName:menuObj.title}}-->
             <i v-if="isShowMore" class="iconfont iconsanjiao_xia"></i>
         </view>
@@ -81,6 +84,10 @@
             isShowTit:{
                 type: Boolean,
                 default: true
+            },
+											typeTime:{
+                type: Boolean,
+                default: false
             },
             isShowMore:{
                 type: Boolean,

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -5,6 +5,7 @@
 
 				<DorpdownSelect class="bar"
 					:menuObj="menuTimeObj"
+					:typeTime="true"
 					:selectItemId.sync="selectTimeId"
 					:typeSelect="1" top="0px"
 					@selectSussess="selectSussess" />