zhangqiOMG 3 年之前
父節點
當前提交
7b4b6a98c5
共有 25 個文件被更改,包括 102 次插入54 次删除
  1. 1 1
      src/Form/QuotedPrice/edit.vue
  2. 9 11
      src/Form/projectChange/edit.vue
  3. 2 2
      src/HDrpManagement/orderManage/details/index.vue
  4. 12 0
      src/HDrpManagement/projectChange/index.vue
  5. 5 5
      src/HDrpManagement/projectChange/modules/detail.vue
  6. 12 20
      src/HDrpManagement/projectChange/modules/modules/productSet/index.vue
  7. 1 1
      src/HManagement/accountManage/modules/add.vue
  8. 8 2
      src/HManagement/clueManage/clue_import/detailPage/modules/billBody.vue
  9. 2 0
      src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue
  10. 6 0
      src/HManagement/clueManage/clue_private/index.vue
  11. 2 2
      src/HManagement/clueManage/clue_private/modules/detail.vue
  12. 2 0
      src/HManagement/clueManage/clue_private/modules/edit.vue
  13. 6 0
      src/HManagement/clueManage/clue_public/index.vue
  14. 2 2
      src/HManagement/clueManage/clue_public/modules/detail.vue
  15. 2 0
      src/HManagement/clueManage/clue_public/modules/edit.vue
  16. 6 0
      src/HManagement/clueManage/m_activity/modules/detailTable.vue
  17. 2 0
      src/HManagement/clueManage/m_activity/modules/editClue.vue
  18. 1 1
      src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue
  19. 1 1
      src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue
  20. 8 1
      src/SDrpManagement/salerPrivatecustomer/detail/modules/accountMoney/index.vue
  21. 1 1
      src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/index.vue
  22. 2 1
      src/SManagement/orderclue/components/edit.vue
  23. 6 0
      src/SManagement/orderclue/index.vue
  24. 2 2
      src/SManagement/orderclue_detail/index.vue
  25. 1 1
      src/components/productTable/indexQty.vue

+ 1 - 1
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="请输入折扣" type="textarea" autosize></el-input>
+                <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">

+ 9 - 11
src/Form/projectChange/edit.vue

@@ -282,15 +282,19 @@ export default {
     },
     editBtn () {
       this.dialogFormVisible = true
-      console.log(this.data,"res项目商机数据")
       this.form = Object.assign({},this.form,this.data)
       this.form.province = [this.form.province,this.form.city,this.form.county]
       /*this.form.grade = parseInt(this.form.grade)*/
       if (this.form.brandname === ''){
         this.form.sa_brandid = ''
       }
-      this.form.tradefields = JSON.parse(this.form.tradefields)
-      console.log(this.form,"项目商机内容")
+      /*this.form.tradefields = JSON.parse(this.form.tradefields)*/
+
+      /*this.form.budgetary = this.form.budgetary !== 0 ? this.tool.formatAmount(this.form.budgetary,2):'' || ''
+      this.form.totalinvestment  ? this.form.totalinvestment = this.tool.formatAmount(this.form.totalinvestment,2):this.form.totalinvestment = ''
+      this.form.costofconstruction  ? this.form.costofconstruction = this.tool.formatAmount(this.form.costofconstruction,2):this.form.costofconstruction = ''
+      this.form.signamount_due  ? this.form.signamount_due = this.tool.formatAmount(this.form.signamount_due,2):this.form.signamount_due = ''*/
+
     },
     /*自动查重判断*/
     duplicateCheck(){
@@ -304,7 +308,7 @@ export default {
             "sa_projectid":this.form.sa_projectid
           },
         })
-        console.log(res,"查重结果")
+
         if (res.data.length !== 0){
           console.log("重复")
         }
