yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

Browse Source
jg-waiwang-pro
CJYXTX\27961 7 months ago
parent 7a79c91b1c 744508c6a4
commit f14ec806c2
5 changed files with 100 additions and 158 deletions
Show Stats Download Patch File Download Diff File

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java
Unescape View File

@ -443,7 +443,7 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
entity.setFlowId(receiptOrderForm.getFlowId());
entity.setVersion(0);
} else {
entity.setReceiptCode(generaterSwapUtil.getBillNumber("sssh", false));
// entity.setReceiptCode(generaterSwapUtil.getBillNumber("sssh", false));
entity.setPreparationTime(DateUtil.getNowDate());
entity.setFlowId(receiptOrderForm.getFlowId());
}
@ -456,7 +456,7 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
entity.setFlowId(receiptOrderForm.getFlowId());
entity.setVersion(0);
} else {
entity.setReceiptCode(generaterSwapUtil.getBillNumber("cgsh", false));
// entity.setReceiptCode(generaterSwapUtil.getBillNumber("cgsh", false));
entity.setPreparationTime(DateUtil.getNowDate());
entity.setFlowId(receiptOrderForm.getFlowId());
}
@ -492,6 +492,7 @@ public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, Rec
entitys.setId(RandomUtil.uuId());
entitys.setOrderId(entity.getId());
if(isSave){
entitys.setBatchNo(generaterSwapUtil.getBillNumber("batch", false));
}else{
}
deliveryProductRelationService.saveOrUpdate(entitys);

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businesslineconfig/BusinessLineConfigConstant.java
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/form.vue
Unescape View File

