Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
cdd0636600
  1. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  2. 5
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
  3. 66
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  4. 5
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@ -1,15 +1,12 @@
package com.yxt.anrui.base.api.basevehicle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.util.List;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -56,26 +53,20 @@ public class BaseVehicleDto implements Dto {
@ApiModelProperty(value = "厂家采购订单类型value")
private String manPurOrderTypeValue;
@ApiModelProperty(value = "厂家入库日期")
@NotBlank(message = "厂家入库日期不能为空")
private String priceDate;
@ApiModelProperty("发车日期")
@NotBlank(message = "发车日期不能为空")
private String departureDate;
@ApiModelProperty("到货日期")
@NotBlank(message = "到货日期不能为空")
private String arrivalDate;
@ApiModelProperty("销售日期")
@NotBlank(message = "销售日期不能为空")
private String salesDate;
@ApiModelProperty(value = "买断日期")
@NotBlank(message = "买断日期不能为空")
private String solidDate;
@ApiModelProperty("结算状态key")
private String settlementStatus;
@ApiModelProperty("结算状态value")
private String settlementStatusValue;
@ApiModelProperty("采购退库日期")
@NotBlank(message = "采购退库日期不能为空")
private String returnDate;
@ApiModelProperty("存放地点sid(陕汽必须的字段)")
private String location;

5
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@ -40,6 +40,11 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(元)" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">

66
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@ -73,6 +73,7 @@ import req from '@/api/ruzhang/scmapplyinbound'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import divAdd from './ruzhangAdd'
import divInfo from './ruzhangInfo'
@ -115,14 +116,15 @@ export default {
applicationDateEnd: '',
nodeState: '',
purchaseOrderNo: '',
modelName: ''
modelName: '',
createOrgSid: ''
}
},
row: {}
}
},
created() {
this.loadList()
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
@ -137,6 +139,14 @@ export default {
break
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.queryParams.params.createOrgSid = resp.data
this.loadList()
}
})
},
// sid
handleSelectionChange(row) {
this.multipleSelection = row
@ -150,14 +160,6 @@ export default {
console.log('获取sids数组', this.sids)
},
toEdit(row) {
// if (this.sids.length === 0) {
// this.$message({ showClose: true, type: 'error', message: '' })
// return
// }
// if (this.sids.length > 1) {
// this.$message({ showClose: true, type: 'error', message: '' })
// return
// }
this.viewState = 3
const sid = row.sid
this.$refs['divadd'].showEdit(sid, row)
@ -184,10 +186,11 @@ export default {
applicationDateEnd: '',
nodeState: '',
purchaseOrderNo: '',
modelName: ''
modelName: '',
createOrgSid: ''
}
}
this.dosearch()
this.init()
},
//
loadList() {
@ -209,45 +212,6 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
//
doDel(row) {
if (this.sids.length === 0) {
this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
return
}
var b = false;
this.multipleSelection.forEach(row => {
if (!(row.nodeState === '待提交')) {
b = true
}
})
if (b) {
this.$message({showClose: true, type: 'error', message: '提交流程审批的记录不能进行删除!'})
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
const _this = this
req.delBySids(this.sids).then(resp => {
loading.close()
_this.$message({type: 'success', message: resp.msg, showClose: true})
_this.loadList()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
//
resetState() {
this.viewState = 1

5
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

@ -40,6 +40,11 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(元)" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">

Loading…
Cancel
Save