diff --git a/src/views/ofm/borrowfile.vue b/src/views/ofm/borrowfile.vue index 7b53b9da..c9ba59f1 100644 --- a/src/views/ofm/borrowfile.vue +++ b/src/views/ofm/borrowfile.vue @@ -71,7 +71,7 @@ v-auth="'fileborrow.update'" >详情 - + @@ -100,7 +100,6 @@ @@ -193,16 +192,16 @@ export default { this.limitedVisible = true; this.addForm = Object.assign({}, row); }, - // async borrowDel(row) { - // var id = row.id; - // var res = await this.$API.ofm.borrow.delete.req(id); - // if (res.err_msg) { - // this.$message.error(res.err_msg); - // } else { - // this.$refs.table.refresh(); - // this.$message.success("删除成功"); - // } - // }, + async borrowDel(row) { + var id = row.id; + var res = await this.$API.ofm.borrow.delete.req(id); + if (res.err_msg) { + this.$message.error(res.err_msg); + } else { + this.$refs.table.refresh(); + this.$message.success("删除成功"); + } + }, //搜索 handleQuery() { this.$refs.table.queryData(this.query); diff --git a/src/views/ofm/borrowfile_form.vue b/src/views/ofm/borrowfile_form.vue index 9ae5d9a7..e9c7d516 100644 --- a/src/views/ofm/borrowfile_form.vue +++ b/src/views/ofm/borrowfile_form.vue @@ -32,14 +32,13 @@ > - + @@ -58,16 +57,17 @@ :title="ticketTitle" :t_id="addForm.id" :ticket_="addForm.ticket_" + :ticket_data="ticket_data" :submit_b_func="submit" ref="ticketd_b_start" @success="$emit('success')" /> - 取消 @@ -97,6 +97,7 @@ export default { addForm: {...this.modelValue}, query: {}, fileList: [], + ticket_data: {}, rules: { file_name: [ { required: true, message: "请选择档案", trigger: "blur" }, @@ -107,11 +108,33 @@ export default { mounted(){ this.getFileList(); }, + watch: { + modelValue: { + handler(val) { + this.addForm = { ...val }; + }, + deep: true, + }, + // 本地数据变动 -> 同步回父组件 + addForm: { + handler(val) { + this.$emit("update:modelValue", val); + }, + deep: true, + }, + addForm: { + handler(val){ + Object.assign(this.ticket_data,{ + return_date: val.return_date, + }) + }, + deep: true, + } + }, methods: { async submit() { let that = this; let res = null; - this.ticketTitle = `${this.addForm.file_name}-档案借阅`; if (that.mode === "add") { res = await that.$API.ofm.borrow.create.req(that.addForm); diff --git a/src/views/ofm/vehicle.vue b/src/views/ofm/vehicle.vue index c4b4318d..3a08aa17 100644 --- a/src/views/ofm/vehicle.vue +++ b/src/views/ofm/vehicle.vue @@ -124,7 +124,6 @@ :transitions="transitions" @success="()=>{handleQuery(); limitedVisible = false}" @closed="limitedVisible = false" - @submit="saveVehicle" />