Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
commit
79c5ece657
  1. 32
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
  2. 10
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  3. 72
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
  4. 70
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  5. 170
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  6. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  7. 15
      anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
  8. 30
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

32
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js

@ -11,6 +11,19 @@ export function listPage(data) {
} }
}) })
} }
// 代收款申请
export function listPagess(data) {
return request({
url: '/fin/fincollectionconfirmation/listPagess',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 应收未收款项明细分页列表查询 // 应收未收款项明细分页列表查询
export function listAll(data) { export function listAll(data) {
return request({ return request({
@ -118,3 +131,22 @@ export function upload(data) {
} }
}) })
} }
// 代收款申请、收款款项确认、出纳款项确认--下载
export function createPdf(data) {
return request({
url: '/fin/fincollectionconfirmation/createPdf',
method: 'post',
params: data
})
}
// 收款款项确认
export function ctskd(data) {
return request({
url: '/fin/fincollectionconfirmation/ctskd',
method: 'post',
params: data,
headers: { 'Content-Type': 'application/json' }
})
}

10
anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@ -153,3 +153,13 @@ export function selectOrgList(data) {
params: data params: data
}) })
} }
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

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

@ -38,8 +38,9 @@
<div class=""> <div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"> <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="80"> <el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -122,19 +123,41 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog center :visible.sync="dialogVisible" width="40%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span>打印机类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group v-model="print">
<el-radio label="针孔式打印机">针孔式打印机</el-radio>
<el-radio label="激光打印机">激光打印机</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</el-button>
<el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
</span>
</el-dialog>
<agencyfundAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/> <agencyfundAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<agencyfundInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/> <agencyfundInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div> </div>
</template> </template>
<script> <script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js' import { listPagess, createPdf } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons' import { typeValues } from '@/api/jichuxinxi/dictcommons'
import agencyfundAdd from './agencyfundAdd.vue' import agencyfundAdd from './agencyfundAdd.vue'
import agencyfundInfo from './agencyfundInfo.vue' import agencyfundInfo from './agencyfundInfo.vue'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'DaiShouKuan', name: 'DaiShouKuan',
@ -149,6 +172,10 @@ export default {
return { return {
btndisabled: false, btndisabled: false,
isSearchShow: false, isSearchShow: false,
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
searchxianshitit: '隐藏查询条件', searchxianshitit: '隐藏查询条件',
viewState: 1, viewState: 1,
tableKey: 0, tableKey: 0,
@ -246,7 +273,7 @@ export default {
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.state = 0 this.listQuery.params.state = 0
listPage(this.listQuery).then((response) => { listPagess(this.listQuery).then((response) => {
this.listLoading = false this.listLoading = false
if (response.code === '200') { if (response.code === '200') {
this.listQuery.total = response.data.total this.listQuery.total = response.data.total
@ -286,6 +313,45 @@ export default {
this.viewState = 2 this.viewState = 2
this.$refs['divAdd'].showEdit(row) this.$refs['divAdd'].showEdit(row)
}, },
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '收款单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) { handLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divInfo'].showInfo(row) this.$refs['divInfo'].showInfo(row)

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

@ -38,8 +38,9 @@
<div class=""> <div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"> <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="80"> <el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -122,19 +123,41 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog center :visible.sync="dialogVisible" width="40%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span>打印机类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group v-model="print">
<el-radio label="针孔式打印机">针孔式打印机</el-radio>
<el-radio label="激光打印机">激光打印机</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</el-button>
<el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
</span>
</el-dialog>
<acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/> <acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/> <acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div> </div>
</template> </template>
<script> <script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js' import {createPdf, listPage} from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons' import { typeValues } from '@/api/jichuxinxi/dictcommons'
import acknowledgementReceiptAdd from './acknowledgementReceiptAdd.vue' import acknowledgementReceiptAdd from './acknowledgementReceiptAdd.vue'
import acknowledgementReceiptInfo from './acknowledgementReceiptInfo.vue' import acknowledgementReceiptInfo from './acknowledgementReceiptInfo.vue'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'shoukuanquerenguanli', name: 'shoukuanquerenguanli',
@ -147,6 +170,10 @@ export default {
}, },
data() { data() {
return { return {
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
btndisabled: false, btndisabled: false,
isSearchShow: false, isSearchShow: false,
searchxianshitit: '隐藏查询条件', searchxianshitit: '隐藏查询条件',
@ -286,6 +313,45 @@ export default {
this.viewState = 2 this.viewState = 2
this.$refs['divAdd'].showEdit(row) this.$refs['divAdd'].showEdit(row)
}, },
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '收款单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) { handLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divInfo'].showInfo(row) this.$refs['divInfo'].showInfo(row)

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

@ -1,12 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<div class="tab-header webtop"> <button-bar view-title="出纳款项确认管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div>出纳款项确认管理</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -48,11 +43,13 @@
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"> <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.auditState !== 1" type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button> <el-button :disabled="scope.row.auditState !== 1" type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button>
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button> <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -76,12 +73,12 @@
<span>{{ scope.row.createByName }}</span> <span>{{ scope.row.createByName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请日期" align="center" width="90"> <el-table-column label="申请日期" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate }}</span> <span>{{ scope.row.createDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款日期" align="center" width="90"> <el-table-column label="收款日期" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span> <span>{{ scope.row.collectionDate }}</span>
</template> </template>
@ -125,33 +122,79 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog center :visible.sync="dialogVisible" width="40%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span>打印机类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group v-model="print">
<el-radio label="针孔式打印机">针孔式打印机</el-radio>
<el-radio label="激光打印机">激光打印机</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</el-button>
<el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
</span>
</el-dialog>
<cashierConfirmationInfo v-show="viewState == 2 || viewState == 3" ref="divInfo" @doback="resetState" @reloadlist="getList"/> <cashierConfirmationInfo v-show="viewState == 2 || viewState == 3" ref="divInfo" @doback="resetState" @reloadlist="getList"/>
</div> </div>
</template> </template>
<script> <script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js' import { createPdf, listPage, ctskd } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons' import ButtonBar from '@/components/ButtonBar'
import { typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
import cashierConfirmationInfo from './cashierConfirmationInfo.vue' import cashierConfirmationInfo from './cashierConfirmationInfo.vue'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'chunakuanxiangquerenguanli', name: 'chunakuanxiangquerenguanli',
components: { components: {
Pagination, Pagination,
pageye, pageye,
ButtonBar,
cashierConfirmationInfo cashierConfirmationInfo
}, },
data() { data() {
return { return {
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
btndisabled: false,
isSearchShow: false, isSearchShow: false,
searchxianshitit: '隐藏查询条件', searchxianshitit: '隐藏查询条件',
viewState: 1, viewState: 1,
tableKey: 0, tableKey: 0,
list: [], list: [],
sids: [],
receiptBank_list: [], receiptBank_list: [],
collectionType_list: [], collectionType_list: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toRepush',
btnLabel: '重推'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
subscriptionState_list: [ subscriptionState_list: [
{ {
dictKey: 1, dictKey: 1,
@ -186,6 +229,20 @@ export default {
} }
} }
}, },
mounted() {
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
created() { created() {
this.getList() this.getList()
this.DataDictionary() this.DataDictionary()
@ -203,6 +260,19 @@ export default {
} }
}) })
}, },
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toRepush':
this.toRepush()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// //
clicksearchShow() { clicksearchShow() {
this.isSearchShow = !this.isSearchShow this.isSearchShow = !this.isSearchShow
@ -219,6 +289,14 @@ export default {
var pageindex = index + 1 + pagestart var pageindex = index + 1 + pagestart
return pageindex return pageindex
}, },
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
console.log('sids', this.sids)
},
// //
getList() { getList() {
this.listLoading = true this.listLoading = true
@ -260,13 +338,79 @@ export default {
this.viewState = 2 this.viewState = 2
this.$refs['divInfo'].showInfo(row, this.viewState) this.$refs['divInfo'].showInfo(row, this.viewState)
}, },
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '收款单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) { handLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divInfo'].showInfo(row, this.viewState) this.$refs['divInfo'].showInfo(row, this.viewState)
}, },
toRepush() {
if (this.sids.length === 1) {
const loading = this.$loading({
lock: true,
text: '数据推送中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
ctskd({ skdSid: this.sids[0] }).then((resp) => {
if (resp.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '推送成功' })
this.getList()
} else {
loading.close()
}
}).catch(() => {
loading.close()
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
return
}
},
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
this.handReset() },
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
} }
} }
} }

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -2030,7 +2030,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis(); long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc"; String typeName = dateStr + seconds + ".doc";
// 生成文件路径 //生成文件路径
String targetPath = sourcePath + dateStr; String targetPath = sourcePath + dateStr;
if (printerType.equals("针孔式打印机")){ if (printerType.equals("针孔式打印机")){
WordUtils.creatWord(dataMap, "skdzks", sourcePath, targetPath, typeName); WordUtils.creatWord(dataMap, "skdzks", sourcePath, targetPath, typeName);

15
anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue

@ -137,7 +137,7 @@
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import { typeValues, getOrgSidByPath, getListDeptByOrgSid, getGysByOrgSid } from '@/api/cheliang/dictcommons' import { typeValues, getOrgSidByPath, getListDeptByOrgSid, getGysByOrgSid, getButtonPermissions } from '@/api/cheliang/dictcommons'
import req from '@/api/purchasereceipt/purchasereceipt' import req from '@/api/purchasereceipt/purchasereceipt'
import { getStorage } from '@/utils/auth' import { getStorage } from '@/utils/auth'
import purchasereceiptInfo from './purchasereceiptInfo' import purchasereceiptInfo from './purchasereceiptInfo'
@ -207,7 +207,18 @@ export default {
this.init() this.init()
}, },
mounted() { mounted() {
this.$refs['btnbar'].setButtonList(this.btnList) getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
}, },
methods: { methods: {
// //

30
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="isCheck"> <div v-show="viewState == 1">
<div class="tab-header webtop"> <div class="tab-header webtop">
<div>{{ viewTitle }}</div> <div>{{ viewTitle }}</div>
<div> <div>
@ -28,7 +28,7 @@
<el-row> <el-row>
<el-col :span="12" class="yancheAdd-bor"> <el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型:"> <el-form-item prop="model" label="车型:">
<span>{{ temp.model }}</span> <span class="bluezi" @click="handleLook()">{{ temp.model }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="yancheAdd-bor"> <el-col :span="12" class="yancheAdd-bor">
@ -98,7 +98,9 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState"/> <vehiclechecklist ref="divchecklist" v-show="viewState == 2" @doback="resetState"/>
<!-- 车型配置标准页面 -->
<vehicleconfiguration v-show="viewState == 3" ref="divPeizhi" @doback="resetState"/>
</div> </div>
</template> </template>
@ -107,17 +109,19 @@ import { getOrgSidByPath } from '@/api/cheliang/dictcommons.js'
import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli' import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli'
import Upload from '@/components/uploadFile/uploadImg.vue' import Upload from '@/components/uploadFile/uploadImg.vue'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist' import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
export default { export default {
name: 'yancheguanliAdd', name: 'yancheguanliAdd',
components: { components: {
Upload, Upload,
vehiclechecklist vehiclechecklist,
vehicleconfiguration
}, },
data() { data() {
return { return {
viewTitle: '', viewTitle: '',
isCheck: true, viewState: 1,
btndisabled: false, btndisabled: false,
// --------- // ---------
sid: '', sid: '',
@ -136,6 +140,7 @@ export default {
engineNo: '', engineNo: '',
orgPath: '' orgPath: ''
}, },
vehicleConfiguration: {},
dialogStatus: '', // dialogStatus: '', //
vehiclePhoto: [], vehiclePhoto: [],
rules: { rules: {
@ -176,6 +181,12 @@ export default {
inspectedSid: row.inspectedSid, inspectedSid: row.inspectedSid,
userSid: window.sessionStorage.getItem('userSid') userSid: window.sessionStorage.getItem('userSid')
} }
this.vehicleConfiguration = {
modelSid: row.modelSid,
configSid: row.configSid,
vehModelConfigSid: row.modelSidAndConfig,
guidedPrice: row.guidedPrice
}
getCarInspectedInfo(data).then((res) => { getCarInspectedInfo(data).then((res) => {
if (res.success) { if (res.success) {
this.temp = res.data this.temp = res.data
@ -207,12 +218,16 @@ export default {
} }
}) })
}, },
handleLook() {
this.viewState = 3
this.$refs['divPeizhi'].showInfo(this.vehicleConfiguration)
},
handleChecklist() { handleChecklist() {
this.isCheck = false this.viewState = 2
this.$refs['divchecklist'].showCheck(this.temp.inspectedSid) this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
}, },
resetState() { resetState() {
this.isCheck = true this.viewState = 1
}, },
getPathSid() { getPathSid() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
@ -263,6 +278,7 @@ export default {
this.btndisabled = false this.btndisabled = false
this.imgList01 = [] this.imgList01 = []
this.imgList02 = [] this.imgList02 = []
this.vehicleConfiguration = {}
this.$emit('doback') this.$emit('doback')
}, },
// //

Loading…
Cancel
Save