RRSWithSmartHome
/
wms_vue
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: RRSWithSmartHome:f264d03008bdf814e0b7bc884f3a04cf4fa4f4c2
Branches Tags
RRSWithSmartHome:hwork-master
RRSWithSmartHome:master
..
compare: RRSWithSmartHome:cf2d0c8d00bf61cf730f55c092932580bf4b5e5e
Branches Tags
RRSWithSmartHome:hwork-master
RRSWithSmartHome:master

No commits in common. "f264d03008bdf814e0b7bc884f3a04cf4fa4f4c2" and "cf2d0c8d00bf61cf730f55c092932580bf4b5e5e" have entirely different histories.
f264d03008 ... cf2d0c8d00

6 changed files with 606 additions and 840 deletions
Show Stats Expand all files Collapse all files

5
src/view/jobLog/modal/info.vue
View File

@ -11,9 +11,9 @@
ref="formRef" ref="formRef"
:model="formState" :model="formState"
:rules="formRules" :rules="formRules"
layout="vertical" :label-col="labelCol"
:wrapper-col="wrapperCol"
> >
<a-col :span="24">
<a-form-item ref="jobName" label="名称" name="jobName"> <a-form-item ref="jobName" label="名称" name="jobName">
<a-input v-model:value="formState.jobName" /> <a-input v-model:value="formState.jobName" />
</a-form-item> </a-form-item>
@ -29,7 +29,6 @@
<a-form-item label="状态" name="state"> <a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.state" /> <a-switch v-model:checked="formState.state" />
</a-form-item> </a-form-item>
</a-col>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>

113
src/view/power/modal/edit.vue
View File

