qymljy 2 anni fa
parent
commit
f157969211

+ 5 - 1
src/HDrpManagement/contractManage/components/addContract.vue

@@ -901,7 +901,7 @@ export default {
       })
       console.log(res,'res')
       this.payTypeData = res.data.map((item,index)=>{
-        if (item.point === '订单审核'){
+        /*if (item.point === '订单审核'){
           return {
             label:item.ruleno +  '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' + "立账额度" + (item.amountrate * 100) +'% ' + '\xa0  \xa0 \xa0 \xa0' + '后置天数' + item.days + '天',
             value:item.ruleno +  '' + item.point + '' + "立账额度" + (item.amountrate * 100) +'% ' + '' + '后置天数' + item.days + '天',
@@ -911,6 +911,10 @@ export default {
             label:item.ruleno + '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' +  '后置天数' + item.days + '天',
             value:item.ruleno + '' + item.point + '' +  '后置天数' + item.days + '天',
           }
+        }*/
+        return {
+          label:item.ruleno + '-' + item.remarks ,
+          value:item.ruleno + '-' + item.remarks
         }
 
       })

+ 5 - 1
src/HDrpManagement/contractManage/components/editContract.vue

@@ -859,7 +859,7 @@ export default {
       })
       console.log(res,'res')
       this.payTypeData = res.data.map((item,index)=>{
-        if (item.point === '订单审核'){
+       /* if (item.point === '订单审核'){
           return {
             label:item.ruleno +  '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' + "立账额度" + (item.amountrate * 100) +'% ' + '\xa0  \xa0 \xa0 \xa0' + '后置天数' + item.days + '天',
             value:item.ruleno +  '' + item.point + '' + "立账额度" + (item.amountrate * 100) +'% ' + '' + '后置天数' + item.days + '天',
@@ -869,6 +869,10 @@ export default {
             label:item.ruleno + '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' +  '后置天数' + item.days + '天',
             value:item.ruleno + '' + item.point + '' +  '后置天数' + item.days + '天',
           }
+        }*/
+        return {
+          label:item.ruleno + '-' + item.remarks ,
+          value:item.ruleno + '-' + item.remarks
         }
 
       })

+ 6 - 2
src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -166,7 +166,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" placeholder="请选择">
+                <el-select v-model="form.paytype" placeholder="请选择" style="width: 100%;">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -706,7 +706,7 @@ export default {
       })
       console.log(res,'res')
       this.payTypeData = res.data.map((item,index)=>{
-        if (item.point === '订单审核'){
+        /*if (item.point === '订单审核'){
           return {
             label:item.ruleno +  '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' + "立账额度" + (item.amountrate * 100) +'% ' + '\xa0  \xa0 \xa0 \xa0' + '后置天数' + item.days + '天',
             value:item.ruleno +  '' + item.point + '' + "立账额度" + (item.amountrate * 100) +'% ' + '' + '后置天数' + item.days + '天',
@@ -716,6 +716,10 @@ export default {
             label:item.ruleno + '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' +  '后置天数' + item.days + '天',
             value:item.ruleno + '' + item.point + '' +  '后置天数' + item.days + '天',
           }
+        }*/
+        return {
+          label:item.ruleno + '-' + item.remarks ,
+          value:item.ruleno + '-' + item.remarks
         }
 
       })

+ 2 - 2
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