From 859c8bfd6d84d31b1863cd130be5e7eb52557800 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 31 Jan 2023 16:46:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6--=E4=B9=B0=E6=96=AD=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue | 4 ++++ .../cheliangtaizhang/relation/cheliangtaizhangMai.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue index ad0e58b149..b727f3b149 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue @@ -674,6 +674,10 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择车型' }) return } + if (this.temp.settlementStatusValue !== '' && this.temp.settlementStatusValue === '买断' && this.temp.solidDate === '') { + this.$message({ showClose: true, type: 'error', message: '因买断状态为买断，则买断日期不能为空' }) + return + } this.$refs['dataForm'].validate((valid) => { if (valid) { this.FormLoading = true diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue index 5a047a45b3..4ab20bfbec 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue @@ -104,6 +104,10 @@ export default { // 保存 handleCreate() { this.getUrl() + if (this.temp.solidDate === '') { + this.$message({ showClose: true, message: '买断日期不能为空！', type: 'error' }) + return + } if (this.temp.commonAppendix.length < 1) { this.$message({ showClose: true, From ddcf365872e8c0ca910d71d99aa386539a62d5e9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 31 Jan 2023 16:47:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9--=E4=BD=BF=E7=94=A8=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruiscm/scmwarehouse/scmwarehouseAdd.vue | 59 +++++++------------ 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue index d79364dcff..0779d74c86 100644 --- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue @@ -24,7 +24,7 @@ - + @@ -125,7 +125,6 @@ export default { warehouseGroup_list: [], libTube_list: [], formobj: { - id: '', sid: '', useOrg: '', // 使用组织 useOrgSid: '', // 使用组织sid @@ -137,8 +136,7 @@ export default { warehouseGroupValue: '', warehouseGroupKey: '', libTubeName: '', - libTubeSid: '', - orgPath: '' + libTubeSid: '' }, rules: { useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织 @@ -163,12 +161,12 @@ export default { getUseOrg() { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { if (res.success) { + this.formobj.useOrgSid = res.data // 使用组织sid fetchBySid(res.data).then((resp) => { if (resp.success) { - this.formobj.useOrg = res.data.name // 使用组织 + this.formobj.useOrg = resp.data.name // 使用组织 } }) - this.formobj.useOrgSid = res.data // 使用组织sid } }) }, @@ -186,7 +184,6 @@ export default { console.log('触发下拉框按钮', value) let bb = null this.useOrg_list.forEach((e) => { - // eslint-disable-next-line eqeqeq if (e.name === value) { bb = { name: e.name, @@ -316,20 +313,20 @@ export default { handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') - this.formobj.id = '' - this.formobj.sid = '' // SID - this.formobj.useOrg = '' // 使用组织 - this.useOrgSid = '' // 使用组织sid - this.gressionCode = '' // 编码 - this.formobj.warehouseName = '' // 名称 - this.formobj.warehouseAttribute = '' // 存放地点属性 - this.formobj.warehouseContract = '' // 存放地点负责人 - this.formobj.warehouseContractSid = '' // 存放地点负责人sid - this.formobj.warehouseGroup = '' // 分组 - this.formobj.libTubeSid = '' - this.formobj.libTubeName = '' - this.formobj.orgPath = '' - // this.useOrg_list = [] + this.formobj = { + sid: '', + useOrg: '', // 使用组织 + useOrgSid: '', // 使用组织sid + gressionCode: '', // 编码 + warehouseName: '', // 名称 + warehouseAttribute: '', // 存放地点属性 + warehouseContract: '', // 存放地点负责人 + warehouseContractSid: '', // 存放地点负责人sid + warehouseGroupValue: '', + warehouseGroupKey: '', + libTubeName: '', + libTubeSid: '' + } this.$refs['form_obj'].resetFields() this.$emit('doback') }, @@ -339,7 +336,6 @@ export default { }) this.dialogStatus = 'add' this.viewTitle = '【新增】存放地点' - this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.getUseOrg() this.getType() }, @@ -349,24 +345,13 @@ export default { }) this.dialogStatus = 'edit' this.viewTitle = '【修改】存放地点' - req.fetchBySid(row.sid).then(resp => { - const vdata = resp.data - this.formobj.id = vdata.id - this.formobj.sid = vdata.sid // SID - this.formobj.useOrg = vdata.useOrg // 使用组织 - this.formobj.gressionCode = vdata.gressionCode // 编码 - this.formobj.warehouseName = vdata.warehouseName // 名称 - this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性 - this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人 - this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid - this.formobj.warehouseGroupKey = vdata.warehouseGroupKey // 分组 - this.formobj.warehouseGroupValue = vdata.warehouseGroupValue // 分组 - this.formobj.libTubeName = vdata.libTubeName - this.formobj.libTubeSid = vdata.libTubeSid + req.fetchBySid(row.sid).then((resp) => { + if (resp.success) { + this.formobj = resp.data + } }).catch(e => { this.formobj = row }) - this.getUseOrg() this.getType() }, saveAdd() { From 1442aeceb07bd06be28dd5085a5255bad712cb02 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 31 Jan 2023 16:48:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruzhang/ruzhangguanli/ruzhangguanli.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue index 408f0f490f..c7f29c5030 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue @@ -55,7 +55,11 @@ - + + + @@ -74,6 +78,8 @@ + + @@ -88,6 +94,7 @@ import pageye from '@/components/pagination/pageye' import { getPathSidByUserSid } from '@/api/cheliang/dictcommons' import divAdd from './ruzhangAdd' import divInfo from './ruzhangInfo' +import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo' import { getStorage } from '@/utils/auth' export default { @@ -97,7 +104,8 @@ export default { Pagination, pageye, divAdd, - divInfo + divInfo, + cheliangpaichanInfo }, data() { return { @@ -218,6 +226,10 @@ export default { const sid = row.sid this.$refs['divinfo'].showInfo(sid, row) }, + hangleLook(row) { + this.viewState = 5 + this.$refs['divCaiGouInfo'].showInfo(row.vehicleOrderSid, row) + }, // 查询 dosearch() { this.queryParams.current = 1