Commit b94a8fe7 authored by Smile's avatar Smile Committed by wux

bug312 APP/WEB控货订单下载提单添加限制条件

parent c2e367b9
...@@ -6,6 +6,12 @@ export function getOrder(query) { ...@@ -6,6 +6,12 @@ export function getOrder(query) {
method: 'get' method: 'get'
}) })
} }
export function getOrderShowLadingStateStatus(query) {
return request({
url: '/app-api/my/order/getOrderShowLadingStateStatus/' + query,
method: 'get'
})
}
// 获得订单编辑详情 // 获得订单编辑详情
export function getOrderDetail(orderId) { export function getOrderDetail(orderId) {
......
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
<el-tab-pane :label="$t('orderdetail.activeThree')" name="three"> <el-tab-pane :label="$t('orderdetail.activeThree')" name="three">
<el-button type="text" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0" @click="showWarehouseReceipt=true">{{ $t('orderdetail.showWarehouseReceipt') }}</el-button> <el-button type="text" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0" @click="showWarehouseReceipt=true">{{ $t('orderdetail.showWarehouseReceipt') }}</el-button>
<el-button type="text" :disabled="!order.tidanNo || order.ladingState==false" @click.native="showLadingBill=true">{{ $t('orderdetail.showLadingBill') }}</el-button> <el-button type="text" :disabled="!orderShowLadingStateStatus||(!order.tidanNo || order.ladingState==false)" @click.native="showLadingBill=true">{{ $t('orderdetail.showLadingBill') }}</el-button>
<el-button type="text" @click.native="declarationOrderId=order.orderId">{{ $t('common.seeDeclaration') }}</el-button> <el-button type="text" @click.native="declarationOrderId=order.orderId">{{ $t('common.seeDeclaration') }}</el-button>
<!-- <el-button :disabled="true" type="text">{{$t('orderdetail.装箱单未上传')}}</el-button> --> <!-- <el-button :disabled="true" type="text">{{$t('orderdetail.装箱单未上传')}}</el-button> -->
</el-tab-pane> </el-tab-pane>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
</template> </template>
<script> <script>
import { getOrder, getOfferCheck } from '@/api/order' import { getOrder, getOfferCheck ,getOrderShowLadingStateStatus} from '@/api/order'
import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict' import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict'
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
...@@ -359,6 +359,7 @@ export default { ...@@ -359,6 +359,7 @@ export default {
// 遮罩层 // 遮罩层
loading: false, loading: false,
order: {}, order: {},
orderShowLadingStateStatus:false,
activeName: 'first', activeName: 'first',
orderId: 17, orderId: 17,
tableData: [], tableData: [],
...@@ -465,6 +466,14 @@ export default { ...@@ -465,6 +466,14 @@ export default {
} }
}, },
methods: { methods: {
getOrderShowLadingStateStatus(id){
let that = this
getOrderShowLadingStateStatus(id).then(res => {
if (res.code==0){
that.orderShowLadingStateStatus=res.data;
}
})
},
getSummary() { getSummary() {
// 货值汇总 // 货值汇总
let worth = new Decimal(0) let worth = new Decimal(0)
...@@ -518,6 +527,11 @@ export default { ...@@ -518,6 +527,11 @@ export default {
if(!that.order.consigneeVO){ if(!that.order.consigneeVO){
that.order.consigneeVO = {} that.order.consigneeVO = {}
} }
if (that.order.isCargoControl){
that.getOrderShowLadingStateStatus(that.order.orderId);
}else {
that.orderShowLadingStateStatus=true;
}
that.documentsDidables = (that.order.customsType == 2) that.documentsDidables = (that.order.customsType == 2)
this.show = true this.show = true
that.getObjectCity(that.order.initialLogisticsInfoDto.destCityId) that.getObjectCity(that.order.initialLogisticsInfoDto.destCityId)
......
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