Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 6 months ago
parent
commit
e204d1d44d
  1. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
  2. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
  3. 2
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue
  4. 2
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
  5. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
  7. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue
  8. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
  9. 95
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  10. 123
      yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue

@ -36,6 +36,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue

@ -34,6 +34,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue

@ -34,6 +34,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue

@ -32,6 +32,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue

@ -36,6 +36,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue

@ -34,6 +34,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue

@ -34,6 +34,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue

@ -32,6 +32,8 @@
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="150" />
<el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
<el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
<el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="150" />
<el-table-column prop="money" label="其中费用" align="center" width="150" />
<el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />

95
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@ -9,7 +9,6 @@
<el-button type="primary" size="small" :disabled="submitdisabled" @click="toSendBack" v-show="formobj.nodeName !== '登记'">退回</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="confirmCLF()" v-show="formobj.nodeName == '结算' && formobj.subject == '保内'">确认材料费</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="toPrintSettle()" v-show="formobj.nodeName == '结算'">打印结算单</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="toSettle()" v-show="formobj.nodeName == '结算'">结算</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -536,27 +535,6 @@
</div>
<!-- 选择客户 -->
<selectCustomer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
<!-- 结算 -->
<settleAccountsAdd v-show="viewState == 3" ref="divSettle" @doback="resetState" />
<!-- 打印结算单保内 -->
<el-dialog title="打印类型" :visible.sync="dialogVisible" width="25%" :show-close="false">
<el-form :model="temp" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<el-form-item>
<el-radio-group v-model="temp.type">
<el-radio label="0">财务打印</el-radio>
<el-radio label="1">客户打印</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="handleConfirm"> </el-button>
<el-button type="info " size="mini" @click="dialogVisible = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -565,14 +543,11 @@ import req from '@/api/operation/repairbill'
import additionitem from '@/api/basicinformation/additionitem'
import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage, getInvoicingList } from '@/api/Common/dictcommons'
import selectCustomer from '@/components/publicPage/selectCustomer'
import settleAccountsAdd from '@/views/operation/settleAccounts/settleAccountsAdd'
import { getStorage } from '@/utils/auth'
export default {
name: 'RepairBillAdd',
components: {
selectCustomer,
settleAccountsAdd
selectCustomer
},
data() {
const claimManufacturerShClaimType = (rule, value, callback) => {
@ -588,19 +563,6 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
dialogVisible: false, //
temp: {
sid: '',
type: '',
createOrgSid: '',
useOrgSid: '',
userSid: ''
},
updateAction: process.env.VUE_APP_BASE_API + '/portal/file/upload',
fileList: [],
headers: {
token: window.sessionStorage.getItem('token')
},
user_list: [], //
subject_list: [], //
claimManufacturer_list: [], //
@ -1577,61 +1539,6 @@ export default {
}
})
},
toPrintSettle() {
if (this.formobj.subject === '保内') {
this.dialogVisible = true
} else {
this.printSettle()
}
},
printSettle() {
this.temp.sid = this.formobj.sid
this.temp.createOrgSid = this.formobj.createOrgSid
this.temp.useOrgSid = this.formobj.deptSid
this.temp.userSid = this.formobj.createBySid
req.printSettlement(this.temp).then((res) => {
if (res.success) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&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()
}
})
},
handleConfirm() {
if (this.temp.type !== '') {
this.dialogVisible = false
this.printSettle()
} else {
this.$message({ showClose: true, type: 'error', message: '打印类型不能为空' })
}
},
toSettle() {
req.settle(this.formobj).then((res) => {
if (res.success) {
this.viewState = 3
this.$refs['divSettle'].showAdd(this.formobj)
} else {
this.$message({ showClose: true, type: 'error', message: res.msg })
}
})
},
resetState() {
this.viewState = 1
},

123
yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue

@ -132,6 +132,27 @@
<repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<!-- 详情 -->
<repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 结算 -->
<settleAccountsAdd v-show="viewState == 3" ref="divSettle" @doback="resetState" />
<!-- 打印结算单保内 -->
<el-dialog title="打印类型" :visible.sync="dialogVisible" width="25%" :show-close="false">
<el-form :model="temp" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<el-form-item>
<el-radio-group v-model="temp.type">
<el-radio label="0">财务打印</el-radio>
<el-radio label="1">客户打印</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="handleConfirm"> </el-button>
<el-button type="info " size="mini" @click="dialogVisible = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -140,10 +161,11 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/operation/repairbill'
import arrearsleavefactory from '@/api/operation/arrearsleavefactory'
import { typeValues } from '@/api/Common/dictcommons'
import { typeValues, getOrgSidByPath } from '@/api/Common/dictcommons'
import { getStorage } from '@/utils/auth'
import repairbillAdd from './repairbillAdd'
import repairbillInfo from './repairbillInfo'
import settleAccountsAdd from '@/views/operation/settleAccounts/settleAccountsAdd'
export default {
name: 'RepairBillBySettleAccounts',
@ -152,11 +174,25 @@ export default {
pageye,
ButtonBar,
repairbillAdd,
repairbillInfo
repairbillInfo,
settleAccountsAdd
},
data() {
return {
btndisabled: false,
dialogVisible: false, //
temp: {
sid: '',
type: '',
createOrgSid: '',
useOrgSid: '',
userSid: ''
},
updateAction: process.env.VUE_APP_BASE_API + '/portal/file/upload',
fileList: [],
headers: {
token: window.sessionStorage.getItem('token')
},
btnList: [
{
type: 'primary',
@ -165,6 +201,13 @@ export default {
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'primary',
size: 'small',
icon: 'toSettle',
btnKey: 'toEdit',
btnLabel: '结算'
},
{
type: 'info',
size: 'small',
@ -179,6 +222,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
billType_list: [],
state_list: [
{
@ -258,6 +302,9 @@ export default {
case 'toEdit':
this.toEdit()
break
case 'toSettle':
this.toSettle()
break
case 'doClose':
this.doClose()
break
@ -267,6 +314,7 @@ export default {
},
// sid
handleSelectionChange(row) {
this.multipleSelection = row
const aa = []
row.forEach(element => {
aa.push(element.sid)
@ -346,6 +394,75 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
//
toPrintSettle() {
if (this.sids.length === 1) {
if (this.multipleSelection[0].subject === '保内') {
this.dialogVisible = true
} else {
this.printSettle()
}
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
printSettle() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.temp.createOrgSid = res.data
}
})
this.temp.sid = this.sids[0]
this.temp.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.temp.userSid = window.sessionStorage.getItem('userSid')
req.printSettlement(this.temp).then((res) => {
if (res.success) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&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()
}
})
},
handleConfirm() {
if (this.temp.type !== '') {
this.dialogVisible = false
this.printSettle()
} else {
this.$message({ showClose: true, type: 'error', message: '打印类型不能为空' })
}
},
//
toSettle() {
if (this.sids.length === 1) {
req.settle(this.sids[0]).then((res) => {
if (res.success) {
this.viewState = 3
this.$refs['divSettle'].showAdd({ sid: this.sids[0] })
} else {
this.$message({ showClose: true, type: 'error', message: res.msg })
}
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)

Loading…
Cancel
Save