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

src/components/fee-info/main.vue

@@ -498,7 +498,19 @@ export default {
     selectValue(value, row) {
       this.$set(row, "feeName", value.cname);
       this.$set(row, "ename", value.ename);
-      this.currencyChange(row);
+      if (this.optionType == "GN") {
+        if (!row.currency) {
+          getParities({
+            currency: "CNY",
+            businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+          }).then(res => {
+            const data = res.data.data;
+            row.exchangeRate = data.receivableParities;
+          });
+        }
+      } else {
+        this.currencyChange(row);
+      }
     },
     //选择应收应付
     // handleClick(tab){
@@ -640,7 +652,16 @@ export default {
           corpId: this.corpId,
           corpName: corpName
         };
-        this.$refs.feeCrud.rowCellAdd(params);
+        if (this.optionType == "GN") {
+          getParities({
+            currency: "CNY",
+            businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+          }).then(res => {
+            const data = res.data.data;
+            params.exchangeRate = data.receivableParities;
+            this.$refs.feeCrud.rowCellAdd(params);
+          });
+        }
       }
     },
     addRow() {

src/views/basicData/customerInformation/configuration/bankOfDeposit.json

@@ -55,7 +55,7 @@
       "index": 4,
       "width":100,
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
+      "dicData":[],
       "props": {
         "label": "dictValue",
         "value": "dictValue"

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -955,6 +955,10 @@ export default {
     gainUser().then(res => {
       this.userList = res.data.data;
     });
+    this.getWorkDicts("currency").then(res => {
+      this.findObject(this.bankOfDeposit.column, "fcyno").dicData =
+        res.data.data;
+    });
   },
   methods: {
     initData(tenantId) {

src/views/basicData/customerManagement/companyMaterial/configuration/bankOfDeposit.json

@@ -53,7 +53,7 @@
       "label": "币别",
       "prop": "fcyno",
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
+      "dicData":[],
       "props": {
         "label": "dictValue",
         "value": "dictValue"

src/views/basicData/customerManagement/companyMaterial/detailsPageEdit.vue

@@ -612,6 +612,10 @@ export default {
     gainUser().then(res => {
       this.userList = res.data.data;
     });
+    this.getWorkDicts("currency").then(res => {
+      this.findObject(this.bankOfDeposit.column, "fcyno").dicData =
+        res.data.data;
+    });
   },
   methods: {
     //新增客户联系人保存触发

src/views/basicData/customerManagement/supplierMaterial/configuration/bankOfDeposit.json

@@ -55,7 +55,7 @@
       "index": 4,
       "width":100,
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
+      "dicData":[],
       "props": {
         "label": "dictValue",
         "value": "dictValue"

src/views/basicData/customerManagement/supplierMaterial/detailsPageEdit.vue

@@ -288,7 +288,7 @@ export default {
         multiple: true
       },
       customerContact: {},
-      advantageProject:advantageProject,
+      advantageProject: advantageProject,
       bankOfDeposit: {},
       contactInformation: {
         column: [
@@ -655,6 +655,10 @@ export default {
     gainUser().then(res => {
       this.userList = res.data.data;
     });
+    this.getWorkDicts("currency").then(res => {
+      this.findObject(this.bankOfDeposit.column, "fcyno").dicData =
+        res.data.data;
+    });
   },
   methods: {
     //新增客户联系人保存触发

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1775,6 +1775,10 @@ export default {
     this.optionPolicy.height = (window.innerHeight - 330) / 2;
     this.customerContact.height = window.innerHeight - 240;
     this.index++;
+    if(localStorage.getItem("roleName")=='salesman'){
+        this.findObject(this.customerContact.column, "purchaseAmount").hide=true;
+        this.findObject(this.customerContact.column, "purchaseAmount").showColumn=false;
+    }
   },
   updated() {
     this.$nextTick(() => {