From 3dda72317fbcb282981e1dd1b101880eee1057a3 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sat, 11 Mar 2023 16:46:19 +0800 Subject: [PATCH] =?UTF-8?q?2023-3-11=20=E5=95=86=E5=93=81=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=20=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-customer-ui/.env.development | 2 +- .../src/api/portal/Upload.js | 2 +- .../src/api/supervise/commodityFile.js | 72 +-- .../src/api/supervise/supplierbankinfo.js | 16 +- .../commodity/commodityManagementInfo.vue | 52 +- .../commodity/commodityManagementInfoAdd.vue | 357 ++++++++++---- .../commodityManagementInfoDetail.vue | 2 +- .../supplierbankinfo/supplierbankinfo.vue | 443 +++++++++--------- .../supplierbankinfo/supplierbankinfoAdd.vue | 132 ++++-- yxt-portal-ui/.env.development | 2 +- 10 files changed, 622 insertions(+), 458 deletions(-) diff --git a/supervise-customer-ui/.env.development b/supervise-customer-ui/.env.development index 12079d63..c6cc7ac1 100644 --- a/supervise-customer-ui/.env.development +++ b/supervise-customer-ui/.env.development @@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://8.130.39.13:8112" -VUE_APP_URL = "http://192.168.3.9:8112" +VUE_APP_URL = "http://192.168.3.20:8112" diff --git a/supervise-customer-ui/src/api/portal/Upload.js b/supervise-customer-ui/src/api/portal/Upload.js index abee38ed..7a3d36e6 100644 --- a/supervise-customer-ui/src/api/portal/Upload.js +++ b/supervise-customer-ui/src/api/portal/Upload.js @@ -4,7 +4,7 @@ import qs from 'qs' const base = process.env.VUE_APP_URL // 文件上传接口 -export const uploadFile = process.env.VUE_APP_BASE_API + '/file/upload' +export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload' diff --git a/supervise-customer-ui/src/api/supervise/commodityFile.js b/supervise-customer-ui/src/api/supervise/commodityFile.js index 10ee0987..1aad5fec 100644 --- a/supervise-customer-ui/src/api/supervise/commodityFile.js +++ b/supervise-customer-ui/src/api/supervise/commodityFile.js @@ -45,14 +45,14 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 品牌品类 通过sid删除一条或多条记录 + // 类别维护 通过sid删除一条或多条记录 classDelBySids: function(sid) { return request({ url: '/customer/v1/restrictedcategory/delBySid/'+ sid, method: 'delete' }) }, - // 品牌品类 保存品牌品类 + // 类别维护 保存品牌品类 saveClass: function(params) { return request({ url: '/customer/v1/restrictedcategory/save', @@ -61,7 +61,7 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 品牌品类 通过sid查询一条记录 + // 类别维护 通过sid查询一条记录 classFetchBySid: function(sid) { return request({ url: '/customer/v1/restrictedcategory/fetchDetailsBySid/' + sid @@ -69,74 +69,36 @@ export default { }, - - - // 查询分页列表 - listPage: function(params) { + // 商品档案 分页列表 + commodityListPage: function(params) { return request({ - url: '/v1/supplierbankinfo/listPage', + url: '/customer/v1/productinformation/listPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, - // 保存新增记录 - saveOrUpdate: function(params) { - return request({ - url: '/v1/supplierbankinfo/save', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 通过sid删除一条或多条记录 - delBySids: function(params) { - return request({ - url: '/v1/supplierbankinfo/delBySids', - method: 'delete', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 通过sid查询一条记录 - fetchBySid: function(sid) { - return request({ - url: '/v1/supplierbankinfo/fetchDetailsBySid/' + sid - }) - }, - // 关联供应商--验证 - verification: function(params) { + + // 商品档案 保存新增记录 + saveCommodity: function(params) { return request({ - url: '/v1/supplierindex/verification', + url: '/customer/v1/productinformation/save', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, - // 关联供应商--查看详情 - fetchDetailsBySid: function(data) { - return request({ - url: '/v1/supplierindex/fetchDetailsBySid/' + data, - method: 'get' - }) - }, - // 关联供应商--查看详情--保存 - save: function(data) { + // 商品档案 通过sid删除一条或多条记录 + CommoditydelBySids: function(sid) { return request({ - url: '/v1/supplierindex/save', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } + url: '/customer/v1/productinformation/delBySid/'+sid, + method: 'delete' }) }, - - // 保存供应商 - saveSupplier: function(params) { + // 商品档案 通过sid查询一条记录 + CommodityFetchBySid: function(sid) { return request({ - url: '/v1/supplier/saveSupplier', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } + url: '/customer/v1/productinformation/fetchDetailsBySid/' + sid }) }, diff --git a/supervise-customer-ui/src/api/supervise/supplierbankinfo.js b/supervise-customer-ui/src/api/supervise/supplierbankinfo.js index dc1cd19c..b3103d3f 100644 --- a/supervise-customer-ui/src/api/supervise/supplierbankinfo.js +++ b/supervise-customer-ui/src/api/supervise/supplierbankinfo.js @@ -5,7 +5,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/v1/supplierbankinfo/listPage', + url: '/customer/v1/supplierbankinfo/listPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -14,25 +14,23 @@ export default { // 保存新增记录 saveOrUpdate: function(params) { return request({ - url: '/v1/supplierbankinfo/save', + url: '/customer/v1/supplierbankinfo/save', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, // 通过sid删除一条或多条记录 - delBySids: function(params) { + delBySids: function(sid) { return request({ - url: '/v1/supplierbankinfo/delBySids', - method: 'delete', - data: params, - headers: { 'Content-Type': 'application/json' } + url: '/customer/v1/supplierbankinfo/delBySids/'+sid, + method: 'delete' }) }, // 通过sid查询一条记录 fetchBySid: function(sid) { return request({ - url: '/v1/supplierbankinfo/fetchDetailsBySid/' + sid + url: '/customer/v1/supplierbankinfo/fetchDetailsBySid/' + sid }) }, // 关联供应商--验证 @@ -60,7 +58,7 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - + // 保存供应商 saveSupplier: function(params) { return request({ diff --git a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue index beb9c5ac..f6bedcf1 100644 --- a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue +++ b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue @@ -12,12 +12,12 @@ - + - + + - - - - - - - - + + + + + + + + - diff --git a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfoDetail.vue b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfoDetail.vue index c214e91b..96acedbb 100644 --- a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfoDetail.vue +++ b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfoDetail.vue @@ -152,7 +152,7 @@ this.$refs['btnbar'].setButtonList(this.btnList) }, created() { - this.loadList() + // this.loadList() }, methods: { // 搜索条件效果 diff --git a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue index 785ceeb4..1227025f 100644 --- a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue +++ b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue @@ -1,7 +1,7 @@ diff --git a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue index 5ba4c3af..fb7a07c6 100644 --- a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue +++ b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue @@ -94,7 +94,8 @@
合同有效期： - +
签署人： @@ -102,7 +103,8 @@
合同金额： - +
经办人： @@ -227,7 +229,6 @@ contractInfo: { contractNo: "", contractValidity: "", - signingDepartment: "", signatory: "", contractPrice: "", handledBy: "", @@ -240,8 +241,44 @@ }, created() {}, methods: { - handleReturn() { - this.formobj = {} + formatNum(e) { + e.target.value = e.target.value.replace(/[^\d.]/g, '') // 清除“数字”和“.”"-"以外的字符 + e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0 + if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') { + // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 + console.log(e.target.value) + e.target.value = parseFloat(e.target.value) + } + }, + handleReturn(isreload) { + this.active = 0 + this.imgList = [] + this.imgList2 = [] + + if (isreload === 'true') this.$emit('reloadlist') + this.formobj = { + name: "", + codeUnified: "", + contacts: "", + telephone: "", + address: "", + bankName: "", + bankAccount: "", + bankAccountNumber: "", + legalRepresentative: "", + businessLicenseNo: "", + businessLicenseFiles: [], + contractInfo: { + contractNo: "", + contractValidity: "", + signatory: "", + contractPrice: "", + handledBy: "", + signingOrganization: "", + contractFiles: [] + }, + codeIndex: [] + } this.$emit('doback') }, handleClose(done) { @@ -253,28 +290,37 @@ .catch(_ => {}); }, showAdd(row) { - // req.fetchBySid(row.sid).then((resp) => { - // if (resp.success) { - // this.formobj.sid = resp.data.sid - // this.formobj.name = resp.data.name - // this.formobj.codeUnified = resp.data.codeUnified - // this.formobj.contacts = resp.data.contacts - // this.formobj.telephone = resp.data.telephone - // this.formobj.address = resp.data.address - // this.formobj.bankAccount = resp.data.bankAccount - // this.formobj.bankAccountNumber = resp.data.bankAccountNumber - // this.formobj.bankName = resp.data.bankName - // this.formobj.legalRepresentative = resp.data.legalRepresentative - // this.formobj.businessLicenseNo = resp.data.businessLicenseNo - // this.formobj.businessLicenseFiles = resp.data.businessLicenseFiles - // this.formobj.contractFiles = resp.data.contractFiles - // if (resp.data.supplierContractInfoDto !== null) { - // this.formobj.supplierContractInfoDto = resp.data.supplierContractInfoDto - // } - // } - // }).catch(e => { - // this.formobj = row - // }) + + }, + showEdit(row) { + req.fetchBySid(row.sid) + .then(resp => { + if (resp.success) { + console.log("data211111111111112222222222>>>", resp.data) + this.formobj = resp.data + + if (this.formobj.businessLicenseFiles.length > 0) + for (var i = 0; i < this.formobj.businessLicenseFiles.length; i++) { + this.imgList.push({ + name: "", + url: this.formobj.businessLicenseFiles[i] + }) + } + + if (this.formobj.contractInfo.contractFiles.length > 0) + for (var j = 0; j < this.formobj.contractInfo.contractFiles.length; j++) { + this.imgList2.push({ + name: "", + url: this.formobj.contractInfo.contractFiles[j] + }) + } + + } + + }) + .catch(e => { + this.formobj = row + }) }, prev() { @@ -303,18 +349,26 @@ this.inputText ) this.inputText = "" + console.log("codeIndex>>>", this.formobj.codeIndex) }, submit() { - req.saveSupplier(this.formobj) - .then(resp => { - this.submitdisabled = false - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: resp.msg }) - this.handleReturn() - } else { - // 根据resp.code进行异常情况处理 - } - }) + + console.log("data>>>", this.formobj) + + req.saveOrUpdate(this.formobj) + .then(resp => { + this.submitdisabled = false + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn("true") + } else { + // 根据resp.code进行异常情况处理 + } + }) }, backData(value) { console.log(value, 999) @@ -382,11 +436,11 @@ margin-bottom: 50px; .stepsLay_top { - width: 70%; + width: 75%; } .box-card { - min-width: 70%; + min-width: 75%; margin-top: 20px; .item { diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development index 0777e64e..8e04a50e 100644 --- a/yxt-portal-ui/.env.development +++ b/yxt-portal-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.3.9:8112" +VUE_APP_URL = "http://192.168.3.20:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"