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

Compare commits

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

No commits in common. "cf2d0c8d00bf61cf730f55c092932580bf4b5e5e" and "d92a44e67f195ad2964f584143985e102ac96053" have entirely different histories.
cf2d0c8d00 ... d92a44e67f

8 changed files with 698 additions and 920 deletions
Show Stats Expand all files Collapse all files

5
src/view/job/modal/edit.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="name" label="名称" name="name"> <a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" /> <a-input v-model:value="formState.name" />
</a-form-item> </a-form-item>
@ -32,7 +32,6 @@
<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-form> </a-form>
</a-modal> </a-modal>
</template> </template>

26
src/view/job/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="name" label="名称" name="name"> <a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" /> <a-input v-model:value="formState.name" />
</a-form-item> </a-form-item>
@ -32,7 +32,6 @@
<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-form> </a-form>
</a-modal> </a-modal>
</template> </template>
@ -45,25 +44,26 @@ 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({});
watch(props, (props) => { watch(props, (props) => {
formState.id = props.record.id; formState.id = props.record.id
formState.name = props.record.name; formState.name = props.record.name
formState.beanName = props.record.beanName; formState.beanName = props.record.beanName
formState.param = props.record.param; formState.param = props.record.param
formState.cronExpression = props.record.cronExpression; formState.cronExpression = props.record.cronExpression
formState.remark = props.record.remark; formState.remark = props.record.remark
formState.enable = props.record.enable; formState.enable = props.record.enable
}); })
const formRules = {}; const formRules = { };
const submit = (e) => { const submit = (e) => {
formRef.value.resetFields(); formRef.value.resetFields();

61
src/view/job/modal/save.vue
View File

@ -11,58 +11,39 @@
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="24">
<a-form-item ref="name" label="名称" name="name"> <a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" /> <a-input v-model:value="formState.name" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="beanName" label="目标" name="beanName"> <a-form-item ref="beanName" label="目标" name="beanName">
<a-input v-model:value="formState.beanName" /> <a-input v-model:value="formState.beanName" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="param" label="参数" name="param"> <a-form-item ref="param" label="参数" name="param">
<a-input v-model:value="formState.param" /> <a-input v-model:value="formState.param" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="cronExpression" label="cron" name="cronExpression"> <a-form-item ref="cronExpression" label="cron" name="cronExpression">
<cron <cron @onChange="(val)=>{formState.cronExpression = val}"/>
@onChange="
(val) => {
formState.cronExpression = val;
}
"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="24">
<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 } from "@/api/module/job"; import {save} from "@/api/module/job";
import { defineComponent, reactive, ref, toRaw } from "vue"; import {defineComponent, reactive, ref, toRaw} from "vue";
import cron from "../cron/index.vue"; import cron from "../cron/index.vue";
export default defineComponent({ export default defineComponent({
components: { components: {
cron, cron
}, },
props: { props: {
visible: { visible: {
@ -71,6 +52,7 @@ export default defineComponent({
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const formRef = ref(); const formRef = ref();
const formState = reactive({ const formState = reactive({
@ -79,38 +61,33 @@ export default defineComponent({
}); });
const formRules = { const formRules = {
name: [{ required: true, message: "请输入任务名称", trigger: "blur" }], name: [{required: true, message: '请输入任务名称', trigger: 'blur'}],
beanName: [ beanName: [{required: true, message: '请输入任务目标', trigger: 'blur'}],
{ required: true, message: "请输入任务目标", trigger: "blur" }, cronExpression: [{required: true, message: '请输入任务周期'}]
],
cronExpression: [{ required: true, message: "请输入任务周期" }],
}; };
const saveKey = "save"; const saveKey = "save";
const submit = (e) => { const submit = (e) => {
formRef.value formRef.value
.validate() .validate()
.then(() => { .then(() => {
message.loading({ content: "提交中...", key: saveKey }); message.loading({content: '提交中...', key: saveKey});
save(toRaw(formState)).then((response) => { save(toRaw(formState)).then((response) => {
if (response.success) { if (response.success) {
message message.success({content: '保存成功', key: saveKey, duration: 1}).then(() => {
.success({ content: "保存成功", key: saveKey, duration: 1 })
.then(() => {
cancel(); cancel();
}); });
} else { } else {
message message.success({content: '保存失败', key: saveKey, duration: 1}).then(() => {
.success({ content: "保存失败", key: saveKey, duration: 1 })
.then(() => {
cancel(); cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };

223
src/view/wms/baseInfo/sku/modal/edit.vue
View File

@ -1,69 +1,19 @@
<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="skuCode" label="物料编号" name="skuCode"> <a-form-item ref="skuCode" label="物料编号" name="skuCode">
<a-input <a-input v-model:value="formState.skuCode" placeholder="请输入物料编号" :disabled="true"/>
v-model:value="formState.skuCode"
placeholder="请输入物料编号"
:disabled="true"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="skuName" label="物料名称" name="skuName"> <a-form-item ref="skuName" label="物料名称" name="skuName">
<a-input <a-input v-model:value="formState.skuName" placeholder="请输入物料名称" />
v-model:value="formState.skuName"
placeholder="请输入物料名称"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="ABC分类" name="abc">
<a-select
v-model:value="formState.abc"
:options="skuAbc"
placeholder="请选择ABC分类"
>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="baseUnit" label="库存单位" name="baseUnit">
<a-input
v-model:value="formState.baseUnit"
placeholder="请选择库存单位"
:disabled="true"
/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="remark" label="备注" name="remark">
<a-textarea
v-model:value="formState.remark"
laceholder="请输入备注"
/>
</a-form-item>
</a-col>
</a-row>
<!-- <a-form-item ref="barCode" label="条码" name="barCode"> <!-- <a-form-item ref="barCode" label="条码" name="barCode">
<a-input v-model:value="formState.barCode" placeholder="请输入条码" /> <a-input v-model:value="formState.barCode" placeholder="请输入条码" />
</a-form-item> --> </a-form-item> -->
<a-form-item label="ABC分类" name="abc">
<a-select v-model:value="formState.abc" :options="skuAbc" placeholder="请选择ABC分类">
</a-select>
</a-form-item>
<!-- <a-form-item ref="categoryCode" label="种类编号" name="categoryCode"> <!-- <a-form-item ref="categoryCode" label="种类编号" name="categoryCode">
<a-input v-model:value="formState.categoryCode" placeholder="请选择种类编号" /> <a-input v-model:value="formState.categoryCode" placeholder="请选择种类编号" />
</a-form-item> --> </a-form-item> -->
@ -73,7 +23,9 @@
<a-select-option value="原材料">原材料</a-select-option> <a-select-option value="原材料">原材料</a-select-option>
</a-select> </a-select>
</a-form-item> --> </a-form-item> -->
<a-form-item ref="baseUnit" label="库存单位" name="baseUnit">
<a-input v-model:value="formState.baseUnit" placeholder="请选择库存单位" :disabled="true" />
</a-form-item>
<!-- <a-form-item ref="primaryUnit" label="换算单位" name="primaryUnit"> <!-- <a-form-item ref="primaryUnit" label="换算单位" name="primaryUnit">
<a-input v-model:value="formState.primaryUnit" placeholder="请选择换算单位" /> <a-input v-model:value="formState.primaryUnit" placeholder="请选择换算单位" />
</a-form-item> --> </a-form-item> -->
@ -100,134 +52,140 @@
<!-- <a-form-item ref="expire" label="有效期" name="expire"> <!-- <a-form-item ref="expire" label="有效期" name="expire">
<a-input-number v-model:value="formState.expire" placeholder="请选择有效期" style="width: 100%" /> <a-input-number v-model:value="formState.expire" placeholder="请选择有效期" style="width: 100%" />
</a-form-item> --> </a-form-item> -->
<!-- <!--
<a-form-item label="使用标志" name="useFlag"> <a-form-item label="使用标志" name="useFlag">
<a-switch v-model:checked="formState.useFlag" checked-children="启用" un-checked-children="禁用"/> <a-switch v-model:checked="formState.useFlag" checked-children="启用" un-checked-children="禁用"/>
</a-form-item> --> </a-form-item> -->
<a-form-item ref="remark" label="备注" name="remark">
<a-textarea v-model:value="formState.remark" laceholder="请输入备注" />
</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/sku"; message
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; } from '@hwork/ant-design-vue';
export default defineComponent({ import {
edit
} from "@/api/wms/sku";
import {
defineComponent,
reactive,
ref,
toRaw,
watch
} from "vue";
export default defineComponent({
props: { props: {
visible: { visible: {
type: Boolean, type: Boolean,
}, },
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({});
watch(props, (props) => { watch(props, (props) => {
formState.id = props.record.id; formState.id = props.record.id
formState.skuCode = props.record.skuCode; formState.skuCode = props.record.skuCode
formState.skuName = props.record.skuName; formState.skuName = props.record.skuName
formState.barCode = props.record.barCode; formState.barCode = props.record.barCode
formState.abc = props.record.abc; formState.abc = props.record.abc
formState.categoryCode = props.record.categoryCode; formState.categoryCode = props.record.categoryCode
formState.categoryName = props.record.categoryName; formState.categoryName = props.record.categoryName
formState.baseUnit = props.record.baseUnit; formState.baseUnit = props.record.baseUnit
formState.primaryUnit = props.record.primaryUnit; formState.primaryUnit = props.record.primaryUnit
formState.ext3 = props.record.ext3; formState.ext3 = props.record.ext3
formState.stackType = props.record.stackType; formState.stackType = props.record.stackType
formState.ext1 = props.record.ext1; formState.ext1 = props.record.ext1
formState.ext2 = props.record.ext2; formState.ext2 = props.record.ext2
formState.fullQty = props.record.fullQty; formState.fullQty = props.record.fullQty
formState.expire = props.record.expire; formState.expire = props.record.expire
formState.useFlag = props.record.useFlag; formState.useFlag = props.record.useFlag
});
})
const formRules = {}; const formRules = {};
const editKey = "add"; const editKey = "add";
const skuAbc = ref([ const skuAbc = ref([{
{ value: 'A类',
value: "A类", label: 'A类',
label: "A类", }, {
value: 'B类',
label: 'B类',
}, {
value: 'C类',
label: 'C类',
}]);
const skuCategoryName = ref([{
value: '成品',
label: '成品',
}, },
{ {
value: "B类", value: '原材料',
label: "B类", label: '原材料',
},
{
value: "C类",
label: "C类",
}, },
]); ]);
const skuCategoryName = ref([ const skuPrimaryUnit = ref([{
{ value: '台',
value: "成品", label: '台',
label: "成品",
}, },
{ {
value: "原材料", value: '箱',
label: "原材料", label: '箱',
},
]);
const skuPrimaryUnit = ref([
{
value: "台",
label: "台",
}, },
{ {
value: "箱", value: '盒',
label: "箱", label: '盒',
},
{
value: "盒",
label: "盒",
}, },
]); ]);
const valueChanged = (e) => { const valueChanged = (e) => {
formState.ext3 = formState.ext3.toFixed(2); formState.ext3 = (formState.ext3).toFixed(2);
}; }
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.success({
.success({ content: '保存失败',
content: "保存失败",
key: editKey, key: editKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -237,6 +195,7 @@ export default defineComponent({
}; };
return { return {
submit, submit,
cancel, cancel,
formRef, formRef,
@ -248,12 +207,12 @@ export default defineComponent({
skuPrimaryUnit, skuPrimaryUnit,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },
}); });
</script> </script>

39
src/view/wms/baseInfo/sku/modal/save.vue
View File

@ -1,17 +1,17 @@
<template> <template>
<a-modal :open="visible" title="新增物料信息" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel" :width='720'> <a-modal :open="visible" title="新增物料信息" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel" :width='1000'>
<a-form ref="formRef" :model="formState" :rules="formRules" layout="vertical"> <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
<div> <div>
<page-layout> <page-layout>
<!-- <a-row :gutter="[0, 0]"> --> <a-row :gutter="[0, 0]">
<!-- <a-col :span="24"> --> <a-col :span="24">
<a-row :gutter="[16, 0]"> <a-row>
<a-col :span="12"> <a-col :span="8">
<a-form-item ref="skuCode" label="物料编号" name="skuCode"> <a-form-item ref="skuCode" label="物料编号" name="skuCode">
<a-input v-model:value="formState.skuCode" placeholder="请输入物料编号" /> <a-input v-model:value="formState.skuCode" placeholder="请输入物料编号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="8">
<a-form-item ref="skuName" label="物料名称" name="skuName"> <a-form-item ref="skuName" label="物料名称" name="skuName">
<a-input v-model:value="formState.skuName" placeholder="请输入物料名称" /> <a-input v-model:value="formState.skuName" placeholder="请输入物料名称" />
</a-form-item> </a-form-item>
@ -28,14 +28,14 @@
</a-col> --> </a-col> -->
</a-row> </a-row>
<a-row :gutter="[16, 0]"> <a-row>
<a-col :span="12"> <a-col :span="8">
<a-form-item label="ABC分类" name="abc"> <a-form-item label="ABC分类" name="abc">
<a-select v-model:value="formState.abc" :options="skuAbc" placeholder="请选择ABC分类"> <a-select v-model:value="formState.abc" :options="skuAbc" placeholder="请选择ABC分类">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="8">
<a-form-item ref="categoryCode" label="物料种类" name="categoryCode"> <a-form-item ref="categoryCode" label="物料种类" name="categoryCode">
<a-select v-model:value="formState.categoryCode" show-search placeholder="请选择物料种类" <a-select v-model:value="formState.categoryCode" show-search placeholder="请选择物料种类"
style="width: 100%" :default-active-first-option="false" :show-arrow="false" style="width: 100%" :default-active-first-option="false" :show-arrow="false"
@ -47,16 +47,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="8">
<a-form-item ref="baseUnit" label="库存单位" name="baseUnit"> <a-form-item ref="baseUnit" label="库存单位" name="baseUnit">
<a-input v-model:value="formState.baseUnit" placeholder="请选择库存单位" :disabled="true" /> <a-input v-model:value="formState.baseUnit" placeholder="请选择库存单位" :disabled="true" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-item label="使用标志" name="useFlag">
<a-switch v-model:checked="formState.useFlag" checked-children="启用" un-checked-children="禁用" />
</a-form-item>
</a-col>
</a-row> </a-row>
<!-- <a-row> <!-- <a-row>
<a-col :span="8"> <a-col :span="8">
@ -106,15 +101,19 @@
<a-input-number v-model:value="formState.expire" placeholder="请选择有效期" style="width: 100%" /> <a-input-number v-model:value="formState.expire" placeholder="请选择有效期" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> --> </a-col> -->
<a-col :span="8">
<a-col :span="24"> <a-form-item label="使用标志" name="useFlag">
<a-switch v-model:checked="formState.useFlag" checked-children="启用" un-checked-children="禁用" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item ref="remark" label="备注" name="remark"> <a-form-item ref="remark" label="备注" name="remark">
<a-textarea v-model:value="formState.remark" laceholder="请输入备注" /> <a-textarea v-model:value="formState.remark" laceholder="请输入备注" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- </a-col> --> </a-col>
<!-- </a-row> --> </a-row>
</page-layout> </page-layout>
</div> </div>
<!-- <a-form-item ref="skuCode" label="物料编号" name="skuCode"> <!-- <a-form-item ref="skuCode" label="物料编号" name="skuCode">

159
src/view/wms/baseInfo/skuCategory/modal/edit.vue
View File

@ -1,156 +1,114 @@
<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="categoryCode" label="种类编号" name="categoryCode"> <a-form-item ref="categoryCode" label="种类编号" name="categoryCode">
<a-input <a-input v-model:value="formState.categoryCode" placeholder="请输入种类编号"/>
v-model:value="formState.categoryCode"
placeholder="请输入种类编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="categoryName" label="种类名称" name="categoryName"> <a-form-item ref="categoryName" label="种类名称" name="categoryName">
<a-input <a-input v-model:value="formState.categoryName" placeholder="请输入种类名称"/>
v-model:value="formState.categoryName"
placeholder="请输入种类名称"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc"> <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
<a-input <a-input v-model:value="formState.categoryDesc" placeholder="请输入种类描述"/>
v-model:value="formState.categoryDesc"
placeholder="请输入种类描述"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="treeLevel" label="树层级" name="treeLevel"> <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
<a-input <a-input v-model:value="formState.treeLevel" placeholder="请输入树层级"/>
v-model:value="formState.treeLevel"
placeholder="请输入树层级"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="treeCode" label="树编号" name="treeCode"> <a-form-item ref="treeCode" label="树编号" name="treeCode">
<a-input <a-input v-model:value="formState.treeCode" placeholder="请输入树编号"/>
v-model:value="formState.treeCode"
placeholder="请输入树编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="isActive" label="是否有效" name="isActive"> <a-form-item ref="isActive" label="是否有效" name="isActive">
<a-select <a-select v-model:value="formState.isActive" :options="skuCategoryIsActive" laceholder="请选择是否有效"/>
v-model:value="formState.isActive"
:options="skuCategoryIsActive"
laceholder="请选择是否有效"
/>
</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 { edit } from "@/api/wms/skuCategory"; message
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; } from '@hwork/ant-design-vue';
export default defineComponent({ import {
edit
} from "@/api/wms/skuCategory";
import {
defineComponent,
reactive,
ref,
toRaw,
watch
} from "vue";
export default defineComponent({
props: { props: {
visible: { visible: {
type: Boolean, type: Boolean,
}, },
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 skuCategoryIsActive = ref([ const skuCategoryIsActive = ref([{
{ value: '1',
value: "1", label: '是',
label: "是", }, {
}, value: '0',
{ label: '否',
value: "0", }, ]);
label: "否",
},
]);
watch(props, (props) => { watch(props, (props) => {
formState.id = props.record.id; formState.id = props.record.id
formState.categoryName = props.record.categoryName; formState.categoryName = props.record.categoryName
formState.categoryDesc = props.record.categoryDesc; formState.categoryDesc = props.record.categoryDesc
formState.categoryCode = props.record.categoryCode; formState.categoryCode = props.record.categoryCode
formState.treeLevel = props.record.treeLevel; formState.treeLevel = props.record.treeLevel
formState.treeCode = props.record.treeCode; formState.treeCode = props.record.treeCode
formState.fullTreeCode = props.record.fullTreeCode; formState.fullTreeCode = props.record.fullTreeCode
formState.isActive = props.record.isActive; formState.isActive = props.record.isActive
formState.remark = props.record.remark; formState.remark = props.record.remark
}); })
const formRules = {}; const formRules = {
};
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.success({
.success({ content: '保存失败',
content: "保存失败",
key: editKey, key: editKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -160,6 +118,7 @@ export default defineComponent({
}; };
return { return {
submit, submit,
cancel, cancel,
formRef, formRef,
@ -168,12 +127,12 @@ export default defineComponent({
skuCategoryIsActive, skuCategoryIsActive,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },
}); });
</script> </script>

198
src/view/wms/baseInfo/skuCategory/modal/save.vue
View File

@ -1,84 +1,45 @@
<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="categoryCode" label="种类编号" name="categoryCode"> <a-form-item ref="categoryCode" label="种类编号" name="categoryCode">
<a-input <a-input v-model:value="formState.categoryCode" placeholder="请输入种类编号" />
v-model:value="formState.categoryCode"
placeholder="请输入种类编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="categoryName" label="种类名称" name="categoryName"> <a-form-item ref="categoryName" label="种类名称" name="categoryName">
<a-input <a-input v-model:value="formState.categoryName" placeholder="请输入种类名称" />
v-model:value="formState.categoryName"
placeholder="请输入种类名称"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc"> <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
<a-input <a-input v-model:value="formState.categoryDesc" placeholder="请输入种类描述" />
v-model:value="formState.categoryDesc"
placeholder="请输入种类描述"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="treeLevel" label="树层级" name="treeLevel"> <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
<a-input <a-input v-model:value="formState.treeLevel" placeholder="请输入树层级" />
v-model:value="formState.treeLevel"
placeholder="请输入树层级"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="treeCode" label="树编号" name="treeCode"> <a-form-item ref="treeCode" label="树编号" name="treeCode">
<a-input <a-input v-model:value="formState.treeCode" placeholder="请输入树编号" />
v-model:value="formState.treeCode"
placeholder="请输入树编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="isActive" label="是否有效" name="isActive"> <a-form-item ref="isActive" label="是否有效" name="isActive">
<a-select <a-select v-model:value="formState.isActive" :options="skuCategoryIsActive" :disabled="false" placeholder="请选择是否有效" />
v-model:value="formState.isActive"
:options="skuCategoryIsActive"
:disabled="false"
placeholder="请选择是否有效"
/>
</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 } from "@/api/wms/skuCategory"; message
} from '@hwork/ant-design-vue';
import {
save
} from "@/api/wms/skuCategory";
import { defineComponent, reactive, ref, toRaw } from "vue"; import {
export default defineComponent({ defineComponent,
reactive,
ref,
toRaw
} from "vue";
export default defineComponent({
props: { props: {
visible: { visible: {
type: Boolean, type: Boolean,
@ -86,107 +47,88 @@ export default defineComponent({
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const formRef = ref(); const formRef = ref();
const formState = reactive({ const formState = reactive({
isActive: "1", isActive: "1",
}); });
const skuCategoryIsActive = ref([ const skuCategoryIsActive = ref([{
{ value: '1',
value: "1", label: '是',
label: "是", }]);
},
]);
const formRules = { const formRules = {
categoryCode: [ categoryCode: [{
{
required: true, required: true,
message: "请输入种类编号", message: '请输入种类编号',
trigger: "blur", trigger: 'blur'
}, }],
], categoryName: [{
categoryName: [
{
required: true, required: true,
message: "请输入种类名称", message: '请输入种类名称',
trigger: "blur", trigger: 'blur'
}, }],
], categoryDesc: [{
categoryDesc: [
{
required: true, required: true,
message: "请输入种类描述", message: '请输入种类描述',
trigger: "blur", trigger: 'blur'
}, }],
], treeLevel: [{
treeLevel: [
{
required: true, required: true,
message: "请输入树层级", message: '请输入树层级',
trigger: "blur", trigger: 'blur'
}, }],
], treeCode: [{
treeCode: [
{
required: true, required: true,
message: "请输入树编号", message: '请输入树编号',
trigger: "blur", trigger: 'blur'
}, }],
], fullTreeCode: [{
fullTreeCode: [
{
required: true, required: true,
message: "请输入全树编号", message: '请输入全树编号',
trigger: "blur", trigger: 'blur'
}, }],
], isActive: [{
isActive: [
{
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.success({
.success({ content: '保存失败',
content: "保存失败",
key: saveKey, key: saveKey,
duration: 1, duration: 1
}) }).then(() => {
.then(() => {
cancel(); cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -204,12 +146,12 @@ export default defineComponent({
skuCategoryIsActive, skuCategoryIsActive,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },
}); });
</script> </script>

203
src/view/wms/stockInfo/pallet/modal/palletDetail/edit.vue
View File

@ -1,77 +1,21 @@
<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="palletCode" label="托盘号" name="palletCode"> <a-form-item ref="palletCode" label="托盘号" name="palletCode">
<a-input <a-input v-model:value="formState.palletCode" placeholder="请输入托盘号" disabled />
v-model:value="formState.palletCode"
placeholder="请输入托盘号"
disabled
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="skuCode" label="物料编号" name="skuCode"> <a-form-item ref="skuCode" label="物料编号" name="skuCode">
<a-input <a-input v-model:value="formState.skuCode" placeholder="请输入物料编号" />
v-model:value="formState.skuCode"
placeholder="请输入物料编号"
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="skuName" label="物料描述" name="skuName"> <a-form-item ref="skuName" label="物料描述" name="skuName">
<a-input <a-input v-model:value="formState.skuName" placeholder="请输入物料描述" disabled />
v-model:value="formState.skuName"
placeholder="请输入物料描述"
disabled
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="skuType" label="物料类型" name="skuType"> <a-form-item ref="skuType" label="物料类型" name="skuType">
<a-input <a-input v-model:value="formState.skuType" placeholder="请输入物料类型" disabled />
v-model:value="formState.skuType"
placeholder="请输入物料类型"
disabled
/>
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="batch" label="批次" name="batch"> <a-form-item ref="batch" label="批次" name="batch">
<a-input v-model:value="formState.batch" placeholder="请输入批次" /> <a-input v-model:value="formState.batch" placeholder="请输入批次" />
</a-form-item> </a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="customer" label="线体" name="customer">
<a-input
v-model:value="formState.customer"
placeholder="请输入客户"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="skuQty" label="物料数量" name="skuQty">
<a-input
v-model:value="formState.skuQty"
placeholder="请输入物料数量"
/>
</a-form-item>
</a-col>
</a-row>
<!-- <a-form-item ref="serial" label="序列号" name="serial"> <!-- <a-form-item ref="serial" label="序列号" name="serial">
<a-input v-model:value="formState.serial" placeholder="请输入序列号" /> <a-input v-model:value="formState.serial" placeholder="请输入序列号" />
</a-form-item> </a-form-item>
@ -81,14 +25,18 @@
<a-form-item ref="producer" label="厂家" name="producer"> <a-form-item ref="producer" label="厂家" name="producer">
<a-input v-model:value="formState.producer" placeholder="请输入厂家" /> <a-input v-model:value="formState.producer" placeholder="请输入厂家" />
</a-form-item> --> </a-form-item> -->
<a-form-item ref="customer" label="线体" name="customer">
<a-input v-model:value="formState.customer" placeholder="请输入客户" />
</a-form-item>
<!-- <a-form-item ref="produceDate" label="生产日期" name="produceDate"> <!-- <a-form-item ref="produceDate" label="生产日期" name="produceDate">
<a-date-picker v-model:value="formState.produceDate" style="width: 100%"/> <a-date-picker v-model:value="formState.produceDate" style="width: 100%"/>
</a-form-item> </a-form-item>
<a-form-item ref="overdue" label="过期日期" name="overdue"> <a-form-item ref="overdue" label="过期日期" name="overdue">
<a-date-picker v-model:value="formState.overdue" style="width: 100%"/> <a-date-picker v-model:value="formState.overdue" style="width: 100%"/>
</a-form-item> --> </a-form-item> -->
<a-form-item ref="skuQty" label="物料数量" name="skuQty">
<a-input v-model:value="formState.skuQty" placeholder="请输入物料数量" />
</a-form-item>
<!-- <a-form-item ref="lockQty" label="锁定数量" name="lockQty"> <!-- <a-form-item ref="lockQty" label="锁定数量" name="lockQty">
<a-input v-model:value="formState.lockQty" placeholder="请输入锁定数量" /> <a-input v-model:value="formState.lockQty" placeholder="请输入锁定数量" />
</a-form-item> </a-form-item>
@ -120,20 +68,31 @@
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { message } from "@hwork/ant-design-vue"; import {
import { edit } from "@/api/wms/palletDetail"; message
import { defineComponent, reactive, ref, toRaw, watch } from "vue"; } from '@hwork/ant-design-vue';
export default defineComponent({ import {
edit,
} from "@/api/wms/palletDetail";
import {
defineComponent,
reactive,
ref,
toRaw,
watch
} from "vue";
export default defineComponent({
props: { props: {
visible: { visible: {
type: Boolean, type: Boolean,
}, },
record: { record: {
type: Object, type: Object,
}, }
}, },
emit: ["close"], emit: ["close"],
setup(props, context) { setup(props, context) {
const formRef = ref(); const formRef = ref();
// const state = reactive({}); // const state = reactive({});
@ -141,56 +100,44 @@ export default defineComponent({
const formState = reactive({}); const formState = reactive({});
const formRules = { const formRules = {
palletCode: [ palletCode: [{
{
required: true, required: true,
message: "请输入托盘号", message: '请输入托盘号',
trigger: "blur", trigger: 'blur'
}, }],
], skuCode: [{
skuCode: [
{
required: true, required: true,
message: "请输入物料编号", message: '请输入物料编号',
trigger: "change", trigger: 'change'
}, }],
], skuQty: [{
skuQty: [
{
required: true, required: true,
message: "请输入物料数量", message: '请输入物料数量',
trigger: "blur", trigger: 'blur',
type: "number", type: 'number',
}, }],
], baseUnit: [{
baseUnit: [
{
required: true, required: true,
message: "请输入物流单位", message: '请输入物流单位',
trigger: "change", trigger: 'change',
}, }],
], convertQty: [{
convertQty: [
{
required: true, required: true,
message: "请输入统计数量", message: '请输入统计数量',
trigger: "blur", trigger: 'blur',
type: "number", type: 'number',
}, }],
], primaryUnit: [{
primaryUnit: [
{
required: true, required: true,
message: "请输入统计单位", message: '请输入统计单位',
trigger: "change", trigger: 'change',
}, }],
], }
};
watch(props, (props) => { watch(props, (props) => {
console.log("state.record", props.record); console.log("state.record", props.record)
formState.id = props.record.id; formState.id = props.record.id
formState.palletCode = props.record.palletCode; formState.palletCode = props.record.palletCode
formState.skuCode = props.record.skuCode; formState.skuCode = props.record.skuCode;
formState.skuName = props.record.skuName; formState.skuName = props.record.skuName;
formState.skuType = props.record.skuType; formState.skuType = props.record.skuType;
@ -211,44 +158,40 @@ export default defineComponent({
formState.qualityStatus = props.record.qualityStatus; formState.qualityStatus = props.record.qualityStatus;
formState.note = props.record.note; formState.note = props.record.note;
formState.remark = props.record.remark; formState.remark = props.record.remark;
}); })
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(() => {
// cancel(); // cancel();
}); });
} }
}); });
}) })
.catch((error) => { .catch(error => {
console.log("error", error); console.log('error', error);
}); });
}; };
@ -266,12 +209,12 @@ export default defineComponent({
formRules, formRules,
labelCol: { labelCol: {
span: 8, span: 8
}, },
wrapperCol: { wrapperCol: {
span: 12, span: 12
}, },
}; };
}, },
}); });
</script> </script>