Commit eacc7dd2 authored by zhoutong's avatar zhoutong

删单退场审核

parent 24dabc9f
...@@ -437,6 +437,12 @@ export default { ...@@ -437,6 +437,12 @@ export default {
shipment_review: { shipment_review: {
component: "shippingDetail", component: "shippingDetail",
processId: this.processInstance.businessKey processId: this.processInstance.businessKey
},
// 删单退场
customs_declare_remove: {
component: "shippingDetail",
processId: this.processInstance.businessKey,
type: 'deleteExit'
} }
} }
console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim()) console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
{{getOverExamineStatus}} {{getOverExamineStatus}}
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')"> <el-form-item v-show="typeof cusDeclarationObj.id != 'undefined' && cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && [0,3,4].includes(shipmentObj.overMachineExamineStatus)">
<el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button> <el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button>
</el-form-item> </el-form-item>
<el-form-item prop="weightMisreport" v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2"> <el-form-item prop="weightMisreport" v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2">
...@@ -308,6 +308,13 @@ export default { ...@@ -308,6 +308,13 @@ export default {
this.$set(this.cusDeclarationObj, "overMachineStatus", 2) this.$set(this.cusDeclarationObj, "overMachineStatus", 2)
this.$set(this.cusDeclarationObj, "overMachineAbnormalStatus", 1) this.$set(this.cusDeclarationObj, "overMachineAbnormalStatus", 1)
} }
if(this.shipmentObj.customsDeleteExitApprovalInfo){
if(this.shipmentObj.customsDeleteExitApprovalInfo.details){
let details = JSON.parse(this.shipmentObj.customsDeleteExitApprovalInfo.details)
this.$set(this.cusDeclarationObj, "deleteExitType", details.deleteExitType)
this.$set(this.cusDeclarationObj, "deleteExitTime", details.deleteExitTime)
}
}
}, },
methods: { methods: {
strToArray(str) { strToArray(str) {
...@@ -405,6 +412,7 @@ export default { ...@@ -405,6 +412,7 @@ export default {
details: JSON.stringify(details) details: JSON.stringify(details)
}).then((res) => { }).then((res) => {
serviceMsg(res, this).then(() => { serviceMsg(res, this).then(() => {
this.cancel("submit");
}); });
}); });
}, },
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<template v-else>暂无出货审核信息</template> <template v-else>暂无出货审核信息</template>
</div> </div>
<el-row style="marginTop:15px"> <el-row style="marginTop:15px" v-show="type != 'deleteExit'">
<el-button type="primary" @click="showOrder">{{$t('订单列表')}}</el-button> <el-button type="primary" @click="showOrder">{{$t('订单列表')}}</el-button>
</el-row> </el-row>
...@@ -194,6 +194,9 @@ export default { ...@@ -194,6 +194,9 @@ export default {
if (this.type === "shipment") { if (this.type === "shipment") {
this.getShipmentDetail(); this.getShipmentDetail();
} }
if (this.type === "deleteExit") {
this.getDeleteExit();
}
}); });
}, },
getShipmentDetail(){ getShipmentDetail(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment