Browse Source

完善入库--提交接口更换为确认接口

master
yunuo970428 2 years ago
parent
commit
1f6bae128e
  1. 9
      anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
  2. 6
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  3. 5
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

9
anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js

@ -28,6 +28,15 @@ export default {
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
}, },
// 确认(暂时取消流程审批,直接推送数据)
confirmRZ: function(params) {
return request({
url: '/scm/v1/scmapplyinbound/confirmRZ',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 通过sid查询一条记录 // 通过sid查询一条记录
fetchBySid: function(sid) { fetchBySid: function(sid) {
return request({ return request({

6
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -5,7 +5,7 @@
<div>{{ viewTitle }}</div> <div>{{ viewTitle }}</div>
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
@ -887,7 +887,7 @@ export default {
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => { req.confirmRZ(this.formobj).then((res) => {
if (res.success) { if (res.success) {
this.$message({ this.$message({
showClose: true, showClose: true,
@ -911,7 +911,7 @@ export default {
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => { req.confirmRZ(this.formobj).then((res) => {
if (res.success) { if (res.success) {
this.$message({ this.$message({
showClose: true, showClose: true,

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

@ -50,8 +50,9 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" header-align="center" width="100"> <el-table-column label="状态" header-align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span> <!-- <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>-->
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span> <!-- <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>-->
<span>{{ scope.row.nodeState }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applicationDate" label="发起日期" align="center" width="100"/> <el-table-column prop="applicationDate" label="发起日期" align="center" width="100"/>

Loading…
Cancel
Save