@ -11,14 +11,13 @@
ref="formRef" ref="formRef"
:model="formState" :model="formState"
:rules="formRules" :rules="formRules"
layout="vertical" :label-col="labelCol"
:wrapper-col="wrapperCol"
> >
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item label="上级" name="parent"> <a-form-item label="上级" name="parent">
<a-tree-select <a-tree-select
v-model:value="formState.parent" v-model:value="formState.parent"
style="width: 100%" style="width: 100%;"
:dropdown-style="{ maxHeight: '360px', overflow: 'auto' }" :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
:tree-data="state.powers" :tree-data="state.powers"
placeholder="上级权限" placeholder="上级权限"
@ -28,55 +27,24 @@
> >
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="title" label="名称" name="title"> <a-form-item ref="title" label="名称" name="title">
<a-input v-model:value="formState.title" /> <a-input v-model:value="formState.title" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showComponent" ref="component" label="组件" name="component">
<a-col :span="12">
<a-form-item
v-if="state.showComponent"
ref="component"
label="组件"
name="component"
>
<a-input v-model:value="formState.component" /> <a-input v-model:value="formState.component" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showPath" ref="path" label="路径" name="path">
<a-col :span="12">
<a-form-item
v-if="state.showPath"
ref="path"
label="路径"
name="path"
>
<a-input v-model:value="formState.path" /> <a-input v-model:value="formState.path" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showCode" ref="code" label="标识" name="code">
<a-col :span="12">
<a-form-item
v-if="state.showCode"
ref="code"
label="标识"
name="code"
>
<a-input v-model:value="formState.code" /> <a-input v-model:value="formState.code" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="图标" name="icon"> <a-form-item label="图标" name="icon">
<pro-icon-picker <pro-icon-picker v-model:modelValue="formState.icon"></pro-icon-picker>
v-model:modelValue="formState.icon"
></pro-icon-picker>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="i18n" label="i18n" name="i18n"> <a-form-item ref="i18n" label="i18n" name="i18n">
<a-input v-model:value="formState.i18n" /> <a-input v-model:value="formState.i18n" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="type" label="类型" name="type"> <a-form-item ref="type" label="类型" name="type">
<a-select v-model:value="formState.type" @change="change"> <a-select v-model:value="formState.type" @change="change">
<a-select-option value="0"> 目录 </a-select-option> <a-select-option value="0"> 目录 </a-select-option>
@ -84,31 +52,20 @@
<a-select-option value="2"> 按钮 </a-select-option> <a-select-option value="2"> 按钮 </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort"> <a-form-item ref="sort" label="排序" name="sort">
<a-input-number <a-input-number v-model:value="formState.sort" />
style="width: 100%"
v-model:value="formState.sort"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable"> <a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" /> <a-switch v-model:checked="formState.enable" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark"> <a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" /> <a-textarea v-model:value="formState.remark" />
</a-form-item> </a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import { message } from '@hwork/ant-design-vue';
import { edit, tree } from "@/api/module/power"; import { edit, tree } from "@/api/module/power";
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; import { defineComponent, reactive, ref, toRaw, watch } from "vue";
export default defineComponent({ export default defineComponent({
@ -117,16 +74,17 @@ export default defineComponent({
type: Boolean, type: Boolean,
}, },
record: { record: {
type: Object, type: Object
}, }
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const state = reactive({ const state = reactive({
depts: [], depts: [],
showComponent: true, showComponent: true,
showPath: true, showPath: true,
showCode: false, showCode: false
}); });
const formRef = ref(); const formRef = ref();
@ -149,7 +107,7 @@ export default defineComponent({
formState.sort = props.record.sort; formState.sort = props.record.sort;
formState.remark = props.record.remark; formState.remark = props.record.remark;
formState.parent = props.record.parent; formState.parent = props.record.parent;
if (formState.type === "2") { if(formState.type === '2') {
state.showComponent = false; state.showComponent = false;
state.showPath = false; state.showPath = false;
state.showCode = true; state.showCode = true;
@ -158,19 +116,17 @@ export default defineComponent({
state.showPath = true; state.showPath = true;
state.showCode = false; state.showCode = false;
} }
}); })
const formRules = { const formRules = {
title: [{ required: true, message: "请输入权限名称", trigger: "blur" }], title: [{ required: true, message: '请输入权限名称', trigger: 'blur'}],
i18n: [{ required: true, message: "请输入 i18n", trigger: "blur" }], i18n: [{ required: true, message: '请输入 i18n', trigger: 'blur'}],
type: [{ required: true, message: "请输入权限类型", trigger: "blur" }], type: [{ required: true, message: '请输入权限类型', trigger: 'blur'}],
parent: [ parent: [{ required: true, message: '请选择上级权限', trigger: 'change'}]
{ required: true, message: "请选择上级权限", trigger: "change" },
],
}; };
const change = function(val) { const change = function(val) {
if (val === "2") { if(val === '2') {
state.showComponent = false; state.showComponent = false;
state.showPath = false; state.showPath = false;
state.showCode = true; state.showCode = true;
@ -179,7 +135,7 @@ export default defineComponent({
state.showPath = true; state.showPath = true;
state.showCode = false; state.showCode = false;
} }
}; }
const submit = (e) => { const submit = (e) => {
formRef.value formRef.value
@ -187,18 +143,18 @@ export default defineComponent({
.then(() => { .then(() => {
edit(toRaw(formState)).then((response)=>{ edit(toRaw(formState)).then((response)=>{
if(response.success){ if(response.success){
message.success({ content: "保存成功", duration: 1 }).then(() => { message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel(); cancel();
}); });
}else{ }else{
message.success({ content: "保存失败", duration: 1 }).then(() => { message.success({ content: '保存失败', duration: 1 }).then(()=>{
cancel(); cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -209,16 +165,14 @@ export default defineComponent({
const loadPower = () => { const loadPower = () => {
tree({}).then((response)=>{ tree({}).then((response)=>{
response.data = [ response.data = [{
{
id:"0", id:"0",
title: "顶级菜单", title: "顶级菜单",
children: response.data, children: response.data
}, }]
];
state.powers = response.data; state.powers = response.data;
}); })
}; }
loadPower(); loadPower();
@ -234,12 +188,7 @@ export default defineComponent({
labelCol: { span: 6 }, labelCol: { span: 6 },
wrapperCol: { span: 18 }, wrapperCol: { span: 18 },
replaceFields: { replaceFields: {children:'children', title:'title', key:'id', value: 'id' }
children: "children",
title: "title",
key: "id",
value: "id",
},
}; };
}, },
}); });

63
src/view/power/modal/info.vue
View File

@ -11,10 +11,9 @@
ref="formRef" ref="formRef"
:model="formState" :model="formState"
:rules="formRules" :rules="formRules"
layout="vertical" :label-col="labelCol"
:wrapper-col="wrapperCol"
> >
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item label="上级" name="parent"> <a-form-item label="上级" name="parent">
<a-tree-select <a-tree-select
v-model:value="formState.parent" v-model:value="formState.parent"
@ -27,28 +26,18 @@
> >
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="title" label="名称" name="title"> <a-form-item ref="title" label="名称" name="title">
<a-input v-model:value="formState.title" /> <a-input v-model:value="formState.title" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="component" label="组件" name="component"> <a-form-item ref="component" label="组件" name="component">
<a-input v-model:value="formState.component" /> <a-input v-model:value="formState.component" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="path" label="路径" name="path"> <a-form-item ref="path" label="路径" name="path">
<a-input v-model:value="formState.path" /> <a-input v-model:value="formState.path" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="i18n" label="i18n" name="i18n"> <a-form-item ref="i18n" label="i18n" name="i18n">
<a-input v-model:value="formState.i18n" /> <a-input v-model:value="formState.i18n" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="type" label="类型" name="type"> <a-form-item ref="type" label="类型" name="type">
<a-select v-model:value="formState.type"> <a-select v-model:value="formState.type">
<a-select-option value="0"> 目录 </a-select-option> <a-select-option value="0"> 目录 </a-select-option>
@ -56,28 +45,20 @@
<a-select-option value="2"> 按钮 </a-select-option> <a-select-option value="2"> 按钮 </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort"> <a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" /> <a-input-number v-model:value="formState.sort" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable"> <a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" /> <a-switch v-model:checked="formState.enable" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark"> <a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" /> <a-textarea v-model:value="formState.remark" />
</a-form-item> </a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import { message } from '@hwork/ant-design-vue';
import { save, tree } from "@/api/module/power"; import { save, tree } from "@/api/module/power";
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; import { defineComponent, reactive, ref, toRaw, watch } from "vue";
export default defineComponent({ export default defineComponent({
@ -86,14 +67,15 @@ export default defineComponent({
type: Boolean, type: Boolean,
}, },
record: { record: {
type: Object, type: Object
}, }
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const state = reactive({ const state = reactive({
depts: [], depts: [],
}); })
const formRef = ref(); const formRef = ref();
@ -112,19 +94,15 @@ export default defineComponent({
formState.i18n = props.record.i18n; formState.i18n = props.record.i18n;
formState.remark = props.record.remark; formState.remark = props.record.remark;
formState.parent = props.record.parent; formState.parent = props.record.parent;
}); })
const formRules = { const formRules = {
title: [{ required: true, message: "请输入权限名称", trigger: "blur" }], title: [{ required: true, message: '请输入权限名称', trigger: 'blur'}],
component: [ component: [{ required: true, message: '请输入路由组件', trigger: 'blur'}],
{ required: true, message: "请输入路由组件", trigger: "blur" }, path: [{ required: true, message: '请输入路由地址', trigger: 'blur'}],
], i18n: [{ required: true, message: '请输入 i18n', trigger: 'blur'}],
path: [{ required: true, message: "请输入路由地址", trigger: "blur" }], type: [{ required: true, message: '请输入权限类型', trigger: 'blur'}],
i18n: [{ required: true, message: "请输入 i18n", trigger: "blur" }], parent: [{ required: true, message: '请选择上级权限', trigger: 'change'}]
type: [{ required: true, message: "请输入权限类型", trigger: "blur" }],
parent: [
{ required: true, message: "请选择上级权限", trigger: "change" },
],
}; };
const submit = (e) => { const submit = (e) => {
@ -140,8 +118,8 @@ export default defineComponent({
const loadPower = () => { const loadPower = () => {
tree({}).then((response)=>{ tree({}).then((response)=>{
state.powers = response.data; state.powers = response.data;
}); })
}; }
loadPower(); loadPower();
@ -156,12 +134,7 @@ export default defineComponent({
labelCol: { span: 6 }, labelCol: { span: 6 },
wrapperCol: { span: 18 }, wrapperCol: { span: 18 },
replaceFields: { replaceFields: {children:'children', title:'title', key:'id', value: 'id' }
children: "children",
title: "title",
key: "id",
value: "id",
},
}; };
}, },
}); });

157
src/view/power/modal/save.vue
View File

@ -1,19 +1,7 @@
<template> <template>
<a-modal <a-modal :open="visible" title="新增权限" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
:open="visible" <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
title="新增权限" <a-row :gutter='[1,1]'>
cancelText="取消"
okText="提交"
@ok="submit"
@cancel="cancel"
>
<a-form
ref="formRef"
:model="formState"
:rules="formRules"
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span ="12"> <a-col :span ="12">
<a-form-item ref="type" label="类型" name="type"> <a-form-item ref="type" label="类型" name="type">
<a-select v-model:value="formState.type" @change="change"> <a-select v-model:value="formState.type" @change="change">
@ -32,76 +20,58 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> </a-row>
<a-form-item label="上级" name="parent"> <a-form-item label="上级" name="parent">
<a-tree-select <a-tree-select v-model:value="formState.parent" style="width: 100%;"
v-model:value="formState.parent" :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }" :tree-data="state.powers" placeholder="上级权限"
style="width: 100%" replace tree-default-expand-all :replaceFields="replaceFields">
:dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
:tree-data="state.powers"
placeholder="上级权限"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="title" label="名称" name="title"> <a-form-item ref="title" label="名称" name="title">
<a-input v-model:value="formState.title" /> <a-input v-model:value="formState.title" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showComponent" ref="component" label="组件" name="component">
<a-col :span="12" v-if="state.showComponent">
<a-form-item ref="component" label="组件" name="component">
<a-input v-model:value="formState.component" /> <a-input v-model:value="formState.component" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showPath" ref="path" label="路径" name="path">
<a-col :span="12" v-if="state.showPath">
<a-form-item ref="path" label="路径" name="path">
<a-input v-model:value="formState.path" /> <a-input v-model:value="formState.path" />
</a-form-item> </a-form-item>
</a-col> <a-form-item v-if="state.showCode" ref="code" label="标识" name="code">
<a-col :span="12" v-if="state.showCode">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" /> <a-input v-model:value="formState.code" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="图标" name="icon"> <a-form-item label="图标" name="icon">
<pro-icon-picker <pro-icon-picker v-model:modelValue="formState.icon"></pro-icon-picker>
v-model:modelValue="formState.icon"
></pro-icon-picker>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="i18n" label="i18n" name="i18n"> <a-form-item ref="i18n" label="i18n" name="i18n">
<a-input v-model:value="formState.i18n" /> <a-input v-model:value="formState.i18n" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort"> <a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" /> <a-input-number v-model:value="formState.sort" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable"> <a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" /> <a-switch v-model:checked="formState.enable" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark"> <a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" /> <a-textarea v-model:value="formState.remark" />
</a-form-item> </a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import {
import { save, tree } from "@/api/module/power"; message
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; } from "@hwork/ant-design-vue";
import {
save,
tree
} from "@/api/module/power";
import {
defineComponent,
reactive,
ref,
toRaw,
watch
} from "vue";
export default defineComponent({ export default defineComponent({
props: { props: {
visible: { visible: {
@ -110,11 +80,12 @@ export default defineComponent({
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const state = reactive({ const state = reactive({
depts: [], depts: [],
showComponent: true, showComponent: true,
showPath: true, showPath: true,
showCode: false, showCode: false
}); });
const formRef = ref(); const formRef = ref();
@ -127,41 +98,31 @@ export default defineComponent({
}); });
const formRules = { const formRules = {
title: [ title: [{
{
required: true, required: true,
message: "请输入权限名称", message: "请输入权限名称",
trigger: "blur", trigger: "blur"
}, }],
], i18n: [{
i18n: [
{
required: true, required: true,
message: "请输入 i18n", message: "请输入 i18n",
trigger: "blur", trigger: "blur"
}, }],
], type: [{
type: [
{
required: true, required: true,
message: "请输入权限类型", message: "请输入权限类型",
trigger: "blur", trigger: "blur"
}, }],
], clientType: [{
clientType: [
{
required: true, required: true,
message: "请选择权限终端类型", message: "请选择权限终端类型",
trigger: "blur", trigger: "blur"
}, }],
], parent: [{
parent: [
{
required: true, required: true,
message: "请选择上级权限", message: "请选择上级权限",
trigger: "change", trigger: "change"
}, }],
],
}; };
const submit = (e) => { const submit = (e) => {
@ -170,21 +131,17 @@ export default defineComponent({
.then(() => { .then(() => {
save(toRaw(formState)).then((response) => { save(toRaw(formState)).then((response) => {
if (response.success) { if (response.success) {
message message.success({
.success({
content: "保存成功", content: "保存成功",
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} else { } else {
message message.success({
.success({
content: "保存失败", content: "保存失败",
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} }
@ -202,19 +159,17 @@ export default defineComponent({
const loadPower = () => { const loadPower = () => {
tree({}).then((response) => { tree({}).then((response) => {
response.data = [ response.data = [{
{
id: "0", id: "0",
title: "顶级菜单", title: "顶级菜单",
children: response.data, children: response.data
}, }]
];
state.powers = response.data; state.powers = response.data;
}); });
}; };
const change = function(val) { const change = function(val) {
if (val === "2") { if (val === '2') {
state.showComponent = false; state.showComponent = false;
state.showPath = false; state.showPath = false;
state.showCode = true; state.showCode = true;
@ -223,7 +178,7 @@ export default defineComponent({
state.showPath = true; state.showPath = true;
state.showCode = false; state.showCode = false;
} }
}; }
loadPower(); loadPower();
@ -237,10 +192,10 @@ export default defineComponent({
formRules, formRules,
labelCol: { labelCol: {
span: 6, span: 6
}, },
wrapperCol: { wrapperCol: {
span: 18, span: 18
}, },
replaceFields: { replaceFields: {

213
src/view/wms/warehouse/seqNum/modal/edit.vue
View File

@ -1,77 +1,24 @@
<template> <template>
<a-modal <a-modal :open="visible" title="编辑" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
:open="visible" <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
title="编辑"
cancelText="取消"
okText="提交"
@ok="submit"
@cancel="cancel"
>
<a-form
ref="formRef"
:model="formState"
:rules="formRules"
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="seqCode" label="值编号" name="seqCode"> <a-form-item ref="seqCode" label="值编号" name="seqCode">
<a-input <a-input v-model:value="formState.seqCode" placeholder="请输入值编号" />
v-model:value="formState.seqCode"
placeholder="请输入值编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="seqName" label="名称" name="seqName"> <a-form-item ref="seqName" label="名称" name="seqName">
<a-input <a-input v-model:value="formState.seqName" placeholder="请输入名称" />
v-model:value="formState.seqName"
placeholder="请输入名称"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="minValue" label="起始值" name="minValue"> <a-form-item ref="minValue" label="起始值" name="minValue">
<a-input-number <a-input-number v-model:value="formState.minValue" placeholder="请输入起始值" style="width: 100%;"/>
v-model:value="formState.minValue"
placeholder="请输入起始值"
style="width: 100%"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="incValue" label="自增值" name="incValue"> <a-form-item ref="incValue" label="自增值" name="incValue">
<a-input-number <a-input-number v-model:value="formState.incValue" placeholder="请输入自增值" style="width: 100%;"/>
v-model:value="formState.incValue"
placeholder="请输入自增值"
style="width: 100%"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="maxValue" label="最大值" name="maxValue"> <a-form-item ref="maxValue" label="最大值" name="maxValue">
<a-input-number <a-input-number v-model:value="formState.maxValue" placeholder="请输入最大值" style="width: 100%;"/>
v-model:value="formState.maxValue"
placeholder="请输入最大值"
style="width: 100%"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="currValue" label="当前值" name="currValue"> <a-form-item ref="currValue" label="当前值" name="currValue">
<a-input-number <a-input-number v-model:value="formState.currValue" placeholder="请输入当前值" style="width: 100%;"/>
v-model:value="formState.currValue"
placeholder="请输入当前值"
style="width: 100%"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
<!-- <a-form-item ref="deleted" label="删除" name="deleted"> <!-- <a-form-item ref="deleted" label="删除" name="deleted">
<a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或者否" /> <a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或者否" />
</a-form-item> </a-form-item>
@ -87,14 +34,26 @@
<a-form-item ref="updateTime" label="修改时间" name="updateTime"> <a-form-item ref="updateTime" label="修改时间" name="updateTime">
<a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" /> <a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" />
</a-form-item> --> </a-form-item> -->
</a-row> <a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import {
import { edit } from "@/api/wms/seqNum"; message
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; } from '@hwork/ant-design-vue';
import {
edit
} from "@/api/wms/seqNum";
import {
defineComponent,
reactive,
ref,
toRaw,
watch
} from "vue";
export default defineComponent({ export default defineComponent({
props: { props: {
visible: { visible: {
@ -102,117 +61,100 @@ export default defineComponent({
}, },
record: { record: {
type: Object, type: Object,
}, }
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const formRef = ref(); const formRef = ref();
const formState = reactive({}); const formState = reactive({});
const seqDeleted = ref([ const seqDeleted = ref([{
{ value: 'false',
value: "false", label: '否',
label: "否", }, {
}, value: 'true',
{ label: '是',
value: "true", }]);
label: "是",
},
]);
watch(props, (props) => { watch(props, (props) => {
formState.id = props.record.id; formState.id = props.record.id
formState.seqCode = props.record.seqCode; formState.seqCode = props.record.seqCode;
formState.sqeName = props.record.seqName; formState.sqeName = props.record.seqName;
formState.minValue = props.record.minValue; formState.minValue = props.record.minValue;
formState.incValue = props.record.incValue; formState.incValue = props.record.incValue;
formState.maxValue = props.record.maxValue; formState.maxValue = props.record.maxValue;
formState.currValue = props.record.currValue; formState.currValue = props.record.currValue;
}); })
const formRules = { const formRules = {
seqCode: [ seqCode: [{
{
required: true, required: true,
message: "请输入值编号(必填)", message: '请输入值编号(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], sqeName: [{
sqeName: [
{
required: true, required: true,
message: "请输入名称(必填)", message: '请输入名称(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], minValue: [{
minValue: [
{
required: true, required: true,
message: "请输入起始值(必填)", message: '请输入起始值(必填)',
trigger: "blur", trigger: 'blur',
type: "number", type:'number'
}, }],
], incValue: [{
incValue: [
{
required: true, required: true,
message: "请输入自增值(必填)", message: '请输入自增值(必填)',
trigger: "blur", trigger: 'blur',
type: "number", type:'number'
}, }],
], maxValue: [{
maxValue: [
{
required: true, required: true,
message: "请输入最大值(必填)", message: '请输入最大值(必填)',
trigger: "blur", trigger: 'blur',
type: "number", type:'number'
}, }],
], currValue: [{
currValue: [
{
required: true, required: true,
message: "请输入当前值(必填)", message: '请输入当前值(必填)',
trigger: "blur", trigger: 'blur',
type: "number", type:'number'
}, }],
],
}; };
const editKey = "add"; const editKey = "add";
const submit = (e) => { const submit = (e) => {
message.loading({ message.loading({
content: "提交中...", content: '提交中...',
key: editKey, key: editKey
}); });
formRef.value formRef.value
.validate() .validate()
.then(() => { .then(() => {
edit(toRaw(formState)).then((response) => { edit(toRaw(formState)).then((response) => {
if (response.success) { if (response.success) {
message message.success({
.success({ content: '保存成功',
content: "保存成功",
key: editKey, key: editKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} else { } else {
message message.error({
.error({
content: response.msg, content: response.msg,
key: editKey, key: editKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -222,6 +164,7 @@ export default defineComponent({
}; };
return { return {
submit, submit,
cancel, cancel,
formRef, formRef,
@ -230,10 +173,10 @@ export default defineComponent({
seqDeleted, seqDeleted,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },

195
src/view/wms/warehouse/seqNum/modal/save.vue
View File

@ -1,74 +1,24 @@
<template> <template>
<a-modal <a-modal :open="visible" title="新增" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
:open="visible" <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
title="新增"
cancelText="取消"
okText="提交"
@ok="submit"
@cancel="cancel"
>
<a-form
ref="formRef"
:model="formState"
:rules="formRules"
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="seqCode" label="值编号" name="seqCode"> <a-form-item ref="seqCode" label="值编号" name="seqCode">
<a-input <a-input v-model:value="formState.seqCode" placeholder="请输入值编号" />
v-model:value="formState.seqCode"
placeholder="请输入值编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="seqName" label="名称" name="seqName"> <a-form-item ref="seqName" label="名称" name="seqName">
<a-input <a-input v-model:value="formState.seqName" placeholder="请输入名称" />
v-model:value="formState.seqName"
placeholder="请输入名称"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="minValue" label="起始值" name="minValue"> <a-form-item ref="minValue" label="起始值" name="minValue">
<a-input <a-input v-model:value="formState.minValue" placeholder="请输入起始值" />
v-model:value="formState.minValue"
placeholder="请输入起始值"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="incValue" label="自增值" name="incValue"> <a-form-item ref="incValue" label="自增值" name="incValue">
<a-input <a-input v-model:value="formState.incValue" placeholder="请输入自增值" />
v-model:value="formState.incValue"
placeholder="请输入自增值"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="maxValue" label="最大值" name="maxValue"> <a-form-item ref="maxValue" label="最大值" name="maxValue">
<a-input <a-input v-model:value="formState.maxValue" placeholder="请输入最大值" />
v-model:value="formState.maxValue"
placeholder="请输入最大值"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="currValue" label="当前值" name="currValue"> <a-form-item ref="currValue" label="当前值" name="currValue">
<a-input <a-input v-model:value="formState.currValue" placeholder="请输入当前值" />
v-model:value="formState.currValue"
placeholder="请输入当前值"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
<!-- <a-form-item ref="deleted" label="删除" name="deleted"> <!-- <a-form-item ref="deleted" label="删除" name="deleted">
<a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或否" /> <a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或否" />
</a-form-item> </a-form-item>
@ -84,13 +34,25 @@
<a-form-item ref="updateTime" label="修改时间" name="updateTime"> <a-form-item ref="updateTime" label="修改时间" name="updateTime">
<a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" /> <a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" />
</a-form-item> --> </a-form-item> -->
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import {
import { save } from "@/api/wms/seqNum"; message
import { defineComponent, reactive, ref, toRaw } from "vue"; } from '@hwork/ant-design-vue';
import {
save
} from "@/api/wms/seqNum";
import {
defineComponent,
reactive,
ref,
toRaw
} from "vue";
export default defineComponent({ export default defineComponent({
props: { props: {
visible: { visible: {
@ -99,102 +61,86 @@ export default defineComponent({
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const formRef = ref(); const formRef = ref();
const state = reactive({}); const state = reactive({});
const formState = reactive({}); const formState = reactive({});
const seqDeleted = ref([ const seqDeleted = ref([{
{ value: 'false',
value: "false", label: '否',
label: "否", }, {
}, value: 'true',
{ label: '是',
value: "true", }]);
label: "是",
},
]);
const formRules = { const formRules = {
seqCode: [ seqCode: [{
{
required: true, required: true,
message: "请输入值编号(必填)", message: '请输入值编号(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], sqeName: [{
sqeName: [
{
required: true, required: true,
message: "请输入名称(必填)", message: '请输入名称(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], minValue: [{
minValue: [
{
required: true, required: true,
message: "请输入起始值(必填)", message: '请输入起始值(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], incValue: [{
incValue: [
{
required: true, required: true,
message: "请输入自增值(必填)", message: '请输入自增值(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], maxValue: [{
maxValue: [
{
required: true, required: true,
message: "请输入最大值(必填)", message: '请输入最大值(必填)',
trigger: "blur", trigger: 'blur'
}, }],
], currValue: [{
currValue: [
{
required: true, required: true,
message: "请输入当前值(必填)", message: '请输入当前值(必填)',
trigger: "blur", trigger: 'blur'
}, }],
],
}; };
const saveKey = "save"; const saveKey = "save";
const submit = (e) => { const submit = (e) => {
message.loading({ message.loading({
content: "提交中...", content: '提交中...',
key: saveKey, key: saveKey
}); });
formRef.value formRef.value
.validate() .validate()
.then(() => { .then(() => {
save(toRaw(formState)).then((response) => { save(toRaw(formState)).then((response) => {
if (response.success) { if (response.success) {
message message.success({
.success({ content: '保存成功',
content: "保存成功",
key: saveKey, key: saveKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} else { } else {
message message.error({
.error({
content: response.msg, content: response.msg,
key: saveKey, key: saveKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -203,6 +149,7 @@ export default defineComponent({
context.emit("close", false); context.emit("close", false);
}; };
return { return {
state, state,
submit, submit,
@ -213,10 +160,10 @@ export default defineComponent({
seqDeleted, seqDeleted,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },