|
@@ -1050,7 +1050,8 @@
|
|
|
<el-button type="success" v-if="this.form.fBillstatus == 11" @click="approval">保 存</el-button>
|
|
|
<el-button type="primary" v-if="this.form.fBillstatus == 11" @click="feeSubmission">费用请核</el-button>
|
|
|
<el-button type="success" v-if="approVal" @click="addOrUpdateHand(form)">审 批</el-button>
|
|
|
- <el-button type="primary" v-if="this.form.fBillstatus != 11"@click="addOrUpdateHandle(form)">查看审批</el-button>
|
|
|
+ <el-button type="danger" v-if="form.moneyStatus === 4" @click="revokeTwo">撤销请核</el-button>
|
|
|
+ <el-button type="primary" v-if="this.form.fBillstatus != 11 || this.form.moneyStatus != null && this.form.moneyStatus != 6"@click="addOrUpdateHandle(form)">查看审批</el-button>
|
|
|
</div>
|
|
|
<!-- 附件查看-->
|
|
|
<el-dialog
|
|
@@ -1157,6 +1158,7 @@ import draggable from 'vuedraggable'
|
|
|
import Vue from 'vue'
|
|
|
import AddOrUpdate from '@/views/viewApproval'
|
|
|
import ApprovalComments from '@/views/startApproval'
|
|
|
+import { revoke, revokeTwo } from '@/api/warehouseBusiness/warehouseInStock'
|
|
|
Vue.directive('dialogDrag', {
|
|
|
bind(el, binding, vnode, oldVnode) {
|
|
|
const dialogHeaderEl = el.querySelector('.el-dialog__header')
|
|
@@ -1294,6 +1296,7 @@ export default {
|
|
|
formDate = {
|
|
|
fId: JSON.parse(this.$route.query.list).billId
|
|
|
}
|
|
|
+ console.log(JSON.parse(this.$route.query.list))
|
|
|
this.approVal = true;
|
|
|
}else if(this.$route.query.data){
|
|
|
formDate = JSON.parse(this.$route.query.data)
|
|
@@ -1301,6 +1304,7 @@ export default {
|
|
|
}
|
|
|
if (formDate) {
|
|
|
addmodify(formDate).then(response => {
|
|
|
+ console.log(response)
|
|
|
this.form = response.rows[0]
|
|
|
this.goodsList = response.rows[0].tWarehousebillsCntrList
|
|
|
this.estimatedTime = response.rows[0].tVoyageL
|
|
@@ -1357,6 +1361,22 @@ export default {
|
|
|
// this.name()
|
|
|
},
|
|
|
methods: {
|
|
|
+ //撤销审批
|
|
|
+ revokeTwo() {
|
|
|
+ let data = {
|
|
|
+ actId: 460,
|
|
|
+ billId: this.form.fId,
|
|
|
+ id: this.form.fId,
|
|
|
+ };
|
|
|
+ revokeTwo(data).then((data) => {
|
|
|
+ if (data.code === 200) {
|
|
|
+ this.msgSuccess("撤销成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ this.reset();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
//费用提交审核
|
|
|
feeSubmission(){
|
|
|
// if(!this.warehouseDrList){
|
|
@@ -1373,6 +1393,8 @@ export default {
|
|
|
formData.append('tWarehousebillsfeesCr',JSON.stringify(this.warehouseCrList))
|
|
|
getfee(formData).then(response=>{
|
|
|
console.log(response)
|
|
|
+ this.$message.success("操作成功")
|
|
|
+ this.modify = true
|
|
|
})
|
|
|
},
|
|
|
cntrWeight(res){
|
|
@@ -1549,6 +1571,8 @@ export default {
|
|
|
let actId = ''
|
|
|
if(this.form.fBillstatus < 6){
|
|
|
actId = "410"
|
|
|
+ }else if(this.form.moneyStatus != null && this.form.moneyStatus < 6){
|
|
|
+ actId = "460";
|
|
|
}else{
|
|
|
actId = "420";
|
|
|
}
|
|
@@ -1596,7 +1620,9 @@ export default {
|
|
|
let actId = ''
|
|
|
if(this.form.fBillstatus < 6){
|
|
|
actId = "410"
|
|
|
- }else{
|
|
|
+ }else if(this.form.moneyStatus != null && this.form.moneyStatus < 6){
|
|
|
+ actId = "460";
|
|
|
+ } else{
|
|
|
actId = "420";
|
|
|
}
|
|
|
this.$nextTick(() => {
|