|
|
@@ -56,8 +56,8 @@
|
|
|
<el-button size="small" style="margin-right: 8px" :loading="saveLoading" :disabled="!form.id"
|
|
|
v-if="bigtabs == 'fy'" @click="previewDialogfun">预 览
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
|
|
|
- v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
|
|
|
+ <el-button size="small" type="warning" :disabled="!form.id || showLock" v-if="form.status == 1"
|
|
|
+ @click.stop="revokeDocumentApproval">撤销单据请核
|
|
|
</el-button>
|
|
|
<el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock"
|
|
|
v-if="form.status == 0 || form.status == 4" @click.stop="DocumentApproval">单据请核
|
|
|
@@ -104,7 +104,7 @@
|
|
|
}} {{ item[0].label }}
|
|
|
</span>
|
|
|
<span v-else style="color: #1e9fff">{{ item[0].label
|
|
|
- }}</span>
|
|
|
+ }}</span>
|
|
|
</span>
|
|
|
<span v-if="item[0].type == 'button'"></span>
|
|
|
<!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
|
|
|
@@ -2075,16 +2075,36 @@ export default {
|
|
|
if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
|
|
|
msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
|
|
|
}
|
|
|
- if (Number(item.price)==0) {
|
|
|
- msgs.push(`应收第${item.$index + 1}行单价不能为0`)
|
|
|
+ if (Number(item.price) == 0 || !item.price) {
|
|
|
+ msgs.push(`应收第${item.$index + 1}行单价不能为0或空`)
|
|
|
+ }
|
|
|
+ if (item.curCode == 'CNY') {
|
|
|
+ if (Number(item.rmbAmount) == 0 || !item.rmbAmount) {
|
|
|
+ msgs.push(`应收第${item.$index + 1}行金额不能为0`)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (item.curCode == 'USD') {
|
|
|
+ if (Number(item.usdAmount) == 0 || !item.usdAmount) {
|
|
|
+ msgs.push(`应收第${item.$index + 1}行金额不能为0`)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
for (let item of this.form.feeCenterListC) {
|
|
|
if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
|
|
|
msgs.push(`应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
|
|
|
}
|
|
|
- if (Number(item.price)==0) {
|
|
|
- msgs.push(`应付第${item.$index + 1}行单价不能为0`)
|
|
|
+ if (Number(item.price) == 0 || !item.price) {
|
|
|
+ msgs.push(`应付第${item.$index + 1}行单价不能为0或空`)
|
|
|
+ }
|
|
|
+ if (item.curCode == 'CNY') {
|
|
|
+ if (Number(item.rmbAmount) == 0 || !item.rmbAmount) {
|
|
|
+ msgs.push(`应收第${item.$index + 1}行金额不能为0`)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (item.curCode == 'USD') {
|
|
|
+ if (Number(item.usdAmount) == 0 || !item.usdAmount) {
|
|
|
+ msgs.push(`应收第${item.$index + 1}行金额不能为0`)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (msgs.length > 0) {
|
|
|
@@ -2243,10 +2263,10 @@ export default {
|
|
|
let fldNames = 'hshipperDetails,hconsigneeDetails,hnotifyDetails,mshipperDetails,mconsigneeDetails,mnotifyDetails'.split(",");
|
|
|
let fldDescs = '发货人,收货人,通知人,MBL 发货人,MBL 收货人,MBL 通知人'.split(",");
|
|
|
let msgsList = []
|
|
|
- fldNames.forEach((fld, idx)=>{
|
|
|
+ fldNames.forEach((fld, idx) => {
|
|
|
const cfs = checkFullWidthSymbols(this.form.detail[fld]);
|
|
|
- if(cfs.hasFullWidth){
|
|
|
- if(cfs.isResetText){
|
|
|
+ if (cfs.hasFullWidth) {
|
|
|
+ if (cfs.isResetText) {
|
|
|
this.$set(this.form.detail, fld, cfs.resetText);
|
|
|
}
|
|
|
msgsList.push(fldDescs[idx] + ": " + cfs.message)
|
|
|
@@ -2255,24 +2275,24 @@ export default {
|
|
|
|
|
|
fldNames = 'marks,commodityDescr,forwarding,siRemarks,bookingRemarks'.split(",");
|
|
|
fldDescs = '唛头,货描,FORWARDING,SI 备注,订舱备注'.split(",");
|
|
|
- fldNames.forEach((fld, idx)=>{
|
|
|
+ fldNames.forEach((fld, idx) => {
|
|
|
const cfs = checkFullWidthSymbols(this.form[fld]);
|
|
|
console.log(fldDescs[idx], cfs)
|
|
|
- if(cfs.isResetText===true){
|
|
|
+ if (cfs.isResetText === true) {
|
|
|
console.log("set", fld, this.form[fld], cfs.resetText)
|
|
|
this.$set(this.form, fld, cfs.resetText);
|
|
|
}
|
|
|
- if(cfs.hasFullWidth){
|
|
|
+ if (cfs.hasFullWidth) {
|
|
|
msgsList.push(fldDescs[idx] + ": " + cfs.message)
|
|
|
}
|
|
|
})
|
|
|
|
|
|
fldNames = 'placeReceiptNamePrint,polNamePrint,podNamePrint,destinationNamePrint,placeDeliveryNamePrint,potNamePrint'.split(",");
|
|
|
fldDescs = '收货地,装货港,卸货港,目的地,交货地,中转港'.split(",");
|
|
|
- fldNames.forEach((fld, idx)=>{
|
|
|
+ fldNames.forEach((fld, idx) => {
|
|
|
const cfs = checkFullWidthSymbols(this.form[fld]);
|
|
|
- if(cfs.hasFullWidth){
|
|
|
- if(cfs.isResetText){
|
|
|
+ if (cfs.hasFullWidth) {
|
|
|
+ if (cfs.isResetText) {
|
|
|
this.$set(this.form, fld, cfs.resetText);
|
|
|
}
|
|
|
msgsList.push(fldDescs[idx] + ": " + cfs.message)
|
|
|
@@ -2288,7 +2308,7 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- msgsList=[]
|
|
|
+ msgsList = []
|
|
|
console.log(this.form.detail)
|
|
|
if (!verifyEnglish(this.form.detail.hshipperDetails)) {
|
|
|
msgsList.push('发货人')
|
|
|
@@ -2644,11 +2664,11 @@ export default {
|
|
|
|
|
|
this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
|
|
|
// 如果已经请核就禁用按钮
|
|
|
- // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
|
|
|
- // this.detailData.seeDisabled = true
|
|
|
- // }else {
|
|
|
- // this.detailData.seeDisabled = false
|
|
|
- // }
|
|
|
+ if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
|
|
|
+ this.detailData.seeDisabled = true
|
|
|
+ } else {
|
|
|
+ this.detailData.seeDisabled = false
|
|
|
+ }
|
|
|
this.columnforfun('teamName').disabled = true
|
|
|
|
|
|
this.columnforfun('operatorName').disabled = true
|
Qukatie