qymljy 2 سال پیش
والد
کامیت
f23def70fe

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

+ 5 - 4
src/Form/publicCustomer/edit.vue

@@ -15,7 +15,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="20">
               <el-form-item label="客户名称:" prop="enterprisename">
-                <el-input v-model="form.enterprisename" placeholder="客户名称"></el-input>
+                <el-input v-model="form.enterprisename" placeholder="客户名称" :disabled="form.isagent !== 0"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
@@ -62,7 +62,7 @@
                                       :total="total">
                                   </el-pagination>
                                 </div>-->
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === '' || form.isagent !== 0">工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24">
@@ -91,7 +91,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户等级:" >
-                <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%">
+                <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%" :disabled="form.isagent !== 0">
                   <el-option
                       v-for="item in options.customerGrade"
                       :key="item.rowindex"
@@ -157,6 +157,7 @@
             <el-col :span="24">
               <el-form-item label="省市县:" prop="province">
                 <el-cascader
+                    :disabled="form.isagent !== 0"
                     style="width: 100%"
                     v-model="form.value"
                     :options="basicData.data().areaData"
@@ -166,7 +167,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="详细地址:" prop="address">
-                <el-input v-model="form.address" placeholder="详细地址"></el-input>
+                <el-input v-model="form.address" placeholder="详细地址" :disabled="form.isagent !== 0"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

+ 6 - 5
src/Form/salerPrivatecustomer/edit.vue

@@ -14,7 +14,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="20">
               <el-form-item label="客户名称:" prop="enterprisename">
-                <el-input v-model="form.enterprisename" placeholder="请输入客户名称" style="width: 100%"></el-input>
+                <el-input v-model="form.enterprisename" placeholder="请输入客户名称" style="width: 100%" :disabled="form.isagent !== 0"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
@@ -61,7 +61,7 @@
                                       :total="total">
                                   </el-pagination>
                                 </div>-->
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === '' || form.isagent !== 0" >工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24">
@@ -90,7 +90,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户等级:" >
-                <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%">
+                <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%" :disabled="form.isagent !== 0">
                   <el-option
                       v-for="item in options.customerGrade"
                       :key="item.rowindex"
@@ -158,14 +158,15 @@
                 <el-cascader
                     style="width: 100%"
                     v-model="form.value"
+                    :disabled="form.isagent !== 0"
                     :options="basicData.data().areaData"
                     @change="cascaderChange" clearable>
                 </el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业地址:" >
-                <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
+              <el-form-item label="详细地址:" >
+                <el-input v-model="form.address" placeholder="请输入详细地址" style="width: 100%" :disabled="form.isagent !== 0"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

+ 2 - 2
src/HDrpManagement/orderManage/modules/edit.vue

@@ -444,9 +444,9 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+        /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
           this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }
+        }*/
         
         this.drawer = false
       })

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

+ 2 - 2
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -395,9 +395,9 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+      /*  if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
           this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }
+        }*/
       })
     },
     onEditSuccess () {

+ 2 - 2
src/SDrpManagement/salerOrder/modules/edit.vue

@@ -399,9 +399,9 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
+        /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
           this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
-        }
+        }*/
       })
     },
     onEditSuccess () {

+ 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