From e4963529b19325117dcbf419c97503b86b16bf22 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 19:29:59 +0800
Subject: [PATCH] 物料
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 68 +++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 30 ++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue | 229 +++++++++++++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 173 +++++++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue | 80 ++++----
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 2
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js | 2
8 files changed, 350 insertions(+), 236 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js
index aea9545..e5072e1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js
+++ b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js
@@ -7,7 +7,7 @@
*/
export function WmsControlRulePage (parameter) {
return axios({
- url: '/WmsControlRule/page',
+ url: '/WmsControlRuleDetail/page',
method: 'get',
params: parameter
})
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue
index 4c663d2..200e517 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue
@@ -7,7 +7,7 @@
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
- <a-form-item label="瑙勫垯缂栧彿">
+ <a-form-item label="瑙勫垯缂栧彿222">
<a-input v-model="queryParam.ruleCode" allow-clear placeholder="璇疯緭鍏ヨ鍒欑紪鍙�" />
</a-form-item>
</a-col>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index e1d757a..b8f8f15 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -89,21 +89,21 @@
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- <add-control-rule ref="WmsControlRule" @ok="handleOk" />
+ <add-control-rule ref="WmsControlRule" />
</a-tab-pane>
<a-tab-pane key="3" tab="鎵规灞炴��">
闇�姹傚緟瀹�
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
+ <add-form-sub ref="addFormWmsSubstituteGoodRef" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
- <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
+ <add-form-base-customer ref="addFormBaseCustomer" />
</a-tab-pane>
- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
+ <!-- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
<add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
- </a-tab-pane>
+ </a-tab-pane> -->
</a-tabs>
</a-spin>
</a-modal>
@@ -115,7 +115,7 @@
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
-import addControlRule from './tabItem/WmsControlRule/index.vue'
+import addControlRule from './tabItem/WmsControlRule/addForm.vue'
export default {
components: {
@@ -208,44 +208,52 @@
const {
form: { validateFields }
} = this
- this.confirmLoading = true
+
validateFields((errors, values) => {
if (!errors) {
- if (this.$getObjectType(values.areas) === 'array') {
- values.areaIds = values.areas.join(',')
- values.areaNameParameterArr = values.areas.map(val => {
- return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
- })
- values.areaNameParameter = values.areaNameParameterArr.join(',')
- }
- if (this.$getObjectType(values.stations) === 'array') {
- values.stationIds = values.stations.join(',')
- values.stationNameParameterArr = values.stations.map(val => {
- return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
- })
- values.stationNameParameter = values.stationNameParameterArr.join(',')
- }
+ // if (this.$getObjectType(values.areas) === 'array') {
+ // values.areaIds = values.areas.join(',')
+ // values.areaNameParameterArr = values.areas.map(val => {
+ // return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
+ // })
+ // values.areaNameParameter = values.areaNameParameterArr.join(',')
+ // }
+ // if (this.$getObjectType(values.stations) === 'array') {
+ // values.stationIds = values.stations.join(',')
+ // values.stationNameParameterArr = values.stations.map(val => {
+ // return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
+ // })
+ // values.stationNameParameter = values.stationNameParameterArr.join(',')
+ // }
console.log(6666666666666 + '鎺у埗灞炴��')
- console.log(this.$refs.WmsControlRule.selectedRows)
- var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
+
+ var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
+ let SubstituteGoodList = []
+ if(this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length>0){
+ SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
+ }
console.log(6666666666666 + '鏇夸唬鍝�')
- console.log(this.$refs.addFormWmsSubstituteGoodRef.list)
+
+ let BaseCustomerList = [];
+ if(this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length>0){
+ BaseCustomerList = this.$refs.addFormWmsSubstituteGoodRef.list
+ }
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
- console.log(this.$refs.addFormBaseCustomer.list)
+ // console.log(6666666666666 + '鍖呰鍏崇郴')
+ // console.log(this.$refs.addFormContainerPackagingRef.list)
- console.log(6666666666666 + '鍖呰鍏崇郴')
- console.log(this.$refs.addFormContainerPackagingRef.list)
var param = {
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
- SubstituteGoodList: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
- BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗ｆ闆嗗悎
- ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
+ SubstituteGoodList: SubstituteGoodList, //鏇夸唬鍝�
+ BaseCustomerList: BaseCustomerList, //瀹㈡埛妗ｆ闆嗗悎
+ // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
+ this.confirmLoading = true
WmsMaterialAdd(param)
.then(res => {
if (res.success) {
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..c6a5a60 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,111 @@
锘�<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>
+ <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: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true
+ this.$nextTick(() => {
+
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ handleSubmit() {
+
+ // if(){
+
+ // }
+ this.visible = false
+ let record1 = this.$refs.showList.selectedRows[0];
+ let record =record1;
+ console.log("5555555")
+debugger
+ 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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
index bf80dc2..d764dad 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
@@ -14,8 +14,7 @@
<a-col :md="8" :sm="24">
<a-form-item label="瑙勫垯鍚嶇О">
<a-input v-model="queryParam.ruleName" allow-clear placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
- </a-form-item> </a-col
- ><template v-if="advanced">
+ </a-form-item> </a-col><template v-if="advanced">
<a-col :md="8" :sm="24">
<a-form-item label="瑙勫垯鎻忚堪">
<a-input v-model="queryParam.ruleDesc" allow-clear placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
@@ -23,12 +22,8 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鏄惁绂佺敤">
- <a-select
- :allowClear="true"
- style="width: 100%"
- v-model="queryParam.isDisabled"
- placeholder="璇烽�夋嫨鏄惁绂佺敤"
- >
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
+ placeholder="璇烽�夋嫨鏄惁绂佺敤">
<a-select-option v-for="(item, index) in isDisabledData" :key="index" :value="item.code">{{
item.name
}}</a-select-option>
@@ -40,18 +35,11 @@
<a-col :md="8" :sm="24">
<a-form-item label="鍒涘缓鏃堕棿">
- <a-range-picker
- style="width: 100%"
- :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
- :show-time="{
- format: 'HH:mm:ss',
- defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
- }"
- v-model="queryParam.createdTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- @change="onChangecreatedTime"
- />
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+ format: 'HH:mm:ss',
+ defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+ }" v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />
</a-form-item>
</a-col>
<!--骞存湀鏃ユ椂鍒嗙-->
@@ -59,18 +47,11 @@
<a-col :md="8" :sm="24">
<a-form-item label="鏇存柊鏃堕棿">
- <a-range-picker
- style="width: 100%"
- :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
- :show-time="{
- format: 'HH:mm:ss',
- defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
- }"
- v-model="queryParam.updatedTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- @change="onChangeupdatedTime"
- />
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+ format: 'HH:mm:ss',
+ defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+ }" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
</a-form-item>
</a-col>
@@ -102,16 +83,9 @@
</a-card>
</div>
<a-card :bordered="false">
- <s-table
- ref="table"
- :columns="columns"
- :data="loadData"
- :alert="true"
- @changeTablePage="pageInfo = $event"
- :scroll="{ x: true, y: tableHeight }"
- :rowKey="record => record.id"
- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
- >
+ <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
+ :scroll="{ x: true, y: tableHeight }" :rowKey="record => record.id"
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRule:add')">
<!-- <div ref="actionBar" class="actionBar">
<a-button
@@ -144,20 +118,19 @@
</div>
<div v-else=""></div>
</span>
- <span slot="action" slot-scope="text, record">
- <!-- 鑷畾涔� -->
+ <!-- <span slot="action" slot-scope="text, record">
<a v-if="hasPerm('WmsControlRule:getdetail')" @click="$refs.detailForm.edit(record)">璇︽儏</a>
</a-popconfirm>
- </span>
+ </span> -->
</s-table>
<add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" />
<excel-form ref="excelForm" @ok="handleOk" />
-
- <!-- 鑷畾涔� -->
+
+ <!-- 鑷畾涔� -->
<detail-form ref="detailForm" @ok="handleOk" />
-
+
</a-card>
</div>
</template>
@@ -204,19 +177,19 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '瑙勫垯缂栧彿',
+ title: '鎺у埗灞炴�ц鍒欑紪鍙�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -224,44 +197,145 @@
dataIndex: 'ruleCode'
},
{
- title: '瑙勫垯鍚嶇О',
+ title: '鏈�楂樺簱瀛�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'ruleName'
+ dataIndex: 'maxImumqty'
},
{
- title: '瑙勫垯鎻忚堪',
+ title: '鏈�浣庡簱瀛�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'ruleDesc'
+ dataIndex: 'minImumqty'
+ },
+ {
+ title: '瀹夊叏搴撳瓨',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'safeImumqty'
+ },
+ {
+ title: '鏈�灏忓簱榫�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'minStorageAge'
+ },
+ {
+ title: '鏈�澶у簱榫�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'maxStorageAge'
+ },
+ {
+ title: '鏄惁鍏嶆',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isNotChek',
+ scopedSlots: { customRender: 'isNotChekscopedSlots' }
+ },
+ {
+ title: '淇濊川鏈熷ぉ鏁�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'shelfLifeDays'
},
{
title: '鏄惁绂佺敤',
@@ -269,14 +343,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -290,14 +364,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -310,14 +384,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -330,14 +404,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -350,14 +424,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -377,14 +451,14 @@
}
},
created() {
- if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
+ // if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
+ // this.columns.push({
+ // title: '鎿嶄綔',
+ // width: '150px',
+ // dataIndex: 'action',
+ // scopedSlots: { customRender: 'action' }
+ // })
+ // }
const path = this.$route.path
const columnStr = window.localStorage.getItem(path)
if (columnStr) {
@@ -506,6 +580,7 @@
.table-operator {
margin-bottom: 18px;
}
+
button {
margin-right: 8px;
}
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index f9e969e..53ff524 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -4,10 +4,10 @@
<a-spin :spinning="confirmLoading">
</a-spin> <a-form :form="form">
- <a-form-item label="鏇夸唬缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="鏇夸唬缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ浛浠ｇ紪鍙�"
v-decorator="['substituteCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｇ紪鍙凤紒' }] }]" />
- </a-form-item>
+ </a-form-item> -->
<!-- <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
@@ -17,13 +17,18 @@
v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
</a-form-item> -->
<a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
- v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" />
+ <!-- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
+ v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" /> -->
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�" v-decorator="['substituteMaterialCode']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode">{{
+ item.materialName }}</a-select-option>
+ </a-select>
+
</a-form-item>
- <a-form-item label="鏇夸唬鍝佺墿鏂欏悕绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="鏇夸唬鍝佺墿鏂欏悕绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡鍚嶇О"
v-decorator="['substituteMaterialName', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡鍚嶇О锛�' }] }]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏇夸唬娆″簭" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ユ浛浠ｆ搴�" style="width: 100%"
v-decorator="['substituteIndex', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｆ搴忥紒' }] }]" />
@@ -40,6 +45,8 @@
import {
WmsSubstituteGoodAdd
} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
+
+import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
export default {
data() {
return {
@@ -55,6 +62,9 @@
confirmLoading: false,
form: this.$form.createForm(this)
}
+ },
+ created() {
+ this.getSelectDataList()
},
methods: {
moment,
@@ -76,8 +86,12 @@
}
)
})
-
-
+ },
+ getSelectDataList() {
+ WmsMaterialPage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+ })
},
/**
* 鎻愪氦琛ㄥ崟
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
index 1d87a39..7b61409 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
@@ -72,26 +72,26 @@
scopedSlots: { customRender: 'index' },
align: 'center'
},
- {
- title: '鏇夸唬缂栧彿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'substituteCode'
- },
+ // {
+ // title: '鏇夸唬缂栧彿',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'substituteCode'
+ // },
// {
// title: '鐗╂枡缂栧彿',
// align: 'center',
@@ -152,26 +152,26 @@
sorter: true,
dataIndex: 'substituteMaterialCode'
},
- {
- title: '鏇夸唬鍝佺墿鏂欏悕绉�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '140px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '140px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'substituteMaterialName'
- },
+ // {
+ // title: '鏇夸唬鍝佺墿鏂欏悕绉�',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '140px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '140px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'substituteMaterialName'
+ // },
{
title: '鏇夸唬娆″簭',
align: 'center',
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index 46f2a31..fe082b6 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -511,7 +511,7 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '140px'//鏈�灏忓垪瀹借缃�
}
}
},
--
Gitblit v1.9.3