Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 5 months ago
parent
commit
3c6adf04fb
  1. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml
  2. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java
  3. 8
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
  4. 52
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
  5. 10
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue
  6. 10
      anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml

@ -121,7 +121,7 @@
</select>
<select id="selectBySid" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM base_internal_purchase
FROM scm_finance_adjust_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java

@ -95,7 +95,7 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign {
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的

8
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js

@ -19,6 +19,14 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 重推
rePushVoucher: function(data) {
return request({
url: '/scm/v1/scmvehrebatewithapply/rePushVoucher',
method: 'post',
params: data
})
},
// 删除
delete: function(params) {
return request({

52
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue

@ -94,7 +94,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import { getButtonPermissions, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import bicyclerebatewithholdingAdd from './bicyclerebatewithholdingAdd'
import bicyclerebatewithholdingInfo from './bicyclerebatewithholdingInfo'
import { getStorage } from '@/utils/auth'
@ -122,6 +122,13 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toRepush',
btnLabel: '重推'
},
{
type: 'danger',
size: 'small',
@ -144,6 +151,7 @@ export default {
tableKey: 0,
list: [],
sids: [],
multipleSelection: [],
FormLoading: false,
listLoading: false,
listQuery: {
@ -176,7 +184,18 @@ export default {
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
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: {
async handleMessage(event) {
@ -231,6 +250,9 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'toRepush':
this.toRepush()
break
case 'doDel':
this.doDel()
break
@ -249,11 +271,11 @@ export default {
},
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
console.log('sids', this.sids)
},
//
getList() {
@ -305,6 +327,30 @@ export default {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toRepush() {
if (this.multipleSelection.length === 1 && this.multipleSelection[0].nodeState === '已办结') {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.rePushVoucher({ sid: 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
}
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)

10
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue

@ -263,8 +263,18 @@ export default {
const choose = this.adjustWay_list.filter((item) => item.dictKey === value)
if (choose !== null) {
this.formobj.adjustWay = choose[0].dictValue
if (this.formobj.adjustWay === '公司认损') {
this.formobj.staffName = ''
this.formobj.staffSid = ''
this.formobj.salesManage = ''
this.formobj.salesManageSid = ''
}
} else {
this.formobj.adjustWay = ''
this.formobj.staffName = ''
this.formobj.staffSid = ''
this.formobj.salesManage = ''
this.formobj.salesManageSid = ''
}
},
changeStaff(value) {

10
anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue

@ -245,8 +245,18 @@ export default {
const choose = this.adjustWay_list.filter((item) => item.dictKey === value)
if (choose !== null) {
this.formobj.adjustWay = choose[0].dictValue
if (this.formobj.adjustWay === '公司认损') {
this.formobj.staffName = ''
this.formobj.staffSid = ''
this.formobj.salesManage = ''
this.formobj.salesManageSid = ''
}
} else {
this.formobj.adjustWay = ''
this.formobj.staffName = ''
this.formobj.staffSid = ''
this.formobj.salesManage = ''
this.formobj.salesManageSid = ''
}
},
changeStaff(value) {

Loading…
Cancel
Save