接近完成

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

@@ -41,7 +41,8 @@
 
 	<!-- 开单选花材输入数量和金额 -->
 	<uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
-		<selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+		<selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData"
+		@addToClear="addToClear" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
 	</uni-popup>
 
 </view>
@@ -108,6 +109,9 @@ export default {
 		// #endif
 	},
     methods:{
+        addToClear(){
+            this.settleCommit()
+        },
 		cancelSelectPrice(){
 			this.$refs.gatheringRef.close()
 		},

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

@@ -29,7 +29,7 @@
         <!-- 选数量金额 -->
         <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
             <selectNum v-if="currentJobType=='selectMake'" @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNum>
-            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @addToClear="addToClear" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 
     </view>
@@ -120,6 +120,9 @@ export default {
         }
     },
     methods:{
+        addToClear(){
+            this.$msg('请扫码打开')
+        },
         setNum(info){
             this.$util.hitVoice()
             this.flowerNum = info.num

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

@@ -23,7 +23,7 @@
         <!-- 开单选花材输入数量和金额 -->
         <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
             <selectNum v-if="currentJobType=='make'" @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNum>
-            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @addToClear="addToClear" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 
     </view>
@@ -86,6 +86,9 @@ export default {
         }
     },
     methods:{
+        addToClear(){
+            this.$msg('请扫码打开')
+        },
 		popAddModelFn(info) {
             this.$util.hitVoice()
 			this.showAddModelFn({ ...info, currentNum: 1, unitPrice: info.price,unitType:0})

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

@@ -31,6 +31,10 @@
                 <image @tap="changeUnitType" class="change-unit" :src="`${constant.imgUrl}/icon/switch/switch128.png`"></image>
             </view>
 
+            <view style="text-align:center;" v-if="customData.property==0">
+            <button class="admin-button-com mini-btn blue" @click="clear()">结算</button>
+            </view>
+
         </view>
         <view class="keyboard-body_box">
          <VKeyboard ref="keyboard" :pointIsShow="true" :digital="true" :disorderly="false" @typing="typing" @enter="enter" @cancel="cancel"> </VKeyboard>
@@ -84,6 +88,18 @@ export default {
 		}
 	},
     methods: {
+        clear(){
+            if(Number(this.currentNum)  <= 0) {
+                this.$msg('请填写数量')
+                return
+            }
+            if(Number(this.unitPrice)  <= 0) {
+                this.$msg('请填写价格')
+                return
+            }
+            this.enter()
+            this.$emit('addToClear')
+        },
         checkCurrent(n){
             this.checkType = n
             this.fillType = n