From 47207c3bcf596f40d949a6f98a1b269b52ec06ab Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Wed, 15 Nov 2023 17:34:21 +0800 Subject: [PATCH] 2023-11-15 xy --- src/api/system/baseForm.js | 5 +- src/api/system/customFormField.js | 5 +- src/utils/index.js | 8 + src/views/baseData/component/addPump.vue | 8 +- src/views/component/table.vue | 1 - src/views/order/component/normalCreate.vue | 58 +++++ src/views/order/component/quickCreate.vue | 263 +++++++++++++++++++++ src/views/order/component/step1.vue | 91 +++++++ src/views/order/create.vue | 59 +++++ 9 files changed, 489 insertions(+), 9 deletions(-) create mode 100644 src/views/order/component/normalCreate.vue create mode 100644 src/views/order/component/quickCreate.vue create mode 100644 src/views/order/component/step1.vue create mode 100644 src/views/order/create.vue diff --git a/src/api/system/baseForm.js b/src/api/system/baseForm.js index d16d26a..3334961 100644 --- a/src/api/system/baseForm.js +++ b/src/api/system/baseForm.js @@ -33,11 +33,12 @@ export function show(params, isLoading = true) { }) } -export function save(data) { +export function save(data, isLoading = true) { return request({ method: "post", url: "/api/admin/base-form/save", - data + data, + isLoading }) } diff --git a/src/api/system/customFormField.js b/src/api/system/customFormField.js index f3e9d51..6525437 100644 --- a/src/api/system/customFormField.js +++ b/src/api/system/customFormField.js @@ -9,11 +9,12 @@ export function index(params,isLoading = false) { }) } -export function show(params) { +export function show(params,isLoading = true) { return request({ method: "get", url: "/api/admin/custom-form-field/show", - params + params, + isLoading }) } diff --git a/src/utils/index.js b/src/utils/index.js index 32825fb..cfc63a5 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -171,3 +171,11 @@ export function debounce(func, delay) { } } + +export function uuid() { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + let r = Math.random() * 16 | 0, + v = c === 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); +} diff --git a/src/views/baseData/component/addPump.vue b/src/views/baseData/component/addPump.vue index c494f51..d4cd6da 100644 --- a/src/views/baseData/component/addPump.vue +++ b/src/views/baseData/component/addPump.vue @@ -271,11 +271,11 @@ export default { render(h) { const dialog = new CreateDialog(this,[ { - key: 'bengzhashuniu', + key: 'equipment_id', label: '泵闸枢纽', render: h('el-transfer',{ props: { - value: this.form['bengzhashuniu'], + value: this.form['equipment_id'], filterable: true, data: this.pumps, titles: ['源列表','目标列表'], @@ -283,11 +283,11 @@ export default { key: 'id', label: 'name' }, - 'right-default-checked': this.form['bengzhashuniu'] + 'right-default-checked': this.form['equipment_id'] }, on: { 'change':e => { - this.form['bengzhashuniu'] = e; + this.form['equipment_id'] = e; this.form = Object.assign({},this.form); } } diff --git a/src/views/component/table.vue b/src/views/component/table.vue index 031bb3c..91317cf 100644 --- a/src/views/component/table.vue +++ b/src/views/component/table.vue @@ -471,7 +471,6 @@ export default { this.form ?.filter((i) => i.list_show) .forEach((i) => { - if (i._relations) return let linkOb = {}; if (i.edit_input === "richtext") { diff --git a/src/views/order/component/normalCreate.vue b/src/views/order/component/normalCreate.vue new file mode 100644 index 0000000..cf186ca --- /dev/null +++ b/src/views/order/component/normalCreate.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/views/order/component/quickCreate.vue b/src/views/order/component/quickCreate.vue new file mode 100644 index 0000000..eb718a1 --- /dev/null +++ b/src/views/order/component/quickCreate.vue @@ -0,0 +1,263 @@ + + + + + + diff --git a/src/views/order/component/step1.vue b/src/views/order/component/step1.vue new file mode 100644 index 0000000..81a93e9 --- /dev/null +++ b/src/views/order/component/step1.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/order/create.vue b/src/views/order/create.vue new file mode 100644 index 0000000..34400da --- /dev/null +++ b/src/views/order/create.vue @@ -0,0 +1,59 @@ + + + + +