花材管理

ghsApp/src/admin/billing/affirm.vue

@@ -3,7 +3,6 @@
   <view class="affirm-page">
 
     <view class="affirm-view overscroll">
-      <!-- 花材列表 -->
       <form>
         <view class="module-com">
           <view class="commodity-view">
@@ -127,13 +126,6 @@
             <button @tap="form.needPrint = 2" class="admin-button-com middle" :class="form.needPrint == 2? 'blue' : 'default'">不打</button>
           </tui-list-cell>
 
-          <!--
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="customInfo.discount && customInfo.discount < 1" >
-            <view class="tui-title">优惠</view>
-            <text style="color: red"></text>
-          </tui-list-cell>
-          -->
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="(form.sendType == 0 || form.sendType == 2) && Number(form.packCost)>0" >
             <view class="tui-title">
               <text>打包费</text>  
@@ -166,7 +158,7 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">备注</view>
-						<textarea style="height: 100upx" v-model="form.remark" placeholder="选填" />
+						<textarea style="height: 100upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder="..." />
 					</tui-list-cell>
 
           </view>
@@ -191,18 +183,18 @@
 			<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;">
 
         <block v-if="!$util.isEmpty(diffPriceList)">
-          <view  v-for="(item, index) in diffPriceList" :key="index" style="font-size:30upx;color:red;font-weight:bold;">
+          <view  v-for="(item, index) in diffPriceList" :key="index" style="font-size:32upx;color:red;font-weight:bold;margin-top:10upx;">
             <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 style="margin-top:20upx;font-size:28upx;font-weight:bold;">
+          <view>以上花材，开单价和系统售价不一样，确认提交吗？</view>
         </view>
         <view style="text-align:center;margin-top:30upx;width:100%;">
-          <button class="admin-button-com middle default" @click="returnCheck()">返回修改</button>
-          <button style="margin-left:20upx;" @click="diffPriceConfirm()" class="admin-button-com middle blue">确认提交</button>
+          <button class="admin-button-com big default" @click="returnCheck()">返回修改</button>
+          <button style="margin-left:20upx;" @click="diffPriceConfirm()" class="admin-button-com big blue">确认提交</button>
         </view>
 			</view>
 
@@ -749,6 +741,9 @@ export default {
 	}
 }
 .class-popup-style{
-	z-index:999999;
+	z-index:99999;
+}
+.remark-class{
+  z-index:0
 }
 </style>

ghsApp/src/mixins/product.js

@@ -191,11 +191,16 @@ export default {
 						if(this.globalItemList[currentId]){
 							currentArray[currentIndex].bigPrice = this.globalItemList[currentId].bigPrice
 							currentArray[currentIndex].smallPrice = this.globalItemList[currentId].smallPrice
-							//已经记住的花材，价格修改之后，被记住的价格也要同步修改
-							//不能放开会造成采购单已经填好的，也会变动 shish 20220114
-							// if(!this.$util.isEmpty(currentArray[currentIndex].userPrice)){
-							// 	currentArray[currentIndex].userPrice = this.globalItemList[currentId].bigPrice
-							// }
+							//已经记住的花材，价格修改之后，被记住的价格也要同步修改（除了采购模块）
+							if(this.selectJobType != 'purchase'){
+								if(!this.$util.isEmpty(currentArray[currentIndex].userPrice)){
+									if(currentArray[currentIndex].bigCount && Number(currentArray[currentIndex].bigCount)>0){
+										currentArray[currentIndex].userPrice = this.globalItemList[currentId].bigPrice
+									}else{
+										currentArray[currentIndex].userPrice = this.globalItemList[currentId].smallPrice
+									}
+								}
+							}
 						}
 					})
 					this.setSelectInfo({ selectJobType: this.selectJobType, info: currentInfo,selectJobId:this.selectJobId })
@@ -603,6 +608,9 @@ export default {
 				})
 			}
 			let upList = this.globalClassItemList;
+			if(this.$util.isEmpty(upList)){
+				return false
+			}
 			for (let i=0;i<upList.length;i++){
 				//将已选的花材数量和价格组合到总列表里
 				if(!this.$util.isEmpty(upList[i].child)){