Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -250,7 +250,7 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item label="信用等级" prop="creditLevel">
                   <el-select v-model="formData.creditLevel" size="small" placeholder="请输入信用等级" clearable
                     :style="{ width: '100%' }">
@@ -260,9 +260,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="PS规则" prop="psRate">
-                  <el-input v-model="formData.psRate" placeholder="请输入PS规则" clearable :style="{ width: '100%' }"
-                    @input="psRateValid(formData.psRate)" @blur="psRateBlue" />
+                <el-form-item label="内部报价 PS 规则" label-width="120" prop="psRate">
+                  <el-input v-model="formData.psRate" placeholder="请输入内部报价PS规则" clearable :style="{ width: '50%' }"
+                    @input="psRateValid(formData, 'psRate')" @blur="psRateBlue('psRate')" />
                   <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
                   <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
                   <!--  <search-query :datalist="psRateData"-->
@@ -277,6 +277,23 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
+                  <el-form-item label="外部报价 PS 规则" label-width="120" prop="psRateExternal">
+                        <el-input v-model="formData.psRateExternal" placeholder="请输入外部报价PS规则" clearable :style="{ width: '50%' }"
+                                  @input="psRateValid(formData, 'psRateExternal')" @blur="psRateBlue('psRateExternal')" />
+                        <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
+                        <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
+                        <!--  <search-query :datalist="psRateData"-->
+                        <!--                :selectValue="formData.psRate"-->
+                        <!--                :filterable="true"-->
+                        <!--                :clearable="true"-->
+                        <!--                :buttonIf="false"-->
+                        <!--                :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"-->
+                        <!--                @corpChange="psRateChange($event,'psRate')"-->
+                        <!--                @corpFocus="psRateWorkDictsfun">-->
+                        <!--  </search-query>-->
+                    </el-form-item>
+                </el-col>
+              <el-col :span="6">
                 <el-form-item label="分管员" prop="adminProfiles">
                   <el-select v-model="formData.adminProfilesList" size="small" multiple @change="adminProfilesChange"
                     filterable placeholder="请选择分管员" :style="{ width: '100%' }">
@@ -1125,7 +1142,9 @@ export default {
   data() {
     return {
       psRateData: [], // ps 规则数据
-      // 业务来源
+      psRateInternalMax: 0.5, // PS RATE 内部报价最大值
+      psRateExternalMax: 0.7, // PS RATE 外部报价最大值
+        // 业务来源
       sourceTypeData: [
         {
           label: '公司',
@@ -1404,7 +1423,20 @@ export default {
           trigger: 'change'
         }]
       }
-
+    })
+    // PS RATE 内部报价最大值
+    isProcurement({ "param": "psRate.Internal.max" }).then(res => {
+        console.log('psRateInternalMax', res.data.data)
+        // res.data.data= 0.5
+        let n = Number(res.data.data)
+        this.psRateInternalMax = isNaN(n) ? 0.5 : n
+    })
+    // PS RATE 外部报价最大值
+    isProcurement({ "param": "psRate.external.max" }).then(res => {
+        console.log('psRateExternalMax', res.data.data)
+        // default res.data.data= 0.7
+        let n = Number(res.data.data)
+        this.psRateExternalMax = isNaN(n) ? 0.7 : n
     })
   },
   mounted() { },
@@ -1429,24 +1461,37 @@ export default {
       });
     },
     // ps规则监听输入事件
