主要页面完成

hdPad/src/mixins/product.js

@@ -15,7 +15,7 @@ export default {
 			globalClassItemList:'',
 			kdType:'HIT',//点击和扫码开单，HIT SCAN
 			checkStock:true,// 考虑库存，盘点不需要考虑库存
-			customData: { buyNum: 0, unitPrice: 0,unitType:0 },
+			customData: { buyNum: 0, unitPrice: 0,unitType:0, unitName:'扎'},
 			globalItemList:[]
 		};
 	},
@@ -195,7 +195,7 @@ export default {
 					return false
 				}
 			}
-			this.$refs.kdSelectNumPriceRef.open('center')
+			this.$refs.selectNumPriceRef.open('center')
 			this.customData = copyObject(info)
 			this.$nextTick(()=>{
 				if(this.currentJobType == 'bill'){
@@ -233,7 +233,7 @@ export default {
 			this.addItemModelHidden()			
 		},
 		addItemModelHidden() {
-			this.$refs.kdSelectNumPriceRef.close()
+			this.$refs.selectNumPriceRef.close()
 			this.customData = {};
 		}
 	}

hdPad/src/pages/home/cash.vue

@@ -17,7 +17,7 @@
 				</view>
 				<!-- 已选花材列表 -->
 				<view class="itemList-box">
-					<leftItem v-if="!$util.isEmpty(selectList)" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftItem>
+					<leftArea v-if="!$util.isEmpty(selectList)" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftArea>
 					<leftGroup v-else :customId.sync="customId"></leftGroup>
 				</view>
 				<!-- 分类和花材图片 -->
@@ -41,14 +41,14 @@ import rightItemArea from './components/rightItemArea.vue'
 import rightGoodsArea from './components/rightGoodsArea.vue'
 import middleButton from './components/middleButton.vue'
 import customerList from './components/customerList.vue'
-import leftItem from './components/leftArea.vue'
+import leftArea from './components/leftArea.vue'
 import leftGroup from './components/leftGroup.vue'
 import casherNav from './components/nav.vue'
 import loginComponent from './login.vue'
 import productMins from "@/mixins/product";
 export default {
 	name: "cash",
-	components: { rightItemArea,middleButton,  loginComponent, leftItem,leftGroup, customerList, rightGoodsArea,casherNav },
+	components: { rightItemArea,middleButton,  loginComponent, leftArea,leftGroup, customerList, rightGoodsArea,casherNav },
 	mixins: [autoUpdateApp,productMins],
 	data() {
 		return {

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

@@ -9,18 +9,8 @@
                     </view>
                     <view class="item-price-num">
                         <template v-if="item.property && item.property == 1">
-
-                            <template v-if="currentJobType == 'modifyWork'">
                             <view>{{parseFloat(item.unitPrice)}}元/{{item.unitName}}</view>
                             <view>{{item.buyNum}} {{item.unitName}}</view>
-                            </template>
-
-                            <template v-if="currentJobType == 'bill'">
-                            <view v-if="item.unitType == 0">{{parseFloat(item.bigPrice)}}元/{{item.bigUnit}}</view>
-                            <view v-else>{{parseFloat(item.smallPrice)}}元/{{item.smallUnit}}</view>
-                            <view>{{item.buyNum}} {{item.unitType == 0 ? item.bigUnit : item.smallUnit}}</view>
-                            </template>
-
                         </template>
                         <template v-else>
                             <view>{{parseFloat(item.unitPrice)}}/份</view>
@@ -34,8 +24,7 @@
         <view class="itemList-footer_box">
             <view> 数量
                 <text style="margin-left:5upx;">
-                    <text v-if="Number(allCount.bigNum)>0">{{allCount.bigNum}}扎</text>
-                    <text v-if="Number(allCount.smallNum)>0">{{allCount.smallNum}}支</text>
+                    <text v-if="Number(allCount.bigNum)>0">{{allCount.bigNum}}扎</text><text v-if="Number(allCount.smallNum)>0">{{allCount.smallNum}}支</text>
                 </text>
             </view>
             <view> 合计 <text style="margin-left:5upx;">￥{{allPrice}}</text> </view>

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

@@ -25,8 +25,8 @@
         <slot name="footer"></slot>
 
         <!-- 开单选花材输入数量和金额 -->
-        <uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
-            <kdSelectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></kdSelectNumPrice>
+        <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
+            <selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 
     </view>
@@ -36,10 +36,10 @@ import { getClass } from '@/api/category/index'
 import { getGoodsList } from '@/api/goods/index'
 import productMins from "@/mixins/product";
 import list from "@/mixins/list";
-import kdSelectNumPrice from './selectNumPrice.vue'
+import selectNumPrice from './selectNumPrice.vue'
 export default {
     name:'rightItemArea',
-    components:{ kdSelectNumPrice },
+    components:{ selectNumPrice },
 	mixins: [productMins,list],
     data(){
         return {

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

@@ -19,7 +19,7 @@
         <slot name="footer"></slot>
 
         <!-- 开单选花材输入数量和金额 -->
-        <uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
+        <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
             <selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 

hdPad/src/pages/home/modify.vue

@@ -4,7 +4,7 @@
             <view class="nav-left"> </view>
             <!-- 已选花材列表 -->
             <view class="itemList-box">
-                <leftItem :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftItem>
+                <leftArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftArea>
             </view>
             <!-- 分类和花材图片 -->
             <view class="all-item-area">
@@ -26,12 +26,12 @@
 <script>
 import { mapGetters } from "vuex";
 import rightItemArea from './components/rightItemArea.vue'
-import leftItem from './components/leftArea.vue'
+import leftArea from './components/leftArea.vue'
 import productMins from "@/mixins/product";
 import { getFullInfo } from '@/api/work'
 export default {
 	name: "modify",
-	components: { rightItemArea,leftItem},
+	components: { rightItemArea,leftArea},
 	mixins: [productMins],
 	data() {
 		return {

hdPad/src/pages/home/selectMake.vue

@@ -6,11 +6,11 @@
             </view>
             <!-- 已选商品列表 -->
             <view class="itemList-box">
-                <leftItem></leftItem>
+                <leftArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></leftArea>
             </view>
             <!-- 成品 -->
             <view class="all-item-area">
-                <rightGoodsArea> </rightGoodsArea>
+                <rightGoodsArea :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"></rightGoodsArea>
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
@@ -26,12 +26,12 @@
 <script>
 import { mapGetters } from "vuex";
 import rightGoodsArea from './components/rightGoodsArea.vue'
-import leftItem from './components/leftArea.vue'
+import leftArea from './components/leftArea.vue'
 import casherNav from './components/nav.vue'
 import productMins from "@/mixins/product"
 export default {
 	name: "make",
-	components: { rightGoodsArea,leftItem, casherNav},
+	components: { rightGoodsArea,leftArea, casherNav},
 	mixins: [productMins],
 	data() {
 		return {