diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js index 27e7428dcb..b2803ddb73 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 销售订单代办任务同意办理 +// 销售订单代办任务同意办理 (8.9修改后) export function businessAgree(params) { return request({ url: "/buscenter/v1/bussalesorder/complete", @@ -47,3 +47,20 @@ export function revokeTask(params) { } }) } + +// 销售订单审批流程(同意)获取下一环节 (8.9修改后) +export function getNextNodesForSubmit(params) { + return request({ + url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit', + method: 'get', + params: params + }) +} +// 审批流程(驳回、终止)获取上一环节(8.9修改后) +export function getPreviousNodesForReject(params) { + return request({ + url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject', + method: 'get', + params: params + }) +} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js index 9befda46dd..39e656a779 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js @@ -36,7 +36,7 @@ export function saveOrderForm(data) { }); } -// 编辑、详情初始化 已改 +// 编辑、详情初始化 已改(8.9修改后) export function fetchDetailsBySid(params) { return request({ url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid, @@ -44,7 +44,7 @@ export function fetchDetailsBySid(params) { params: params, }); } -// 销售订单提交接口 +// 销售订单提交接口 (8.9修改后) export function submitOrderForm(params) { return request({ url: "/buscenter/v1/bussalesorder/submit", diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index e990e2df88..693dbf6f7b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -222,6 +222,13 @@ export default { return { btndisabled: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: 'plus', + btnKey: 'toQuickAdd', + btnLabel: '快速新增' + }, { type: 'primary', size: 'small', @@ -345,6 +352,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toQuickAdd': + this.toQuickAdd() + break case 'toAdd': this.toAdd() break @@ -558,6 +568,29 @@ export default { this.sids = aa console.log('sids', this.sids) }, + // 打开快速添加 + toQuickAdd() { + if (this.sids.length === 1) { + this.viewState = 2 + const sid = this.sids[0] + this.$refs['divadd'].showQuickAdd(sid) + } else if (this.sids.length > 1) { + this.$notify({ + title: '提示', + message: '不能选中多个车型进行快速新增操作!', + type: 'info', + duration: 2000 + }) + } else { + this.$notify({ + title: '提示', + message: '没有选择车型进行快速新增操作!', + type: 'error', + duration: 2000 + }) + return + } + }, // 打开添加 toAdd() { this.viewState = 2 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue index a0541762bf..5d6557d444 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue @@ -191,8 +191,7 @@ import { SaveList, selectByOrgSid } from '@/api/cheliang/basevehiclemodel' -import {fetchBySid} from '@/api/cheliang/dictcommons' -import { typeValues } from '@/api/cheliang/dictcommons' +import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons' import Upload from '@/components/uploadFile/uploadImg.vue' export default { @@ -353,7 +352,41 @@ export default { this.setDetaList() this.getChang() }, - + showQuickAdd(sid) { + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) + this.dialogStatus = 'add' + this.stateId = 0 + this.viewTitle = '【新增】常用配置信息' + // 此时数据必须修改才能保存 + const userSid = window.sessionStorage.getItem('userSid') + getAll({ sid: sid, userSid: userSid }).then(resp => { + if (resp.success) { + const data = resp.data + this.temp = data + this.temp = JSON.parse(JSON.stringify(this.temp).replace( + /baseVehicleModelAppendixVos/g, + 'baseVehicleModelAppendixDtos' + ) + ) + this.temp.sid = '' + if (this.temp.baseVehicleModelAppendixDtos.length > 0) { + for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) { + var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/') + this.imgList.push({ + name: imgName[imgName.length - 1], + url: this.temp.baseVehicleModelAppendixDtos[i].filePath + }) + } + console.log('123123', this.imgList) + } + } + }) + this.getPathSid() + this.setDetaList() + this.getChang() + }, showEdit(sid, row) { console.log(sid) console.log('imgList', this.imgList) @@ -426,13 +459,15 @@ export default { }, getUrl() { console.log('已有图片', this.imgList) + var img_file = [] for (var i = 0; i < this.imgList.length; i++) { console.log(this.temp) - this.temp.baseVehicleModelAppendixDtos.push({ + img_file.push({ modelSid: this.temp.sid, filePath: this.imgList[i].url }) } + this.temp.baseVehicleModelAppendixDtos = img_file }, updateUrl() { console.log('回显', this.imgList) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue index 209bb61772..c5af5c683e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue @@ -165,7 +165,12 @@ {{ props.row.specification }} - + + + {{ props.row.rearAxleValue }} + + + {{ props.row.rearAxleRatio }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue index f5f2c92a92..ce20bd58c3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue @@ -166,7 +166,12 @@ {{ scope.row.specification }} - + + + {{ scope.row.rearAxleValue }} + + + {{ scope.row.rearAxleRatio }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue index 824eb60044..08d06163c1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue @@ -170,7 +170,12 @@ {{ scope.row.specification }} - + + + {{ scope.row.rearAxleValue }} + + + {{ scope.row.rearAxleRatio }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue index 49140e223c..8e3fcd6d92 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue @@ -183,7 +183,12 @@ {{ scope.row.specification }} - + + + {{ scope.row.rearAxleValue }} + + + {{ scope.row.rearAxleRatio }} diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue index 71de0afe9e..5c721235d6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue @@ -8,7 +8,7 @@ {{ searchxianshitit }} - + @@ -18,7 +18,7 @@ - + @@ -27,9 +27,14 @@ - + + + + + + 查询 @@ -54,11 +59,16 @@ {{ scope.row.state == '0' ? '未认款' : '已认款' }} - + {{ scope.row.proSchAppNo }} + + + {{ scope.row.applyType }} + + {{ scope.row.paymentMoney }} @@ -110,7 +120,7 @@