diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue index 2d52b273..5fde1bad 100644 --- a/src/layout/components/TopNotice/index.vue +++ b/src/layout/components/TopNotice/index.vue @@ -163,7 +163,7 @@ export default { position: 'top-right', // type: 'success', customClass:'notify-success', - duration: 0, + // duration: 0, onClick: function () { //self.warnDetailByWarnid(messageBody.warnId); //自定义回调,message为传的参数 // 点击跳转的页面 diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue index c28e772c..7f842e5e 100644 --- a/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue +++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue @@ -75,6 +75,19 @@ v-hasPermi="['emis:emisWaybillAjustApply:add']" >新增申请 + + + 再次申请 + + - + @@ -243,6 +256,7 @@ export default { currentId:null, openForm: false, titleForm: "", + isReApply:false, // 弹出展示层 id:null, @@ -334,19 +348,20 @@ export default { this.currentId=null; this.openForm= true; this.titleForm = "新增费用申请"; - // this.$router.push("/d24/expenseRecognitionManagemen/WaybillAdjustApply?action=adjust"); }, handleShowMoreInput(){ this.moreInputVisible = !this.moreInputVisible; }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.currentId= row.id; + /** 再次申请按钮操作 */ + handleReApply(row) { + this.currentId= row.id||this.ids; + this.isReApply=true; this.openForm = true; - this.titleForm = "修改"; + this.titleForm = "再次申请"; }, handleView(row) { this.currentId= row.id || this.ids; + this.isReApply=false; this.titleForm="查看费用申请"; this.openForm=true; }, diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index b1781ca3..3b2f86b8 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1325,6 +1325,12 @@ export default { }, deep: true }, + disabled:{ + handler (newVa, oldValue) { + console.log("=xxx1===>disabled==>",this.disabled); + } + + }, oldValue: { handler (newValue, oldValue) { this.billDetail = this.oldValue; diff --git a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue index d3f63e56..2c0efe09 100644 --- a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue +++ b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue @@ -55,7 +55,11 @@ export default { name: "emisWaybillAjustApplyForm", props:{ id:{ - type:Number + type:[Number,Array] + }, + isReApply:{ + type:[Boolean], + default:false } }, components: { @@ -70,13 +74,13 @@ export default { data() { return { - isFormDisabled:true, + isFormDisabled:null, emisWaybillAjustApplyOptions: [], ajustTypeItems:[], - isEditDisabled:true, + isEditDisabled:null, // 遮罩层 loading: true, @@ -111,6 +115,15 @@ export default { this.initData(); }, deep: true + }, + "isReApply": { + handler (newValue, oldValue) { + if(newValue){ + this.isFormDisabled=false; + } + + }, + deep: true } }, created() { @@ -124,7 +137,7 @@ export default { if(this.id !=null) { this.loading = true; this.isFormDisabled=true; - getEmisWaybillAjustApply(this.id).then(response => { + getEmisWaybillAjustApply(this.id).then(async response => { this.form = response.data; this.form.jsonDataObj=JSON.parse(this.form.jsonData); console.log("===>this.form.jsonDataObj ==>",this.form.jsonDataObj); @@ -132,6 +145,18 @@ export default { this.form.jsonDataObj.oldValue=Object.assign({},this.billDetail); this.form.jsonDataObj.newValue=Object.assign({},this.form.jsonDataObj.newValue); + // 再次申请 + console.log("===>this.isReApply ==>",this.isReApply); + if(this.isReApply){ + + let res=await getWaybillDetail(this.form.billCode); + this.billDetail=res.data; + this.form.jsonDataObj.oldValue=deepClone(this.billDetail); + + this.isFormDisabled=false; + this.form.id=null; + } + this.loading = false; }); }else{