diff --git a/.env.prod b/.env.prod index c578e08..81d84ad 100644 --- a/.env.prod +++ b/.env.prod @@ -1,5 +1,6 @@ NODE_ENV=prod VUE_APP_API_BASE_URL=https://lcapi.midea.com/api-iems-cn/gcs +VUE_APP_API_BASE_DOMAIN=https://lcapi.midea.com VUE_APP_API_BASE_SITE=https://lcapi.midea.com/api-iems-cn/gcs VUE_APP_CAS_BASE_URL=https://signin.midea.com/login VUE_APP_ONLINE_BASE_URL= diff --git a/.env.production b/.env.production index 390a4e7..c266333 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ NODE_ENV=production VUE_APP_API_BASE_URL=https://lcapi.midea.com/api-iems-cn/gcs +VUE_APP_API_BASE_DOMAIN=https://lcapi.midea.com VUE_APP_API_BASE_SITE=https://lcapi.midea.com/api-iems-cn/gcs VUE_APP_CAS_BASE_URL=https://signin.midea.com/login VUE_APP_ONLINE_BASE_URL= diff --git a/.env.sit b/.env.sit index 57170b4..5abc9a7 100644 --- a/.env.sit +++ b/.env.sit @@ -1,5 +1,6 @@ NODE_ENV=sit VUE_APP_API_BASE_URL=https://lsitapi.midea.com/api-iems-cn/gcs +VUE_APP_API_BASE_DOMAIN=https://lsitapi.midea.com VUE_APP_API_BASE_SITE=http://localhost:9000 VUE_APP_CAS_BASE_URL=https://signinuat.midea.com/login VUE_APP_ONLINE_BASE_URL= diff --git a/.env.uat b/.env.uat index 2075e5a..d16e9f6 100644 --- a/.env.uat +++ b/.env.uat @@ -1,5 +1,6 @@ NODE_ENV=uat VUE_APP_API_BASE_URL=https://luatapi.midea.com/api-iems-cn/gcs +VUE_APP_API_BASE_DOMAIN=https://luatapi.midea.com VUE_APP_API_BASE_SITE=http://localhost:9000 VUE_APP_CAS_BASE_URL=https://signinuat.midea.com/login VUE_APP_ONLINE_BASE_URL= diff --git a/.env.ver b/.env.ver index df80897..5987d40 100644 --- a/.env.ver +++ b/.env.ver @@ -1,5 +1,6 @@ NODE_ENV=ver VUE_APP_API_BASE_URL=https://lverapi.midea.com/api-iems-cn/gcs +VUE_APP_API_BASE_DOMAIN=https://lverapi.midea.com VUE_APP_API_BASE_SITE=http://localhost:9000 VUE_APP_CAS_BASE_URL=https://signinuat.midea.com/login VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/src/views/excel/ExcelExportTaskList.vue b/src/views/excel/ExcelExportTaskList.vue index 307f30d..50312ef 100644 --- a/src/views/excel/ExcelExportTaskList.vue +++ b/src/views/excel/ExcelExportTaskList.vue @@ -60,8 +60,6 @@ 批量操作 --> - - 导出执行 @@ -106,7 +104,6 @@ import { JeecgListMixin, WGridResizeByCssMixin } from '@/mixins/JeecgListMixin' import { mixinDevice } from '@/utils/mixin' -import { getAction } from '@/api/manage' import ExcelExportModel from './modules/ExcelExportModel.vue' export default { name: 'ExcelExportTaskList', @@ -257,7 +254,6 @@ export default { delete: '/sys/excel/export/task/delete', deleteBatch: '/sys/excel/export/task/deleteBatch', downloadUrl: '/sys/excel/download', - executeExportTask: '/sys/excel/export/task/executeExportTask', }, dictOptions: {}, superFieldList: [], @@ -290,16 +286,6 @@ export default { this.createTime = [] this.searchReset() }, - execute() { - getAction(this.url.executeExportTask).then((res) => { - if (res.success) { - this.$message.success('导出执行成功') - this.loadData(1) - } else { - this.$message.warning(res.message) - } - }) - }, }, } diff --git a/src/views/excel/ExcelImportTaskList.vue b/src/views/excel/ExcelImportTaskList.vue index 9bee12f..085939d 100644 --- a/src/views/excel/ExcelImportTaskList.vue +++ b/src/views/excel/ExcelImportTaskList.vue @@ -43,7 +43,6 @@
- 导入执行
@@ -94,7 +93,6 @@ import { JeecgListMixin, WGridResizeByCssMixin } from '@/mixins/JeecgListMixin' import { mixinDevice } from '@/utils/mixin' import ExcelImportTaskModal from './modules/ExcelImportTaskModal' -import { getAction } from '@/api/manage' export default { name: 'ExcelImportTaskList', @@ -255,7 +253,6 @@ export default { exportXlsUrl: '/sys/excel/import/task/exportXls', importExcelUrl: '/sys/excel/import/task/importExcel', downloadUrl: '/sys/excel/download', - executeImportTask: '/sys/excel/import/task/executeImportTask', }, dictOptions: {}, superFieldList: [], @@ -288,16 +285,6 @@ export default { this.createTime = [] this.searchReset() }, - execute() { - getAction(this.url.executeImportTask).then((res) => { - if (res.success) { - this.$message.success('导入执行成功') - this.loadData(1) - } else { - this.$message.warning(res.message) - } - }) - }, }, } diff --git a/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue b/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue index d06f435..f1475e8 100644 --- a/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue +++ b/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue @@ -18,6 +18,14 @@ 重置 + + + + + + diff --git a/src/views/merger/mergeredConfig/productClassify/modules/MergerGoodsForm.vue b/src/views/merger/mergeredConfig/productClassify/modules/MergerGoodsForm.vue index 99ec6c7..ad521ac 100644 --- a/src/views/merger/mergeredConfig/productClassify/modules/MergerGoodsForm.vue +++ b/src/views/merger/mergeredConfig/productClassify/modules/MergerGoodsForm.vue @@ -161,7 +161,7 @@
{{ model.country + '-' + model.countryName }}
- + @@ -396,6 +396,7 @@ > + + +
+ +
+ +
+
+ + + @@ -559,6 +574,7 @@ + @@ -576,10 +592,12 @@ import CNattachmentCode from './CNattachmentCode'; import CNregulatoryConditions from './CNregulatoryConditions'; import CNtaxrateDesc from './CNtaxrateDesc'; import ApprovalProgressTemplate from '@/components/ApprovalProgressTemplate/index'; +import additionCodeDialog from './additionCodeDialog'; export default { name: 'MideaMergerGoodsForm', components: { + additionCodeDialog, WorkflowList, ModifyRecord, devClassify, @@ -624,6 +642,7 @@ export default { }, confirmLoading: false, validatorRules: { + additionalCode: [{ required: true, message: '请选择附加编码!', trigger: 'blur' }], hsCode: [{ required: true, message: '请输入HSCode!', trigger: 'blur' }], gname: [{ required: true, message: '请输入商品名称!', trigger: 'blur' }], }, @@ -694,6 +713,10 @@ export default { formDisabled() { return this.disabled; }, + showAdditionCode() { + // 国家为泰国才展示附加编码 + return this.model.country && this.model.country === 'TH'; + }, controlMaQuanType() { if (this.model.controlMa && this.model.quanType) { return this.model.controlMa + ',' + this.model.quanType; @@ -711,6 +734,13 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { + showAdditionCodeHandle() { + this.$refs.additionCodeDialogRef.show({ data: this.model }); + }, + confirmAdditionCode(data) { + this.model.additionalCode = data.additionalCode; + this.getOtherCountry(); + }, timestampToDate(timestamp) { if (!timestamp) { return ''; @@ -733,7 +763,7 @@ export default { return; // 直接return，不执行后续代码 } } else if (!['GC', 'CN'].includes(this.model.country)) { - if (this.model.hsCode.length < 6) { + if (this.model.hsCode && this.model.hsCode.length < 6) { this.$message.error('国家为海外时，HSCode必须大于等于6位'); return; // 直接return，不执行后续代码 } @@ -783,7 +813,7 @@ export default { id: this.model.id, }); if (resp.success) { - if (this.model.country === 'ID') { + if (this.model.country === 'ID' || this.model.country === 'TH') { this.SubmitValid(); } else { this.$refs.ApprovalProgressTemplate.show({ @@ -820,11 +850,15 @@ export default { } }, async auditFlow() { - if (this.model.country === 'ID') { - const valid = await getAction(this.url.regulationValid, { + if (this.model.country === 'ID' || this.model.country === 'TH') { + const data = { countryCode: this.model.country, - hscode: this.model.hsCode, - }); + hscode: this.model.hsCode + }; + if ( this.model.country === 'TH' ) { + data.additionalCode = this.model.additionalCode; + } + const valid = await getAction(this.url.regulationValid, data); if (valid.success) { this.$refs.ApprovalProgressTemplate.show({ id: this.model.id, @@ -888,6 +922,9 @@ export default { flag: this.flag, }); } + if (this.model.country === 'TH' && value) { + this.initAdditionalCode(); + } }, filterOption(input, option) { return option.componentOptions.children[0].text.indexOf(input) !== -1; @@ -895,10 +932,20 @@ export default { closeModal(record) { if (record) { this.model.hsCode = record.codeTS || record.hscode; + if (this.model.country === 'TH') { + this.initAdditionalCode(); + } this.queryByIdHscode('enter'); } this.CNhSCodeModalShow = false; }, + initAdditionalCode(){ + this.model.additionalCode = ''; + this.regulatoryConditionsDataSource = []; + if (this.activeKeyBottom === 'regulatoryConditions') { + this.$refs.CNregulatoryConditions.show(this.regulatoryConditionsDataSource); + } + }, // 展示HSCode showHsCode() { if (this.formDisabled) { @@ -1087,6 +1134,7 @@ export default { const resp = await getAction(this.url.hscodDetail, { hscode: this.model.hsCode, countryCode: this.model.country, + additionalCode: this.model.country === 'TH' ? this.model.additionalCode : undefined }); if (resp.success) { const result = JSON.parse(resp.result); @@ -1251,6 +1299,8 @@ export default { } } }); + } else { + that.$message.warning('请检查必填项'); } }); }, @@ -1358,10 +1408,14 @@ export default { }); }, async SubmitValid() { - const valid = await getAction(this.url.regulationValid, { + const data = { countryCode: this.model.country, - hscode: this.model.hsCode, - }); + hscode: this.model.hsCode + }; + if ( this.model.country === 'TH' ) { + data.additionalCode = this.model.additionalCode; + } + const valid = await getAction(this.url.regulationValid, data); if (valid.success) { this.$refs.ApprovalProgressTemplate.show({ id: this.model.id, @@ -1435,7 +1489,15 @@ export default { } } } - +.merger-good-form-box { + .plus-box { + width: 26px; + height: 26px; + background-color: #0f69ff; + line-height: 26px; + text-align: center; + } +} /deep/ .md-form-item__label { width: 120px; } diff --git a/src/views/merger/mergeredConfig/productClassify/modules/additionCode.js b/src/views/merger/mergeredConfig/productClassify/modules/additionCode.js new file mode 100644 index 0000000..17f2162 --- /dev/null +++ b/src/views/merger/mergeredConfig/productClassify/modules/additionCode.js @@ -0,0 +1,42 @@ +export default { + searchFields: [ + { + name: '附加编码', + value: 'additionalCode', + type: 'input', + isFixed: true, + span: 3 + }, + { + name: '语言类别', + value: 'cultureCode', + type: 'select', + optionsKey: 'GLOBAL_TARIFF_LANGUAGE_TYPE', + isFixed: true, + span: 3 + } + ], + columns:[ + { + label: '附加编码', + prop: 'additionalCode', + 'width': 130, + }, + { + label: '附加编码类型', + prop: 'additionalCodeType', + 'width': 130, + }, + { + label: '附加编码说明', + prop: 'codeDescription', + 'min-width': 160, + }, + { + label: '语言类别', + prop: 'cultureCode', + 'width': 130, + }, + ] + +} \ No newline at end of file diff --git a/src/views/merger/mergeredConfig/productClassify/modules/additionCodeDialog.vue b/src/views/merger/mergeredConfig/productClassify/modules/additionCodeDialog.vue new file mode 100644 index 0000000..38e701a --- /dev/null +++ b/src/views/merger/mergeredConfig/productClassify/modules/additionCodeDialog.vue @@ -0,0 +1,158 @@ + + + \ No newline at end of file diff --git a/test.log b/test.log deleted file mode 100644 index 3c5424b..0000000 --- a/test.log +++ /dev/null @@ -1,6 +0,0 @@ -1dddssssdf -sa -df -asg -asggs -