|
@@ -50,10 +50,6 @@
|
|
|
<uni-popup ref="selectUserRef" background-color="#fff" type="center" :animation="false">
|
|
<uni-popup ref="selectUserRef" background-color="#fff" type="center" :animation="false">
|
|
|
<selectUser @selectUser="selectUserReturn" @cancelSelectUser="cancelSelectUser"> </selectUser>
|
|
<selectUser @selectUser="selectUserReturn" @cancelSelectUser="cancelSelectUser"> </selectUser>
|
|
|
</uni-popup>
|
|
</uni-popup>
|
|
|
- <!-- 开单选花材输入数量和金额 -->
|
|
|
|
|
- <uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
|
|
|
|
|
- <kdSelectNumPrice @enterNum="confirmAddItemModel" :selectItem.sync="selectItem" @cancelKdSelectNumPrice="addItemModelHidden"></kdSelectNumPrice>
|
|
|
|
|
- </uni-popup>
|
|
|
|
|
<!-- 结算弹框 isShowSettle -->
|
|
<!-- 结算弹框 isShowSettle -->
|
|
|
<uni-popup ref="settlePopRef" background-color="#fff" type="center" :animation="false">
|
|
<uni-popup ref="settlePopRef" background-color="#fff" type="center" :animation="false">
|
|
|
<settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
|
|
<settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
|
|
@@ -77,7 +73,6 @@
|
|
|
import { mapGetters,mapActions } from "vuex";
|
|
import { mapGetters,mapActions } from "vuex";
|
|
|
import productMins from "@/mixins/product";
|
|
import productMins from "@/mixins/product";
|
|
|
import autoUpdateMixins from "@/mixins/autoUpdate";
|
|
import autoUpdateMixins from "@/mixins/autoUpdate";
|
|
|
-import kdSelectNumPrice from '@/components/app-kd-select-num-price.vue'
|
|
|
|
|
import settlePop from './components/settle-pop.vue'
|
|
import settlePop from './components/settle-pop.vue'
|
|
|
import selectUser from './components/select-user.vue'
|
|
import selectUser from './components/select-user.vue'
|
|
|
import rightItemArea from './components/rightItemArea.vue'
|
|
import rightItemArea from './components/rightItemArea.vue'
|
|
@@ -86,7 +81,7 @@ import loginComponent from './login.vue'
|
|
|
import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
|
|
import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
|
|
|
export default {
|
|
export default {
|
|
|
name: "workbench",
|
|
name: "workbench",
|
|
|
- components: { selectUser, rightItemArea, kdSelectNumPrice, settlePop, selectPayWay,loginComponent },
|
|
|
|
|
|
|
+ components: { selectUser, rightItemArea, settlePop, selectPayWay,loginComponent },
|
|
|
mixins: [productMins,autoUpdateMixins],
|
|
mixins: [productMins,autoUpdateMixins],
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -250,32 +245,6 @@ export default {
|
|
|
& .all-item-area {
|
|
& .all-item-area {
|
|
|
flex: 63;
|
|
flex: 63;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
- & .show-footer_box {
|
|
|
|
|
- height: 40upx;
|
|
|
|
|
- display: flex;
|
|
|
|
|
- background:red;
|
|
|
|
|
- width:150upx;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- justify-content: flex-end;
|
|
|
|
|
- & > view {
|
|
|
|
|
- height: 40upx;
|
|
|
|
|
- padding: 5upx 25upx;
|
|
|
|
|
- border-radius: 5upx;
|
|
|
|
|
- font-size: 14upx;
|
|
|
|
|
- margin: 0 10upx;
|
|
|
|
|
- vertical-align: middle;
|
|
|
|
|
- display: flex;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- &.btn-breakage {
|
|
|
|
|
- background-color: #da9f5a;
|
|
|
|
|
- color: #ffffff;
|
|
|
|
|
- }
|
|
|
|
|
- &.btn-account {
|
|
|
|
|
- background-color: #009966;
|
|
|
|
|
- color: #ffffff;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
& .nav-left {
|
|
& .nav-left {
|
|
|
height: 100%;
|
|
height: 100%;
|
|
@@ -291,7 +260,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
& .itemList-box {
|
|
& .itemList-box {
|
|
|
- flex: 25;
|
|
|
|
|
|
|
+ flex: 25;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|