判断花材有效性

ghsApp/src/admin/billing/affirm.vue

@@ -164,11 +164,6 @@
             </picker>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <div class="tui-title">含处理价</div>
-            <view><switch style="transform:scale(0.7,0.7)" :checked="form.dealPrice == 0 ? false : true" @change="dealPriceChangeFn" />{{form.dealPrice == 0?'否':'是'}}</view>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">备注</view>
 						<textarea style="height: 100upx" v-model="form.remark" placeholder="选填" />
@@ -192,13 +187,25 @@
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
     background:#3385ff;color:white;z-index:9999;position:fixed;bottom:230upx;right:40upx;border-radius:60upx;">{{calc=='add'?'+':'-'}}</view>
 
+		<uni-popup ref="diffPriceRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:40upx 20upx 20upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 
-		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
-			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-
-				aaaaaaaaaaaaaaaaaaaaa
-
+        <block v-if="!$util.isEmpty(diffPriceList)">
+          <view  v-for="(item, index) in diffPriceList" :key="index" style="font-size:30upx;color:red;font-weight:bold;">
+            <text>{{item.name}}</text>
+            <text style="margin-left:25upx;">系统售价 ¥{{item.price?parseFloat(item.price):0}}</text>
+            <text style="margin-left:25upx;">您开价 ¥{{item.kdPrice?parseFloat(item.kdPrice):0}}</text>
+          </view>
+        </block>
+        <view style="margin-top:20upx;font-size:26upx;font-weight:bold;">
+          <view>以上花材，您开单价和系统售价不一样，确认提交吗？</view>
+        </view>
+        <view style="text-align:center;margin-top:30upx;width:100%;">
+          <button class="admin-button-com middle default">返回修改</button>
+          <button style="margin-left:20upx;" @click="diffPriceConfirm()" class="admin-button-com middle blue">确认提交</button>
+        </view>
 			</view>
+
 		</uni-popup>
 
     </view>
@@ -275,7 +282,8 @@ export default {
 			xjDataInfo:{},
       modifyPrice:'',
       isScanEnv:false,
-      calc:'add'
+      calc:'add',
+      diffPriceList:[]
     };
   },
   onLoad (option) {
@@ -361,9 +369,6 @@ export default {
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
-    dealPriceChangeFn(e) {
-      this.form.dealPrice = e.detail.value ? 1 : 0;
-    },
     changeGet(){
       this.calc = this.calc == 'add' ? 'sub' : 'add'
     },
@@ -401,9 +406,11 @@ export default {
         this.form.sendCost = ""
       }
     },
+    diffPriceConfirm(){
+      this.form.dealPrice = 1
+      this.confirmSubmit()
+    },
     confirmSubmit () {
-      //this.$refs.selectFlowerNumRef.open('bottom')
-      //return
       let self = this;
         let rules = [
           {
@@ -432,6 +439,7 @@ export default {
         })
     },
     async formSubmit () {
+      let that = this
       let formData = this.form;
       const product = this.selectList.map((ele) => {
         return {productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount, classId: ele.classId, itemId: ele.itemId, price: ele.userPrice}
@@ -455,6 +463,11 @@ export default {
       Fn(params).then((res) => {
         uni.hideLoading()
         if(res.code == 1){
+          if(res.data.respondType && res.data.respondType == 'priceError'){
+            that.diffPriceList = res.data.diff
+            that.$refs.diffPriceRef.open('bottom')
+            return
+          }
           this.removeFromSaveDirect()
           const {data: { id, orderSn,actPrice }} = res;
           if(this.form.hasPay == 0){