|
@@ -367,6 +367,7 @@
|
|
|
<financial-account
|
|
|
:billType="billType"
|
|
|
:billData="billData"
|
|
|
+ :checkData="checkData"
|
|
|
@choceFun="choceFun"
|
|
|
>
|
|
|
</financial-account>
|
|
@@ -413,6 +414,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ lockData:{},
|
|
|
form: {},
|
|
|
disabled: false,
|
|
|
customerContact: {},
|
|
@@ -446,6 +448,12 @@ export default {
|
|
|
placeholder:'请点击右边按钮选择',
|
|
|
dicData:[]
|
|
|
},
|
|
|
+ checkData:{
|
|
|
+ url:"/purchase/contract/index",
|
|
|
+ pageStatus:"this.$store.getters.entranceCgStatus",
|
|
|
+ pageLabel:"付费申请",
|
|
|
+ checkType: 'ffsq'
|
|
|
+ },
|
|
|
//对比新旧数据信息
|
|
|
oldContactsData:[],
|
|
|
oldForm:{},
|
|
@@ -732,6 +740,14 @@ export default {
|
|
|
},
|
|
|
async created() {
|
|
|
this.customerContact = await this.getColumnData(this.getColumnName(37), customerContact);
|
|
|
+ // this.lockData = {
|
|
|
+ // moduleName: 'cg',
|
|
|
+ // tableName: 'business_order',
|
|
|
+ // billId: this.detailData.id,
|
|
|
+ // billNo:this.detailData.srcBillNo,
|
|
|
+ // no: localStorage.getItem('browserID')
|
|
|
+ // }
|
|
|
+
|
|
|
//币别
|
|
|
this.getWorkDicts("currency").then(res =>{
|
|
|
this.currencyDic = res.data.data
|
|
@@ -948,10 +964,23 @@ export default {
|
|
|
this.copyData()
|
|
|
}
|
|
|
},
|
|
|
- openDisabled(){
|
|
|
+
|
|
|
+ openDisabled() {
|
|
|
this.viewDisabled = false
|
|
|
this.checkDisabled = false
|
|
|
},
|
|
|
+
|
|
|
+ // async openDisabled(){
|
|
|
+ // this.viewDisabled = false
|
|
|
+ // this.checkDisabled = false
|
|
|
+ // if(!await this.checkLocks(this.lockData)){
|
|
|
+ // this.onLock(this.lockData)
|
|
|
+ // this.viewDisabled = false
|
|
|
+ // this.checkDisabled = false
|
|
|
+ // }else{
|
|
|
+ // this.$message.warning("此订单已被锁定,请稍后操作!")
|
|
|
+ // }
|
|
|
+ // },
|
|
|
selectionContact(row){
|
|
|
this.selectContact = row;
|
|
|
},
|
|
@@ -1169,7 +1198,13 @@ export default {
|
|
|
this.$message.success("复制成功!")
|
|
|
}
|
|
|
},
|
|
|
- backToList() {
|
|
|
+ backToList() {
|
|
|
+ //如果单据已被锁定 并且编辑按钮存在 则直接返回
|
|
|
+ // if(await this.checkLocks(this.lockData) && this.viewDisabled){
|
|
|
+ // this.$emit("goBack");
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+
|
|
|
this.orderFeesList = this.$refs.feeInfo.submitData();
|
|
|
if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
|
|
|
|| contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
|
|
@@ -1181,6 +1216,7 @@ export default {
|
|
|
}).then(() => {
|
|
|
this.editCustomer(true)
|
|
|
}).catch(()=>{
|
|
|
+ // this.unLock(this.lockData) //解锁
|
|
|
this.$emit("goBack");
|
|
|
})
|
|
|
}else{
|