From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
index c9a44f1..83aaf80 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
@@ -1,8 +1,12 @@
<script setup>
-import { ref, nextTick } from 'vue';
+import { ref, nextTick, reactive, watch } from 'vue';
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
+import {
+ MinusCircleOutlined,
+ PlusOutlined,
+} from "@ant-design/icons-vue";
const formTable = ref(null);
const submitButton = ref(null);
@@ -10,6 +14,10 @@
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
+
+const dynamicValidateForm = reactive({
+ detls: [],
+});
const emit = defineEmits(['tableReload'])
@@ -24,6 +32,12 @@
const onFinish = values => {
// console.log('Success:', values);
open.value = false;
+
+ let detls = []
+ dynamicValidateForm.detls.forEach((item) => {
+ detls.push(item.value)
+ })
+ formData.value.detls = detls;
post(isSave.value ? '/api/shelvesRule/save' : '/api/shelvesRule/update', formData.value).then((resp) => {
let result = resp.data;
if (result.code === 200) {
@@ -59,6 +73,36 @@
})
}
+const removeDomain = item => {
+ const index = dynamicValidateForm.detls.indexOf(item);
+ if (index !== -1) {
+ dynamicValidateForm.detls.splice(index, 1);
+ }
+};
+
+const addDomain = () => {
+ dynamicValidateForm.detls.push({
+ value: '',
+ });
+};
+
+watch(open, (newVal, oldVal) => {
+ if (open.value) {
+ if (!isSave.value) {
+ let ruleDetls = formData.value.ruleDetl$
+ let detls = []
+ ruleDetls.forEach((item) => {
+ detls.push({
+ value: item.detlType
+ })
+ })
+
+ dynamicValidateForm.detls = detls;
+ }
+ }else {
+ dynamicValidateForm.detls = []
+ }
+})
defineExpose({
open,
@@ -83,6 +127,10 @@
<a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }"
:wrapper-col="{ span: 16 }" style="display: flex;justify-content: space-between;flex-wrap: wrap;"
autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule.name', '瑙勫垯鍚嶇О')" name="name"
+ style="width: 250px;">
+ <a-input v-model:value="formData.name" />
+ </a-form-item>
<a-form-item :label="formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷')" name="ruleType"
style="width: 250px;">
<a-select v-model:value="formData.ruleType" :options="[
@@ -106,7 +154,7 @@
]">
</a-select>
</a-form-item>
- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ <!-- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
style="width: 250px;">
<a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" />
@@ -129,7 +177,7 @@
style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
optionLabelProp="label">
</a-select>
- </a-form-item>
+ </a-form-item> -->
<a-form-item :label="formatMessage('db.strategy_shelves_rule.memo', '澶囨敞')" name="memo"
style="width: 250px;">
<a-input v-model:value="formData.memo" />
@@ -140,6 +188,31 @@
style="visibility: hidden;">Submit</a-button>
</a-form-item>
</a-form>
+
+ <a-form>
+ <a-form-item v-for="(domain, index) in dynamicValidateForm.detls" :key="domain.key"
+ :label="formatMessage('db.strategy_shelves_rule.memo', '瑙勫垯鏄庣粏')" :name="['domains', index, 'value']"
+ :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 400px;">
+ <a-select v-model:value="domain.value" :options="[
+ { label: '搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅', value: 1 },
+ { label: '鎺ㄨ崘鍖哄煙', value: 2 },
+ { label: '瀹屾暣宸烽亾', value: 3 },
+ ]" style="width: 300px;margin-right: 20px;">
+ </a-select>
+ <MinusCircleOutlined v-if="dynamicValidateForm.detls.length > 1"
+ @click="removeDomain(domain)" />
+ </div>
+ </a-form-item>
+ <a-form-item :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 200px;">
+ <a-button type="dashed" style="width: 200px;" @click="addDomain">
+ <PlusOutlined />
+ {{ formatMessage('db.strategy_shelves_rule.addDetl', '娣诲姞鏄庣粏') }}
+ </a-button>
+ </div>
+ </a-form-item>
+ </a-form>
</a-modal>
</div>
</template>
--
Gitblit v1.9.1