diff --git a/sgzb-ui/src/api/cost/cost.js b/sgzb-ui/src/api/cost/cost.js index d093128c..1ff8f389 100644 --- a/sgzb-ui/src/api/cost/cost.js +++ b/sgzb-ui/src/api/cost/cost.js @@ -11,11 +11,11 @@ export function getSltAgreementInfo(query) { // 查询费用结算申请详情 -export function getSltInfo(query) { +export function getSltInfo(params){ return request({ url: '/material/sltAgreementInfo/getSltInfo', - method: 'get', - params: query + method: 'post', + data: params }) } @@ -37,4 +37,3 @@ export function getSltInfo(query) { - diff --git a/sgzb-ui/src/api/login.js b/sgzb-ui/src/api/login.js index 60e8791f..eab46307 100644 --- a/sgzb-ui/src/api/login.js +++ b/sgzb-ui/src/api/login.js @@ -87,7 +87,7 @@ export function checkCode(data) { -//南网机具认证中心登录 +//南网机具认证中心登录1 export function SsoLogin(data) { return request({ url: '/auth/onlineApprove', @@ -100,4 +100,17 @@ export function SsoLogin(data) { } +//南网机具认证中心登录2 +export function loginByMall(data) { + return request({ + url: '/auth/loginByMall', + headers: { + isToken: false + }, + method: 'post', + data: data + }) +} + + diff --git a/sgzb-ui/src/store/modules/user.js b/sgzb-ui/src/store/modules/user.js index b1f0aaaa..7f8e9270 100644 --- a/sgzb-ui/src/store/modules/user.js +++ b/sgzb-ui/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logout, getInfo, refreshToken,checkCode,SsoLogin } from '@/api/login' +import { login, logout, getInfo, refreshToken,checkCode,loginByMall } from '@/api/login' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' import { Notification, MessageBox, Message, Loading } from 'element-ui' const user = { @@ -55,7 +55,7 @@ const user = { }) }) }, - // 验证码 登录 + // 短信验证码 登录 textLogin({ commit }, userInfo) { console.log(userInfo) let params = { @@ -78,20 +78,20 @@ const user = { }) }) }, - + //机具租赁平台跳转登录---南网 ssoLogin({ commit }, param) { return new Promise((resolve, reject) => { - SsoLogin(param).then(res => { + loginByMall(param).then(res => { console.log(res) let data = res.data if(res.code==200){ - console.log('登录成功1111111') + // console.log('登录成功1111111') setToken(data.access_token) commit('SET_TOKEN', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) }else{ - console.log('登录失败22222222') + // console.log('登录失败22222222') this.$modal.msgError('登录失败'); } resolve() diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue index 388fdc47..57424132 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue @@ -8,7 +8,7 @@ 维修明细导出 报废明细导出 全部明细导出 - 提交 + 提交 返回 @@ -20,107 +20,117 @@
- + - - - - - - - - - - - - + + + + + + + + + + + + -
租赁费用小计：97010.08
- + - - - - - - - + + + + + + + + + + + -
维修费用小计：230
- + - - - - - - - - + + + + + + + + + + -
报废费用小计：230
- + - - - - - - - + + + + + + + -
丢失费用小计：230
+ + +
+ + + + + + + + + + + + + + +
+
+ 取 消 + 确 定 +
+ + + + @@ -205,11 +215,19 @@ { required: true, message: "通知内容不能为空", trigger: "blur" } ] }, + leaseList:[],//租赁费用列表 + repairList:[],//维修费用列表 + scrapList:[],//报废费用列表 + loseList:[],//丢失费用列表 deptName: undefined, + applyVisible:false, + applyList:[] }; }, created() { - this.getList(); + this.rowData = this.$route.query.rowData; + console.log(this.rowData) + this.getDataAll(); // this.getUnitList(); // this.getProjectList(); @@ -227,16 +245,28 @@ }) }, - /** 查询字典类型列表 */ - getList() { + /** 查询列表 */ + getDataAll() { this.loading = true; - getAgreementList(this.queryParams).then(response => { - this.agreementList = response.rows; - this.total = response.total; + getSltInfo(this.rowData).then(response => { + // this.agreementList = response.rows; + this.leaseList = response.data.leaseList;//租赁费用列表 + + this.repairList = response.data.repairList;//维修费用列表 + + this.scrapList = response.data.scrapList;//报废费用列表 + + this.loseList = response.data.loseList;//丢失费用列表 + this.loading = false; } ); }, + // + handleAdd() { + this.applyVisible = true + }, + //返回 handleBack(){ this.$tab.closeOpenPage({ path:'/cost/cost/costApplyList', @@ -251,20 +281,6 @@ this.single = selection.length!=1 this.multiple = !selection.length }, - - /** 删除按钮操作 */ - handleDelete(row) { - // const agreementId = row.agreementId; - // let param = { - // agreementId:row.agreementId+'' - // } - // this.$modal.confirm('是否确认删除该数据项？').then(function() { - // return removeAgreement(param); - // }).then(() => { - // this.getList(); - // this.$modal.msgSuccess("删除成功"); - // }).catch(() => {}); - }, /** 导出按钮操作 */ handleExport() { // this.download('material/agreementInfo/export', { diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue index 43dd99e4..4038ed59 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue @@ -126,7 +126,7 @@ export default { pageNum: 1, pageSize: 10, keyWord: undefined, - + sltStatus:'0' }, // 表单参数 form: {}, @@ -217,7 +217,7 @@ export default { this.$tab.closeOpenPage({ path:'/cost/cost/costApplyAdd', query:{ - isEdit:true + rowData:[row] } }) }, diff --git a/sgzb-ui/src/views/login.vue b/sgzb-ui/src/views/login.vue index 537a8f0e..60b7ab31 100644 --- a/sgzb-ui/src/views/login.vue +++ b/sgzb-ui/src/views/login.vue @@ -120,7 +120,7 @@