@@ -337,8 +341,6 @@ export default {
     onSubmit(){
       if (this.form.signdate_due !== ''){
         const data = new Date(this.form.signdate_due)
-        console.log(data.getFullYear())
-        console.log(data.getMonth()+1)
         if (data.getMonth() +1 < 10){
           this.form.signdate_due = data.getFullYear() + '-0' + (data.getMonth() + 1)
         }else {
@@ -349,8 +351,6 @@ export default {
       }
       if (this.form.begdate_due !== ''){
         const data = new Date(this.form.begdate_due)
-        console.log(data.getFullYear())
-        console.log(data.getMonth()+1)
         if (data.getMonth() +1 < 10){
           this.form.begdate_due = data.getFullYear() + '-0' + (data.getMonth() + 1)
         }else {
@@ -361,8 +361,6 @@ export default {
       }
       if (this.form.enddate_due !== ''){
         const data = new Date(this.form.enddate_due)
-        console.log(data.getFullYear())
-        console.log(data.getMonth()+1)
         if (data.getMonth() +1 < 10){
           this.form.enddate_due = data.getFullYear() + '-0' + (data.getMonth() + 1)
         }else {
@@ -371,7 +369,7 @@ export default {
       }else {
         this.form.enddate_due = ''
       }
-      console.log(this.form,'form')
+
       /*this.form.tradefields[0] = this.form.tradefields
       console.log(this.form,'form')*/
       this.$refs['form'].validate(async (valid) => {

+ 2 - 2
src/HDrpManagement/orderManage/details/index.vue

@@ -30,8 +30,8 @@
             <el-select class="mt-10" v-model="value" placeholder="请选择" size="mini">
               <el-option
                 v-for="item in options"
-                :key="item.value"
-                :label="item.value"
+                :key="item.value "
+                :label="item.value + '-' + item.remarks"
                 :value="item.value">
                 <span style="float: left">{{ item.value }}</span>
                 <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>

+ 12 - 0
src/HDrpManagement/projectChange/index.vue

@@ -138,6 +138,18 @@
         <div v-else-if="scope.data.column.columnname === 'projecttype'">
           {{scope.data.column.data.projecttype + '-' + scope.data.column.data.projecttype_remarks}}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'totalinvestment'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'costofconstruction'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'budgetary'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'signamount_due'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>

+ 5 - 5
src/HDrpManagement/projectChange/modules/detail.vue

@@ -340,14 +340,14 @@ export default {
           /*{label:'项目地址',value:this.mainData.address},*/
           {label:'项目地址',value:`${this.mainData.province} - ${this.mainData.city} - ${this.mainData.county} - ${this.mainData.address}`},
           {label:'项目规模',value:this.mainData.scale ? this.mainData.scale : '--'},
-          {label:'项目预算(元)',value:this.mainData.budgetary ? this.mainData.budgetary : '--'},
-          {label:'总投资额(百万)',value:this.mainData.totalinvestment ? this.mainData.totalinvestment : '--'},
-          {label:'造价(百万)',value:this.mainData.costofconstruction ? this.mainData.costofconstruction : '--'},
+          {label:'项目预算(元)',value:this.mainData.budgetary ? this.tool.formatAmount(this.mainData.budgetary,2) : '--'},
+          {label:'总投资额(百万)',value:this.mainData.totalinvestment ? this.tool.formatAmount(this.mainData.totalinvestment,2) : '--'},
+          {label:'造价(百万)',value:this.mainData.costofconstruction ? this.tool.formatAmount(this.mainData.costofconstruction,2) : '--'},
           {label:'预计开工时间',value:this.mainData.begdate_due ? this.mainData.begdate_due : '--'},
           {label:'预计完工时间',value:this.mainData.enddate_due ? this.mainData.enddate_due : '--'},
 
           {label:'预计签约时间',value:this.mainData.signdate_due ? this.mainData.signdate_due : '--'},
-          {label:'预计签约金额(元)',value:this.mainData.signamount_due ? this.mainData.signamount_due : '--'},
+          {label:'预计签约金额(元)',value:this.mainData.signamount_due ? this.tool.formatAmount(this.mainData.signamount_due,2) : '--'},
           {label:'赢率',value:this.mainData.winrate ? this.mainData.winrate : '--'},
           {label:'领域',value:this.mainData.tradefield ? this.mainData.tradefield : '--'},
           {label:'品牌',value:this.mainData.brandname ? this.mainData.brandname : '--'},
@@ -450,7 +450,7 @@ export default {
         },
         {
           label:'预计签约金额(元)',
-          value: this.mainData.signamount_due
+          value: this.mainData.signamount_due  ? this.tool.formatAmount(this.mainData.signamount_due,2) : '--'
         },
       ]
     },

+ 12 - 20
src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -157,7 +157,7 @@
             fixed="right"
             width="100">
           <template slot-scope="scope">
-            <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
+            <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -190,7 +190,7 @@
       </el-table>
       <div style="margin-top:16px;">
         <div style="float: left">
-          <span>总金额(元):{{totalPrice}}</span>
+          <span>总金额(元):{{tool.formatAmount(totalPrice,2)}}</span>
         </div>
         <div style="float: right">
           <el-pagination
@@ -258,8 +258,6 @@ export default {
     },*/
 
     async listData(){
-      console.log(this.data,"data的数据")
-      console.log(this.data.discountrate)
       this.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100
       this.totalPrice = 0
       this.params.content.sa_projectid = this.data.sa_projectid
@@ -340,16 +338,17 @@ export default {
     /*修改单价*/
     priceChange(val,index,data){
       if (val > data.marketprice){
-        data.price = data.marketprice
+        data.price = this.tool.formatAmount(data.marketprice,2)
       }else if(val < 0) {
         data.price = 0
       }else {
-        data.price = Math.round(val * 100)/100
+        data.price = this.tool.formatAmount(val ,2)
       }
-      data.amount = Math.round((data.price * data.qty)*100)/100
+      data.amount = this.tool.formatAmount(data.price * data.qty,2)
       this.$set(this.list,index,data)
       this.onChangePrice(data,data.price)
     },
+    /*执行修改数量*/
     async onChangQty(data,val){
       const res = await this.$api.requested({
         "id": 20221021145502,
@@ -370,6 +369,7 @@ export default {
       this.listData()
       this.$emit("productSetSuccess")
     },
+    /*执行修改单价*/
     async onChangePrice(data,val){
       const res = await this.$api.requested({
         "id": 20221021145502,
@@ -394,29 +394,21 @@ export default {
     async discountrateChange(val){
       if (val > 100){
         this.discountrate = 100
-      }else if(val < 1){
-        this.discountrate = 1
+      }else if(val < 0){
+        this.discountrate = 0
       }else {
         this.discountrate = Math.round(val * 100)/100
       }
-      console.log(this.data,"修改预计折扣")
-      this.discountrate = (this.discountrate / 100).toFixed(3)
+     /* this.discountrate = (this.discountrate / 100).toFixed(4)*/
       const res = await this.$api.requested({
         "id": 20230207090702,
         "content": {
           "sa_projectid": this.$route.query.id,
-          "discountrate": this.discountrate
+          "discountrate": (this.discountrate / 100).toFixed(4)
         },
       })
       this.tool.showMessage(res,()=>{
-        this.data.discountrate = this.discountrate
-
-       /* if (this.discountrate > 1){
-          this.discountrate = Math.round((this.data.discountrate) * 100) / 100
-        }else {
-          this.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100
-        }*/
-
+        this.data.discountrate = this.discountrate / 100
         this.$emit("productSetSuccess")
         this.listData()
       })

+ 1 - 1
src/HManagement/accountManage/modules/add.vue

@@ -124,7 +124,7 @@ export default {
           } else {
             this.$notify({
               title: '失败',
-              message: res.data,
+              message: res.msg,
               type: 'error'
             });
           }

+ 8 - 2
src/HManagement/clueManage/clue_import/detailPage/modules/billBody.vue

@@ -10,8 +10,14 @@
         <div v-else-if="scope.column.columnname === 'errmsg'">
           <span style="color:red">{{scope.column.data[scope.column.columnname]}}</span>
         </div>
-<!--        <span v-else-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation' && scope.column.columnname != 'errmsg'">&#45;&#45;</span>-->
-        <span v-else>{{scope.column.data[scope.column.columnname] || '--'}}</span>
+        <div v-else-if="scope.column.columnname == 'totalinvestment'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'costofconstruction'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <span v-else-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation' ">--</span>
+        <span v-else>{{scope.column.data[[scope.column.columnname]]}}</span>
       </template>
       <template v-slot:opreation="scope">
         <body-edit 

+ 2 - 0
src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -202,6 +202,8 @@ export default {
       this.form.enterprisename = this.data.enterprisename_customer
       this.form.begdate_due = this.form.begdate_due || ''
       this.form.enddate_due = this.form.enddate_due || ''
+      this.form.totalinvestment !== 0 ? this.form.totalinvestment =  this.tool.formatAmount(this.form.totalinvestment,2): this.form.totalinvestment =''
+      this.form.costofconstruction !== 0 ? this.form.costofconstruction =  this.tool.formatAmount(this.form.costofconstruction,2): this.form.costofconstruction =''
       console.log(this.form);
       
     },

+ 6 - 0
src/HManagement/clueManage/clue_private/index.vue

@@ -64,6 +64,12 @@
             {{scope.data.column.data.allocationstatus === '已分配'?scope.data.column.data.leader[0] && scope.data.column.data.leader[0].name:'--'}}
           </span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'totalinvestment'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'costofconstruction'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'allocationstatus'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '待分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

+ 2 - 2
src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -274,11 +274,11 @@ export default {
           },
           {
             label:'总投资额(百万)',
-            value:this.mainData.totalinvestment
+            value:this.mainData.totalinvestment !== 0?this.tool.formatAmount(this.mainData.totalinvestment,2):'--'
           },
           {
             label:'造价(百万)',
-            value:this.mainData.costofconstruction
+            value:this.mainData.costofconstruction !== 0?this.tool.formatAmount(this.mainData.costofconstruction,2):'--'
           },
           {
             label:'预计开工时间',

+ 2 - 0
src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -189,6 +189,8 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.province = [this.data.province,this.data.city,this.data.county]
       this.form.enterprisename = this.data.enterprisename_customer
+      this.form.totalinvestment !== 0 ? this.form.totalinvestment =  this.tool.formatAmount(this.form.totalinvestment,2): this.form.totalinvestment =''
+      this.form.costofconstruction !== 0 ? this.form.costofconstruction =  this.tool.formatAmount(this.form.costofconstruction,2): this.form.costofconstruction =''
       console.log(this.form);
       
     },

+ 6 - 0
src/HManagement/clueManage/clue_public/index.vue

@@ -33,6 +33,12 @@
         <div v-else-if="scope.data.column.columnname == 'province' && scope.data.column.data.province">
           {{scope.data.column.data.province}}-{{scope.data.column.data.city}}-{{scope.data.column.data.county}}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'totalinvestment'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'costofconstruction'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] || '--'}}
         </div>

+ 2 - 2
src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -252,11 +252,11 @@ export default {
           },
           {
             label:'总投资额(百万)',
-            value:this.mainData.totalinvestment
+            value:this.mainData.totalinvestment !== 0 ? this.tool.formatAmount(this.mainData.totalinvestment,2):'--'
           },
           {
             label:'造价(百万)',
-            value:this.mainData.costofconstruction
+            value:this.mainData.costofconstruction !== 0 ? this.tool.formatAmount(this.mainData.costofconstruction,2):'--'
           },
           {
             label:'预计开工时间',

+ 2 - 0
src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -179,6 +179,8 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.province = [this.data.province, this.data.city, this.data.county]
       this.form.enterprisename = this.data.enterprisename_customer
+      this.form.totalinvestment !== 0 ? this.form.totalinvestment =  this.tool.formatAmount(this.form.totalinvestment,2): this.form.totalinvestment =''
+      this.form.costofconstruction !== 0 ? this.form.costofconstruction =  this.tool.formatAmount(this.form.costofconstruction,2): this.form.costofconstruction =''
     },
     async onSubmit () {
       if (this.form.begdate_due !== ''){

+ 6 - 0
src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -20,6 +20,12 @@
           <div v-else-if="scope.column.columnname == 'allocationstatus'">
           <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '待分配'">{{scope.column.data[[scope.column.columnname]]}}</span>
           <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '已分配'">{{scope.column.data[[scope.column.columnname]]}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'totalinvestment'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'costofconstruction'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
         </div>
           <div v-else-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>

+ 2 - 0
src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -188,6 +188,8 @@ export default {
       this.form.enterprisename = this.data.enterprisename_customer
       this.form.province = [this.form.province,this.form.city,this.form.county]
       this.form.sat_campaignid = this.$route.query.id
+      this.form.totalinvestment !== 0 ? this.form.totalinvestment =  this.tool.formatAmount(this.form.totalinvestment,2): this.form.totalinvestment =''
+      this.form.costofconstruction !== 0 ? this.form.costofconstruction =  this.tool.formatAmount(this.form.costofconstruction,2): this.form.costofconstruction =''
       console.log(this.form);
       
     },

+ 1 - 1
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -119,7 +119,7 @@
         <el-table-column
             prop="discountDifferenceAmount"
             label="单价差额(元)"
-            width="62"
+            width="100"
         >
           <template slot-scope="scope">
             <p><span>{{scope.row.discountDifferenceAmount}}</span></p>

+ 1 - 1
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="请输入折扣" type="textarea" autosize></el-input>
+                <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24">

+ 8 - 1
src/SDrpManagement/salerPrivatecustomer/detail/modules/accountMoney/index.vue

@@ -2,7 +2,13 @@
   <div>
     <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 405px)">
       <template v-slot:customcol="scope">
-        <p>{{scope.column.data[scope.column.columnname]}}</p>
+        <div v-if="scope.column.columnname == 'balance'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'creditquota'">
+          <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
     </tableLayout>
   </div>
@@ -15,6 +21,7 @@ export default {
   data () {
     return {
       list:[],
+      tablecols:[],
       param:{}
     }
   },

+ 1 - 1
src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/index.vue

@@ -16,7 +16,7 @@
     </div>  
     
     <el-table
-        :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+
       :data="tableData"
       stripe
       size="mini"

+ 2 - 1
src/SManagement/orderclue/components/edit.vue

@@ -221,7 +221,8 @@ export default {
       this.param.province = [this.data.province, this.data.city, this.data.county]
       this.param.enterprisename = this.data.enterprisename_customer
       this.areaSelectResult = this.param.province
-
+      this.param.totalinvestment !== 0 ? this.param.totalinvestment =  this.tool.formatAmount(this.param.totalinvestment,2): this.param.totalinvestment =''
+      this.param.costofconstruction !== 0 ? this.param.costofconstruction =  this.tool.formatAmount(this.param.costofconstruction,2): this.param.costofconstruction =''
     },
     handleClose () {
       this.drawer = false

+ 6 - 0
src/SManagement/orderclue/index.vue

@@ -51,6 +51,12 @@
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已转化'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'totalinvestment'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'costofconstruction'">
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] !== 0?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'leader'">
           <span v-if="scope.data.column.data[[scope.data.column.columnname]].length !== 0">{{scope.data.column.data[[scope.data.column.columnname]].length > 0 && scope.data.column.data[[scope.data.column.columnname]][0].name}}</span>
           <span v-else>--</span>

+ 2 - 2
src/SManagement/orderclue_detail/index.vue

@@ -236,11 +236,11 @@ export default {
           },
           {
             label:'总投资额(百万)',
-            value:this.mainData.totalinvestment
+            value:this.mainData.totalinvestment !== 0 ? this.tool.formatAmount(this.mainData.totalinvestment,2):'--'
           },
           {
             label:'造价(百万)',
-            value:this.mainData.costofconstruction
+            value:this.mainData.costofconstruction !== 0 ? this.tool.formatAmount(this.mainData.costofconstruction,2):'--'
           },
           {
             label:'预计开工时间',

+ 1 - 1
src/components/productTable/indexQty.vue

@@ -77,7 +77,7 @@
           prop="discountDifferenceAmount"
           label="单价差额(元)"
 
-          width="62">
+          width="100">
         <template slot-scope="scope">
           <span >{{scope.row.discountDifferenceAmount?scope.row.discountDifferenceAmount:'--'}}</span>
         </template>