From 8c89f7c22bb2f4e2bede78e8abd806a77f7e5693 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 13:01:23 +0800
Subject: [PATCH] css
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue | 14 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 10 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue | 14 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 10 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/editForm.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/addForm.vue | 12 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue | 103 ++++++++------------
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js | 16 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 7
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue | 18 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/editForm.vue | 12 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 12 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 20 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/index.vue | 2
17 files changed, 126 insertions(+), 140 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js
index 9f2dc11..b23c98e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js
+++ b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js
@@ -1,7 +1,7 @@
锘縤mport { axios } from '@/utils/request'
/**
- * 鏌ヨ瀹㈡埛妗ｆ
+ * 鏌ヨ寰�鏉ュ叧绯�
*
* @author ly
*/
@@ -14,7 +14,7 @@
}
/**
- * 瀹㈡埛妗ｆ鍒楄〃
+ * 寰�鏉ュ叧绯诲垪琛�
*
* @author ly
*/
@@ -27,7 +27,7 @@
}
/**
- * 娣诲姞瀹㈡埛妗ｆ
+ * 娣诲姞寰�鏉ュ叧绯�
*
* @author ly
*/
@@ -40,7 +40,7 @@
}
/**
- * 缂栬緫瀹㈡埛妗ｆ
+ * 缂栬緫寰�鏉ュ叧绯�
*
* @author ly
*/
@@ -53,7 +53,7 @@
}
/**
- * 鍒犻櫎瀹㈡埛妗ｆ
+ * 鍒犻櫎寰�鏉ュ叧绯�
*
* @author ly
*/
@@ -67,7 +67,7 @@
/**
- * 瀵煎嚭瀹㈡埛妗ｆ鐨凟xcel鏂囦欢
+ * 瀵煎嚭寰�鏉ュ叧绯荤殑Excel鏂囦欢
*
* @author ly
*/
@@ -81,7 +81,7 @@
}
/**
- * 瀵煎叆瀹㈡埛妗ｆ鐨凟xcel鏂囦欢
+ * 瀵煎叆寰�鏉ュ叧绯荤殑Excel鏂囦欢
*
* @author ly
*/
@@ -97,7 +97,7 @@
/**
- * 涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ * 涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
*
* @author ly
*/
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/editForm.vue
index 170765a..2df31cb 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/editForm.vue
@@ -33,8 +33,8 @@
<a-form-item label="閫�璐ф柟" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ��璐ф柟" v-decorator="['returnGoods']" />
</a-form-item>
- <a-form-item label="瀹㈡埛缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴风紪鍙�" v-decorator="['returnGoodsOrderNo']" />
+ <a-form-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['returnGoodsOrderNo']" />
</a-form-item>
<a-form-item label="閿�鍞崟鎹�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ攢鍞崟鎹�" v-decorator="['saleOrderNo']" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/index.vue
index 7a19b74..11feb57 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/SalesStockReturnOrder/index.vue
@@ -118,7 +118,7 @@
dataIndex: 'returnGoods'
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
dataIndex: 'returnGoodsOrderNo'
},
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
index 0769e4a..0f56a8b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
@@ -1,6 +1,6 @@
锘�<template>
<a-modal
- title="鏂板瀹㈡埛妗ｆ"
+ title="鏂板寰�鏉ュ叧绯�"
:width="1100"
:visible="visible"
:confirmLoading="confirmLoading"
@@ -8,11 +8,11 @@
@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="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
index b6688ec..af0bf41 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
@@ -1,6 +1,6 @@
锘�<template>
<a-modal
- title="缂栬緫瀹㈡埛妗ｆ"
+ title="缂栬緫寰�鏉ュ叧绯�"
:width="1100"
:visible="visible"
:confirmLoading="confirmLoading"
@@ -8,11 +8,11 @@
@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="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
index 8a552a5..24ac6b1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
@@ -7,18 +7,18 @@
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛缂栧彿">
- <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ュ鎴风紪鍙�"/>
+ <a-form-item label="缂栧彿">
+ <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛涓枃鍚嶇О">
- <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�"/>
+ <a-form-item label="涓枃鍚嶇О">
+ <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"/>
</a-form-item>
</a-col><template v-if="advanced">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О">
- <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�"/>
+ <a-form-item label="鑻辨枃鍚嶇О">
+ <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -139,7 +139,7 @@
<a-button type="info" v-if="hasPerm('BaseCustomer:exportExcel')" icon="download" @click="BaseCustomerToExcel()">
瀵煎嚭
</a-button>
- <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板瀹㈡埛妗ｆ</a-button>
+ <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板寰�鏉ュ叧绯�</a-button>
</div>
</template>
<span slot="custTypescopedSlots" slot-scope="text">
@@ -204,7 +204,7 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
customHeaderCell: () => {
return {
@@ -224,7 +224,7 @@
dataIndex: 'custCode'
},
{
- title: '瀹㈡埛涓枃鍚嶇О',
+ title: '涓枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -244,7 +244,7 @@
dataIndex: 'custChinaName'
},
{
- title: '瀹㈡埛鑻辨枃鍚嶇О',
+ title: '鑻辨枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index b24126a..f709eff 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -10,10 +10,10 @@
<!-- <a-form-item label="浠撳簱缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['warehouseCode', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒'}]}]" />
</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="['warehouseName', { 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="['areaName', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖哄悕绉帮紒' }] }]" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
index f091b69..6ff3aa7 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -10,10 +10,10 @@
<!-- <a-form-item label="浠撳簱缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['warehouseCode', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒'}]}]" />
</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="['warehouseName', { 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="['areaName', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖哄悕绉帮紒' }] }]" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index 3937741..4de560e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -15,12 +15,13 @@
<a-form-item label="浠撳簱缂栧彿">
<a-input v-model="queryParam.warehouseCode" allow-clear placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�"/>
</a-form-item>
- </a-col><template v-if="advanced">
- <a-col :md="8" :sm="24">
+ </a-col>
+ <template v-if="advanced">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="浠撳簱鍚嶇О">
<a-input v-model="queryParam.warehouseName" allow-clear placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="搴撳尯鍚嶇О">
<a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�"/>
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 34da4a7..717475c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -142,6 +142,8 @@
},
created() {
this.materialTypeDataList()
+ const materialTypeOption = this.$options
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
},
data() {
return {
@@ -162,7 +164,8 @@
stationNameParameterData: [],
visible: false,
confirmLoading: false,
- form: this.$form.createForm(this)
+ form: this.$form.createForm(this),
+ materialTypeData2:[]
}
},
methods: {
@@ -208,8 +211,7 @@
handleOk() { },
// 鍒濆鍖栨柟娉�
add(record) {
- const materialTypeOption = this.$options
- this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
+
this.visible = true
if (record) {//缂栬緫
@@ -282,7 +284,7 @@
BaseCustomerList = this.$refs.addFormBaseCustomer.list
}
- console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
+ console.log(6666666666666 + '寰�鏉ュ叧绯婚泦鍚�')
// console.log(6666666666666 + '鍖呰鍏崇郴')
// console.log(this.$refs.addFormContainerPackagingRef.list)
@@ -291,7 +293,7 @@
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
SubstituteGoodList: SubstituteGoodList, //鏇夸唬鍝�
- BaseCustomerList: BaseCustomerList, //瀹㈡埛妗ｆ闆嗗悎
+ BaseCustomerList: BaseCustomerList, //寰�鏉ュ叧绯婚泦鍚�
// ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
this.confirmLoading = true
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue
index 98ee481..c1a9e00 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue
@@ -1,6 +1,6 @@
锘�<template>
<a-modal
- title="鏂板瀹㈡埛妗ｆ"
+ title="鏂板寰�鏉ュ叧绯�"
:width="900"
:visible="visible"
:confirmLoading="confirmLoading"
@@ -8,14 +8,14 @@
@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="['custCode', {rules: [{required: true, message: '璇疯緭鍏ュ鎴风紪鍙凤紒'}]}]" />
+ <a-form-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['custCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
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 e07f210..75ee0a3 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
@@ -73,7 +73,7 @@
align: 'center'
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
customHeaderCell: () => {
return {
@@ -93,7 +93,7 @@
dataIndex: 'custCode'
},
{
- title: '瀹㈡埛涓枃鍚嶇О',
+ title: '涓枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue
index 56a3beb..2326bd0 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue
@@ -1,6 +1,6 @@
锘�<template>
<a-modal
- title="缂栬緫瀹㈡埛妗ｆ"
+ title="缂栬緫寰�鏉ュ叧绯�"
:width="900"
:visible="visible"
:confirmLoading="confirmLoading"
@@ -8,14 +8,14 @@
@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="['custCode', {rules: [{required: true, message: '璇疯緭鍏ュ鎴风紪鍙凤紒'}]}]" />
+ <a-form-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['custCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
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 2d2dfeb..7eb397f 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
@@ -7,18 +7,18 @@
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛缂栧彿">
- <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ュ鎴风紪鍙�" />
+ <a-form-item label="缂栧彿">
+ <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛涓枃鍚嶇О">
- <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" />
+ <a-form-item label="涓枃鍚嶇О">
+ <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
</a-form-item>
</a-col><template v-if="advanced">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О">
- <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" />
+ <a-form-item label="鑻辨枃鍚嶇О">
+ <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -27,13 +27,11 @@
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="绫诲瀷">
- <a-input-number v-model="queryParam.custType" style="width: 100%" allow-clear
- placeholder="璇疯緭鍏ョ被鍨�" />
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.custTypeName" allow-clear placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" />
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.custType"
+ placeholder="璇烽�夋嫨绫诲瀷">
+ <a-select-option v-for="(item, index) in custTypeData" :key="index"
+ :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -145,19 +143,22 @@
<a-button type="info" v-if="hasPerm('BaseCustomer:exportExcel')" icon="download" @click="BaseCustomerToExcel()">
瀵煎嚭
</a-button>
- <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板瀹㈡埛妗ｆ</a-button>
+ <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板寰�鏉ュ叧绯�</a-button>
</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="action" slot-scope="text, record">
+ <span slot="custTypescopedSlots" slot-scope="text">
+ {{ 'base_customer_type' | dictType(text) }}
+ </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('BaseCustomer:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
<a-divider type="vertical" v-if="hasPerm('BaseCustomer:edit') & hasPerm('BaseCustomer:delete')" />
@@ -165,7 +166,7 @@
@confirm="() => BaseCustomerDelete(record)">
<a>鍒犻櫎</a>
</a-popconfirm>
- </span>
+ </span> -->
</s-table>
<add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" />
@@ -208,7 +209,7 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
customHeaderCell: () => {
return {
@@ -228,7 +229,7 @@
dataIndex: 'custCode'
},
{
- title: '瀹㈡埛涓枃鍚嶇О',
+ title: '涓枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -248,7 +249,7 @@
dataIndex: 'custChinaName'
},
{
- title: '瀹㈡埛鑻辨枃鍚嶇О',
+ title: '鑻辨枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -293,26 +294,6 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'custType'
- },
- {
- title: '绫诲瀷鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
@@ -325,7 +306,8 @@
}
},
sorter: true,
- dataIndex: 'custTypeName'
+ dataIndex: 'custType',
+ scopedSlots: { customRender: 'custTypescopedSlots' }
},
{
title: '鑱旂郴浜�',
@@ -581,14 +563,14 @@
}
},
created() {
- if (this.hasPerm('BaseCustomer:edit') || this.hasPerm('BaseCustomer:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
+ // if (this.hasPerm('BaseCustomer:edit') || this.hasPerm('BaseCustomer: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) {
@@ -602,9 +584,11 @@
}
});
}
+
+ const custTypeOption = this.$options
+ this.custTypeData = custTypeOption.filters['dictData']('base_customer_type')
const isDisabledOption = this.$options
this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
-
this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
window.addEventListener(
'resize',
@@ -707,8 +691,7 @@
}
}
</script>
-<style lang="less">
-.table-operator {
+<style lang="less">.table-operator {
margin-bottom: 18px;
}
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/addForm.vue
index 01be2bf..7002f43 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/addForm.vue
@@ -20,14 +20,14 @@
<a-form-item label="瀹㈡埛ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鎴稩D" v-decorator="['custId']" />
</a-form-item>
- <a-form-item label="瀹㈡埛缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴风紪鍙�" v-decorator="['custCode']" />
+ <a-form-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['custCode']" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
- <a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName']" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName']" />
</a-form-item>
</a-form>
</a-spin>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/editForm.vue
index aeb5542..d40f6da 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/editForm.vue
@@ -20,14 +20,14 @@
<a-form-item label="瀹㈡埛ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鎴稩D" v-decorator="['custId']" />
</a-form-item>
- <a-form-item label="瀹㈡埛缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴风紪鍙�" v-decorator="['custCode']" />
+ <a-form-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['custCode']" />
</a-form-item>
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
+ <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-decorator="['custEnglishName']" />
</a-form-item>
- <a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName']" />
+ <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" v-decorator="['custChinaName']" />
</a-form-item>
<a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue
index 9efe979..93dabcf 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue
@@ -27,18 +27,18 @@
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛缂栧彿">
- <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ュ鎴风紪鍙�"/>
+ <a-form-item label="缂栧彿">
+ <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О">
- <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�"/>
+ <a-form-item label="鑻辨枃鍚嶇О">
+ <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛涓枃鍚嶇О">
- <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�"/>
+ <a-form-item label="涓枃鍚嶇О">
+ <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"/>
</a-form-item>
</a-col> <!--骞存湀鏃ユ椂鍒嗙-->
<!--鏃堕棿鑼冨洿-->
@@ -238,7 +238,7 @@
dataIndex: 'custId'
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
customHeaderCell: () => {
return {
@@ -258,7 +258,7 @@
dataIndex: 'custCode'
},
{
- title: '瀹㈡埛鑻辨枃鍚嶇О',
+ title: '鑻辨枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -278,7 +278,7 @@
dataIndex: 'custEnglishName'
},
{
- title: '瀹㈡埛涓枃鍚嶇О',
+ title: '涓枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
--
Gitblit v1.9.3