|
|
@@ -4,7 +4,7 @@
|
|
|
<loginComponent></loginComponent>
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
- <view v-if="customId == 0">
|
|
|
+ <view v-if="chooseCustomer">
|
|
|
<!-- 客户列表 -->
|
|
|
<customerList @selectCustomer="selectCustomer"> </customerList>
|
|
|
</view>
|
|
|
@@ -15,7 +15,8 @@
|
|
|
</view>
|
|
|
<!-- 已选花材列表 -->
|
|
|
<view class="itemList-box">
|
|
|
- <leftItem :customId.sync="customId"></leftItem>
|
|
|
+ <leftItem v-if="!$util.isEmpty(selectList)" :customId.sync="customId"></leftItem>
|
|
|
+ <leftGroup v-else :customId.sync="customId"></leftGroup>
|
|
|
</view>
|
|
|
<!-- 按钮操作 -->
|
|
|
<view class="open-box">
|
|
|
@@ -37,11 +38,13 @@ import rightItemArea from './components/rightItemArea.vue'
|
|
|
import middleButton from './components/middleButton.vue'
|
|
|
import customerList from './components/customer-list.vue'
|
|
|
import leftItem from './components/leftItem.vue'
|
|
|
+import leftGroup from './components/leftGroup.vue'
|
|
|
import loginComponent from './login.vue'
|
|
|
+import productMins from "@/mixins/product";
|
|
|
export default {
|
|
|
name: "workbench",
|
|
|
- components: { rightItemArea,middleButton, loginComponent, leftItem, customerList },
|
|
|
- mixins: [autoUpdateApp],
|
|
|
+ components: { rightItemArea,middleButton, loginComponent, leftItem,leftGroup, customerList },
|
|
|
+ mixins: [autoUpdateApp,productMins],
|
|
|
data() {
|
|
|
return {
|
|
|
itemList:[],
|
|
|
@@ -49,7 +52,10 @@ export default {
|
|
|
selectItem: {},
|
|
|
selectItemUser:{},
|
|
|
isLogin:false,
|
|
|
- customId:0
|
|
|
+ customId:0,
|
|
|
+ selectJobType:'bill',
|
|
|
+ selectJobId:0,
|
|
|
+ chooseCustomer:false
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -77,10 +83,11 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
resetCustomer(){
|
|
|
- this.customId = 0
|
|
|
+ this.chooseCustomer = true
|
|
|
},
|
|
|
selectCustomer(info){
|
|
|
this.customId = info.id ? parseInt(info.id) : 0
|
|
|
+ this.selectJobId = this.customId
|
|
|
},
|
|
|
init() {
|
|
|
},
|
|
|
@@ -100,7 +107,7 @@ export default {
|
|
|
flex: 5;
|
|
|
background-color: rgba(72, 91, 107, 1);
|
|
|
& .item-list {
|
|
|
- margin-top: 23upx;
|
|
|
+ margin-top: 21upx;
|
|
|
font-size: 16upx;
|
|
|
text-align: center;
|
|
|
padding: 15upx 0;
|
shish