暂存

src/Form/QuotedPrice/edit.vue

@@ -266,7 +266,7 @@
             </el-col>
             <el-col  :span="24">
               <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
-                <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  ></el-input>
+                <el-input type="number"  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">
@@ -480,7 +480,8 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.date[0] = this.form.begdate
       this.form.date[1] = this.form.enddate
-      this.form.discountrate = Math.round((this.form.discountrate * 100)*100)/100
+      this.form.discountrate !== 0 ? this.form.discountrate = Math.round((this.form.discountrate * 100)*100)/100 : this.form.discountrate = ''
+
       this.form.salername = this.form.leader[0].name
       console.log(this.form,"form")
       if (this.form.quotedpricetype === '项目报价'){
@@ -760,6 +761,10 @@ export default {
       this.form.salername = res.data[0].name
       this.form.saler_hrid = res.data[0].hrid
       console.log(this.form,"更换业务员后")
+    },
+    /*修改折扣数据*/
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
     }
    /* async mainData(val) {
       const res = await this.$api.requested({

src/HDrpManagement/contractManage/components/addContract.vue

@@ -44,7 +44,7 @@
             </el-col>-->
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -143,7 +143,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -247,7 +247,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -467,12 +467,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio"  placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.orderratio"  placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -630,20 +630,20 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
+       /*   { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
+        /*  { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         salername: [
           { required: true, message: '请选择经销商', trigger: 'change' },
         ],
         discountrate: [
-          { validator: checkNumber, trigger: 'blur'},
+         /* { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
       },

src/HDrpManagement/contractManage/components/editContract.vue

@@ -39,7 +39,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate">
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -138,7 +138,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -242,7 +242,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -470,12 +470,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -528,7 +528,7 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value <= 1 && value) {
+      if (+value > 100 || +value <= 0 && value) {
         return callback(new Error('折扣范围(1-100%)'));
       }
       callback()
@@ -625,20 +625,20 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
+          /*{ validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
+         /* { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         enterprisename: [
           { required: true, message: '请选择经销商', trigger: 'change' },
         ],
         discountrate: [
-          { validator: checkNumber, trigger: 'blur'},
+         /* { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
       },

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -63,7 +63,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -161,7 +161,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -298,12 +298,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -445,21 +445,21 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
-          { validator: NumberSize, trigger: 'blur'}
+          { validator: NumberSize, trigger: 'blur'},
+
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
-          { validator: checkNumber, trigger: 'blur'},
-          { validator: NumberSize, trigger: 'blur'}
+          { validator: NumberSize, trigger: 'blur'},
+
         ],
         salername: [
           { required: true, message: '请选择经销商', trigger: 'change' },
         ],
         discountrate: [
-          { validator: checkNumber, trigger: 'blur'},
-          { validator: NumberSize, trigger: 'blur'}
+          { validator: NumberSize, trigger: 'blur'},
+
         ],
       },
       salerListParams: {

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -266,12 +266,12 @@
             </el-col>
             <el-col  :span="24">
               <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
-                <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
+                <el-input type="number"  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"   @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">
               <el-form-item label="业务员:" label-width="100px" prop="salername">
-                <el-input disabled  v-model="form.salername" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
+                <el-input disabled  v-model="form.salername" autocomplete="off" placeholder="请选择业务员"  ></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">
@@ -647,6 +647,10 @@ export default {
       this.$store.dispatch('optiontypeselect','itemtype').then(res => {
         this.itemtype = res.data
       })
+    },
+    /*修改折扣数据*/
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
     }
   },
   mounted() {

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -202,7 +202,7 @@ export default {
         },
         {
           label:'总金额(元)',
-          value:this.totalPrice
+          value:this.totalPrice ? this.tool.formatAmount(this.totalPrice,2) : '--'
         },
 
         {
@@ -241,14 +241,6 @@ export default {
               label:'报价类型',
               value:this.mainData.quotedpricetype
             },
-            // {
-            //   label:'项目编号',
-            //   value:this.mainData.projectnum
-            // },
-            // {
-            //   label:'项目名称',
-            //   value:this.mainData.projectname
-            // },
             {
               label:'报价日期',
               value:this.mainData.billdate
@@ -275,7 +267,7 @@ export default {
             },
             {
               label:'总金额(元)',
-              value:this.totalPrice
+              value:this.totalPrice ? this.tool.formatAmount(this.totalPrice,2) : '--'
             },
 
             {

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

@@ -40,7 +40,7 @@
         <el-table-column
             prop="discountrate"
             label="折扣(%)"
-            width="80"
+            width="100"
             fixed="right">
           <template slot-scope="scope">
             <div v-if=" !saveShow || index !== scope.row.rowindex">
@@ -125,10 +125,15 @@ export default {
       this.list = res.data
       this.total = res.total
       for (var i=0 ;i<res.data.length;i++){
-        if (this.list[i].discountrate <= 1){
+        /*if (this.list[i].discountrate <= 1){
           this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
         }else {
           this.list[i].discountrate = Math.round((res.data[i].discountrate)*100)/100
+        }*/
+        if (this.list[i].discountrate === 0){
+          this.list[i].discountrate = '--'
+        }else {
+          this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
         }
 
         /* this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price*/

src/SDrpManagement/QuotedPrice/detail/modules/otherExpenses/add.vue

@@ -31,7 +31,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="单价" label-width="80px" prop="price">
-                <el-input  v-model="form.items[0].price" autocomplete="off" placeholder="请输入单价" @change="priceChange"></el-input>
+                <el-input type="number"  v-model="form.items[0].price" autocomplete="off" placeholder="请输入单价" @change="priceChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -157,15 +157,19 @@ export default {
     },
     numChange(){
       if (this.form.items[0].qty !== '' && this.form.items[0].price !== ''){
-        this.amount = this.form.items[0].qty * this.form.items[0].price
+        this.form.items[0].price = Math.round(this.form.items[0].price * 100) / 100
+        this.amount = Math.round((this.form.items[0].qty * this.form.items[0].price) * 100) /100
       }else {
+        this.form.items[0].price = Math.round(this.form.items[0].price * 100) / 100
         this.amount = 0
       }
     },
     priceChange(){
       if (this.form.items[0].qty !== '' && this.form.items[0].price !== ''){
-        this.amount = this.form.items[0].qty * this.form.items[0].price
+        this.form.items[0].price = Math.round(this.form.items[0].price * 100)/100
+        this.amount = Math.round((this.form.items[0].qty * this.form.items[0].price) * 100) /100
       }else {
+        this.form.items[0].price = Math.round(this.form.items[0].price * 100) /100
         this.amount = 0
       }
     }

src/SDrpManagement/QuotedPrice/detail/modules/otherExpenses/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" type="text" @click="onShow" :disabled="!tool.checkAuth($route.name,'otherExpenses') || status !== '新建'">编 辑</el-button>
     <el-drawer
-        title="添加其他费用"
+        title="修改其他费用"
         :visible.sync="visible"
         size="800px"
         direction="rtl"
@@ -31,7 +31,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="单价" label-width="80px" prop="price">
-                <el-input  v-model="form.price" autocomplete="off" placeholder="请输入单价" @change="priceChange"></el-input>
+                <el-input type="number" v-model="form.price" autocomplete="off" placeholder="请输入单价" @change="priceChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -128,16 +128,18 @@ export default {
     },
     numChange(){
       if (this.form.qty !== '' && this.form.price !== ''){
-        this.amount = this.form.qty * this.form.price
+        this.form.amount = Math.round((this.form.qty * this.form.price) * 100)/100
       }else {
-        this.amount = 0
+        this.form.amount = 0
       }
     },
     priceChange(){
       if (this.form.qty !== '' && this.form.price !== ''){
-        this.amount = this.form.qty * this.form.price
+        this.form.price = Math.round(this.form.price * 100)/100
+        this.form.amount = Math.round((this.form.qty * this.form.price) * 100)/100
       }else {
-        this.amount = 0
+        this.form.price = Math.round(this.form.price * 100)/100
+        this.form.amount = 0
       }
     }
   },

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

@@ -24,6 +24,12 @@
             <div v-else-if="scope.column.columnname === 'operation'">
               <span>{{scope.column.data[scope.column.columnname]}}</span>
             </div>
+            <div v-else-if="scope.column.columnname === 'price'">
+              <span>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'amount'">
+              <span>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+            </div>
             <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
           </template>
           <template v-slot:opreation="scope">

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -265,7 +265,7 @@
             </el-col>
             <el-col  :span="24">
               <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
-                <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  ></el-input>
+                <el-input type="number" v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">
@@ -704,6 +704,10 @@ export default {
       const res = await this.$api.requested(this.salerParam)
       this.form.salername = res.data[0].name
       this.form.saler_hrid = res.data[0].hrid
+    },
+    /*修改折扣数据*/
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
     }
     /*isSpecial(val){
       console.log("获取")