From 4d14b84903bf0277c5e8b9b3138c5e1d981e95db Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:01:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 179 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 77 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
index 3d0e4ed..78066dd 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
@@ -1,94 +1,119 @@
锘�<template>
- <a-modal
- title="鏂板鎺у埗灞炴�ц鍒�"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel">
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
- <a-form-item label="瑙勫垯缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヨ鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ヨ鍒欑紪鍙凤紒'}]}]" />
+ <div>
+ <!--tab 鎺у埗灞炴�ц鍒欐槑缁� -->
+ <a-form :form="form">
+ <a-form-item label="鎺у埗灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙凤紒'}]}]" />
</a-form-item>
- <a-form-item label="瑙勫垯鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヨ鍒欏悕绉�" v-decorator="['ruleName', {rules: [{required: true, message: '璇疯緭鍏ヨ鍒欏悕绉帮紒'}]}]" />
+ <a-form-item label="鏈�楂樺簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty']" />
</a-form-item>
- <a-form-item label="瑙勫垯鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヨ鍒欐弿杩�" v-decorator="['ruleDesc']" />
+ <a-form-item label="鏈�浣庡簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" v-decorator="['minImumqty']" />
</a-form-item>
- <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁绂佺敤锛�' }], valuePropName: 'checked'}]" />
+ <a-form-item label="瀹夊叏搴撳瓨" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛�" v-decorator="['safeImumqty']" />
</a-form-item>
+ <a-form-item label="鏈�灏忓簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ユ渶灏忓簱榫�" v-decorator="['minStorageAge']" />
+ </a-form-item>
+ <a-form-item label="鏈�澶у簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ユ渶澶у簱榫�" v-decorator="['maxStorageAge']" />
+ </a-form-item>
+ <a-form-item label="鏄惁鍏嶆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
+ </a-form-item>
+ <a-form-item label="淇濊川鏈熷ぉ鏁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input disabled placeholder="璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟" v-decorator="['shelfLifeDays']" />
+ </a-form-item>
+ <!-- <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
+ </a-form-item> -->
+ <a-form-item style="visibility:hidden" v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
- </a-spin>
- </a-modal>
+
+ <p @click="visible = true">鏂板琛�</p>
+ <a-modal title="鏂板鐗╂枡-鎺у埗灞炴��" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ @cancel="handleCancel">
+ <show-list ref="showList" @ok="handleOk" />
+ <!-- <a-spin :spinning="confirmLoading"></a-spin> -->
+ </a-modal>
+ </div>
</template>
<script>
- import moment from 'moment'
- import {
+import moment from 'moment'
+import {
WmsControlRuleAdd
- } from '@/api/modular/main/WmsBase/WmsControlRuleManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- add (record) {
- this.visible = true
- this.$nextTick(() => {
+} from '@/api/modular/main/WmsBase/WmsControlRuleManage'
+import showList from './index.vue'
- });
+export default {
+ components: {
+ showList
+ },
+ data() {
+ return {
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
},
- /**
- * 鎻愪氦琛ㄥ崟
- */
- handleSubmit () {
- const { form: { validateFields } } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (typeof (values[key]) === 'object') {
- values[key] = JSON.stringify(values[key])
- }
- }
- WmsControlRuleAdd(values).then((res) => {
- if (res.success) {
- this.$message.success('鏂板鎴愬姛')
- this.confirmLoading = false
- this.$emit('ok', values)
- this.handleCancel()
- } else {
- this.$message.error('鏂板澶辫触锛�' + JSON.stringify(res.message))
- }
- }).finally((res) => {
- this.confirmLoading = false
- })
- } else {
- this.confirmLoading = false
- }
- })
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
},
- handleCancel () {
- this.form.resetFields()
- this.visible = false
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
+ },
+ methods: {
+ handleOk(){
+
+ },
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true
+ this.$nextTick(() => {
+
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ handleSubmit() {
+
+ if(this.$refs.showList.selectedRows.length!=1){
+ this.$message.warning("鍙兘閫夋嫨涓�涓�")
+ return
}
+ this.visible = false
+ let record = this.$refs.showList.selectedRows[0];
+ this.form.setFieldsValue({
+ id: record.id,
+ ruleCode: record.ruleCode,
+ maxImumqty: record.maxImumqty,
+ minImumqty: record.minImumqty,
+ safeImumqty: record.safeImumqty,
+ minStorageAge: record.minStorageAge,
+ maxStorageAge: record.maxStorageAge,
+ isNotChek: record.isNotChek,
+ shelfLifeDays: record.shelfLifeDays,
+ isDisabled: record.isDisabled
+ })
+
+ },
+ handleCancel() {
+ this.form.resetFields()
+ this.visible = false
}
}
+}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3