|
|
|
@ -64,6 +64,19 @@
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="8" v-if="judgeShow('reservedFields1')">
|
|
|
|
|
|
|
|
<jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')"
|
|
|
|
|
|
|
|
prop="reservedFields1">
|
|
|
|
|
|
|
|
<JnpfPopupSelect v-model="dataForm.reservedFields1"
|
|
|
|
|
|
|
|
@change="changeData('reservedFields1',-1)" :rowIndex="null" :formData="dataForm"
|
|
|
|
|
|
|
|
:templateJson="interfaceRes.reservedFields1" placeholder="请选择" :disabled="true"
|
|
|
|
|
|
|
|
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
|
|
|
|
relationField='name' field='reservedFields1' interfaceId="517979330417001669"
|
|
|
|
|
|
|
|
:pageSize="20" :columnOptions="reservedFields1columnOptions" clearable
|
|
|
|
|
|
|
|
:style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="24" v-if="judgeShow('-${html.relationField}')">
|
|
|
|
<el-col :span="24" v-if="judgeShow('-${html.relationField}')">
|
|
|
|
<jnpf-form-tip-item label-width="0">
|
|
|
|
<jnpf-form-tip-item label-width="0">
|
|
|
|
<div class="JNPF-common-title">
|
|
|
|
<div class="JNPF-common-title">
|
|
|
|
@ -86,21 +99,21 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column label="订单类型" v-if="judgeShow('warehousingproduct-spec')"
|
|
|
|
<el-table-column label="订单类型"
|
|
|
|
prop="spec">
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-spec')">*</span>订单类型
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>订单类型
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.spec"
|
|
|
|
<JnpfSelect v-model="scope.row.orderType"
|
|
|
|
@change="changeData('warehousingproduct-spec',scope.$index)" placeholder="请输入"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-spec')"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
:options="orderTypeOptions" :props="orderTypeProps">
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfSelect>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="期望送达时间"
|
|
|
|
<!-- <el-table-column label="期望送达时间"
|
|
|
|
v-if="judgeShow('warehousingproduct-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
v-if="judgeShow('warehousingproduct-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
@ -114,7 +127,7 @@
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column> -->
|
|
|
|
<el-table-column label="关联客户(二级)"
|
|
|
|
<el-table-column label="关联客户(二级)"
|
|
|
|
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
|
|
|
|
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
@ -122,7 +135,7 @@
|
|
|
|
v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联客户(二级)
|
|
|
|
v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联客户(二级)
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.purchaseUnitId"
|
|
|
|
<JnpfInput v-model="scope.row.secondCustomName"
|
|
|
|
@change="changeData('warehousingproduct-purchaseUnitId',scope.$index)"
|
|
|
|
@change="changeData('warehousingproduct-purchaseUnitId',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请输入"
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseUnitId')"
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseUnitId')"
|
|
|
|
@ -137,7 +150,7 @@
|
|
|
|
v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
|
|
|
|
v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.purchaseNum"
|
|
|
|
<JnpfInput v-model="scope.row.businessLineName"
|
|
|
|
@change="changeData('warehousingproduct-purchaseNum',scope.$index)"
|
|
|
|
@change="changeData('warehousingproduct-purchaseNum',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请输入"
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseNum')"
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseNum')"
|
|
|
|
@ -145,145 +158,79 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="业务类型" v-if="judgeShow('warehousingproduct-storageAreaId')"
|
|
|
|
<el-table-column label="业务类型"
|
|
|
|
prop="storageAreaId">
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-storageAreaId')">*</span>业务类型
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>业务类型
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.storageAreaId"
|
|
|
|
<JnpfSelect v-model="scope.row.businessOrderType"
|
|
|
|
@change="changeData('warehousingproduct-storageAreaId',scope.$index)"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-storageAreaId')"
|
|
|
|
:options="businessOrderTypeOptions" :props="businessOrderTypeProps">
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="币种" v-if="judgeShow('warehousingproduct-warehousingUnitId')"
|
|
|
|
<el-table-column label="币种"
|
|
|
|
prop="warehousingUnitId">
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-warehousingUnitId')">*</span>币种
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>币种
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.warehousingUnitId"
|
|
|
|
<JnpfSelect v-model="scope.row.currency"
|
|
|
|
@change="changeData('warehousingproduct-warehousingUnitId',scope.$index)"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-warehousingUnitId')"
|
|
|
|
:options="currencyOptions" :props="currencyProps">
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="销售模式" v-if="judgeShow('warehousingproduct-barCode')"
|
|
|
|
<el-table-column label="销售模式"
|
|
|
|
prop="barCode">
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-barCode')">*</span>销售模式
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>销售模式
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.barCode"
|
|
|
|
<JnpfSelect v-model="scope.row.saleMode"
|
|
|
|
@change="changeData('warehousingproduct-barCode',scope.$index)"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-barCode')"
|
|
|
|
:options="saleModeOptions" :props="saleModeProps">
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="交货方式"
|
|
|
|
<el-table-column label="交货方式"
|
|
|
|
v-if="judgeShow('warehousingproduct-notificationStorageNumber')"
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
prop="notificationStorageNumber">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('warehousingproductList-notificationStorageNumber')">*</span>交货方式
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.notificationStorageNumber"
|
|
|
|
|
|
|
|
@change="changeData('warehousingproduct-notificationStorageNumber',scope.$index)"
|
|
|
|
|
|
|
|
placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-notificationStorageNumber')"
|
|
|
|
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="配送方式" v-if="judgeShow('warehousingproduct-volume')"
|
|
|
|
|
|
|
|
prop="volume">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('warehousingproductList-volume')">*</span>配送方式
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.volume"
|
|
|
|
|
|
|
|
@change="changeData('warehousingproduct-volume',scope.$index)"
|
|
|
|
|
|
|
|
placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-volume')"
|
|
|
|
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="运输方式" v-if="judgeShow('warehousingproduct-batchNo')"
|
|
|
|
|
|
|
|
prop="batchNo">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-batchNo')">*</span>运输方式
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>交货方式
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.batchNo"
|
|
|
|
<JnpfSelect v-model="scope.row.transactionMode"
|
|
|
|
@change="changeData('warehousingproduct-batchNo',scope.$index)"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-batchNo')"
|
|
|
|
:options="transactionModeOptions" :props="transactionModeProps">
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="运输方式"
|
|
|
|
<el-table-column label="生产日期" v-if="judgeShow('warehousingproduct-produceDate')"
|
|
|
|
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
|
|
|
|
prop="produceDate">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('warehousingproductList-produceDate')">*</span>生产日期
|
|
|
|
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>运输方式
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfDatePicker v-model="scope.row.produceDate"
|
|
|
|
<JnpfSelect v-model="scope.row.transportMode"
|
|
|
|
@change="changeData('warehousingproduct-produceDate',scope.$index)"
|
|
|
|
@change="changeData('warehousingproductList-inventoryUnitId',scope.$index)"
|
|
|
|
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
|
|
|
|
placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
|
|
|
|
placeholder="请选择"
|
|
|
|
:options="transportModeOptions" :props="transportModeProps">
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-produceDate')"
|
|
|
|
</JnpfSelect>
|
|
|
|
clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
|
|
|
|
|
|
|
|
</JnpfDatePicker>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="备注" v-if="judgeShow('warehousingproduct-remark')"
|
|
|
|
|
|
|
|
prop="remark">
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
|
|
|
v-if="judgeRequired('warehousingproductList-remark')">*</span>备注
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.remark"
|
|
|
|
|
|
|
|
@change="changeData('warehousingproduct-remark',scope.$index)"
|
|
|
|
|
|
|
|
placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-remark')"
|
|
|
|
|
|
|
|
clearable :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8" v-if="judgeShow('reservedFields1')">
|
|
|
|
|
|
|
|
<jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')"
|
|
|
|
|
|
|
|
prop="reservedFields1">
|
|
|
|
|
|
|
|
<JnpfPopupSelect v-model="dataForm.reservedFields1"
|
|
|
|
|
|
|
|
@change="changeData('reservedFields1',-1)" :rowIndex="null" :formData="dataForm"
|
|
|
|
|
|
|
|
:templateJson="interfaceRes.reservedFields1" placeholder="请选择"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('reservedFields1')" propsValue="id" popupWidth="800px"
|
|
|
|
|
|
|
|
popupTitle="选择数据" popupType="dialog" relationField='name' field='reservedFields1'
|
|
|
|
|
|
|
|
interfaceId="517979330417001669" :pageSize="20"
|
|
|
|
|
|
|
|
:columnOptions="reservedFields1columnOptions" clearable :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-col :span="24">
|
|
|
|
<jnpf-form-tip-item>
|
|
|
|
<jnpf-form-tip-item>
|
|
|
|
<JnpfGroupTitle content="收货信息" contentPosition="left">
|
|
|
|
<JnpfGroupTitle content="收货信息" contentPosition="left">
|
|
|
|
@ -386,14 +333,13 @@
|
|
|
|
v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*</span>凭证编号
|
|
|
|
v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*</span>凭证编号
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfPopupSelect v-model="scope.row.voucherId"
|
|
|
|
<JnpfPopupSelect v-model="scope.row.voucherId" @change="getSaleDeliveryVoucher"
|
|
|
|
@change="changeData('deliveryvoucherrelation-voucherId',scope.$index)"
|
|
|
|
|
|
|
|
:rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
:rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
:templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
|
|
|
|
:templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
|
|
|
|
placeholder="请选择"
|
|
|
|
placeholder="请选择"
|
|
|
|
:disabled="judgeWrite('deliveryvoucherrelationList')||judgeWrite('deliveryvoucherrelationList-voucherId')"
|
|
|
|
:disabled="judgeWrite('deliveryvoucherrelationList')||judgeWrite('deliveryvoucherrelationList-voucherId')"
|
|
|
|
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
relationField='voucher_code' :field="'voucherId'+scope.$index"
|
|
|
|
relationField='voucherCode' :field="'voucherId'+scope.$index"
|
|
|
|
interfaceId="530666910480598149" :pageSize="20"
|
|
|
|
interfaceId="530666910480598149" :pageSize="20"
|
|
|
|
:columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
|
|
|
|
:columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
|
|
|
|
:style='{"width":"100%"}'>
|
|
|
|
:style='{"width":"100%"}'>
|
|
|
|
@ -953,10 +899,10 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
<div class="table-actions" @click="adddeliveryproductrelationList()"
|
|
|
|
<!-- <div class="table-actions" @click="adddeliveryproductrelationList()"
|
|
|
|
v-if="!judgeWrite('deliveryproductrelationList')">
|
|
|
|
v-if="!judgeWrite('deliveryproductrelationList')">
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
</div>
|
|
|
|
</div> -->
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<!-- 表单结束 -->
|
|
|
|
<!-- 表单结束 -->
|
|
|
|
@ -1147,6 +1093,18 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "计划销售", "id": "2" }, { "fullName": "合同销售", "id": "3" }, { "fullName": "其他销售", "id": "4" }],
|
|
|
|
|
|
|
|
orderTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
|
|
|
businessOrderTypeOptions: [{ "fullName": "钢材类", "id": "1" }, { "fullName": "设备类", "id": "2" }, { "fullName": "废钢类", "id": "3" }, { "fullName": "低值易耗品", "id": "4" }, { "fullName": "合金类", "id": "5" }, { "fullName": "矿产类", "id": "6" }],
|
|
|
|
|
|
|
|
businessOrderTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
|
|
|
currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }],
|
|
|
|
|
|
|
|
currencyProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
|
|
|
saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
|
|
|
|
|
|
|
|
saleModeProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
|
|
|
transactionModeOptions: [{ "fullName": "快递交货", "id": "1" }, { "fullName": "送货上门", "id": "2" }, { "fullName": "上门提货", "id": "3" }],
|
|
|
|
|
|
|
|
transactionModeProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
|
|
|
transportModeOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
|
|
|
|
|
|
|
|
transportModeProps: { "label": "fullName", "value": "id" },
|
|
|
|
deliveryTypeOptions: [{ "fullName": "销售发货", "id": "2" }],
|
|
|
|
deliveryTypeOptions: [{ "fullName": "销售发货", "id": "2" }],
|
|
|
|
deliveryTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
deliveryTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" },],
|
|
|
|
businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" },],
|
|
|
|
@ -1155,7 +1113,7 @@ export default {
|
|
|
|
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
|
|
|
|
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
|
|
|
|
warehouseIdcolumnOptions: [{ "label": "仓库编码", "value": "code" }, { "label": "仓库名称", "value": "name" },],
|
|
|
|
warehouseIdcolumnOptions: [{ "label": "仓库编码", "value": "code" }, { "label": "仓库名称", "value": "name" },],
|
|
|
|
shippingAddresscolumnOptions: [{ "label": "业务类型", "value": "address_type" }, { "label": "国家", "value": "country" }, { "label": "详细地址", "value": "addressDetail" },],
|
|
|
|
shippingAddresscolumnOptions: [{ "label": "业务类型", "value": "address_type" }, { "label": "国家", "value": "country" }, { "label": "详细地址", "value": "addressDetail" },],
|
|
|
|
deliveryvoucherrelationvoucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucher_code" }, { "label": "单据类型", "value": "document_type" }, { "label": "磅单编号", "value": "pound_code" },],
|
|
|
|
deliveryvoucherrelationvoucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucherCode" }, { "label": "单据类型", "value": "documentType" }, { "label": "磅单编号", "value": "poundCode" },],
|
|
|
|
deliveryvoucherrelationdocumentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
|
|
|
|
deliveryvoucherrelationdocumentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
|
|
|
|
deliveryvoucherrelationdocumentTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
deliveryvoucherrelationdocumentTypeProps: { "label": "fullName", "value": "id" },
|
|
|
|
deliveryvoucherrelationvoucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
|
|
|
|
deliveryvoucherrelationvoucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
|
|
|
|
@ -1231,18 +1189,31 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
mounted() { },
|
|
|
|
mounted() { },
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
getSaleDeliveryVoucher(val, val2) {
|
|
|
|
|
|
|
|
val2.voucherId = val2.id
|
|
|
|
|
|
|
|
val2.businessType = "4"
|
|
|
|
|
|
|
|
this.dataForm.deliveryVoucherRelationList.push(val2)
|
|
|
|
|
|
|
|
this.dataForm.deliveryVoucherRelationList.splice(0, 1)
|
|
|
|
|
|
|
|
val2.productWarehouseEntityList.forEach((item, index) => {
|
|
|
|
|
|
|
|
item.productId = item.id
|
|
|
|
|
|
|
|
item.businessType = "4"
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
this.dataForm.deliveryProductRelationList.push(val2.productWarehouseEntityList[0])
|
|
|
|
|
|
|
|
},
|
|
|
|
getSaleOrder(val, val2) {
|
|
|
|
getSaleOrder(val, val2) {
|
|
|
|
debugger
|
|
|
|
this.dataForm.saleOrderInfo = []
|
|
|
|
this.dataForm.saleOrderInfo[0] = val2
|
|
|
|
this.dataForm.saleOrderInfo[0] = val2
|
|
|
|
this.dataForm.subjectBasicId = val2.firstSubjectBasicId
|
|
|
|
this.dataForm.subjectId = val2.firstSubjectBasicId
|
|
|
|
this.dataForm.deliveryAddress = val2.receiveAddress
|
|
|
|
this.dataForm.deliveryAddress = val2.receiveAddress
|
|
|
|
this.dataForm.enterpriseId = val2.enterpriseId
|
|
|
|
this.dataForm.enterpriseId = val2.enterpriseId
|
|
|
|
this.dataForm.warehouseId = val2.deliveryWarehouse
|
|
|
|
this.dataForm.warehouseId = val2.deliveryWarehouse
|
|
|
|
this.dataForm.shippingAddress = val2.deliveryAddress
|
|
|
|
this.dataForm.shippingAddress = val2.deliveryAddress
|
|
|
|
|
|
|
|
this.dataForm.reservedFields1 = val2.businessLineId
|
|
|
|
val2.businessOrderProductRelationalList.forEach((item, index) => {
|
|
|
|
val2.businessOrderProductRelationalList.forEach((item, index) => {
|
|
|
|
item.productName = item.name
|
|
|
|
item.productName = item.name
|
|
|
|
item.purchaseUnitId = item.salesMainUnitId
|
|
|
|
item.purchaseUnitId = item.salesMainUnitId
|
|
|
|
item.purchaseNum = item.businessNum
|
|
|
|
item.purchaseNum = item.businessNum
|
|
|
|
|
|
|
|
item.businessType = "4"
|
|
|
|
})
|
|
|
|
})
|
|
|
|
this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList
|
|
|
|
this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
XI_TENG\xixi_
8 months ago