From f757239baac505b261faebccd4d6103e5ca007a7 Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Sat, 14 May 2022 15:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseoutsourcingapplication.vue | 97 ++-- .../baseoutsourcingapplicationAdd.vue | 268 ++++++++--- .../baseoutsourcingapplicationInfo.vue | 140 +++--- .../baseoutsourcingapplicationvehicle.vue | 241 +++------- .../workflow/baseoutsourcingapplication.vue | 207 ++++++++ .../baseoutsourcingapplicationAdd.vue | 453 ++++++++++++++++++ .../baseoutsourcingapplicationInfo.vue | 192 ++++++++ 7 files changed, 1248 insertions(+), 350 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue index e05e214593..b6461f2168 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue @@ -6,18 +6,15 @@ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }} - - + + + + 确 定 + + + + + + + 确 定 + + + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue index a52a2cb91b..1ffe9b6952 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue @@ -10,81 +10,68 @@
- -
外采申请表
+
外采申请表
- 申请编号 - {{ formobj.applicationCode }} + 申请编号 + + {{ formobj.applicationCode }} + 申请人姓名 + {{ formobj.createByName }} + 申请日期 + {{ formobj.applicationDate }} - - 申请人姓名 - {{ formobj.createByName }} - - - 申请日期 - {{ formobj.applicationDate }} - - - 外采类型key - {{ formobj.externalMiningTypeKey }} - - - 外采类型value - {{ formobj.externalMiningTypeValue }} - - - 采购单位sid - {{ formobj.purchasingUnitSid }} - - - 采购单位名称 - {{ formobj.purchasingUnitName }} - - - 车型sid - {{ formobj.modelSid }} - - - 车型名称 - {{ formobj.modelName }} + + 外采类型 + + + 政策外采 + 直接外采 + - 常用配置名称 - {{ formobj.configName }} + 采购单位名称 + {{ formobj.purchasingUnitName }} - 采购价格 - {{ formobj.purchasePrice }} + 车型名称 + {{ formobj.modelName }} + 常用配置名称 + {{ formobj.configName }} + + 采购价格 + {{ formobj.purchasePrice }} + 销售指导价 {{ formobj.guidedPrice }} - - - 厂家合同价 - {{ formobj.manufactorSettlementPrice }} - - + + 厂家合同价 + {{ formobj.manufactorSettlementPrice }} + 台数 {{ formobj.num }} - - - 订金 - {{ formobj.deposit }} - - + + 订金 + {{ formobj.deposit }} + 费用名称 {{ formobj.expenseName }} - - - 费用金额合计 - {{ formobj.totalExpenseAmount }} - - - 部门sid - {{ formobj.orgSid }} - + + 费用金额合计 + {{ formobj.totalExpenseAmount }} + +
+
+ 车辆列表 +
+ ‘ + + + +
+
@@ -95,22 +82,44 @@ export default { name: 'BaseOutsourcingApplicationInfo', data() { return { - formobj: {} + formobj: { + sid: '', + applicationCode: '123456', // 申请编号 + createByName: window.sessionStorage.getItem('name'), // 申请人姓名 + applicationDate: '', // 申请日期 + externalMiningTypeKey: '1', // 外采类型key + externalMiningTypeValue: '', // 外采类型value + purchasingUnitName: '', // 采购单位名称 + modelSid: '', // 车型sid + modelName: '', // 车型名称 + configName: '', // 常用配置名称 + configSid: '', // 常用配置sid + purchasePrice: '', // 采购价格 + guidedPrice: '', // 销售指导价 + manufactorSettlementPrice: '', // 厂家合同价 + num: '0', // 台数 + deposit: '', // 订金 + expenseName: '', // 费用名称 + totalExpenseAmount: '', // 费用金额合计 + orgSid: '', // 部门sid + baseOutsourcingApplicationVehicleDtos:[] + } } }, methods: { handleReturn() { - this.formobj = {} this.$emit('doback') }, showInfo(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + const _this = this req .fetchBySid(row.sid) .then(resp => { if (resp.success) { const vdata = resp.data - _this.formobj.id = vdata.id - _this.formobj.sid = vdata.sid // SID _this.formobj.applicationCode = vdata.applicationCode // 申请编号 _this.formobj.createByName = vdata.createByName // 申请人姓名 _this.formobj.applicationDate = vdata.applicationDate // 申请日期 @@ -122,13 +131,14 @@ export default { _this.formobj.modelName = vdata.modelName // 车型名称 _this.formobj.configName = vdata.configName // 常用配置名称 _this.formobj.purchasePrice = vdata.purchasePrice // 采购价格 - _this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价 + _this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价 _this.formobj.manufactorSettlementPrice = vdata.manufactorSettlementPrice // 厂家合同价 _this.formobj.num = vdata.num // 台数 _this.formobj.deposit = vdata.deposit // 订金 _this.formobj.expenseName = vdata.expenseName // 费用名称 _this.formobj.totalExpenseAmount = vdata.totalExpenseAmount // 费用金额合计 _this.formobj.orgSid = vdata.orgSid // 部门sid + _this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos } }) .catch(e => { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue index 84487dc6af..21d3db8f41 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue @@ -1,12 +1,10 @@ @@ -66,31 +74,47 @@ import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplicationvehi import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' -import divAdd from './baseoutsourcingapplicationvehicleAdd' -import divInfo from './baseoutsourcingapplicationvehicleInfo' export default { name: 'BaseOutsourcingApplicationVehicleIndex', components: { ButtonBar, Pagination, - pageye, - divAdd, - divInfo + pageye }, + props:{ + selectedSids:{ + type:String, + required:true + }, + modelSid:{ + type:String, + required:true + }, + configSid:{ + type:String, + required:true + } + }, data() { return { btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 - isSearchShow: true, + isSearchShow: false, tableLoading: false, dataList: [], + list: [], + tableKey:0, + listLoading: false, + sids: [], queryParams: { current: 1, size: 10, total: 0, params: { - sids: [], // 用于导出的时候保存已选择SID + modelSid:"", + configSid:"", + vehicleSid: "", // 用于导出的时候保存已选择SID outAppSid: '', // 外采申请单sid VIN: '' // 车架号 } @@ -102,159 +126,28 @@ export default { this.loadList() }, methods: { + getSids(){ + return this.multipleSelection; + }, resetState() { this.viewState = 1 }, - btnHandle(btnKey) { - switch (btnKey) { - case 'toAdd': - this.toAdd() - break - case 'toEdit': - this.toEdit() - break - case 'doSubmit': - this.doSubmit() - break - case 'doDel': - this.doDel() - break - case 'doImport': - this.doImport() - break - case 'doExport': - this.doExport() - break - default: - break - } - }, - toAdd(row) { - this.viewState = 2 - this.$refs['divadd'].showAdd() - }, - toEdit() { - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) - return - } - if (this.multipleSelection.length > 1) { - this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' }) - return - } - this.viewState = 3 - const row = this.multipleSelection[0] - this.$refs['divadd'].showEdit(row) - }, - doSubmit(row) { - // 提交的代码 - this.btndisabled = true - req - .doSubmit(this.queryParams.params) - .then(resp => { - console.log(resp) - this.btndisabled = false - if (resp.success) { - // 加提交后的逻辑 - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => { - this.btndisabled = false - }) - }, - doDel(row) { - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) - return - } - const _this = this - const sids = [] - this.multipleSelection.forEach(row => { - sids.push(row.sid) - }) - const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - req - .delBySids(sids) - .then(resp => { - loading.close() - if (resp.success) { - _this.$message({ type: 'success', message: resp.msg, showClose: true }) - _this.loadList() - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(e => { - loading.close() - }) - }) - .catch(() => {}) - }, - doImport(row) { - // 导入的代码 - req - .importExcel(this.queryParams.params) - .then(resp => { - if (resp.success) { - console.log(resp) - } - }) - .catch(() => {}) - }, - doExport(row) { - // 导出的代码 - const sids = [] - this.multipleSelection.forEach(row => { - sids.push(row.sid) - }) - this.queryParams.params.sids = sids - req - .exportExcel(this.queryParams.params) - .then(resp => { - if (resp.success) { - var map = resp.data - const fileName = map.filename // 导出文件名 - // // 对于标签,只有 Firefox 和 Chrome(内核) 支持 download 属性 - // // IE10以上支持blob但是依然不支持download - const link = document.createElement('a') // 创建a标签 - link.download = fileName // a标签添加属性 - link.style.display = 'none' - link.href = map.downurl - document.body.appendChild(link) - link.click() // 执行下载 - URL.revokeObjectURL(link.href) // 释放url - document.body.removeChild(link) // 释放标签 - } - }) - .catch(() => {}) - }, dosearch() { this.queryParams.current = 1 this.loadList() }, resetQuery() { - this.queryParams.params = {} - this.queryParams.params.sid = '' // sid - this.queryParams.params.name = '' // 登录名 + this.queryParams.params.vehicleSid = '' + this.queryParams.params.modelSid = '' + this.queryParams.params.configSid = '' this.dosearch() }, loadList() { const _this = this this.tableLoading = true + this.queryParams.params.vehicleSid = this.selectedSids + this.queryParams.params.modelSid = this.modelSid + this.queryParams.params.configSid = this.configSid req .listPage(this.queryParams) .then(resp => { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue new file mode 100644 index 0000000000..93bf81ba1b --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue new file mode 100644 index 0000000000..f8d27104e9 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue @@ -0,0 +1,453 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue new file mode 100644 index 0000000000..fedfe2c636 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue @@ -0,0 +1,192 @@ + + + + +