学 赵 1 year ago
parent
commit
4383d9b5c7
  1. 2
      code/.gitignore
  2. 3
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore
  3. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
  4. 20
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/index.js
  5. 59
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  6. BIN
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxd.exe
  7. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxdb.conf
  8. 11
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/start.cmd
  9. 3
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/stop.cmd
  10. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js
  11. 10
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
  12. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
  13. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
  14. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
  15. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
  16. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js

2
code/.gitignore

@ -17,3 +17,5 @@ obj/
*.db-shm *.db-shm
*.db-wal *.db-wal
influxdb/data/

3
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore

@ -1,3 +1,4 @@
files/ files/
btsecsummary/ btsecsummary/
secsummary/ secsummary/
influxdb/data/**

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@ -22,7 +22,7 @@ export default {
v-model="model[prop]" v-model="model[prop]"
:placeholder="$t('select')" :placeholder="$t('select')"
:multiple="!!schema.multiple" :multiple="!!schema.multiple"
clearable :clearable="!!schema.clearable"
style="width:100%" style="width:100%"
:title="JSON.stringify(options)" :title="JSON.stringify(options)"
> >
@ -56,7 +56,7 @@ export default {
</template> </template>
<template v-else> <template v-else>
<el-input <el-input
clearable :clearable="!!schema.clearable"
:disabled="getDisabled()" :disabled="getDisabled()"
:placeholder="schema.title" :placeholder="schema.title"
v-model="model[prop]" v-model="model[prop]"
@ -65,7 +65,7 @@ export default {
v-if="schema.input==='password'" v-if="schema.input==='password'"
/> />
<el-input <el-input
clearable :clearable="!!schema.clearable"
:disabled="getDisabled()" :disabled="getDisabled()"
:placeholder="schema.title" :placeholder="schema.title"
v-model="model[prop]" v-model="model[prop]"

20
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/index.js

@ -8,15 +8,17 @@ export default {
name: "AppForm", name: "AppForm",
template: html`<div v-loading="loading"> template: html`<div v-loading="loading">
<el-form ref="formRef" :model="model" label-width="auto" :inline="inline"> <el-form ref="formRef" :model="model" label-width="auto" :inline="inline">
<template v-for="(value, prop) in schema.properties"> <template v-if="schema && schema.properties">
<app-form-item <template v-for="(value, prop) in schema.properties">
:parentSchema="schema" <app-form-item
:schema="value" :parentSchema="schema"
v-model="model" :schema="value"
:prop="prop" v-model="model"
:mode="mode" :prop="prop"
:errors="errors" :mode="mode"
/> :errors="errors"
/>
</template>
</template> </template>
<slot></slot> <slot></slot>
<el-form-item v-if="!hideButton"> <el-form-item v-if="!hideButton">

59
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@ -258,21 +258,17 @@ export default {
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
<template v-else-if="editFormMode==='import'"> <template v-else-if="editFormMode==='import'">
<el-form :model="importModel" style="height:100%;"> <app-form
<!-- <el-form-item :label="$t('导入模板')"> inline
<el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link> mode="import"
</el-form-item> --> label-position="left"
<el-form-item label="选择工厂" label-width="80px"> :schema="config.import?.schema"
<el-select v-model="importModel.version"> v-model="importModel"
<el-option v-for="item in versions" :value="item.value" :label="item.label" /> :hideButton="true"
</el-select> :isQueryForm="true"
</el-form-item> >
<el-form-item label="选择期间" label-width="80px">
<el-select v-model="importModel.factory">
<el-option v-for="item in versions" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item :label="$t('文件')" label-width="80px"> <el-form-item :label="$t('文件')" label-width="80px">
<el-upload <el-upload
ref="uploadRef" ref="uploadRef"
@ -285,7 +281,7 @@ export default {
<el-icon class="el-icon--upload"><ep-upload-filled /></el-icon> <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </app-form>
</template> </template>
<template v-else-if="editFormMode==='filter'"> <template v-else-if="editFormMode==='filter'">
<el-form :model="filterList" inline class="filter"> <el-form :model="filterList" inline class="filter">
@ -429,11 +425,9 @@ export default {
enumBusinessType: route.meta.enumBusinessType, enumBusinessType: route.meta.enumBusinessType,
}; };
const exportModel = ref(defaultExportModel); const exportModel = ref(defaultExportModel);
const defaultImportModel = { const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
factory: "", const importModel = ref(defaultImportModel);
version: "",
};
const importModel = ref(defaultExportModel);
const factories = ref([]); const factories = ref([]);
const versions = ref([]); const versions = ref([]);
const fileList = ref([]); const fileList = ref([]);
@ -688,8 +682,15 @@ export default {
editFormloading.value = true; editFormloading.value = true;
const url = config.edit.importUrl; const url = config.edit.importUrl;
const formData = new FormData(); const formData = new FormData();
formData.append("version", importModel.value.version); // formData.append("version", importModel.value.version);
formData.append("factory", importModel.value.factory); // // 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++) { for (let i = 0; i < fileList.value.length; i++) {
formData.append(`files`, fileList.value[i].raw); formData.append(`files`, fileList.value[i].raw);
} }
@ -828,6 +829,20 @@ export default {
} }
return postData; 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() { function isNotJit() {
return ( return (
route.meta.enumBusinessType !== "ZhiGongJian" || route.meta.enumBusinessType !== "ZhiGongJian" ||

BIN
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/influxd.exe

Binary file not shown.

6
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"

11
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

3
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/influxdb/stop.cmd

@ -0,0 +1,3 @@
@ECHO OFF
taskkill /im influxd.exe /f /t

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js

@ -122,6 +122,7 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
edit: { edit: {
detailsUrl, detailsUrl,
createUrl, createUrl,

10
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js

@ -82,6 +82,16 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
import: {
schema: {
properties: {
isBj: {
title: "是否为备件",
type: "boolean",
},
},
},
},
edit: { edit: {
importUrl, importUrl,
exportUrl, exportUrl,

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@ -86,6 +86,7 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
edit: { edit: {
importUrl, importUrl,
exportUrl, exportUrl,

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@ -98,6 +98,7 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
edit: { edit: {
importUrl, importUrl,
exportUrl, exportUrl,

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js

@ -78,6 +78,7 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
edit: { edit: {
importUrl, importUrl,
exportUrl, exportUrl,

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@ -86,6 +86,7 @@ export default function () {
table: { table: {
schema: schema, schema: schema,
}, },
edit: { edit: {
importUrl, importUrl,
exportUrl, exportUrl,

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js

@ -5,4 +5,5 @@ export default {
url: "settleaccount/centralized-control/get-all", url: "settleaccount/centralized-control/get-all",
value: "version", value: "version",
label: "version", label: "version",
clearable: false,
}; };

Loading…
Cancel
Save