暂存

src/HDrpManagement/projectChange/index.vue

@@ -138,6 +138,15 @@
         <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]] !== 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 == 'signamount_due'">
+          <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]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>

src/HManagement/accountManage/modules/add.vue

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

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 

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);
       
     },

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>

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:'预计开工时间',

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);
       
     },

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>

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:'预计开工时间',

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 !== ''){

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>

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);
       
     },

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>

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:{}
     }
   },

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"

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

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>

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:'预计开工时间',

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>

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites