Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
98a7409587
  1. 2
      anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
  2. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
  3. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
  4. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  5. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
  7. 49
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
  8. 2
      anrui-system-ui/src/icons/svg/Import.svg
  9. 2
      anrui-system-ui/src/icons/svg/cross.svg
  10. 2
      anrui-system-ui/src/icons/svg/del.svg
  11. 2
      anrui-system-ui/src/icons/svg/edit.svg
  12. 2
      anrui-system-ui/src/icons/svg/export.svg
  13. 2
      anrui-system-ui/src/icons/svg/plus.svg

2
anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@ -166,7 +166,7 @@ const codemenu = [
path: '/chunafukuan/daifukuanguanli',
component: () => import('@/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue'),
name: 'DaiFuKuan',
meta: { title: '付款', noCache: true }
meta: { title: '付款查询', noCache: true }
}
]
},

1
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue

@ -350,6 +350,7 @@ export default {
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
this.getList()
} else {
this.visibleDisabled = false
}

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue

@ -2,7 +2,7 @@
<div class="app-container">
<!-- Start 列表页面 -->
<div>
<button-bar view-title="付款列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="付款查询列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -36,7 +36,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">付款列表</div>
<div class="tit">付款查询列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">

1
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@ -350,6 +350,7 @@ export default {
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
this.getList()
} else {
this.visibleDisabled = false
}

1
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@ -375,6 +375,7 @@ export default {
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
this.getList()
} else {
this.visibleDisabled = false
}

2
anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js

@ -42,7 +42,7 @@ export function exportExcel(data) {
return request({
url: '/base/v1/basevehicleout/exportExcel',
method: 'post',
responseType: 'blob' , // 表明返回服务器返回的数据类型
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: { 'Content-Type': 'application/json' }
})

49
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@ -515,34 +515,29 @@ export default {
},
//
doExport() {
if (this.sids.length > 0) {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
exportExcel(this.sids).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '车辆销售台账表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
} else {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行导出操作' })
return
}
const fileName = '车辆销售台账表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
resetState() {
this.viewState = 1

2
anrui-system-ui/src/icons/svg/Import.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654478485023" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2834" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112c-4.1 3.2-4.1 9.4 0 12.6l141.9 112c5.3 4.2 13 0.4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z" p-id="2835" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

2
anrui-system-ui/src/icons/svg/cross.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654485972937" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33086" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M561.17013333 509.06026667L858.02666667 213.73973333c14.03733333-13.968 14.1088-36.60053333 0.1408-50.63786666-13.99893333-14.06826667-36.592-14.10773333-50.62933334-0.1408L510.6048 458.31466667 216.256 163.06986667c-13.9328-13.96693333-36.59733333-14.03733333-50.63466667-0.07146667-14.00426667 13.96586667-14.03733333 36.63146667-0.0704 50.6688l294.27733334 295.1744-296.71466667 295.14026667c-14.0384 13.968-14.1088 36.59733333-0.14293333 50.63786666a35.7216 35.7216 0 0 0 25.3856 10.56c9.13066667 0 18.26666667-3.4688 25.25013333-10.4192l296.78613333-295.2128L807.4304 857.48266667c6.9824 7.02186667 16.15253333 10.53013333 25.35253333 10.53013333a35.72906667 35.72906667 0 0 0 25.28213334-10.45973333c13.99893333-13.96586667 14.03733333-36.592 0.07146666-50.62933334L561.17013333 509.06026667z m0 0" p-id="33087" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

2
anrui-system-ui/src/icons/svg/del.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654484882072" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31744" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M365.714286 199.972571h292.571428V136.045714H365.714286v64zM658.285714 62.902857a73.142857 73.142857 0 0 1 73.142857 73.142857v55.954286l189.147429 0.073143a40.594286 40.594286 0 0 1 0 81.188571h-42.934857l0.073143 613.668572a73.142857 73.142857 0 0 1-73.142857 73.142857H219.428571a73.142857 73.142857 0 0 1-73.142857-73.142857v-613.668572h-39.497143a40.594286 40.594286 0 1 1 0-81.188571H292.571429v-56.027429a73.142857 73.142857 0 0 1 73.142857-73.142857h292.571428z m137.142857 211.456h-566.857142V877.714286h566.857142V274.285714zM402.285714 365.714286a36.571429 36.571429 0 0 1 36.571429 36.571428v292.571429a36.571429 36.571429 0 1 1-73.142857 0v-292.571429a36.571429 36.571429 0 0 1 36.571428-36.571428z m219.428572 0a36.571429 36.571429 0 0 1 36.571428 36.571428v292.571429a36.571429 36.571429 0 1 1-73.142857 0v-292.571429a36.571429 36.571429 0 0 1 36.571429-36.571428z" p-id="31745" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

2
anrui-system-ui/src/icons/svg/edit.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654484190363" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5568" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M120.576 872.32c221.824-25.984 234.88-38.912 234.88-51.968l547.968-545.28c26.112-25.984 26.112-64.896 0-90.88L772.992 54.272c-26.112-25.984-65.28-25.984-91.392 0L133.632 612.608s-13.056 12.928-39.168 233.728c0 12.928 0 12.928 13.056 25.984h13.056zM733.824 93.312l143.488 142.848-78.336 64.896-130.432-129.92 65.28-77.824z m-117.504 116.864l143.488 142.848-404.48 402.432-143.36-142.848 404.352-402.432z m-430.464 454.4l130.432 129.792c-39.168 0-104.32 12.928-156.544 12.928 0-51.84 13.056-116.736 26.112-142.72z m717.568 272.64H146.688c-13.056 0-26.112 12.928-26.112 25.984-13.056 12.928 0 25.984 26.112 25.984h756.736c13.056 0 26.112-12.928 26.112-25.984 0-13.056-13.056-25.984-26.112-25.984z m0 0" p-id="5569" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

2
anrui-system-ui/src/icons/svg/export.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654478800491" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5753" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7z m18.6-251.7L765 393.7c-5.3-4.2-13-0.4-13 6.3v76H438c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112c4.1-3.2 4.1-9.4 0-12.6z" p-id="5754" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

2
anrui-system-ui/src/icons/svg/plus.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654484039932" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3069" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M512 512V170.666667h42.666667v341.333333h341.333333v42.666667h-341.333333v341.333333h-42.666667v-341.333333H170.666667v-42.666667h341.333333z" fill="#ffffff" p-id="3070"></path></svg>

After

Width:  |  Height:  |  Size: 875 B

Loading…
Cancel
Save