进口

src/components/check/checkSchedule.vue

@@ -4,12 +4,12 @@
       <el-steps direction="vertical"
                 :active="active"
                 space="150px"
-                :finish-status="finish"
                 align-center
                 style="font-size: 12px">
         <el-step :key="index"
                  v-for="(item,index) in data"
                  :title="item.title"
+                 :status="item.status"
                  style="font-size: 14px !important;">
           <template slot="description" scope="scope">
             <table width="100%" border="0" cellspacing="0" cellpadding="0" style="font-size: 14px">
@@ -58,7 +58,6 @@
         loading:false,
         option:option,
         active:1,
-        finish:"success",
         data:[],
         page: {
           pageSize: 10,
@@ -73,10 +72,11 @@
           if(item.auditStatus == "A"){
             this.active = index + 2
             item.title = "审批通过"
+            item.status = "success"
           }
           if(item.auditStatus == "B"){
-            this.finish = "error"
             item.title = "审批驳回"
+            item.status = "error"
           }
           if(item.auditStatus == "S" || item.auditStatus == "N"){
             item.title = "待审批"

src/components/fee-info/main.vue

@@ -402,13 +402,13 @@ export default {
         feesType:this.selectTab
       });
     },
-    currencyChange(row) {
-      if (row.currency == "CNY") {
-        row.exchangeRate = 1;
-      }
-      if (row.currency == "USD") {
-        row.exchangeRate = 6.3843;
-      }
+    //带出汇率
+    currencyChange(row){
+      this.currencyList.forEach(item =>{
+        if(item.dictValue === row.currency){
+          this.$set(row,"exchangeRate",item.remark)
+        }
+      })
     },
     rowDel(row, index) {
       this.$confirm("确定删除数据?", {

src/components/finance/applyPayment.vue

@@ -374,9 +374,9 @@ export default {
                     });
                   }else{
                     //关闭一下存在的列表页  跳转
-                    this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
+                    this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
                     this.$router.push({
-                      path: "/financialManagement/paymentRequest/paymentRequest",
+                      path: "/financialManagement/paymentRequest/index",
                       query: {params: res.data.data.id},
                     });
                   }

src/router/views/index.js

@@ -537,18 +537,18 @@ export default [{
   },
   // 付款申请
   {
-    path: '/financialManagement/paymentRequest/paymentRequest',
+    path: '/financialManagement/paymentRequest/index',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/financialManagement/paymentRequest/paymentRequest',
+        path: '/financialManagement/paymentRequest/index',
         name:"付款申请",
         meta: {
-          i18n: '/financialManagement/paymentRequest/paymentRequest',
+          i18n: '/financialManagement/paymentRequest/index',
           keepAlive: true,
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/paymentRequest/paymentRequest')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/paymentRequest/index')
       }
     ]
   },

src/views/approveData/configuration/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 100,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/approveData/index.vue

@@ -47,21 +47,7 @@
           size="small"
           :disabled="scope.row.auditStatus != 'S'"
           @click.stop="openCheck(scope.row)"
-        >审批
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
-          :disabled="scope.row.auditStatus != 'S'"
-          @click.stop="pass(scope.row, 1)"
-        >审批通过
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
-          :disabled="scope.row.auditStatus != 'S'"
-          @click.stop="pass(scope.row, 2)"
-        >审批驳回
+        >审核
         </el-button>
       </template>
     </avue-crud>

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -22,7 +22,6 @@
                 @click.native="paymentCheck">{{form.checkStatus == '审核中'?'审核中':'请核'}}
               </el-dropdown-item>
               <el-dropdown-item
-                :disabled="!checkDisabled"
                 :loading="buttonLoading"
                 @click.native="checkScheduleDialog = true,checkId=form.id">审核进度
               </el-dropdown-item>
@@ -57,7 +56,7 @@
           </el-button>
         </div>
         <div v-if="auditDisabled" class="upper_right_button">
-          <el-button type="success"
+          <el-button type="primary"
                      size="small"
                      class="el-button--small-yh"
                      :loading="buttonLoading"
@@ -207,6 +206,7 @@
   import _ from "lodash";
   import { approvePass } from "@/api/approveData/main"
   import checkSchedule from "../../../components/check/checkSchedule";
+  import check from "@/components/check/check";
   import { cancelCheck } from "@/api/check/check";
 
   export default {
@@ -217,7 +217,8 @@
       }
     },
     components:{
-      checkSchedule
+      checkSchedule,
+      check
     },
     data() {
       return {

src/views/purchase/contract/detailsPage.vue

@@ -396,7 +396,7 @@ export default {
       takeDisabled:false, //收货状态
       viewDisabled:false,
       tableData: [],
-      billUrl:"/financialManagement/paymentRequest/paymentRequest",
+      billUrl:"/financialManagement/paymentRequest/index",
       billType:"",
       billData:{},
       contractTypeDic:[],
@@ -792,6 +792,10 @@ export default {
     //币别
     this.getWorkDicts("currency").then(res =>{
       this.currencyDic = res.data.data
+      if(!this.detailData.id){
+        this.$set(this.form,"currency","USD")
+        this.currencyChange("USD")
+      }
     })
     this.getWorkDicts("contractType").then(res =>{
       this.contractTypeDic = res.data.data
@@ -813,9 +817,6 @@ export default {
       }).finally(()=>{
         this.buttonLoading = false;
       })
-    } else{
-      this.$set(this.form,"currency","USD")
-      this.$set(this.form,"exchangeRate",6.3686)
     }
   },
   methods: {
@@ -836,7 +837,7 @@ export default {
         row.amount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
-    //带出人民币
+    //带出汇率
     currencyChange(value){
       this.currencyDic.forEach(item =>{
         if(item.dictValue === value){

src/views/salesManagement/salesContract/detailsPage.vue

@@ -796,6 +796,10 @@ export default {
     //币别
     this.getWorkDicts("currency").then(res =>{
       this.currencyDic = res.data.data
+      if(!this.detailData.id){
+        this.$set(this.form,"currency","USD")
+        this.currencyChange("USD")
+      }
     })
     if(this.detailData.view){
       this.viewDisabled = true
@@ -824,8 +828,6 @@ export default {
         this.buttonLoading = false
       })
     }else{
-      this.$set(this.form,"currency","USD")
-      this.$set(this.form,"exchangeRate",6.3686)
       //采购日期默认当天
       let date = new Date();
       let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
@@ -857,17 +859,13 @@ export default {
       this.$set(this.form,"invoiceWeight", invoiceList.reduce((n,m) => n + m))
       this.$set(this.form,"billWeight", billList.reduce((n,m) => n + m))
     },
-    //汇率
+    //带出汇率
     currencyChange(value){
-      if(this.form.exchangeRate == 1 || this.form.exchangeRate == 6.368600 || this.form.exchangeRate == 7.174900){
-        if(value == "CNY"){
-          this.$set(this.form,"exchangeRate",1)
-        }else if(value == "USD"){
-          this.$set(this.form,"exchangeRate",6.368600)
-        }else if(value == "EUR"){
-          this.$set(this.form,"exchangeRate",7.174900)
+      this.currencyDic.forEach(item =>{
+        if(item.dictValue === value){
+          this.$set(this.form,"exchangeRate",item.remark)
         }
-      }
+      })
     },
     //单价
     priceChange(row) {