diff --git a/src/application/mk/basic-pages/edit.vue b/src/application/mk/basic-pages/edit.vue index 5010dfb..e94aaf2 100644 --- a/src/application/mk/basic-pages/edit.vue +++ b/src/application/mk/basic-pages/edit.vue @@ -1,14 +1,18 @@ @@ -31,7 +37,8 @@ export default { options: { type: Object }, - dataId: {} + dataId: { + } }, @@ -45,7 +52,8 @@ export default { }; }, - computed: {}, + computed: { + }, created() { @@ -74,13 +82,13 @@ export default { // 打开列表页面 this.$openPage(this.options.listPageUrl) } else { - this.$emit("callback", {success: true}); + this.$emit("callback", { success: true }); } }, // 保存 - save({afterSave}) { + save({ afterSave }) { let _this = this; @@ -99,11 +107,7 @@ export default { // postdata = { MesUnit: postdata } } // 格式化提交的数据 - this.$mk.formatFormData({ - data: postdata, - rules: this.options.formOptions.items, - igFields: this.options.saveIgFields - }); + this.$mk.formatFormData({ data: postdata, rules: this.options.formOptions.items ,igFields : this.options.saveIgFields }); // 提交数据 @@ -119,7 +123,7 @@ export default { if (a.code == 200) { this.$mk.success("保存成功"); - this.$emit("afterSave", {data: postdata}); + this.$emit("afterSave", { data: postdata }); if (!this.isEdit) { // 如果是新增模式,关闭当前页面 if (this.options.action_afterSave == "confirm") { @@ -155,7 +159,7 @@ export default { // 验证表单 - this.$mk.validateForm({form: this.$refs.xForm}).then(() => { // 验证表单 + this.$mk.validateForm({ form: this.$refs.xForm }).then(() => { // 验证表单 save(); // 提交保存 }).catch(count => { // 验证失败 this.$mk.error(`存在${count}项错误,请检查`); @@ -175,7 +179,8 @@ export default { } }, // 监听属性 - watch: {} + watch: { + } }; @@ -198,6 +203,7 @@ export default { .footerbar { padding-left: 10px; + padding-top: 20px; } .imagePanel { @@ -210,4 +216,16 @@ export default { height: 80px; } } +.Htitle{ + font-weight: bold; + font-size: 16px; + color: #122ed1; + display: flex; + align-items: center; + width: 100%; + padding-left: 10px; + .Htitle-p{margin-bottom: 0;margin: 0 10px;} + .left-line{width: 40px;height: 1px;background-color:#122ed1;} + .right-line{flex-grow: 1;height: 1px;background-color:#122ed1;} +} diff --git a/src/application/mk/components/editors/MkFormDataSelector.vue b/src/application/mk/components/editors/MkFormDataSelector.vue index 1bc75a3..d68c57b 100644 --- a/src/application/mk/components/editors/MkFormDataSelector.vue +++ b/src/application/mk/components/editors/MkFormDataSelector.vue @@ -238,7 +238,6 @@ export default { }); } } - return this.$mk.getPagedData({ url: this.actions.getList, useBigInt: true, @@ -421,12 +420,13 @@ export default { this.$emit('input', e.row[params.showField]); } } else { - this.$emit('input', [e.row.ID, e.row[textField]]); + this.$emit('input', [e.row.id, e.row[textField]]); } if (params.onDataChanged) { - params.onDataChanged({value: [e.row.ID, e.row[textField]], data: e.row}) + console.log(e) + params.onDataChanged({value: [e.row.id, e.row[textField]], data: e.row}) } this.$refs.xDown.hidePanel() }, diff --git a/src/pages/Middle/transport/Custom/Custom/Edit.vue b/src/pages/Middle/transport/Custom/Custom/Edit.vue index 8493232..8dd4f69 100644 --- a/src/pages/Middle/transport/Custom/Custom/Edit.vue +++ b/src/pages/Middle/transport/Custom/Custom/Edit.vue @@ -1,5 +1,5 @@