diff --git a/code/.gitignore b/code/.gitignore
index 4e191f0f..390269f5 100644
--- a/code/.gitignore
+++ b/code/.gitignore
@@ -17,3 +17,5 @@ obj/
*.db-shm
*.db-wal
+influxdb/data/
+
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore
index 816f02db..1d72fd7a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore
@@ -1,3 +1,4 @@
files/
btsecsummary/
-secsummary/
\ No newline at end of file
+secsummary/
+influxdb/data/**
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
index a7c27f10..17967d8a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
@@ -22,7 +22,7 @@ export default {
v-model="model[prop]"
:placeholder="$t('select')"
:multiple="!!schema.multiple"
- clearable
+ :clearable="!!schema.clearable"
style="width:100%"
:title="JSON.stringify(options)"
>
@@ -56,7 +56,7 @@ export default {
-
-
+
+
+
+
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 3e61c4df..b0436d44 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -258,21 +258,17 @@ export default {
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -429,11 +425,9 @@ export default {
enumBusinessType: route.meta.enumBusinessType,
};
const exportModel = ref(defaultExportModel);
- const defaultImportModel = {
- factory: "",
- version: "",
- };
- const importModel = ref(defaultExportModel);
+ const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
+ const importModel = ref(defaultImportModel);
+
const factories = ref([]);
const versions = ref([]);
const fileList = ref([]);
@@ -688,8 +682,15 @@ export default {
editFormloading.value = true;
const url = config.edit.importUrl;
const formData = new FormData();
- formData.append("version", importModel.value.version);
- formData.append("factory", importModel.value.factory);
+ // formData.append("version", importModel.value.version);
+ // // formData.append("factory", importModel.value.factory);
+ // Object.keys(importModel.value).forEach((q) => {if(importModel.value)
+ Object.keys(importModel.value).forEach((q) => {
+ if (importModel.value[q]) {
+ formData.append(q, importModel.value[q]);
+ }
+ });
+
for (let i = 0; i < fileList.value.length; i++) {
formData.append(`files`, fileList.value[i].raw);
}
@@ -828,6 +829,20 @@ export default {
}
return postData;
}
+ function buildImport() {
+ importModel.value.maxResultCount = pageModel.pageSize;
+ importModel.value.skipCount = (pageModel.pageIndex - 1) * pageModel.pageSize;
+ //
+ const postData = JSON.parse(JSON.stringify(importModel.value));
+ postData.filters = filterList.value.filter((o) => o.column && o.action && (o.value || o.value === false));
+ if (postData.items) {
+ delete postData["items"];
+ }
+ if (postData.import?.id) {
+ delete postData.import["id"];
+ }
+ return postData;
+ }
function isNotJit() {
return (
route.meta.enumBusinessType !== "ZhiGongJian" ||
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxd.exe b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxd.exe
new file mode 100644
index 00000000..c19c20a2
Binary files /dev/null and b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxd.exe differ
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxdb.conf b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxdb.conf
new file mode 100644
index 00000000..d8684f07
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxdb.conf
@@ -0,0 +1,6 @@
+[meta]
+ dir = "./data/meta"
+
+[data]
+ dir = "./data/data"
+ wal-dir = "./data/wal"
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/start.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/start.cmd
new file mode 100644
index 00000000..53bd52af
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/start.cmd
@@ -0,0 +1,11 @@
+@echo off
+
+tasklist|find /i "influxd.exe"
+
+if %errorlevel% == 0 (
+exit
+)
+
+%1 start mshta vbscript:createobject("wscript.shell").run("""%~0"" ::",0)(window.close)&&exit
+
+start /b ./influxd.exe -config ./influxdb.conf
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/stop.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/stop.cmd
new file mode 100644
index 00000000..d8259131
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/stop.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+taskkill /im influxd.exe /f /t
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js
index b8c925af..41586761 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js
@@ -122,6 +122,7 @@ export default function () {
table: {
schema: schema,
},
+
edit: {
detailsUrl,
createUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
index fd6156b1..38d54298 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
@@ -82,6 +82,16 @@ export default function () {
table: {
schema: schema,
},
+ import: {
+ schema: {
+ properties: {
+ isBj: {
+ title: "是否为备件",
+ type: "boolean",
+ },
+ },
+ },
+ },
edit: {
importUrl,
exportUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
index 6c3b058a..73739a59 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
@@ -86,6 +86,7 @@ export default function () {
table: {
schema: schema,
},
+
edit: {
importUrl,
exportUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
index 27322cbf..499350b1 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
@@ -98,6 +98,7 @@ export default function () {
table: {
schema: schema,
},
+
edit: {
importUrl,
exportUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
index e8fa348b..f501aca5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
@@ -78,6 +78,7 @@ export default function () {
table: {
schema: schema,
},
+
edit: {
importUrl,
exportUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
index 77d35223..b68de9ca 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
@@ -86,6 +86,7 @@ export default function () {
table: {
schema: schema,
},
+
edit: {
importUrl,
exportUrl,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
index 794e4987..0bb02076 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
@@ -5,4 +5,5 @@ export default {
url: "settleaccount/centralized-control/get-all",
value: "version",
label: "version",
+ clearable: false,
};