-    psRateValid(inputContent) {
+    psRateValid(inputContent, name) {
       let reg = /^(0.\d+|0|1)$/;
-      if (reg.test(inputContent)) {
-        this.formData.psRate = Number(inputContent);
+      if (reg.test(inputContent[name])) {
+        let n = Number(inputContent[name])
+        n = isNaN(n) ? 0 : n
+        if(name=='psRate') {
+            if (n > this.psRateInternalMax) n = this.psRateInternalMax
+        }else{
+            if (n > this.psRateExternalMax) n = this.psRateExternalMax
+        }
+        this.formData[name] = n;
       } else {
-        if (inputContent != "0.") {
-          this.formData.psRate = "";
+        if (inputContent[name] != "0.") {
+          this.formData[name] = "";
         }
       }
     },
     // ps 规则失去焦点触发
-    psRateBlue() {
-      if (this.formData.psRate) {
-        this.$set(this.formData, 'psRate', Number(this.formData.psRate).toFixed(2))
+    psRateBlue(name) {
+      if (this.formData[name]) {
+        let n = Number(this.formData[name])
+        n = isNaN(n) ? 0 : n
+        if(name=='psRate') {
+            if (n > this.psRateInternalMax) n = this.psRateInternalMax
+        }else{
+            if (n > this.psRateExternalMax) n = this.psRateExternalMax
+        }
+        this.$set(this.formData, name, n.toFixed(2))
       } else {
-        this.$set(this.formData, 'psRate', '')
+        this.$set(this.formData, name, '')
       }
-
     },
     // 详情
     getBcorpsDetailfun(id) {

src/views/iosBasicData/psBcorps/detailsPage.vue

@@ -269,7 +269,7 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="信用等级" prop="creditLevel">
                   <el-select v-model="formData.creditLevel" size="small" placeholder="请输入信用等级" clearable :style="{ width: '100%' }">
                     <el-option v-for="(item, index) in creditLevelDict" :key="index" :label="item.dictValue"
@@ -277,10 +277,10 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="PS规则" prop="psRate">
-                   <el-input v-model="formData.psRate" placeholder="请输入PS规则"
-                             clearable :style="{ width: '100%' }" @input="psRateValid(formData.psRate)" @blur="psRateBlue" />
+              <el-col :span="6">
+                <el-form-item label="内部报价 PS 规则" prop="psRate">
+                   <el-input v-model="formData.psRate" placeholder="请输入内部报价PS规则"
+                             clearable :style="{ width: '100%' }" @input="psRateValid(formData, 'psRate')" @blur="psRateBlue('psRate')" />
                   <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
                   <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
                   <!--  <search-query :datalist="psRateData"-->
@@ -294,6 +294,23 @@
                   <!--  </search-query>-->
                 </el-form-item>
               </el-col>
+                <el-col :span="6">
+                    <el-form-item label="外部报价 PS 规则" label-width="120" prop="psRateExternal">
+                        <el-input v-model="formData.psRateExternal" placeholder="请输入外部报价PS规则" clearable :style="{ width: '50%' }"
+                                  @input="psRateValid(formData, 'psRateExternal')" @blur="psRateBlue('psRateExternal')" />
+                        <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
+                        <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
+                        <!--  <search-query :datalist="psRateData"-->
+                        <!--                :selectValue="formData.psRate"-->
+                        <!--                :filterable="true"-->
+                        <!--                :clearable="true"-->
+                        <!--                :buttonIf="false"-->
+                        <!--                :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"-->
+                        <!--                @corpChange="psRateChange($event,'psRate')"-->
+                        <!--                @corpFocus="psRateWorkDictsfun">-->
+                        <!--  </search-query>-->
+                    </el-form-item>
+                </el-col>
               <el-col :span="8">
                 <el-form-item label="分管员" prop="adminProfiles">
                   <el-select v-model="formData.adminProfilesList" size="small" multiple @change="adminProfilesChange" filterable
@@ -1044,6 +1061,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
 import blines from "@/views/iosBasicData/blines/index.vue";
 import {selectListLos} from "@/api/approval/processConfig";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
+import {isProcurement} from "@/api/basicData/configuration";
 export default {
   components: {
     SearchQuery, bcountrys, user, rateManagement,blines
@@ -1059,6 +1077,8 @@ export default {
   data() {
     return {
         psRateData:[], // ps 规则数据
+        psRateInternalMax: 0.5, // PS RATE 内部报价最大值
+        psRateExternalMax: 0.7, // PS RATE 外部报价最大值
         // 客户来源
         sourceTypeData:[
             {
@@ -1302,7 +1322,7 @@ export default {
           }
         })
       }
-      
+
     })
     // 查询用户信息
     userList(1, 9999999).then((res) => {
@@ -1324,28 +1344,55 @@ export default {
         }
     });
 
+      // PS RATE 内部报价最大值
+      isProcurement({ "param": "psRate.Internal.max" }).then(res => {
+          console.log('psRateInternalMax', res.data.data)
+          // res.data.data= 0.5
+          let n = Number(res.data.data)
+          this.psRateInternalMax = isNaN(n) ? 0.5 : n
+      })
+      // PS RATE 外部报价最大值
+      isProcurement({ "param": "psRate.external.max" }).then(res => {
+          console.log('psRateExternalMax', res.data.data)
+          // default res.data.data= 0.7
+          let n = Number(res.data.data)
+          this.psRateExternalMax = isNaN(n) ? 0.7 : n
+      })
   },
   mounted() { },
   methods: {
       // ps规则监听输入事件
-      psRateValid(inputContent){
+      psRateValid(inputContent, name) {
           let reg = /^(0.\d+|0|1)$/;
-          if (reg.test(inputContent)) {
-              this.formData.psRate = Number(inputContent);
+          if (reg.test(inputContent[name])) {
+              let n = Number(inputContent[name])
+              n = isNaN(n) ? 0 : n
+              if(name=='psRate') {
+                  if (n > this.psRateInternalMax) n = this.psRateInternalMax
+              }else{
+                  if (n > this.psRateExternalMax) n = this.psRateExternalMax
+              }
+              this.formData[name] = n;
           } else {
-              if (inputContent != "0.") {
-                  this.formData.psRate = "";
+              if (inputContent[name] != "0.") {
+                  this.formData[name] = "";
               }
           }
       },
       // ps 规则失去焦点触发
-      psRateBlue(){
-          if (this.formData.psRate) {
-              this.$set(this.formData,'psRate',Number(this.formData.psRate).toFixed(2))
-          }else {
-              this.$set(this.formData,'psRate','')
+      psRateBlue(name) {
+          if (this.formData[name]) {
+              let n = Number(this.formData[name])
+              n = isNaN(n) ? 0 : n
+              if(name=='psRate') {
+                  if (n > this.psRateInternalMax) n = this.psRateInternalMax
+              }else{
+                  if (n > this.psRateExternalMax) n = this.psRateExternalMax
+              }
+              this.$set(this.formData, name, n.toFixed(2))
+          } else {
+              this.$set(this.formData, name, '')
           }
-
       },
       // 详情
       getBcorpsDetailfun(id){