@ -161,7 +161,7 @@ export default {
dataRule:
{
},
jnpf_base_user_jnpf_enabledMarkOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
jnpf_base_user_jnpf_enabledMarkOptions: [{ "fullName": "禁用", "id": "0" }, { "fullName": "启用", "id": "1" }],
jnpf_base_user_jnpf_enabledMarkProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,

3
jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue
Unescape View File

@ -231,7 +231,7 @@ export default {
exportBoxVisible: false,
treeData: [],
treeActiveId: '',
jnpf_base_user_jnpf_enabledMarkOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
jnpf_base_user_jnpf_enabledMarkOptions: [{ "fullName": "禁用", "id": "0" }, { "fullName": "启用", "id": "1" }],
jnpf_base_user_jnpf_enabledMarkProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
@ -511,6 +511,7 @@ export default {
data: _query
}).then(res => {
var _list = res.data.list;
debugger
this.list = _list.map(o => ({
...o,
...this.expandObj,

242
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
Unescape View File

@ -80,7 +80,7 @@
<el-table :data="dataForm.purchaseOrderInfo" size="mini">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="采购订单" v-if="judgeShow('warehousingproduct-productName')"
prop="code">
prop="code" width="190">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingproductList-productName')">*</span>采购订单
@ -99,7 +99,8 @@
</template>
</el-table-column>
<el-table-column label="订单类型"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -116,21 +117,6 @@
</JnpfSelect>
</template>
</el-table-column>
<!-- <el-table-column label="期望送达时间"
v-if="judgeShow('warehousingproduct-inventoryUnitId')" prop="inventoryUnitId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>期望送达时间
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitId"
@change="changeData('warehousingproduct-inventoryUnitId',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-inventoryUnitId')"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column> -->
<el-table-column label="期望送达时间"
v-if="judgeShow('warehousingproductList-inventoryUnitId')"
prop="underpaymentMethod" width="360" align="center">
@ -156,7 +142,8 @@
</template>
</el-table-column>
<el-table-column label="关联供应商(二级)"
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId"
width="300">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-purchaseUnitId')
@ -173,7 +160,8 @@
</template>
</el-table-column>
<el-table-column label="关联供应商(三级)"
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId"
width="300">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-purchaseUnitId')
@ -190,7 +178,7 @@
</template>
</el-table-column>
<el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')"
prop="purchaseNum">
prop="purchaseNum" width="180">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
@ -220,7 +208,8 @@
</template>
</el-table-column> -->
<el-table-column label="币种"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="110">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -238,7 +227,8 @@
</template>
</el-table-column>
<el-table-column label="采购模式"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -256,7 +246,8 @@
</template>
</el-table-column>
<el-table-column label="交货方式"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -274,7 +265,8 @@
</template>
</el-table-column>
<el-table-column label="运输方式"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -292,7 +284,8 @@
</template>
</el-table-column>
<el-table-column label="承运方式"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -310,7 +303,8 @@
</template>
</el-table-column>
<el-table-column label="承运商"
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('warehousingproductList-inventoryUnitId')
@ -437,12 +431,10 @@
@change="getPurchaseReceiptVoucher" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="
interfaceRes.deliveryvoucherrelationvoucherId
" placeholder="请选择" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-voucherId')
" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField="voucherCode" :field="'voucherId' + scope.$index"
interfaceId="531790337677461573" :pageSize="20" :columnOptions="
" placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField="voucherCode"
:field="'voucherId' + scope.$index" interfaceId="531790337677461573"
:pageSize="20" :columnOptions="
deliveryvoucherrelationvoucherIdcolumnOptions
" clearable :style="{ width: '100%' }">
</JnpfPopupSelect>
@ -464,17 +456,15 @@
'deliveryvoucherrelation-documentType',
scope.$index
)
" placeholder="请选择" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-documentType')
" clearable :style="{ width: '100%' }"
" placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
:options="deliveryvoucherrelationdocumentTypeOptions"
:props="deliveryvoucherrelationdocumentTypeProps">
</JnpfSelect>
</template>
</el-table-column>
<el-table-column label="凭证类型"
v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType">
v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType"
width="110">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-voucherType')
@ -486,9 +476,7 @@
'deliveryvoucherrelation-voucherType',
scope.$index
)
" placeholder="请选择" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-voucherType')
" placeholder="请选择" :disabled="true
" clearable :style="{ width: '100%' }"
:options="deliveryvoucherrelationvoucherTypeOptions"
:props="deliveryvoucherrelationvoucherTypeProps">
@ -496,7 +484,7 @@
</template>
</el-table-column>
<el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')"
prop="poundCode">
prop="poundCode" width="190">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-poundCode')
@ -508,16 +496,15 @@
'deliveryvoucherrelation-poundCode',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-poundCode')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="磅单时间"
v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime">
v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime"
width="180">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -532,17 +519,13 @@
scope.$index
)
" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite(
'deliveryvoucherrelationList-poundlistTime'
)
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true
" clearable :style="{ width: '100%' }" type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleId')"
prop="vehicleId">
prop="vehicleId" width="150">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-vehicleId')
@ -567,7 +550,7 @@
</template>
</el-table-column>
<el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')"
prop="productId">
prop="productId" width="150">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-productId')
@ -581,9 +564,7 @@
)
" :rowIndex="scope.$index" :formData="dataForm" :templateJson="
interfaceRes.deliveryvoucherrelationproductId
" placeholder="请选择" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-productId')
" placeholder="请选择" :disabled="true
" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField="name" :field="'productId' + scope.$index"
interfaceId="529919666429100229" :pageSize="20" :columnOptions="
@ -593,7 +574,7 @@
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
prop="spec">
prop="spec" width="140">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
@ -601,15 +582,13 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" @change="
changeData('deliveryvoucherrelation-spec', scope.$index)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-spec')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
prop="unit">
prop="unit" width="110">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
@ -617,15 +596,13 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" @change="
changeData('deliveryvoucherrelation-unit', scope.$index)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-unit')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')"
prop="grossWeight">
prop="grossWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-grossWeight')
@ -637,15 +614,13 @@
'deliveryvoucherrelation-grossWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-grossWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')"
prop="tareWeight">
prop="tareWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-tareWeight')
@ -657,15 +632,13 @@
'deliveryvoucherrelation-tareWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-tareWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('deliveryvoucherrelation-buckleWeight')"
prop="buckleWeight">
prop="buckleWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -679,15 +652,13 @@
'deliveryvoucherrelation-buckleWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-buckleWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')"
prop="netWeight">
prop="netWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryvoucherrelationList-netWeight')
@ -699,15 +670,13 @@
'deliveryvoucherrelation-netWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryvoucherrelationList') ||
judgeWrite('deliveryvoucherrelationList-netWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')"
prop="remark">
prop="remark" width="150">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
@ -751,7 +720,7 @@
<el-table :data="dataForm.deliveryProductRelationList" size="mini">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
prop="productId">
prop="productId" width="150">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-productId')
@ -765,9 +734,7 @@
)
" :rowIndex="scope.$index" :formData="dataForm" :templateJson="
interfaceRes.deliveryproductrelationproductId
" placeholder="请选择" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-productId')
" placeholder="请选择" :disabled="true
" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField="name" :field="'productId' + scope.$index"
interfaceId="529919666429100229" :pageSize="20" :columnOptions="
@ -777,7 +744,7 @@
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')"
prop="spec">
prop="spec" width="140">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
@ -785,16 +752,14 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" @change="
changeData('deliveryproductrelation-spec', scope.$index)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-spec')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位"
v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
prop="inventoryUnitId">
v-if="judgeShow('deliveryproductrelation-inventoryUnitId')" prop="inventoryUnitId"
width="110">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -808,18 +773,14 @@
'deliveryproductrelation-inventoryUnitId',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite(
'deliveryproductrelationList-inventoryUnitId'
)
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="采购单位"
v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
prop="salesMainUnitId">
v-if="judgeShow('deliveryproductrelation-salesMainUnitId')" prop="salesMainUnitId"
width="110">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -833,17 +794,13 @@
'deliveryproductrelation-salesMainUnitId',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite(
'deliveryproductrelationList-salesMainUnitId'
)
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="采购数量" v-if="judgeShow('deliveryproductrelation-saleNum')"
prop="saleNum">
prop="saleNum" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-saleNum')
@ -855,15 +812,14 @@
'deliveryproductrelation-saleNum',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-saleNum')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="收货单位"
v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit">
v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit"
width="110">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -894,7 +850,7 @@
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
prop="grossWeight">
prop="grossWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-grossWeight')
@ -906,15 +862,13 @@
'deliveryproductrelation-grossWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-grossWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')"
prop="tareWeight">
prop="tareWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-tareWeight')
@ -926,15 +880,13 @@
'deliveryproductrelation-tareWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-tareWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('deliveryproductrelation-buckleWeight')"
prop="buckleWeight">
prop="buckleWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired(
@ -948,15 +900,13 @@
'deliveryproductrelation-buckleWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-buckleWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')"
prop="netWeight">
prop="netWeight" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-netWeight')
@ -968,15 +918,13 @@
'deliveryproductrelation-netWeight',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-netWeight')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')"
prop="cargoId">
prop="cargoId" width="130">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-cargoId')
@ -1002,7 +950,8 @@
</template>
</el-table-column>
<el-table-column label="收货数量"
v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum">
v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum"
width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-deliveryNum')
@ -1022,7 +971,7 @@
</template>
</el-table-column>
<el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')"
prop="batchNo">
prop="batchNo" width="140">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-batchNo')
@ -1034,16 +983,15 @@
'deliveryproductrelation-batchNo',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-batchNo')
" placeholder="批次号自动生成" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="生产日期"
v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime">
v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime"
width="140">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-produceTime')
@ -1064,7 +1012,7 @@
</template>
</el-table-column>
<el-table-column label="采购单价" v-if="judgeShow('deliveryproductrelation-returnUnit')"
prop="returnUnit">
prop="returnUnit" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-returnUnit')
@ -1076,15 +1024,13 @@
'deliveryproductrelation-returnUnit',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-returnUnit')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')"
prop="tax">
prop="tax" width="110">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
@ -1092,15 +1038,13 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tax" @change="
changeData('deliveryproductrelation-tax', scope.$index)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-tax')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')"
prop="taxCount">
prop="taxCount" width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-taxCount')
@ -1112,15 +1056,14 @@
'deliveryproductrelation-taxCount',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-taxCount')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="不含税单价"
v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice">
v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice"
width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-notTaxPrice')
@ -1132,15 +1075,14 @@
'deliveryproductrelation-notTaxPrice',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-notTaxPrice')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="不含税小计"
v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount">
v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount"
width="120">
<template slot="header">
<span class="required-sign" v-if="
judgeRequired('deliveryproductrelationList-notTaxCount')
@ -1152,15 +1094,13 @@
'deliveryproductrelation-notTaxCount',
scope.$index
)
" placeholder="请输入" :disabled="
judgeWrite('deliveryproductrelationList') ||
judgeWrite('deliveryproductrelationList-notTaxCount')
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('deliveryproductrelation-remark')"
prop="remark">
prop="remark" width="140">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注

Write Preview
Loading…
Cancel
Save