Commit 3abb42b8 authored by dragondean@qq.com's avatar dragondean@qq.com

出货审核

parent d8b525df
...@@ -421,6 +421,10 @@ export default { ...@@ -421,6 +421,10 @@ export default {
component: () => import('@/views/ecw/customer/components/customer-handover-details.vue'), component: () => import('@/views/ecw/customer/components/customer-handover-details.vue'),
processId: this.processInstance.businessKey, processId: this.processInstance.businessKey,
type: this.processInstance.processDefinition?.formCustomViewPath type: this.processInstance.processDefinition?.formCustomViewPath
},
// 出货审核
air_shipment: {
} }
} }
console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim()) console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<el-form-item :label="$t('司机联系方式')"> <el-form-item :label="$t('司机联系方式')">
<el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input> <el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-show="airShipmentObj.deliverType === '2'"> <div v-show="airShipmentObj.deliverType === '2'">
...@@ -52,13 +51,15 @@ ...@@ -52,13 +51,15 @@
<el-form-item :label="$t('司机联系方式')"> <el-form-item :label="$t('司机联系方式')">
<el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input> <el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item>
<work-flow xmlkey="shipment_audit" v-model="airShipmentObj.copyUserId"></work-flow>
</el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary">{{$t('出货审核中')}}</el-button> <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="goBmpDetail">{{$t('出货审核中')}}</el-button>
<el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="canclAudit">{{$t('取消出货审核')}}</el-button> <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="canclAudit">{{$t('取消出货审核')}}</el-button>
<el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button> <el-button v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
...@@ -71,14 +72,14 @@ ...@@ -71,14 +72,14 @@
import { airShipmentCreate, approvalCancel } from "@/api/ecw/boxSea"; import { airShipmentCreate, approvalCancel } from "@/api/ecw/boxSea";
import userSelect from "./common/userSelect.vue"; import userSelect from "./common/userSelect.vue";
import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../utils"; import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../utils";
import WorkFlow from "@/components/WorkFlow/index.vue";
/** /**
* 驳船 * 驳船
*/ */
export default { export default {
name: "shipment", name: "shipment",
inheritAttrs: false, inheritAttrs: false,
components: { userSelect }, components: { userSelect, WorkFlow },
data() { data() {
return { return {
// 空运出货对象 // 空运出货对象
...@@ -117,11 +118,19 @@ export default { ...@@ -117,11 +118,19 @@ export default {
} }
}); });
}, },
goBmpDetail(){
this.$emit("closeDialog", 'close');
this.$router.push("/bpm/process-instance/detail?id=" + this.airShipmentApprovalInfo.bpmProcessId)
},
/* 取消审核 */ /* 取消审核 */
canclAudit() { async canclAudit() {
console.log(this.shipmentObj) console.log(this.shipmentObj)
const res = await this.$prompt(this.$t("取消审核"), this.$t("请输入取消原因"), {
confirmButtonText: this.$t("确定"),
cancelButtonText: this.$t("取消"),
})
approvalCancel({ approvalCancel({
applyReason: this.$t("取消审核"), applyReason: res.value,
id: this.airShipmentApprovalInfo.id, id: this.airShipmentApprovalInfo.id,
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
}).then((res) => { }).then((res) => {
......
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