Commit daaf98a4 authored by dragondean@qq.com's avatar dragondean@qq.com

变更空运渠道无法提交的bug

parent fe2fb604
...@@ -497,17 +497,25 @@ ...@@ -497,17 +497,25 @@
<work-flow xmlkey="order_modify" v-model="ccIdArr" /> <work-flow xmlkey="order_modify" v-model="ccIdArr" />
</el-card> </el-card>
<el-form-item label="" style="margin: 30px 0"> <div style="margin: 30px 0; display: flex">
<!--返回按钮应该在表单被禁用的情况下也可以点击,所以需要用一个form来包裹以脱离原form的disabled控制-->
<el-form inline class="mr-10">
<el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</el-form>
<template v-if="form.applyStatus == 1"> <template v-if="form.applyStatus == 1">
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">{{$t('审核中')}}</el-button> <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">{{$t('审核中')}}</el-button>
</template> </template>
<!--更新渠道的时候用一个form包裹按钮,脱离原form的disabled控制-->
<el-form v-else-if="updateChannel" inline>
<el-button type="primary" @click="submitForm(2)">{{$t('编辑订单')}}</el-button> <!--修改-->
</el-form>
<template v-else> <template v-else>
<el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿--> <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿-->
<el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓--> <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓-->
<el-button type="primary" @click="submitForm(2)" v-else>{{$t('编辑订单')}}</el-button> <!--修改--> <el-button type="primary" @click="submitForm(2)" v-else>{{$t('编辑订单')}}</el-button> <!--修改-->
</template> </template>
<el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button> </div>
</el-form-item>
</el-form> </el-form>
<el-dialog :title="$t('批量导入')" :visible.sync="showBatchImportDialog" width="1000px" :close-on-click-modal="false"> <el-dialog :title="$t('批量导入')" :visible.sync="showBatchImportDialog" width="1000px" :close-on-click-modal="false">
...@@ -941,7 +949,7 @@ export default { ...@@ -941,7 +949,7 @@ export default {
this.getOrder() this.getOrder()
} }
if(this.$route.query.transportType != this.transportId){ if(this.$route.query.transportType != this.transportId){
this.set(this.form.transportId, +this.$route.query.transportType || null) this.$set(this.form.transportId, +this.$route.query.transportType || null)
} }
// 变更出货渠道 // 变更出货渠道
......
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