修复bug

src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue

@@ -73,7 +73,7 @@
             prop="creditquota"
             label="信用额度">
             <template slot-scope="scope">
-              <el-input type="text" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
+              <el-input type="number" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
             </template>
           </el-table-column>
           <el-table-column

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -291,7 +291,7 @@ export default {
       })
       if (!res.data){
         /*直接添加*/
-        this.batchSelects(item)
+        this.addProducts(item)
       }else {
         /*询问是否覆盖*/
         this.checkItems(item)

src/HDrpManagement/contractManage/modules/detail.vue

@@ -301,7 +301,7 @@ export default {
           },
           {
             label:'合同有效期',
-            value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+            value:`${this.mainData.begdate}至${this.mainData.enddate}`,
             style:function () {
               let style = {color:'#3874f6'}
               return style
@@ -392,7 +392,7 @@ export default {
           },
           {
             label:'合同有效期',
-            value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+            value:`${this.mainData.begdate}至${this.mainData.enddate}`,
             style:function () {
               let style = {color:'#3874f6'}
               return style
@@ -477,7 +477,7 @@ export default {
           },
           {
             label:'合同有效期',
-            value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+            value:`${this.mainData.begdate}至${this.mainData.enddate}`,
             style:function () {
               let style = {color:'#3874f6'}
               return style
@@ -562,7 +562,7 @@ export default {
           },
           {
             label:'合同有效期',
-            value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+            value:`${this.mainData.begdate}至${this.mainData.enddate}`,
             style:function () {
               let style = {color:'#3874f6'}
               return style
@@ -642,7 +642,7 @@ export default {
           },
           {
             label:'合同有效期',
-            value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+            value:`${this.mainData.begdate}至${this.mainData.enddate}`,
             style:function () {
               let style = {color:'#3874f6'}
               return style
@@ -755,7 +755,7 @@ export default {
                   },
                   {
                     label:'合同有效期',
-                    value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+                    value:`${this.mainData.begdate}至${this.mainData.enddate}`,
                     style:function () {
                       let style = {color:'#3874f6'}
                       return style
@@ -857,7 +857,7 @@ export default {
                   },
                   {
                     label:'合同有效期',
-                    value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+                    value:`${this.mainData.begdate}至${this.mainData.enddate}`,
                     style:function () {
                       let style = {color:'#3874f6'}
                       return style
@@ -964,7 +964,7 @@ export default {
                   },
                   {
                     label:'合同有效期',
-                    value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+                    value:`${this.mainData.begdate}至${this.mainData.enddate}`,
                     style:function () {
                       let style = {color:'#3874f6'}
                       return style
@@ -1066,7 +1066,7 @@ export default {
                       },
                       {
                         label:'合同有效期',
-                        value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+                        value:`${this.mainData.begdate}至${this.mainData.enddate}`,
                         style:function () {
                           let style = {color:'#3874f6'}
                           return style
@@ -1156,7 +1156,7 @@ export default {
                       },
                       {
                         label:'合同有效期',
-                        value:`${this.mainData.begdate}-${this.mainData.enddate}`,
+                        value:`${this.mainData.begdate}至${this.mainData.enddate}`,
                         style:function () {
                           let style = {color:'#3874f6'}
                           return style

src/HDrpManagement/projectChange/modules/detail.vue

@@ -451,6 +451,7 @@ export default {
           label:'预计签约金额(元)',
           value: this.mainData.signamount_due  ? this.tool.formatAmount(this.mainData.signamount_due,2) : '--'
         },
+        {label:'领域',value:this.mainData.tradefield ? this.mainData.tradefield : '--'},
       ]
     },
     /*获取项目阶段*/

src/HDrpManagement/serveBill/modules/detail.vue

@@ -133,7 +133,7 @@ export default {
                 style = {color:'#fa8c16'}
                 break; 
               case '已完成':
-                style = {color:'#fa8c16'}
+                style = {color:'#000000'}
                 break; 
               default:
                 break;
@@ -164,7 +164,35 @@ export default {
           info: [
             {label:'单号',value:this.mainData.billno},
             {label:'单据日期',value:this.mainData.billdate},
-            {label:'状态',value:this.mainData.status},
+            {label:'状态',value:this.mainData.status ? this.mainData.status : '',
+              style:function () {
+                let style = {}
+                switch (that.mainData.status) {
+                  case '进行中':
+                    style = {color:'#52c41a'}
+                    break;
+                  case '待处理':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '新建':
+                    style = {color:'#333333'}
+                    break;
+                  case '提交':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '待指派':
+                    style = {color:'#fa8c16'}
+                    break;
+                  case '已完成':
+                    style = {color:'#000000'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+
+              }
+            },
             {label:'经销商编号',value:this.mainData.agentnum},
             {label:'经销商',value:this.mainData.enterprisename},
             {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},

src/HDrpManagement/serveBillMag/index.vue

@@ -47,7 +47,7 @@
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <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 style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#000000" 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 == 'province'">

src/HManagement/salesForecastTemplate/modules/product.vue

@@ -10,23 +10,23 @@
       size="80%">
       <div style="border-top:1px solid #eeeeee; padding:20px 16px; margin-bottom:0px">
         <el-row :gutter="10">
-          <el-col :span="3">
+          <el-col :span="4">
             <span class="search__label">项目编号:</span>
             <span class="topTile">{{data.projectnum}}</span>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span class="search__label">项目名称:</span>
             <span class="topTile">{{data.projectname}}</span>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span class="search__label">项目类型:</span>
             <span class="topTile">{{data.projecttype}}</span>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="8">
             <span class="search__label">项目地址:</span>
             <span class="topTile">{{data.address}}</span>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span class="search__label">预测金额(元):</span>
             <span class="topTile">{{data.sumprojectamount}}</span>
           </el-col>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -23,7 +23,7 @@
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.sourcepoolname === ''" :disabled="mainData.disabled" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
         <toBack class="inline-16" v-if="tool.checkAuth($route.name,'back') && mainData.sa_customerpoolid_source !== 0" :disabled="mainData.disabled" :data="mainData" @backSuccess="onSuccess"></toBack>
         <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" :disabled="mainData.disabled" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
-        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') " :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
+        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') && mainData.sa_customerpoolid_source !== 0 " :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
       <div slot="slot0" >
         <detailed :data="mainData" ref="baseDetail"></detailed>

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'http://192.168.3.9:8080',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://192.168.3.9:8080',  // 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