Browse Source

完善流程审批功能

master
yxt_djz 3 years ago
parent
commit
08e127f09b
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  3. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  4. 2
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
  5. 4
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
  6. 19
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue
  7. 16
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue
  8. 1
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/vehiclelibraryconfiguration.vue
  9. 10
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
  10. 19
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
  11. 7
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue
  12. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue
  13. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
  14. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue
  15. 4
      anrui-system-ui/src/views/Home/Home.vue

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java

@ -72,6 +72,8 @@ public class AppModelConfigListVo implements Vo {
@ApiModelProperty(value = "有效期:移动")
private String priceValidity;
@ApiModelProperty(value = "厂家结算价")
private String manufactorSettlementPrice;
// @ApiModelProperty(value = "指导价")
// private String guidedPrice;

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -41,6 +41,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/save无法访问");
}
@Override
public ResultBean saveAll(@Valid List<BaseVehicleDto> dto) {
return null;
}
@Override
public ResultBean update(BaseVehicleDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问");

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -701,6 +701,7 @@
bmc.multimedia,
bvc.guidedPrice as price,
bvc.priceValidity,
bvc.manufactorSettlementPrice,
bvm.sid as modelSid,
bvm.vehicleAlias as modelName,
bvm.brandName as brand,

2
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@ -37,7 +37,7 @@
<el-table-column width="50px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column width="150px" label="操作" align="center" >
<template slot-scope="scope">
<el-button v-if="scope.row.nodeState==''||(scope.row.nodeState!=''&&scope.row.nodeState=='外采申请')"
<el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')"
type="primary" size="mini" @click="edit(scope.row)">办理</el-button>
<el-button v-else type="info" size="mini">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button></template>

4
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@ -164,7 +164,7 @@
</el-dialog>
<!-- 选择待办人 -->
<modellibrary v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
<modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
@ -311,6 +311,7 @@ export default {
this.formobj.configName = info.configName //
this.formobj.configSid = info.configSid // sid
this.formobj.guidedPrice = info.guidedPrice//
this.formobj.manufactorSettlementPrice = info.manufactorSettlementPrice//
},
selectVehicleDialog() {
var objs = this.formobj.baseOutsourcingApplicationVehicleDtos
@ -351,6 +352,7 @@ export default {
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()

19
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue

@ -20,14 +20,9 @@
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
@ -35,19 +30,9 @@
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="颜色" align="center">
<template slot-scope="scope">
<span>{{ scope.row.color }}</span>
</template>
</el-table-column>
<el-table-column label="存放地点" align="center">
<template slot-scope="scope">
<span>{{ scope.row.location }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(万元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
<span>{{ scope.row.locationName }}</span>
</template>
</el-table-column>
</el-table>

16
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue

@ -1,17 +1,22 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div style="text-align: right; width: 100%">
<el-button type="info" size="small" @click="handleReturn()">返回上一级</el-button>
</div>
</div>
<div class="webcon">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="品牌:" class="searchlist">
<!-- <el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -233,6 +238,9 @@ export default {
//
},
methods: {
handleReturn() {
this.$emit('doback')
},
showChexing(){
this.init()
this.Dictionary()
@ -262,11 +270,11 @@ export default {
// ------------------
//
Dictionary() {
brandDown().then((res) => {
/* brandDown().then((res) => {
if (res.code === '200') {
this.carBrand_list = res.data
}
})
})*/
dataDictionary({ type: 'vehicleFunction' }).then((res) => {
if (res.code === '200') {
this.vehicleType_list = res.data

1
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/vehiclelibraryconfiguration.vue

@ -441,6 +441,7 @@ export default {
configName: this.multipleSelection[0].configName, //
configSid: this.multipleSelection[0].sid, // sid
guidedPrice: this.multipleSelection[0].price,
manufactorSettlementPrice: this.multipleSelection[0].manufactorSettlementPrice
}
this.$emit('getChexing',info)
},

10
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue

@ -57,7 +57,6 @@
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="150" label="操作" align="center">
<template slot-scope="scope">
<el-button
@ -69,6 +68,7 @@
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="nodeState" label="状态" align="center"/>
<el-table-column prop="applicationCode" label="申请编号" align="center"/>
<el-table-column prop="applicationName" label="申请人" align="center"/>
@ -183,11 +183,11 @@ export default {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
toEdit(row) {
this.viewState = 3
const sid = this.sids[0]
const row = this.row
this.$refs['divadd'].showEdit(sid, row)
const sid = row.sid
const nodeState = row.nodeState
this.$refs['divadd'].showEdit(sid, nodeState)
},
toInfo(row) {
this.viewState = 4

19
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@ -47,7 +47,7 @@
<el-form-item prop="reason" label="退库原因">
<el-input
v-model="formobj.reason"
placeholder="请输入验收员"
placeholder="请输入退库原因"
class="addinputw"
clearable
/>
@ -56,10 +56,20 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="费用">
<el-form-item prop="money" label="退库费用">
<el-input
v-model="formobj.money"
placeholder="请输入费用"
placeholder="请输入退库费用"
class="addinputw"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="money" label="退费说明">
<el-input
v-model="formobj.remarks"
placeholder="请输入退费说明"
class="addinputw"
clearable
/>
@ -100,7 +110,7 @@
<span>{{scope.row.configName}}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{scope.row.inboundDate}}</span>
</template>
@ -135,6 +145,7 @@
list: [],
//
formobj: {
remarks:'',
sid: '', // sid
applicationCode: '',
name: '',

7
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue

@ -44,10 +44,15 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="费用">
<el-form-item prop="money" label="退库费用">
<span>{{ formobj.money }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="money" label="费用说明">
<span>{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">

9
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue

@ -43,10 +43,15 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="费用">
<el-form-item prop="money" label="退库费用">
<span>{{ formobj.money }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="money" label="费用说明">
<span>{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">
@ -73,7 +78,7 @@
<span>{{scope.row.configName}}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{scope.row.inboundDate}}</span>
</template>

18
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue

@ -46,7 +46,7 @@
<el-form-item prop="reason" label="退库原因">
<el-input
v-model="formobj.reason"
placeholder="请输入验收员"
placeholder="请输入退库原因"
class="addinputw"
clearable
/>
@ -55,10 +55,20 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="费用">
<el-form-item prop="money" label="退库费用">
<el-input
v-model="formobj.money"
placeholder="请输入费用"
placeholder="请输入退库费用"
class="addinputw"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="money" label="退费说明">
<el-input
v-model="formobj.remarks"
placeholder="请输入退费说明"
class="addinputw"
clearable
/>
@ -99,7 +109,7 @@
<span>{{scope.row.configName}}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{scope.row.inboundDate}}</span>
</template>

9
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue

@ -41,10 +41,15 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="money" label="费用">
<el-form-item prop="money" label="退库费用">
<span>{{ formobj.money }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="money" label="费用说明">
<span>{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">
@ -71,7 +76,7 @@
<span>{{scope.row.configName}}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{scope.row.inboundDate}}</span>
</template>

4
anrui-system-ui/src/views/Home/Home.vue

@ -254,7 +254,6 @@
let myPopup = window.open(name + '?token=' + getStorage(), '_blank')
},
toNav(index, name, titleName) {
console.log(index, 9999)
if (index == '9') {
// this.$router.push({path: '/index'})
let myPopup = window.open('/#/index', '_blank')
@ -263,7 +262,8 @@
} else if (index == '8') {
let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') {
let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
//let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') {
let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') {

Loading…
Cancel
Save