From 09542900534645e28c23f16caa94aa8a2c20cc5b Mon Sep 17 00:00:00 2001 From: payne <bzrlw2012@163.com> Date: 周五, 03 5月 2024 16:10:02 +0800 Subject: [PATCH] 往来单位助记码功能调整为 中文名称输入立即调用接口实现 --- iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/ChineseSpell/MnemonicCodeUtil.cs | 4 + iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 34 ++++++++--- iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsUnit/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 51 ++++++++++++++++- iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 6 +- iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 6 +- iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 4 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue | 4 12 files changed, 97 insertions(+), 32 deletions(-) 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 ba76139..8b6f3b9 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue @@ -5,6 +5,8 @@ <a-form :form="form"> <a-form-item label="涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" + + @input="custChinaNameChange" v-decorator="['custChinaName', { rules: [{ required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉帮紒' }] }]" /> </a-form-item> <a-form-item label="鑻辨枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> @@ -13,7 +15,8 @@ <a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <!-- <a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" /> --> - <a-input-search :disabled="disabled" placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" @search="onSearch" /> + <!-- <a-input-search :disabled="disabled" placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" @search="onSearch" /> --> + <a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode', { rules: [{ required: true, message: '璇疯緭鍏ュ姪璁扮爜锛�' }] }]" /> </a-form-item> <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol"> @@ -87,14 +90,26 @@ const custTypeOption = this.$options this.custTypeData = custTypeOption.filters['dictData']('base_customer_type') }, - onSearch() { - let mnemonicCode = this.form.getFieldValue('mnemonicCode'); - if (!mnemonicCode) { - this.$message.warning("璇疯緭鍏ュ姪璁扮爜") + /*涓枃鍚嶇О鍊兼敼鍙樿皟鐢ㄧ殑鏂规硶*/ + custChinaNameChange(){ + let custChinaNameValue = this.form.getFieldValue('custChinaName'); + console.log(typeof custChinaNameValue) + console.log("custChinaNameValue:"+custChinaNameValue); + if(!custChinaNameValue){ + this.form.setFieldsValue({ + mnemonicCode: '' + }) return } + if (custChinaNameValue!=undefined&&!custChinaNameValue.trim().length) { + this.form.setFieldsValue({ + mnemonicCode: '' + }) + return + } + /*璋冪敤鑾峰彇鍔╄鐮佹帴鍙�*/ BaseZjmList({ - 'name': mnemonicCode + 'name': custChinaNameValue }).then((res) => { if (res.success) { if (res.data) { @@ -104,18 +119,19 @@ mnemonicCode: this.zjCode }) } else { - this.$message.warning("鍔╄鐮佺敓鎴愬け璐�") + // this.$message.warning("鍔╄鐮佺敓鎴愬け璐�") this.form.setFieldsValue({ mnemonicCode: '' }) } } else { - this.$message.error('鏂板澶辫触锛�' + JSON.stringify(res.message)) + this.$message.error('鍔╄鐮佺敓鎴愬け璐�:' + JSON.stringify(res.message)) } }).finally((res) => { this.confirmLoading = false }) }, + /** * 鎻愪氦琛ㄥ崟 */ @@ -130,7 +146,7 @@ } } if (values.mnemonicCode && !this.zjCode) { - this.$message.warning("璇风偣鍑绘悳绱㈠姪璁扮爜锛�") + this.$message.warning("鍔╄鐮佷笉鑳戒负绌猴紒") return } this.confirmLoading = true 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 7b6e0c9..5aaa967 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue @@ -9,13 +9,17 @@ <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-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" + @input="custChinaNameChange" + 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> <a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> - <a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" /> + <!-- <a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" /> --> + <a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode', { rules: [{ required: true, message: '璇疯緭鍏ュ姪璁扮爜锛�' }] }]" /> + </a-form-item> <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['custType', {rules: [{ required: true, message: '璇烽�夋嫨绫诲瀷锛�' }]}]"> @@ -55,7 +59,7 @@ <script> import moment from 'moment' import { - BaseCustomerEdit + BaseCustomerEdit, BaseZjmList } from '@/api/modular/main/WmsBase/BaseCustomerManage' export default { data () { @@ -142,7 +146,48 @@ handleCancel () { this.form.resetFields() this.visible = false + }, + /*涓枃鍚嶇О鍊兼敼鍙樿皟鐢ㄧ殑鏂规硶*/ + custChinaNameChange(){ + let custChinaNameValue = this.form.getFieldValue('custChinaName'); + console.log(typeof custChinaNameValue) + console.log("custChinaNameValue:"+custChinaNameValue); + if(!custChinaNameValue){ + this.form.setFieldsValue({ + mnemonicCode: '' + }) + return } + if (custChinaNameValue!=undefined&&!custChinaNameValue.trim().length) { + this.form.setFieldsValue({ + mnemonicCode: '' + }) + return + } + /*璋冪敤鑾峰彇鍔╄鐮佹帴鍙�*/ + BaseZjmList({ + 'name': custChinaNameValue + }).then((res) => { + if (res.success) { + if (res.data) { + this.zjCode = res.data || ''; + this.disabled = true; + this.form.setFieldsValue({ + mnemonicCode: this.zjCode + }) + } else { + // this.$message.warning("鍔╄鐮佺敓鎴愬け璐�") + this.form.setFieldsValue({ + mnemonicCode: '' + }) + } + } else { + this.$message.error('鍔╄鐮佺敓鎴愬け璐�:' + JSON.stringify(res.message)) + } + }).finally((res) => { + this.confirmLoading = false + }) + } } } </script> 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 8f6fb61..7a6dc47 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue @@ -77,13 +77,13 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> 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 2c60278..b6c0a0f 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue @@ -25,9 +25,9 @@ <a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%" v-decorator="['areaStatus', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒' }] }]" /> </a-form-item> --> - <a-form-item label="搴撳瓨鍦扮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> - <a-input placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜" - v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱瀛樺湴缂栫爜锛�' }] }]" /> + <a-form-item label="ERP搴撳瓨鍦�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> + <a-input placeholder="璇疯緭鍏RP搴撳瓨鍦�" + v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP搴撳瓨鍦帮紒' }] }]" /> </a-form-item> <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�" 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 01e9116..b313e4d 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue @@ -25,9 +25,9 @@ <a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%" v-decorator="['areaStatus', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒' }] }]" /> </a-form-item> --> - <a-form-item label="搴撳瓨鍦扮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> - <a-input placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜" - v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱瀛樺湴缂栫爜锛�' }] }]" /> + <a-form-item label="ERP搴撳瓨鍦�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> + <a-input placeholder="璇疯緭鍏RP搴撳瓨鍦�" + v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP搴撳瓨鍦帮紒' }] }]" /> </a-form-item> <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�" diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue index 80f1dba..095df95 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue @@ -97,7 +97,7 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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')] @@ -106,7 +106,7 @@ format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" /> </a-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> 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 0d7529f..342749d 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue @@ -64,13 +64,13 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> 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 85f5f15..180a821 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterialCustomer/index.vue @@ -43,13 +43,13 @@ </a-col> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue index 46bd705..b42bd19 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsSubstituteGood/index.vue @@ -45,13 +45,13 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsUnit/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsUnit/index.vue index 0019b37..3a26072 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsUnit/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsUnit/index.vue @@ -31,13 +31,13 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue index 1bf2c64..f41da14 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue @@ -69,13 +69,13 @@ <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> - <a-col :md="8" :sm="24"> + <!-- <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-form-item> - </a-col> + </a-col> --> <!--骞存湀鏃ユ椂鍒嗙--> <!--鏃堕棿鑼冨洿--> diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/ChineseSpell/MnemonicCodeUtil.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/ChineseSpell/MnemonicCodeUtil.cs index 2d6ef48..861d235 100644 --- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/ChineseSpell/MnemonicCodeUtil.cs +++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/ChineseSpell/MnemonicCodeUtil.cs @@ -155,6 +155,10 @@ /// <returns></returns> public static string funChineseSpell(string strChinese, bool IsName) { + if (string.IsNullOrWhiteSpace(strChinese)) + { + return string.Empty; + } string strSpell, strThis; int i, numCount, numIndex; char[] chrWord; -- Gitblit v1.9.3