优化

hdPad/src/pages.json

@@ -4,7 +4,7 @@
 		{"path": "pages/home/work","style": {"navigationBarTitleText": "工单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},
-		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款制作"}}
+		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款"}}
 	],
 	"subPackages": [],
 	"globalStyle": {

hdPad/src/pages/home/cash.vue

@@ -22,12 +22,12 @@
 				</view>
 				<!-- 分类和花材图片 -->
 				<view class="all-item-area">
-					<rightGoodsArea v-if="currentProperty == 0" :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightGoodsArea>
-					<rightItemArea v-else :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItemArea>
+					<rightGoods v-if="currentProperty == 0" :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightGoods>
+					<rightItem v-else :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
 				</view>
 				<!-- 按钮操作 -->
 				<view class="open-box">
-					<middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
+					<consoleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></consoleButton>
 				</view>
 			</view>
 		</template>
@@ -37,9 +37,9 @@
 <script>
 import { mapGetters } from "vuex";
 import autoUpdateApp from "@/mixins/autoUpdate";
-import rightItemArea from './components/rightItemArea.vue'
-import rightGoodsArea from './components/rightGoodsArea.vue'
-import middleButton from './components/middleButton.vue'
+import rightItem from './components/rightItem.vue'
+import rightGoods from './components/rightGoods.vue'
+import consoleButton from './components/console.vue'
 import customerList from './components/customerList.vue'
 import leftArea from './components/leftArea.vue'
 import leftGroup from './components/leftGroup.vue'
@@ -48,7 +48,7 @@ import loginComponent from './login.vue'
 import productMins from "@/mixins/product";
 export default {
 	name: "cash",
-	components: { rightItemArea,middleButton,  loginComponent, leftArea,leftGroup, customerList, rightGoodsArea,casherNav },
+	components: { rightItem,consoleButton,  loginComponent, leftArea,leftGroup, customerList, rightGoods,casherNav },
 	mixins: [autoUpdateApp,productMins],
 	data() {
 		return {

hdPad/src/pages/home/components/middleButton.vue → hdPad/src/pages/home/components/console.vue

@@ -36,7 +36,7 @@ import toPayWay from './toPay.vue'
 import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
 import productMins from "@/mixins/product";
 export default {
-    name:'middleButton',
+    name:'console',
 	mixins: [productMins],
     components:{ settlePop,toPayWay },
 	props: {

hdPad/src/pages/home/components/nav.vue

@@ -7,7 +7,7 @@
 export default {
   data() {
     return {
-        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'新款制作',page:'/pages/home/make'},{name:'选款制作',page:'/pages/home/selectMake'}]
+        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'新款',page:'/pages/home/make'},{name:'选款',page:'/pages/home/selectMake'}]
     }
   },
   methods:{

hdPad/src/pages/home/components/rightGoodsArea.vue → hdPad/src/pages/home/components/rightGoods.vue

@@ -40,7 +40,7 @@ import list from "@/mixins/list";
 import selectNumPrice from './selectNumPrice.vue'
 import selectNum from './selectNum.vue'
 export default {
-    name:'rightItemArea',
+    name:'rightItem',
     components:{ selectNumPrice,selectNum },
 	mixins: [productMins,list],
     data(){
@@ -51,6 +51,7 @@ export default {
             currentJobType:'bill',
             currentJobId:0,
             flowerNum:0,
+            flower:'',
             checkStock:true,
             flowerNumList:[{num:0,name:'支数'},{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
         }
@@ -116,7 +117,7 @@ export default {
 			this.showAddModelFn({ ...info, buyNum: 1, unitPrice: info.price,unitType:0})
 		},
         init(){
-            getClass().then(res=>{
+            getClass({flower:this.flower}).then(res=>{
                 if(res.code == 1){
                     this.allCategory = res.data
                     this.currentCategory = this.allCategory[0]

hdPad/src/pages/home/components/rightItemArea.vue → hdPad/src/pages/home/components/rightItem.vue

@@ -33,7 +33,7 @@ import productMins from "@/mixins/product";
 import selectNumPrice from './selectNumPrice.vue'
 import selectNum from './selectNum.vue'
 export default {
-    name:'rightItemArea',
+    name:'rightItem',
     components:{ selectNumPrice,selectNum },
 	mixins: [productMins],
     data(){

hdPad/src/pages/home/make.vue

@@ -10,7 +10,7 @@
             </view>
             <!-- 分类和花材图片 -->
             <view class="all-item-area">
-                <rightItemArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItemArea>
+                <rightItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
@@ -26,13 +26,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import rightItemArea from './components/rightItemArea.vue'
+import rightItem from './components/rightItem.vue'
 import leftItem from './components/leftArea.vue'
 import casherNav from './components/nav.vue'
 import productMins from "@/mixins/product";
 export default {
 	name: "make",
-	components: { rightItemArea,leftItem, casherNav},
+	components: { rightItem,leftItem, casherNav},
 	mixins: [productMins],
 	data() {
 		return {

hdPad/src/pages/home/modify.vue

@@ -8,7 +8,7 @@
             </view>
             <!-- 分类和花材图片 -->
             <view class="all-item-area">
-                <rightItemArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItemArea>
+                <rightItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
@@ -25,13 +25,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import rightItemArea from './components/rightItemArea.vue'
+import rightItem from './components/rightItem.vue'
 import leftArea from './components/leftArea.vue'
 import productMins from "@/mixins/product";
 import { getFullInfo } from '@/api/work'
 export default {
 	name: "modify",
-	components: { rightItemArea,leftArea},
+	components: { rightItem,leftArea},
 	mixins: [productMins],
 	data() {
 		return {

hdPad/src/pages/home/selectMake.vue

@@ -10,7 +10,7 @@
             </view>
             <!-- 成品 -->
             <view class="all-item-area">
-                <rightGoodsArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" :changeCheckStock="checkStock"></rightGoodsArea>
+                <rightGoods :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" :changeCheckStock="checkStock"></rightGoods>
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
@@ -25,13 +25,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import rightGoodsArea from './components/rightGoodsArea.vue'
+import rightGoods from './components/rightGoods.vue'
 import leftArea from './components/leftArea.vue'
 import casherNav from './components/nav.vue'
 import productMins from "@/mixins/product"
 export default {
 	name: "make",
-	components: { rightGoodsArea,leftArea, casherNav},
+	components: { rightGoods,leftArea, casherNav},
 	mixins: [productMins],
 	data() {
 		return {