From 07562e1627ef14d4a946d352739d2f8d17d6360b Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 13:42:29 +0800
Subject: [PATCH] 细节
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue | 8 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue | 57 +++++++++++++++++++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 3 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue | 16 ++++++++
6 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
index 31ca90c..272dd71 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
@@ -202,14 +202,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -222,14 +222,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
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 717475c..6da1ac1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,5 +1,5 @@
<template>
- <a-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal :title="title" :width="1300" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
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 78066dd..367a2a9 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
@@ -5,6 +5,9 @@
<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 disabled placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欏悕绉�" v-decorator="['ruleName', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欏悕绉帮紒'}]}]" />
+ </a-form-item>
<a-form-item label="鏈�楂樺簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input disabled placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty']" />
</a-form-item>
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 e0ad10c..1caab29 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
@@ -66,7 +66,7 @@
</a-form-item>
</a-col>
</template>
-
+
<a-col :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
@@ -84,7 +84,7 @@
</div>
<a-card :bordered="false">
<s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
- :scroll="{ x: true}" :rowKey="record => record.id"
+ :scroll="{ x: true }" :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">
@@ -109,22 +109,31 @@
>
</div> -->
</template>
- <span slot="isDisabledscopedSlots" slot-scope="text">
- <div v-if="text === true">
- <a-tag color="green">鏄�</a-tag>
- </div>
- <div v-else-if="text == false">
- <a-tag color="volcano">鍚�</a-tag>
- </div>
- <div v-else=""></div>
- </span>
+ <span slot="isNotChekscopedSlots" slot-scope="text">
+ <div v-if="text===true ">
+ <a-tag color="green">鏄�</a-tag>
+ </div>
+ <div v-else-if="text==false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+ <span slot="isDisabledscopedSlots" slot-scope="text">
+ <div v-if="text===true ">
+ <a-tag color="green">鏄�</a-tag>
+ </div>
+ <div v-else-if="text==false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+
<!-- <span slot="action" slot-scope="text, record">
<a v-if="hasPerm('WmsControlRule:getdetail')" @click="$refs.detailForm.edit(record)">璇︽儏</a>
</a-popconfirm>
</span> -->
</s-table>
-
</a-card>
</div>
</template>
@@ -144,7 +153,7 @@
export default {
// mixins: [setTableHtMixin],
components: {
- STable,
+ STable
},
data() {
return {
@@ -174,7 +183,7 @@
customCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -182,6 +191,26 @@
dataIndex: 'ruleCode'
},
{
+ title: '鎺у埗灞炴�ц鍒欏悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'ruleName'
+ },
+ {
title: '鏈�楂樺簱瀛�',
align: 'center',
customHeaderCell: () => {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
index 75ee0a3..bf61488 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
@@ -181,6 +181,22 @@
this.list = param
},
handleSubmit() {
+ var selectedRowsArrMy = this.$refs.showList.selectedRows;
+ console.log("3333333")
+ console.log(selectedRowsArrMy)
+ if(this.list.length==0){
+ this.list = selectedRowsArrMy
+ }else{
+ var arr1 = []
+ this.list.forEach(item => {
+ var itemArr = selectedRowsArrMy.filter(v=>v.id != item.id)
+ if(itemArr.length>0){
+ //arr1.push(itemArr[0])
+ arr1.concat(itemArr)
+ }
+ })
+ this.list.concat(arr1)
+ }
this.visible = false
},
handleCancel() {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
index 7eb397f..ebbe17c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
@@ -686,7 +686,7 @@
onSelectChange(selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys
this.selectedRows = selectedRows
- this.$emit('ok', selectedRows)
+ // this.$emit('ok', selectedRows)
}
}
}
--
Gitblit v1.9.3