|
|
@ -1,7 +1,7 @@
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
|
<div :style="{ margin: '0 auto', width: '100%' }">
|
|
|
|
<div :style="{ margin: '0 auto', width: '100%' }">
|
|
|
|
<el-row :gutter="15" class="">
|
|
|
|
<el-row :gutter="15" class="">
|
|
|
|
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
|
|
|
|
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="140px" label-position="right"
|
|
|
|
:disabled="setting.readonly">
|
|
|
|
:disabled="setting.readonly">
|
|
|
|
<template v-if="!loading && formOperates">
|
|
|
|
<template v-if="!loading && formOperates">
|
|
|
|
<!-- 具体表单 -->
|
|
|
|
<!-- 具体表单 -->
|
|
|
@ -59,12 +59,15 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="8" v-if="judgeShow('expectArriveDateStart')">
|
|
|
|
<el-col :span="8" v-if="judgeShow('expectArriveDateStart')">
|
|
|
|
<jnpf-form-tip-item label="期望送达" v-if="judgeShow('expectArriveDateStart')" prop="expectArriveDateStart">
|
|
|
|
<jnpf-form-tip-item label="期望送达时间" v-if="judgeShow('expectArriveDateStart')" prop="expectArriveDate">
|
|
|
|
<JnpfDatePicker v-model="dataForm.expectArriveDateStart" @change="changeData('expectArriveDateStart', -1)"
|
|
|
|
<!-- <JnpfDatePicker v-model="dataForm.expectArriveDateStart" @change="changeData('expectArriveDateStart', -1)"
|
|
|
|
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
|
|
|
|
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
|
|
|
|
:disabled="judgeWrite('expectArriveDateStart')" clearable :style='{ "width": "100%" }' type="date"
|
|
|
|
:disabled="judgeWrite('expectArriveDateStart')" clearable :style='{ "width": "100%" }' type="date"
|
|
|
|
format="yyyy-MM-dd">
|
|
|
|
format="yyyy-MM-dd">
|
|
|
|
</JnpfDatePicker>
|
|
|
|
</JnpfDatePicker> -->
|
|
|
|
|
|
|
|
<el-date-picker v-model="dataForm.expectArriveDate" type="daterange" start-placeholder="开始日期"
|
|
|
|
|
|
|
|
end-placeholder="结束日期" value-format="yyyy-MM-dd">
|
|
|
|
|
|
|
|
</el-date-picker>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8" v-if="judgeShow('createOrderDate')">
|
|
|
|
<el-col :span="8" v-if="judgeShow('createOrderDate')">
|
|
|
@ -590,9 +593,9 @@
|
|
|
|
<h2></h2>
|
|
|
|
<h2></h2>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<el-table :data="dataForm.businessOrderProductRelationalList" size='mini'>
|
|
|
|
<el-table :data="dataForm.businessOrderProductRelationalList" size='mini'>
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" />
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
|
|
|
|
<el-table-column label="商品名称" v-if="judgeShow('businessorderproductrelational-productId')"
|
|
|
|
<el-table-column label="商品名称" v-if="judgeShow('businessorderproductrelational-productId')"
|
|
|
|
prop="productId">
|
|
|
|
prop="productId" width="160" align="center" fixed="left">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-productId')">*</span>商品名称
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-productId')">*</span>商品名称
|
|
|
@ -603,11 +606,12 @@
|
|
|
|
placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
relationField='name' :field="'productId' + scope.$index" interfaceId="530009896687501829"
|
|
|
|
relationField='name' :field="'productId' + scope.$index" interfaceId="530009896687501829"
|
|
|
|
:pageSize="20" :columnOptions="businessorderproductrelationalproductIdcolumnOptions2" clearable
|
|
|
|
:pageSize="20" :columnOptions="businessorderproductrelationalproductIdcolumnOptions2" clearable
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
:style='{ "width": "100%" }' disabled>
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="规格" v-if="judgeShow('businessorderproductrelational-spec')" prop="spec">
|
|
|
|
<el-table-column label="规格" v-if="judgeShow('businessorderproductrelational-spec')" prop="spec"
|
|
|
|
|
|
|
|
width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-spec')">*</span>规格
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-spec')">*</span>规格
|
|
|
@ -616,12 +620,12 @@
|
|
|
|
<JnpfInput v-model="scope.row.spec"
|
|
|
|
<JnpfInput v-model="scope.row.spec"
|
|
|
|
@change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
|
|
|
|
@change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
clearable :style='{ "width": "100%" }' readonly>
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="库存单位" v-if="judgeShow('businessorderproductrelational-inventoryUnitId')"
|
|
|
|
<el-table-column label="库存单位" v-if="judgeShow('businessorderproductrelational-inventoryUnitId')"
|
|
|
|
prop="inventoryUnitId">
|
|
|
|
prop="inventoryUnitId" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-inventoryUnitId')">*</span>库存单位
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-inventoryUnitId')">*</span>库存单位
|
|
|
@ -631,12 +635,12 @@
|
|
|
|
@change="changeData('businessorderproductrelational-inventoryUnitId', scope.$index)"
|
|
|
|
@change="changeData('businessorderproductrelational-inventoryUnitId', scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请输入"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-inventoryUnitId')"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-inventoryUnitId')"
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
clearable :style='{ "width": "100%" }' readonly>
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="实物库存" v-if="judgeShow('businessorderproductrelational-realBound')"
|
|
|
|
<el-table-column label="实物库存" v-if="judgeShow('businessorderproductrelational-realBound')"
|
|
|
|
prop="realBound">
|
|
|
|
prop="realBound" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-realBound')">*</span>实物库存
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-realBound')">*</span>实物库存
|
|
|
@ -650,7 +654,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="可用库存" v-if="judgeShow('businessorderproductrelational-useBound')"
|
|
|
|
<el-table-column label="可用库存" v-if="judgeShow('businessorderproductrelational-useBound')"
|
|
|
|
prop="useBound">
|
|
|
|
prop="useBound" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>可用库存
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>可用库存
|
|
|
@ -663,8 +667,22 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="日均销量" v-if="judgeShow('businessorderproductrelational-useBound')"
|
|
|
|
|
|
|
|
prop="useBound" width="120" align="center">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>日均销量
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.useBound1"
|
|
|
|
|
|
|
|
@change="changeData('businessorderproductrelational-useBound', scope.$index)" placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-useBound')"
|
|
|
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="采购单位" v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
|
|
|
|
<el-table-column label="采购单位" v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
|
|
|
|
prop="salesMainUnitId">
|
|
|
|
prop="salesMainUnitId" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
|
|
|
@ -675,13 +693,47 @@
|
|
|
|
placeholder="请选择"
|
|
|
|
placeholder="请选择"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
|
|
|
|
clearable :style='{ "width": "100%" }'
|
|
|
|
clearable :style='{ "width": "100%" }'
|
|
|
|
:options="businessorderproductrelationalsalesMainUnitIdOptions"
|
|
|
|
:options="scope.row.businessorderproductrelationalsalesMainUnitIdOptions"
|
|
|
|
:props="businessorderproductrelationalsalesMainUnitIdProps">
|
|
|
|
:props="businessorderproductrelationalsalesMainUnitIdProps">
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfSelect>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="订货量限制" v-if="judgeShow('businessorderproductrelational-businessNum')"
|
|
|
|
|
|
|
|
prop="businessNum" width="250" align="center">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>订货量限制
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.purchaseOrderQuantityDown"
|
|
|
|
|
|
|
|
@change="changeData('businessorderproductrelational-businessNum', scope.$index)" placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
|
|
|
|
|
|
|
|
clearable :style='{ "width": "40%" }'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
<span>至</span>
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.purchaseOrderQuantityUpper"
|
|
|
|
|
|
|
|
@change="changeData('businessorderproductrelational-businessNum', scope.$index)" placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
|
|
|
|
|
|
|
|
clearable :style='{ "width": "40%" }'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="订货倍数" v-if="judgeShow('businessorderproductrelational-businessNum')"
|
|
|
|
|
|
|
|
prop="businessNum" width="120" align="center">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>订货倍数
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.purchaseOrderMultiple"
|
|
|
|
|
|
|
|
@change="changeData('businessorderproductrelational-businessNum', scope.$index)" placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
|
|
|
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="业务数量" v-if="judgeShow('businessorderproductrelational-businessNum')"
|
|
|
|
<el-table-column label="业务数量" v-if="judgeShow('businessorderproductrelational-businessNum')"
|
|
|
|
prop="businessNum">
|
|
|
|
prop="businessNum" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>业务数量
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>业务数量
|
|
|
@ -695,7 +747,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="业务单价" v-if="judgeShow('businessorderproductrelational-businessPrice')"
|
|
|
|
<el-table-column label="业务单价" v-if="judgeShow('businessorderproductrelational-businessPrice')"
|
|
|
|
prop="businessPrice">
|
|
|
|
prop="businessPrice" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>业务单价
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>业务单价
|
|
|
@ -709,7 +761,8 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')" prop="tax">
|
|
|
|
<el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')" prop="tax"
|
|
|
|
|
|
|
|
width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-tax')">*</span>税率
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-tax')">*</span>税率
|
|
|
@ -723,7 +776,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="含税小计" v-if="judgeShow('businessorderproductrelational-taxCount')"
|
|
|
|
<el-table-column label="含税小计" v-if="judgeShow('businessorderproductrelational-taxCount')"
|
|
|
|
prop="taxCount">
|
|
|
|
prop="taxCount" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-taxCount')">*</span>含税小计
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-taxCount')">*</span>含税小计
|
|
|
@ -737,7 +790,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="不含税单价" v-if="judgeShow('businessorderproductrelational-notTaxPrice')"
|
|
|
|
<el-table-column label="不含税单价" v-if="judgeShow('businessorderproductrelational-notTaxPrice')"
|
|
|
|
prop="notTaxPrice">
|
|
|
|
prop="notTaxPrice" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-notTaxPrice')">*</span>不含税单价
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-notTaxPrice')">*</span>不含税单价
|
|
|
@ -751,7 +804,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="不含税小计" v-if="judgeShow('businessorderproductrelational-notTaxCount')"
|
|
|
|
<el-table-column label="不含税小计" v-if="judgeShow('businessorderproductrelational-notTaxCount')"
|
|
|
|
prop="notTaxCount">
|
|
|
|
prop="notTaxCount" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-notTaxCount')">*</span>不含税小计
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-notTaxCount')">*</span>不含税小计
|
|
|
@ -765,7 +818,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="上一次采购单价" v-if="judgeShow('businessorderproductrelational-lastSalePrice')"
|
|
|
|
<el-table-column label="上一次采购单价" v-if="judgeShow('businessorderproductrelational-lastSalePrice')"
|
|
|
|
prop="lastSalePrice">
|
|
|
|
prop="lastSalePrice" width="120" align="center">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-lastSalePrice')">*</span>上一次采购单价
|
|
|
|
v-if="judgeRequired('businessorderproductrelationalList-lastSalePrice')">*</span>上一次采购单价
|
|
|
@ -779,7 +832,8 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作" width="50" v-if="!judgeWrite('businessorderproductrelationalList')">
|
|
|
|
<el-table-column label="操作" width="50" v-if="!judgeWrite('businessorderproductrelationalList')"
|
|
|
|
|
|
|
|
fixed="right" align="center">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button size="mini" type="text" class="JNPF-table-delBtn"
|
|
|
|
<el-button size="mini" type="text" class="JNPF-table-delBtn"
|
|
|
|
@click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
|
|
|
|
@click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
|
|
|
@ -915,6 +969,8 @@ export default {
|
|
|
|
counterpartOrderCode: undefined,
|
|
|
|
counterpartOrderCode: undefined,
|
|
|
|
urgentOrder: "1",
|
|
|
|
urgentOrder: "1",
|
|
|
|
expectArriveDateStart: undefined,
|
|
|
|
expectArriveDateStart: undefined,
|
|
|
|
|
|
|
|
expectArriveDateEnd: undefined,
|
|
|
|
|
|
|
|
expectArriveDate: [],
|
|
|
|
createOrderDate: undefined,
|
|
|
|
createOrderDate: undefined,
|
|
|
|
deliveryType: undefined,
|
|
|
|
deliveryType: undefined,
|
|
|
|
contractId: undefined,
|
|
|
|
contractId: undefined,
|
|
|
@ -955,7 +1011,7 @@ export default {
|
|
|
|
trigger: 'change'
|
|
|
|
trigger: 'change'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
],
|
|
|
|
expectArriveDateStart: [
|
|
|
|
expectArriveDate: [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: '请选择',
|
|
|
|
message: '请选择',
|
|
|
@ -1121,6 +1177,7 @@ export default {
|
|
|
|
counterpartOrderCode: [],
|
|
|
|
counterpartOrderCode: [],
|
|
|
|
urgentOrder: [],
|
|
|
|
urgentOrder: [],
|
|
|
|
expectArriveDateStart: [],
|
|
|
|
expectArriveDateStart: [],
|
|
|
|
|
|
|
|
expectArriveDateEnd: [],
|
|
|
|
createOrderDate: [],
|
|
|
|
createOrderDate: [],
|
|
|
|
deliveryType: [],
|
|
|
|
deliveryType: [],
|
|
|
|
contractId: [],
|
|
|
|
contractId: [],
|
|
|
@ -1243,6 +1300,20 @@ export default {
|
|
|
|
val2.subjectbasicEntityList[0].subjectBasicId = val2.subjectbasicEntityList[0].id
|
|
|
|
val2.subjectbasicEntityList[0].subjectBasicId = val2.subjectbasicEntityList[0].id
|
|
|
|
val2.subjectbasicEntityList[0].businessType = '1'
|
|
|
|
val2.subjectbasicEntityList[0].businessType = '1'
|
|
|
|
this.dataForm.settlementInfoList = val2.subjectbasicEntityList
|
|
|
|
this.dataForm.settlementInfoList = val2.subjectbasicEntityList
|
|
|
|
|
|
|
|
val2.productByContractModelList.forEach(item => {
|
|
|
|
|
|
|
|
item.inventoryUnitId = item.inventoryUnitId1
|
|
|
|
|
|
|
|
// item.salesMainUnitId = item.orderMainUnitId1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var aaa = JSON.parse(item.orderMainUnitId1)
|
|
|
|
|
|
|
|
var bbb = [];
|
|
|
|
|
|
|
|
for (let i = 0; i < aaa.length; i++) {
|
|
|
|
|
|
|
|
var opt = {};
|
|
|
|
|
|
|
|
opt.fullName = aaa[i];
|
|
|
|
|
|
|
|
opt.id = aaa[i];
|
|
|
|
|
|
|
|
bbb.push(opt);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
item.businessorderproductrelationalsalesMainUnitIdOptions = bbb;
|
|
|
|
|
|
|
|
})
|
|
|
|
this.dataForm.businessOrderProductRelationalList = val2.productByContractModelList
|
|
|
|
this.dataForm.businessOrderProductRelationalList = val2.productByContractModelList
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getSupplyName(val, val2) {
|
|
|
|
getSupplyName(val, val2) {
|
|
|
@ -1566,12 +1637,24 @@ export default {
|
|
|
|
return timeDataValue;
|
|
|
|
return timeDataValue;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
dataList() {
|
|
|
|
dataList() {
|
|
|
|
|
|
|
|
if (this.dataForm.expectArriveDate && this.dataForm.expectArriveDate.length) {
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDateStart = this.dataForm.expectArriveDate[0]
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDateEnd = this.dataForm.expectArriveDate[1]
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDateStart = ''
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDateEnd = ''
|
|
|
|
|
|
|
|
}
|
|
|
|
var _data = this.dataForm;
|
|
|
|
var _data = this.dataForm;
|
|
|
|
return _data;
|
|
|
|
return _data;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
dataInfo(dataAll) {
|
|
|
|
dataInfo(dataAll) {
|
|
|
|
let _dataAll = dataAll
|
|
|
|
let _dataAll = dataAll
|
|
|
|
this.dataForm = _dataAll
|
|
|
|
this.dataForm = _dataAll
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDate = [];
|
|
|
|
|
|
|
|
if (this.dataForm.expectArriveDateStart && this.dataForm.expectArriveDateEnd) {
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDate[0] = new Date(this.dataForm.expectArriveDateStart)
|
|
|
|
|
|
|
|
this.dataForm.expectArriveDate[1] = new Date(this.dataForm.expectArriveDateEnd)
|
|
|
|
|
|
|
|
}
|
|
|
|
this.isEdit = true
|
|
|
|
this.isEdit = true
|
|
|
|
this.dataAll()
|
|
|
|
this.dataAll()
|
|
|
|
for (let i = 0; i < _dataAll.settlementInfoList.length; i++) {
|
|
|
|
for (let i = 0; i < _dataAll.settlementInfoList.length; i++) {
|
|
|
|