出库功能优化

ghsApp/src/admin/shop/selectShop.vue

@@ -36,6 +36,7 @@ import AppTag from "@/components/module/app-tag.vue";
 import AppSearchModule from "@/components/module/app-search";
 import { list } from "@/mixins";
 import { getList } from "@/api/shop";
+import { mapGetters } from "vuex";
 export default {
   name: "selectShop",
   components: {
@@ -69,6 +70,9 @@ export default {
       uni.stopPullDownRefresh();
     }
   },
+  computed: {
+    ...mapGetters(["getLoginInfo"]),
+  },
   onLoad(option) {
     // #ifdef APP-PLUS
     if(plus.device.vendor == 'Newland'){
@@ -81,6 +85,10 @@ export default {
       let style = this.option.style ? this.option.style : 1
       this.selectStyle = style
       if(style == 1){
+        if(item.id == this.getLoginInfo.shopId){
+          this.$msg('当前门店不可用，请选择其它门店')
+          return false
+        }
         if(this.$util.isScanEnv()){
           this.$util.pageTo({url: '/pagesStorehouse/allot/addExDetails',type:2,query: {inShopId: item.id,inShopName:item.shopName}})
         }else{

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -41,8 +41,7 @@
               </template>
             </view>
             <view class="summary-bar">
-              <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.inShopId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
-              <view class="operate-view" v-else @click="reSelectItem"><text class="iconfont icongouwuche"></text>修改花材</view>
+              <view class="operate-view" @click="reSelectItem"><text class="iconfont icongouwuche"></text>返回修改</view>
               <view class="describe-view">共{{ selectList.length }}种</view>
             </view>
           </view>
@@ -73,7 +72,6 @@
           <text></text>
         </text>
       </view>
-      <button v-if="!$util.isEmpty(selectList)" class="admin-button-com big default" @click="removeFromSave()">清空花材</button>
       <button class="admin-button-com blue big" @click="stockOutFn(1)" 
       style="width:300upx;background-color:green;border:1upx solid green;">确认出库并入库</button>
       <!--<button class="admin-button-com blue big" @click="stockOutFn(0)">确认出库</button>-->
@@ -361,10 +359,10 @@ export default {
         border-top: 1upx solid #eeeeee;
         .operate-view {
           display: flex;
-
           align-items: center;
           color: #3385ff;
-          font-size: 26upx;
+          font-size: 30upx;
+          font-weight:bold;
           .iconfont {
             margin-right: 20upx;
             font-size: 40upx;

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -8,6 +8,9 @@
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
 			</view>
+			<view style="float:right;">
+				<button class="admin-button-com middle blue" @click="removeFromSave()">清除花材</button>
+			</view>
 		</view>
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view">

hdApp/src/pagesClient/official/apply.vue

@@ -23,7 +23,7 @@
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >
           <div class="tui-title">花店名称</div>
-          <input v-model="form.name" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name" placeholder="请填写，没有店请填姓名" />
+          <input v-model="form.name" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name" placeholder="请填写，没有开店请填姓名" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres" >
           <div class="tui-title">所在城市</div>