licq/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
z 2026-04-14 11:27:41 +08:00
commit 40be57b9fb
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jnpf-java-boot/jnpf-web/.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,12 @@
{
// 已修改但未暂存的文件：亮橙色，加粗
"gitDecoration.modifiedResourceForeground": "#FFA500",
// 已暂存的文件：亮绿色
"gitDecoration.stageModifiedResourceForeground": "#7FFF00",
// 新增但未追踪的文件：亮青色
"gitDecoration.untrackedResourceForeground": "#00FFFF",
// 被删除的文件：红色，删除线效果
"gitDecoration.deletedResourceForeground": "#FF4444",
// 冲突文件：洋红色
"gitDecoration.conflictingResourceForeground": "#FF00FF"
}

7
jnpf-java-boot/jnpf-web/src/views/example/storehouse/form.vue
View File

@ -42,6 +42,7 @@ NEW_FILE_CODE
<script>
import request from '@/utils/request'
import { mapGetters } from 'vuex'
import { customerOptions } from '../customer/options'
export default {
components: {},
@ -95,11 +96,7 @@ export default {
{ fullName: "启用", id: 1 },
{ fullName: "未启用", id: 2 },
],
storeTypeOptions: [
{ fullName: "原料库", id: 1 },
{ fullName: "在制品库", id: 2 },
{ fullName: "成品库", id: 3 },
],
storeTypeOptions: customerOptions.storeType || [],
storeTypeProps: { label: "fullName", value: "id" },
enabledStatusProps: { label: "fullName", value: "id" },
}

8
jnpf-java-boot/jnpf-web/src/views/example/storehouse/index.vue
View File

@ -69,7 +69,7 @@ import request from "@/utils/request";
import { mapGetters } from "vuex";
import JNPFForm from "./form";
import jnpf from "@/utils/jnpf";
import { getCustomerLabel } from "../customer/options";
import { getCustomerLabel, customerOptions } from "../customer/options";
export default {
name: "storehouse",
@ -104,11 +104,7 @@ export default {
{ fullName: "启用", id: 1 },
{ fullName: "未启用", id: 2 },
],
storeTypeOptions: [
{ fullName: "原料库", id: 1 },
{ fullName: "在制品库", id: 2 },
{ fullName: "成品库", id: 3 },
],
storeTypeOptions: customerOptions.storeType || [],
storeTypeProps: { label: "fullName", value: "id" },
enabledStatusProps: { label: "fullName", value: "id" },
};