|
|
|
@ -74,6 +74,7 @@
|
|
|
|
|
</JnpfDatePicker> -->
|
|
|
|
|
<el-date-picker v-model="dataForm.expectArriveDate" type="daterange"
|
|
|
|
|
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
|
|
|
|
|
:disabled="judgeWrite('expectArriveDateStart')"
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
@ -449,6 +450,25 @@
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8" v-if="judgeShow('transportMode')">
|
|
|
|
|
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportMode')" prop="carriageMode">
|
|
|
|
|
<JnpfSelect v-model="dataForm.carriageMode" @change="changeData('transportMode', -1)"
|
|
|
|
|
placeholder="请选择" :disabled="judgeWrite('transportMode')" clearable
|
|
|
|
|
:style='{ "width": "100%" }' :options="transportationMethodOptions"
|
|
|
|
|
:props="transportationMethodProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<template v-if="this.dataForm.carriageMode == '2'">
|
|
|
|
|
<el-col :span="8" v-if="judgeShow('transportMode')">
|
|
|
|
|
<jnpf-form-tip-item label="承运商" v-if="judgeShow('transportMode')" prop="carrier">
|
|
|
|
|
<JnpfInput v-model="dataForm.carrier" @change="changeData('transportMode', -1)"
|
|
|
|
|
placeholder="请输入" :disabled="judgeWrite('transportMode')" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</template>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<jnpf-form-tip-item>
|
|
|
|
|
<JnpfGroupTitle content="结算信息" contentPosition="left">
|
|
|
|
@ -956,8 +976,8 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
<div class="table-actions" @click="choiceProduct(dataForm.contractId)"
|
|
|
|
|
v-if="this.dataForm.orderType == '3'">
|
|
|
|
|
<div class="table-actions" @click="choiceProduct"
|
|
|
|
|
v-if="this.dataForm.orderType == '3' && this.isLongAgreement == '2'">
|
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="table-actions" @click="addProduct" v-if="this.dataForm.orderType == '1'">
|
|
|
|
@ -1007,6 +1027,7 @@ export default {
|
|
|
|
|
props: [],
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
isLongAgreement: '',
|
|
|
|
|
BomgoodsBoxVisible: false,
|
|
|
|
|
BomgoodsBoxVisible1: false,
|
|
|
|
|
dataFormSubmitType: 0,
|
|
|
|
@ -1110,6 +1131,8 @@ export default {
|
|
|
|
|
deliveryWarehouse: undefined,
|
|
|
|
|
deliveryAddress: undefined,
|
|
|
|
|
transportMode: undefined,
|
|
|
|
|
carriageMode: undefined,
|
|
|
|
|
carrier: undefined,
|
|
|
|
|
remark: undefined,
|
|
|
|
|
status: undefined,
|
|
|
|
|
settlementInfoList: [],
|
|
|
|
@ -1284,6 +1307,8 @@ export default {
|
|
|
|
|
businessorderproductrelationalsalesMainUnitIdProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
costBearingMianOptions: [{ "fullName": "甲方", "id": "1" }, { "fullName": "乙方", "id": "2" }],
|
|
|
|
|
costBearingMianProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],
|
|
|
|
|
transportationMethodProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
childIndex: -1,
|
|
|
|
|
isEdit: false,
|
|
|
|
|
interfaceRes: {
|
|
|
|
@ -1350,6 +1375,8 @@ export default {
|
|
|
|
|
if (this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
|
|
|
|
|
this.initDefaultData()
|
|
|
|
|
this.dataForm.businessType = '2'
|
|
|
|
|
const user = this.$store.getters.userInfo
|
|
|
|
|
this.dataForm.enterpriseId = user.organizeId
|
|
|
|
|
}
|
|
|
|
|
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
|
|
|
|
|
},
|
|
|
|
@ -1480,14 +1507,16 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
contractInfo(val, val2) {
|
|
|
|
|
this.dataForm.expectArriveDate = [];
|
|
|
|
|
if (val2.contractPeriodTime && val2.contractPeriodTimeEnd) {
|
|
|
|
|
this.dataForm.expectArriveDate[0] = new Date(val2.contractPeriodTime)
|
|
|
|
|
this.dataForm.expectArriveDate[1] = new Date(val2.contractPeriodTimeEnd)
|
|
|
|
|
}
|
|
|
|
|
this.dataForm.contractInfoList = []
|
|
|
|
|
this.dataForm.contractInfoList[0] = val2
|
|
|
|
|
this.isLongAgreement = val2.isLongAgreement
|
|
|
|
|
this.dataForm.firstSubjectBasicId = val2.subject
|
|
|
|
|
this.dataForm.enterpriseId = val2.deptId
|
|
|
|
|
// this.dataForm.enterpriseId = val2.deptId
|
|
|
|
|
this.dataForm.receiveAddress = val2.deliveryLocation
|
|
|
|
|
this.dataForm.transportMode = val2.modeTransport
|
|
|
|
|
this.dataForm.transactionMode = val2.deliveryModel
|
|
|
|
|