From cdacaa3a770e30582d57b9c4aef379b7da65c8c7 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 19:24:18 +0800
Subject: [PATCH] bug
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue | 2 +-
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js | 16 ++++++++--------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/editForm.vue | 2 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 2 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue | 4 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 4 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addForm.vue | 2 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 2 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue | 4 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 2 +-
10 files changed, 20 insertions(+), 20 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 09dbe4c..3dc26e3 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
*/
@@ -36,7 +36,7 @@
}
/**
- * 娣诲姞寰�鏉ュ叧绯�
+ * 娣诲姞寰�鏉ュ崟浣�
*
* @author ly
*/
@@ -49,7 +49,7 @@
}
/**
- * 缂栬緫寰�鏉ュ叧绯�
+ * 缂栬緫寰�鏉ュ崟浣�
*
* @author ly
*/
@@ -62,7 +62,7 @@
}
/**
- * 鍒犻櫎寰�鏉ュ叧绯�
+ * 鍒犻櫎寰�鏉ュ崟浣�
*
* @author ly
*/
@@ -76,7 +76,7 @@
/**
- * 瀵煎嚭寰�鏉ュ叧绯荤殑Excel鏂囦欢
+ * 瀵煎嚭寰�鏉ュ崟浣嶇殑Excel鏂囦欢
*
* @author ly
*/
@@ -90,7 +90,7 @@
}
/**
- * 瀵煎叆寰�鏉ュ叧绯荤殑Excel鏂囦欢
+ * 瀵煎叆寰�鏉ュ崟浣嶇殑Excel鏂囦欢
*
* @author ly
*/
@@ -106,7 +106,7 @@
/**
- * 涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
+ * 涓嬭浇寰�鏉ュ崟浣嶇殑Excel瀵煎叆妯℃澘
*
* @author ly
*/
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 a151e9a..ba76139 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
@@ -1,5 +1,5 @@
锘�<template>
- <a-modal title="鏂板寰�鏉ュ叧绯�" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="鏂板寰�鏉ュ崟浣�" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
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 af0bf41..7b6e0c9 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"
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 24ac6b1..780e791 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
@@ -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">
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
index e21a1c0..5a25075 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
@@ -7,7 +7,7 @@
<!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒绫诲瀷鍚嶇О" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]">
- <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{ item.typeName
}}</a-select-option>
</a-select>
@@ -17,7 +17,7 @@
</a-form-item> -->
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]">
- <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.id">{{
item.materialTypeName }}</a-select-option>
</a-select>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
index ffa7875..c0ca439 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
@@ -7,7 +7,7 @@
<!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒绫诲瀷鍚嶇О" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]">
- <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{ item.typeName
}}</a-select-option>
</a-select>
@@ -17,7 +17,7 @@
</a-form-item> -->
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]">
- <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.id">{{
item.materialTypeName }}</a-select-option>
</a-select>
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 b59e34c..4e2c9bb 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -322,7 +322,7 @@
BaseCustomerList = this.$refs.addFormBaseCustomer.list
}
- console.log(6666666666666 + '寰�鏉ュ叧绯婚泦鍚�')
+ console.log(6666666666666 + '寰�鏉ュ崟浣嶉泦鍚�')
// console.log(6666666666666 + '鍖呰鍏崇郴')
// console.log(this.$refs.addFormContainerPackagingRef.list)
@@ -334,7 +334,7 @@
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
SubstituteGoodList: SubstituteGoodList, //鏇夸唬鍝�
- BaseCustomerList: a1, //寰�鏉ュ叧绯婚泦鍚�
+ BaseCustomerList: a1, //寰�鏉ュ崟浣嶉泦鍚�
// 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 c1a9e00..2c7da4f 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"
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 2326bd0..3b2507c 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"
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 ebbe17c..f58d380 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
@@ -143,7 +143,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">
--
Gitblit v1.9.3