|
|
@@ -76,9 +76,15 @@
|
|
|
<el-select v-else-if="item.prop === 'currency'" style="width: 100%" v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
|
|
|
<el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
+ <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]" :disabled="item.disabled?true:false" size="small" autocomplete="off" @change="currencyChange" placeholder="请输入">
|
|
|
+ <template slot="append">%</template>
|
|
|
+ </el-input>
|
|
|
<el-select v-else-if="item.prop === 'paymentType'" style="width: 100%" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
|
|
|
<el-option v-for="(item,index) in paymentTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
+ <!--<div v-else-if="item.prop === 'advancePayment'">
|
|
|
+ <el-input type="textarea" v-else-if="(item.prop === 'advancePayment')" v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
|
|
|
+ </div>-->
|
|
|
<el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
|
|
|
<el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -198,6 +204,17 @@
|
|
|
></el-input>
|
|
|
<span v-else>{{ row.amount }}</span>
|
|
|
</template>
|
|
|
+ <template slot="taxRate" slot-scope="{ row }">
|
|
|
+ <el-input v-if="row.$cellEdit"
|
|
|
+ v-model="row.taxRate"
|
|
|
+ size="small"
|
|
|
+ autocomplete="off"
|
|
|
+ placeholder="请输入">
|
|
|
+ <template slot="append"
|
|
|
+ >%</template>
|
|
|
+ </el-input>
|
|
|
+ <span v-else>{{ row.taxRate }}</span>
|
|
|
+ </template>
|
|
|
<template slot-scope="{row,index}" slot="menu">
|
|
|
<el-button
|
|
|
type="text"
|
|
|
@@ -249,7 +266,7 @@
|
|
|
append-to-body
|
|
|
class="el-dialogDeep"
|
|
|
:visible.sync="applicationDialog"
|
|
|
- width="70%"
|
|
|
+ width="60%"
|
|
|
:close-on-click-modal="false"
|
|
|
:destroy-on-close="true"
|
|
|
:close-on-press-escape="false"
|
|
|
@@ -286,20 +303,16 @@
|
|
|
import customerContact from "./config/customerContact.json"
|
|
|
import uploadList from './config/uploadList.json'
|
|
|
import advantageProject from "./config/advantageProject.json"
|
|
|
-import {getDeptLazyTree,customerList} from "@/api/basicData/basicFeesDesc";
|
|
|
+import { getDeptLazyTree } from "@/api/basicData/basicFeesDesc";
|
|
|
import optionTwoCost from "./config/mainListCost.json"
|
|
|
-import {detailListData, submitData,getSysNo} from "@/api/importTrade/purchase";
|
|
|
-import commodity from "./config/commodity.json"
|
|
|
+import {detailListData, submitData} from "@/api/importTrade/purchase";
|
|
|
import feeInfo from "@/components/fee-info/main";
|
|
|
import uploadFile from "@/components/upload-file/main";
|
|
|
import _ from "lodash";
|
|
|
import billApplication from "@/components/bill/billApplication";
|
|
|
//商品详情接口
|
|
|
-import {corpsattn, corpsbank, getDeptLazyTreeS} from "@/api/basicData/configuration"
|
|
|
-import { getList } from "@/api/basicData/commodityType"
|
|
|
+import { corpsattn } from "@/api/basicData/configuration"
|
|
|
import { contrastObj,contrastList } from "@/util/contrastData";
|
|
|
-import {getSpecification} from "@/api/exportTrade/purchaseContract";
|
|
|
-import option from "./config/mainList.json";
|
|
|
import ApplyPayment from "../../../components/finance/applyPayment";
|
|
|
export default {
|
|
|
name: "detailsPage",
|
|
|
@@ -457,7 +470,7 @@ export default {
|
|
|
disabled:this.takeDisabled,
|
|
|
rules: [
|
|
|
{
|
|
|
- required: false,
|
|
|
+ required: true,
|
|
|
message: ' ',
|
|
|
trigger: 'blur'
|
|
|
}
|
|
|
@@ -589,6 +602,7 @@ export default {
|
|
|
prop: 'currency'
|
|
|
}, {
|
|
|
label: '汇率',
|
|
|
+ type:"unit",
|
|
|
prop: 'exchangeRate',
|
|
|
}, {
|
|
|
label: '人民币金额',
|
|
|
@@ -758,20 +772,20 @@ export default {
|
|
|
},
|
|
|
//带出人民币
|
|
|
currencyChange(){
|
|
|
- if(this.form.orderAmount){
|
|
|
- if(this.form.currency === "CNY"){
|
|
|
- this.form.exchangeRate = 1
|
|
|
+ if(this.form.currency === "CNY" && this.form.exchangeRate == 6.368600){ //如果为人民币
|
|
|
+ this.form.exchangeRate = 1
|
|
|
+ if(this.form.orderAmount){ //合同金额不为0 赋值人民币金额
|
|
|
this.$set(this.form,"rmbAmount",this.form.orderAmount)
|
|
|
- }else{
|
|
|
- if(this.form.exchangeRate != 6.368600){
|
|
|
- this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
|
|
|
- }else{
|
|
|
- this.form.exchangeRate = 6.3686
|
|
|
+ }
|
|
|
+ }else if(this.form.exchangeRate === 1){
|
|
|
+ this.form.exchangeRate = 6.3686
|
|
|
+ if(this.form.orderAmount){
|
|
|
this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 6.3686).toFixed(2))
|
|
|
}
|
|
|
- }
|
|
|
}else{
|
|
|
- this.$set(this.form,"rmbAmount","")
|
|
|
+ if(this.form.orderAmount && this.form.exchangeRate){
|
|
|
+ this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
//合计
|
|
|
@@ -888,7 +902,7 @@ export default {
|
|
|
if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
|
|
|
|| contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
|
|
|
){
|
|
|
- this.$confirm("您已改动数据,是否先保存在进行操作!", {
|
|
|
+ this.$confirm("数据发生变化，请先提交保存？", {
|
|
|
confirmButtonText: "保存",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
@@ -964,7 +978,7 @@ export default {
|
|
|
if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
|
|
|
|| contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
|
|
|
){
|
|
|
- this.$confirm("您已改动数据,是否先保存在进行操作!", {
|
|
|
+ this.$confirm("数据发生变化，请先提交保存？", {
|
|
|
confirmButtonText: "保存",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
@@ -1040,7 +1054,7 @@ export default {
|
|
|
if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
|
|
|
|| contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
|
|
|
){
|
|
|
- this.$confirm("是否保存当前页面？", "提示", {
|
|
|
+ this.$confirm("数据发生变化，是否提交保存？", "提示", {
|
|
|
confirmButtonText: "保存",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
qinbai