diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue index c6cd0080..23e88e31 100644 --- a/src/components/xtSelect/index.vue +++ b/src/components/xtSelect/index.vue @@ -69,7 +69,7 @@ - diff --git a/src/views/ofm/archive_form.vue b/src/views/ofm/archive_form.vue deleted file mode 100644 index fa75442d..00000000 --- a/src/views/ofm/archive_form.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/src/views/ofm/borrowfile.vue b/src/views/ofm/borrowfile.vue index 910d8293..8c53bf21 100644 --- a/src/views/ofm/borrowfile.vue +++ b/src/views/ofm/borrowfile.vue @@ -6,7 +6,6 @@ type="primary" icon="el-icon-plus" @click="handleAdd" - v-auth="'fileborrow.create'" >
@@ -61,23 +60,22 @@ prop="return_date" min-width="100" > - + - - - - diff --git a/src/views/ofm/publicityForm.vue b/src/views/ofm/publicityForm.vue index 2e0c0cfe..33ff4873 100644 --- a/src/views/ofm/publicityForm.vue +++ b/src/views/ofm/publicityForm.vue @@ -9,35 +9,35 @@ label-position="left" > - + - + - + - + - + - + @@ -47,14 +47,14 @@ placeholder = "请输入名称" size = "small" style="margin-top: 10;" - :disabled="localMode ==='view'" + :disabled="localMode ==='show'" > - + - + @@ -67,42 +67,44 @@ placeholder = "请输入渠道名称" size = "small" style="margin-top: 10;" - :disabled="localMode ==='view'" + :disabled="localMode ==='show'" > - + - +
- - - - ，应做 - - - - + + 不符合定密要求 + 同意内容为涉密事项 + +
+ + +
+ 应做 + + 公开 + 受控 + 处理。
-
- - - - ，涉密等级为： - - - - +
+ 涉密等级为： + + 机密 + 秘密 + ，保密期限（解密时间或解密条件）为：
- - + + - - + + @@ -127,7 +129,7 @@ - + + /> + :ticket_="addForm.ticket_" + :ticket_data="ticket_data" + @success="$emit('success')" + style="margin-top: 20px;" + /> - diff --git a/src/views/ofm/seal.vue b/src/views/ofm/seal.vue index 313ae5f3..10cac5a1 100644 --- a/src/views/ofm/seal.vue +++ b/src/views/ofm/seal.vue @@ -6,14 +6,7 @@ type="primary" icon="el-icon-plus" @click="handleAdd" - v-auth="'seal.create'" - >内用 - 外借 + >新增
否 - + - - - - @@ -113,64 +116,37 @@ import ticketd_b from "@/views/wf/ticketd_b.vue"; import ticketd from '@/views/wf/ticketd.vue' export default { props: { - mode: { type: String, default: "view" }, // add / edit / view - lending_type: { type: String, default: "outer" }, // inner / outer - modelValue: { type: Object, default: () => ({}) }, + mode: { + type: String, default: "show" + }, // add / edit / show t_id: { - type: String, - default: null - }, - }, + type: String, default: null + }, + }, components: {ticketd, ticketd_b }, - emits: ["update:modelValue", "submit", "cancel"], data() { return { - ticket_data: {}, - ticketview: false, ticketTitle: "用印申请", - localForm: { - ticket_: { - state_: { type: '' } - }, - ...this.modelValue }, - localMode : this.mode, + ticket_data: {}, + localForm: {}, + localMode: this.mode, timeRange: [], rules: { filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], }, }; }, - mounted() { - // console.log('--------this.t_id----------',this.t_id) - this.getTid(); - this.initTimeRange(); - if (this.localForm.ticket_?.state_.type===1){ - this.localMode = 'edit' - } - if(this.lending_type === 'outer'){ - this.ticket_data = { - is_lending: true - }; - }else{ - this.ticket_data={is_lending: false} - }; + mounted() { + let that = this; + if (that.t_id) { + that.getTid(); + } }, watch: { 'localForm.actual_return_date'(val) { this.ticket_data.actual_return_date = val }, }, - computed: { - addForm: { - get() { - return this.modelValue; - }, - set(val) { - this.$emit("update:modelValue", val); - }, - }, - }, - methods: { handleDateChange(val) { this.localForm.lending_date = val?.[0] || null @@ -178,10 +154,8 @@ export default { }, async submit_b_func() { let that = this; - this.ticketTitle = `${this.localForm.filename}-用印申请` if(that.localMode == "add") { let res = await that.$API.ofm.lendingseal.create.req(that.localForm); - that.localForm.id = res.id; } else if (that.localMode == "edit") { await that.$API.ofm.lendingseal.update.req(that.localForm.id, that.localForm); @@ -189,18 +163,16 @@ export default { }, getTid (){ var that = this; - // console.log('----------that--------',that.t_id) - if (that.t_id) { - that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{ - that.localForm = res; - // console.log('----------ticket_--------',that.localForm.ticket_) - that.ticketview = true; - if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { - that.localMode = "edit"; - }else{ - that.localMode = "show"; - } - }) + if (that.t_id) { + that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{ + that.localForm = res; + that.initTimeRange(); + if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { + that.localMode = "edit"; + }else{ + that.localMode = "show"; + } + }) } }, initTimeRange() { diff --git a/src/views/ofm/vehicle.vue b/src/views/ofm/vehicle.vue index ec88f806..b8a88343 100644 --- a/src/views/ofm/vehicle.vue +++ b/src/views/ofm/vehicle.vue @@ -80,23 +80,22 @@ prop="actual_km" min-width="100" > - + - - - - diff --git a/src/views/ofm/vehicleForm.vue b/src/views/ofm/vehicleForm.vue index c85d0ae4..37843430 100644 --- a/src/views/ofm/vehicleForm.vue +++ b/src/views/ofm/vehicleForm.vue @@ -9,29 +9,25 @@ label-position="left" > - + - - - + + 市内 + 市外 + - + - + - + - + @@ -41,38 +37,37 @@ - + @@ -92,60 +87,33 @@ import ticketd_b from "@/views/wf/ticketd_b.vue"; import ticketd from '@/views/wf/ticketd.vue' export default { props: { - mode: { type: String, default: "view" }, // add / edit / view - modelValue: { type: Object, default: () => ({}) }, - transitions: { type: Array, default: () => [] }, + mode: { + type: String, default: "show" + }, // add / edit / show t_id: { type: String, default: null }, }, components: {ticketd, ticketd_b}, - emits: ["update:modelValue", "submit", "cancel"], data() { return { - addForm: { - ticket_: { - state_: { type: '' } - }, - ...this.modelValue }, - - ticketTitle: "用车申请", - ticket_data: {}, - localMode : this.mode, - rules:{ - filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], - }, - workflow_key: "vehicle_in", - vehicle_scope:[{name: '市内', is_city: true},{name: '市外', is_city: false}], - } + addForm: {}, + ticketTitle: "用车申请", + ticket_data: {}, + localMode : this.mode, + rules:{ + filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], + }, + } }, mounted() { - if (this.addForm.ticket_?.state_.type===1){ - this.localMode = 'edit' - }; - this.ticket_data = { - ...this.ticket_data, - is_city: this.addForm.is_city, - }; - this.getTid(); - + let that = this; + if (that.t_id) { + that.getTid(); + } }, 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, { @@ -157,23 +125,16 @@ export default { deep: true, } }, - methods: { async submit_b_func() { - let that = this; - if (this.addForm.is_city === true){ - that.workflow_key = "vehicle" - }else{ - that.workflow_key = "vehicle_out" - } - this.ticketTitle = `${this.addForm.reason}-用车申请` - if(that.localMode == "add") { - let res = await that.$API.ofm.vehicle.create.req(that.addForm); - that.addForm.id = res.id; - } else if (that.localMode == "edit") { - await that.$API.ofm.vehicle.update.req(that.addForm.id, that.addForm); - } - }, + let that = this; + if(that.localMode == "add") { + let res = await that.$API.ofm.vehicle.create.req(that.addForm); + that.addForm.id = res.id; + } else if (that.localMode == "edit") { + await that.$API.ofm.vehicle.update.req(that.addForm.id, that.addForm); + } + }, getTid (){ var that = this; if (that.t_id) { diff --git a/src/views/srm/paperse.vue b/src/views/srm/paperse.vue index b2341b69..3815795d 100644 --- a/src/views/srm/paperse.vue +++ b/src/views/srm/paperse.vue @@ -94,24 +94,22 @@ — - + - - -