|
|
@@ -2,10 +2,13 @@
|
|
|
<view class="app-content">
|
|
|
<view class="billing_box_bg">
|
|
|
<view class="input-wrap" >
|
|
|
+ <view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
|
|
|
+ <button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
|
|
|
+ </view>
|
|
|
<view class="search-bar">
|
|
|
- <app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn" />
|
|
|
+ <app-search-module ref="globalSearchRef" v-model="globalPy" placeholder="这里搜索" @input="globalSearch" />
|
|
|
</view>
|
|
|
- <view style="float:right">
|
|
|
+ <view style="float:right;margin-left:10upx;">
|
|
|
<button class="admin-button-com middle blue" @click="removeFromSave(0)">清除花材</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -13,55 +16,41 @@
|
|
|
<view class="scroll-middle_bx">
|
|
|
|
|
|
<scroll-view scroll-y scroll-with-animation class="tab-view">
|
|
|
- <!--分类 start -->
|
|
|
- <div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="classIndex == index ? 'active' : ''" :data-current="index" @tap.stop="swichClass(index)">
|
|
|
- <text>{{ item.className || "" }}</text>
|
|
|
+ <div v-for="(item, index) in globalClassData" :key="index" class="tab-bar-item" :class="globalClassIndex == index ? 'active' : ''" :data-current="index" @tap.stop="globalSwitchClass(index,item)">
|
|
|
+ <text>{{ item.name || "" }}</text>
|
|
|
</div>
|
|
|
- <!--分类 end -->
|
|
|
<view style="height: 120upx"></view>
|
|
|
</scroll-view>
|
|
|
|
|
|
- <scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
|
|
|
- <!--花材列表 start -->
|
|
|
- <block v-if="!$util.isEmpty(globalClassItemList)">
|
|
|
- <view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
|
|
|
- <view class="item_list_title">{{ classItem.className }}</view>
|
|
|
-
|
|
|
- <view v-if="classItem.child && !$util.isEmpty(classItem.child)">
|
|
|
-
|
|
|
- <template v-for="(productItem, productIndex) in classItem.child">
|
|
|
- <view style="height: 160upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
|
|
|
- <Commondity v-if="classItem.isActive"
|
|
|
- :checkStock="true"
|
|
|
- :info="productItem"
|
|
|
- @showAddModelFn="showAddModelFn"
|
|
|
- @replaceItemFn="replaceItemFn"
|
|
|
- ></Commondity>
|
|
|
- </view>
|
|
|
- </template>
|
|
|
-
|
|
|
- </view>
|
|
|
- <view v-else>
|
|
|
- <view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
|
|
|
- <view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
|
|
|
+ <scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
|
|
|
+ :scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" lower-threshold="100" @scrolltolower="globalScrollBottom">
|
|
|
+ <block v-if="!$util.isEmpty(globalItemData)">
|
|
|
+ <view class="item_list_bx selectAll">
|
|
|
+ <template v-for="(productItem, productIndex) in globalItemData">
|
|
|
+ <view class="item_list_title" v-if="productItem.className && productItem.className!=''">{{ productItem.className }}</view>
|
|
|
+ <view style="height: 175upx" :key="productIndex">
|
|
|
+ <Commondity
|
|
|
+ :checkStock="true"
|
|
|
+ :info="productItem"
|
|
|
+ @showAddModelFn="showAddModelFn"
|
|
|
+ @replaceItemFn="replaceItemFn"
|
|
|
+ ></Commondity>
|
|
|
</view>
|
|
|
- </view>
|
|
|
-
|
|
|
+ </template>
|
|
|
</view>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
- <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(globalClassItemList)" />
|
|
|
+ <app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalItemData)" />
|
|
|
</block>
|
|
|
- <!--花材列表 end -->
|
|
|
</scroll-view>
|
|
|
|
|
|
</view>
|
|
|
|
|
|
- <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
|
|
|
+ <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
|
|
|
<template slot="customContent">
|
|
|
<view class="select-cmd_bx" v-if="customData">
|
|
|
- <view class="kc"><text class="unit_price">库存 {{ customData.stock?parseFloat(customData.stock):0 }}</text></view>
|
|
|
- <view class="num_bx">
|
|
|
+ <view class="kc"><text class="unit_price">库存 {{ customData.stock||0 }}</text></view>
|
|
|
+ <view class="num_bx">
|
|
|
|
|
|
<!-- #ifdef APP-PLUS -->
|
|
|
<input style="width: 260upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
|
|
|
@@ -75,6 +64,7 @@
|
|
|
<input style="width: 260upx" v-model="customData.smallCount" v-if="globalUnitType == 1" :focus="isAddInputFocus" type="number" />
|
|
|
<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">{{customData.smallUnit}}</text>
|
|
|
<!-- #endif -->
|
|
|
+ <image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" style="width:86upx;height:86upx;" mode="widthFix"></image>
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -82,9 +72,22 @@
|
|
|
</modal-module>
|
|
|
|
|
|
<!-- 花材不足提示框 -->
|
|
|
- <modal-module :show="showSubmitModel" title="确认下一步？" color="#333" :size="32" padding="30rpx 30rpx" >
|
|
|
+ <modal-module :show="showSubmitModel" title="确认下一步？" color="#333" :size="32" padding="30upx 30upx" >
|
|
|
</modal-module>
|
|
|
- <FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSave" ></FooterCart>
|
|
|
+
|
|
|
+ <FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSave" :displayTotalPrice="false"></FooterCart>
|
|
|
+
|
|
|
+ <uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
|
|
|
+ <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
|
|
|
+
|
|
|
+ <view v-for="(item, index) in globalClassData" :key="index" @tap.stop="globalChangeClass(index,item)" style="margin-bottom:20upx;margin-left:3upx;">
|
|
|
+ <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
|
|
|
+ <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </uni-popup>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -97,9 +100,9 @@ import Commondity from "@/components/module/app-commodity";
|
|
|
import FooterCart from "@/components/module/app-footer-cart";
|
|
|
import ModalModule from "@/components/plugin/modal";
|
|
|
import { COMMODITY_TYPE } from "@/utils/declare";
|
|
|
-import productMins from "@/mixins/product";
|
|
|
+import productMins from "@/mixins/product2";
|
|
|
export default {
|
|
|
- name: "WastageBilling",//损耗
|
|
|
+ name: "index",
|
|
|
components: {
|
|
|
AppTabs,
|
|
|
AppSearchModule,
|
|
|
@@ -111,7 +114,7 @@ export default {
|
|
|
mixins: [productMins],
|
|
|
data() {
|
|
|
return {
|
|
|
- selectJobType: "wastage", //选择商品页面类别
|
|
|
+ selectJobType: "wastage",
|
|
|
COMMODITY_TYPE,
|
|
|
isAddModel: false,
|
|
|
isSmallCount:false,
|
|
|
@@ -121,14 +124,29 @@ export default {
|
|
|
smallCount: 0,
|
|
|
userPrice:0
|
|
|
},
|
|
|
- showSubmitModel: false
|
|
|
+ showSubmitModel: false,
|
|
|
+ unitType:0,
|
|
|
+ showClassRemind:false,
|
|
|
+ autoLoad: false
|
|
|
};
|
|
|
},
|
|
|
- computed: {
|
|
|
- },
|
|
|
- onUnload() {
|
|
|
+ onLoad(){
|
|
|
+ this.globalRequestType = 'break'
|
|
|
+ this.initData()
|
|
|
},
|
|
|
methods: {
|
|
|
+ selectFlowerNumFn(){
|
|
|
+ this.$refs.globalClassImgRef.open('top')
|
|
|
+ },
|
|
|
+ switchGlobalUnitType(){
|
|
|
+ if(this.globalUnitType == 0){
|
|
|
+ this.globalUnitType = 1
|
|
|
+ this.customData.bigCount = null
|
|
|
+ }else{
|
|
|
+ this.globalUnitType = 0
|
|
|
+ this.customData.smallCount = null
|
|
|
+ }
|
|
|
+ },
|
|
|
confirmToSave() {
|
|
|
if(this.$util.isEmpty(this.selectList)){
|
|
|
this.$msg('请选择花材')
|
|
|
@@ -147,10 +165,10 @@ export default {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
.input-wrap {
|
|
|
- padding: 22upx 20upx 22upx 30upx;
|
|
|
+ display: flex;
|
|
|
+ padding: 22upx 20upx 22upx 13upx;
|
|
|
.search-bar {
|
|
|
- display:inline-block;
|
|
|
- width:530upx;
|
|
|
+ flex: 1;
|
|
|
}
|
|
|
}
|
|
|
.scroll-middle_bx {
|
|
|
@@ -212,6 +230,7 @@ export default {
|
|
|
height: calc(100vh - 140upx);
|
|
|
flex: 1;
|
|
|
box-sizing: border-box;
|
|
|
+
|
|
|
}
|
|
|
.item_list_bx {
|
|
|
padding: 40upx 16upx;
|
