2023-5-16

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -38,23 +38,23 @@
               :deletebtn="false"
             ></previewImage>
           </div>
+          
           <div v-else-if="scope.column.columnname == 'type'">
-            <el-select v-model="scope.column.data.type" @change="changeType(scope.column.data.type,scope.$index,scope.column.data)" :disabled="!tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader">
+            <el-select v-model="scope.column.data.type" @change="changeType(scope.column.data.type,scope.$index,scope.column.data)"
+            :disabled="!tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader" >
               <el-option label="折扣系数" value="折扣系数"></el-option>
               <el-option label="指定单价" value="指定单价"></el-option>
             </el-select>
           </div>
           <div v-else-if="scope.column.columnname == 'discountrate'">
-<!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @input="discountrateChange($event,scope.column.data)"></el-input>-->
             <el-input 
               size="mini" 
-              :disabled="scope.column.data.type === '指定单价' || !tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader "  
               v-model="scope.column.data.discountrate" 
+              :disabled="scope.column.data.type === '指定单价' || !tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader "  
               @change="discountrateChange(scope.column.data.discountrate,scope.$index,scope.column.data)"
             ></el-input>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
-<!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @input="priceChange($event,scope.column.data)"></el-input>-->
             <el-input 
               size="mini" 
               :disabled="scope.column.data.type === '折扣系数' || !tool.checkAuth($route.name,'productDetailManage') || data.status !== '新建' || !isLeader"  
@@ -201,25 +201,29 @@ export default {
       this.save(data)
     },
     discountrateChange (num,index,data) {
-      if (num > 100){
-        data.discountrate = 100
-      }else if (num < 0){
-        data.discountrate = 0
-      }else {
-        data.discountrate = Math.round(num*100)/100
-      }
+      // if (num > 100){
+      //   data.discountrate = 100
+      // }else if (num < 0){
+      //   data.discountrate = 0
+      // }else {
+      //   data.discountrate = Math.round(num*100)/100
+      // }
+      data.discountrate = Math.round(num*100)/100
+
       data.price = (data.discountrate / 100 * data.marketprice).toFixed(2)
       this.$set(this.list,index,data)
       this.save(data)
     },
     priceChange (num,index,data) {
-      if (num > data.marketprice){
-        data.price = data.marketprice
-      }else if (num < 0 ){
-        data.price = 0
-      }else {
-        data.price = Math.round(num*100)/100
-      }
+      // if (num > data.marketprice){
+      //   data.price = data.marketprice
+      // }else if (num < 0 ){
+      //   data.price = 0
+      // }else {
+      //   data.price = Math.round(num*100)/100
+      // }
+      data.price = Math.round(num*100)/100
+      
       console.log(data.price)
       data.discountrate = Math.round((data.price / data.marketprice * 100)*100)/100
       console.log(data.discountrate)

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -359,13 +359,15 @@ export default {
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
-      if (val > 100){
-        data.discountrate = 100
-      }else if (val <= 0){
-        data.discountrate = 1
-      }else {
-        data.discountrate = Math.round(val * 100)/100
-      }
+      // if (val > 100){
+      //   data.discountrate = 100
+      // }else if (val <= 0){
+      //   data.discountrate = 1
+      // }else {
+      //   data.discountrate = Math.round(val * 100)/100
+      // }
+      data.discountrate = Math.round(val * 100)/100
+
       data.price = Math.round((data.marketprice * (data.discountrate / 100)) *100)/100
       data.amount = Math.round((data.qty * data.price)*100)/100
       data.discountDifferenceAmount =  data.marketprice- data.price
@@ -383,13 +385,15 @@ export default {
     },
     onChangePrice(val,data,index){
       data.specialoffer = 0
-      if (val > data.marketprice) {
-        data.price = data.marketprice
-      }else if (val < data.marketprice * 0.01){
-        data.price = data.marketprice * 0.01
-      }else {
-        data.price = Math.round(data.price * 100)/100
-      }
+      // if (val > data.marketprice) {
+      //   data.price = data.marketprice
+      // }else if (val < data.marketprice * 0.01){
+      //   data.price = data.marketprice * 0.01
+      // }else {
+      //   data.price = Math.round(data.price * 100)/100
+      // }
+      data.price = Math.round(data.price * 100)/100
+
       data.discountrate = Math.round(((data.price / data.marketprice) * 100) *100)/100
       data.discountDifferenceAmount =  data.marketprice - data.price
       data.amount = Math.round((data.qty * data.price)*100)/100