bug修改

src/HDrpManagement/contractManage/index.vue

@@ -82,6 +82,9 @@
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '工具借用'">工具使用协议</span>
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">居间协议</span>
         </div>
+        <div  v-else-if="scope.data.column.columnname == 'discountrate'">
+          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -95,6 +95,7 @@
 export default {
   data () {   
     var validatePass2 = (rule, value, callback) => {
+      console.log(value)
       if (value.length === 0) {
         callback(new Error('请设置提报周期'));
       } else {

src/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct.vue

@@ -156,7 +156,7 @@
           fixed="right"
           width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+            <el-input v-model="scope.row.price" size="mini" type="number" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -258,11 +258,14 @@ export default {
       this.list = res.data
       this.total = res.total
       this.totalPrice = 0
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.list[i].mindiscountrate = this.list[i].mindiscountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
+      for (var i=0 ;i<res.data.length;i++){
+        this.list[i].discountrate = res.data[i].discountrate * 100
+        this.list[i].mindiscountrate = res.data[i].mindiscountrate * 100
+        this.list[i].price = res.data[i].price.toFixed(2)
+        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
+      this.totalPrice = this.totalPrice.toFixed(2)
       this.$emit('productData',this.list)
     },
     handleSizeChange(val) {
@@ -345,7 +348,7 @@ export default {
         val = data.marketprice * 0.1
       }
       data.discountrate = ((val / data.marketprice) * 100).toFixed(2)
-      data.amount = data.qty * data.price
+      data.amount = (data.qty * data.price).toFixed(2)
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -143,7 +143,7 @@ export default {
         },
         {
           label:'总金额(元)',
-          value:this.totalPrice
+          value:this.totalPrice.toFixed(2)
         },
         {
           label:'联系人',

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

@@ -260,11 +260,14 @@ export default {
       this.list = res.data
       this.total = res.total
       this.totalPrice = 0
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.list[i].mindiscountrate = this.list[i].mindiscountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
+      for (var i=0 ;i<res.data.length;i++){
+        this.list[i].discountrate = (res.data[i].discountrate * 100).toFixed(2)
+        this.list[i].mindiscountrate = (res.data[i].mindiscountrate * 100).toFixed(2)
+        this.list[i].price = res.data[i].price.toFixed(2)
+        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
+      this.totalPrice = this.totalPrice.toFixed(2)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SManagement/orderclue/components/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="edit">
     <el-button size="mini" :type="disabled ? 'defalt':'primary'" :disabled="disabled" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑线索" :visible.sync="drawer" size="600px" direction="rtl" append-to-body>
+    <el-drawer title="编辑线索" :visible.sync="drawer" size="600px" direction="rtl" append-to-body :show-close="false" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="param" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"
@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage :keyWord="param.enterprisename" ref="businessMessage" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -186,6 +186,10 @@ export default {
       this.param.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.param.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.$refs.businessMessage.businessShow = false
+      this.drawer = false
     }
   },
 }