添加货区

jg-waiwang-pro
CJYXTX\27961 8 months ago
parent 86ba2d7f9b
commit 76abc64d46

@ -72,4 +72,7 @@ public class WarehousingInventoryProductEntity {
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

@ -53,4 +53,6 @@ public class WarehousingReceiveProductEntity {
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

@ -51,4 +51,7 @@ public class WarehousingReportlossProductEntity {
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

@ -53,4 +53,6 @@ public class WarehousingReturnProductEntity {
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

@ -73,5 +73,7 @@ public class WorkOrderEntity {
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark;
@TableField(value = "WAREHOUSING_ID" , updateStrategy = FieldStrategy.IGNORED)
private String warehousingId;
}

@ -42,4 +42,7 @@ public class WorkOrderPrimaryEntity {
private String tenantId;
@TableField("WORK_ID")
private String workId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

@ -47,4 +47,7 @@ public class WorkOrderProductEntity {
private String tenantId;
@TableField("WORK_ID")
private String workId;
@TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED)
private String cargoId;
}

File diff suppressed because one or more lines are too long

@ -1,12 +1,8 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,48 +13,44 @@
</el-col>
<el-col :span="24" v-if="judgeShow('inventoryType')">
<jnpf-form-tip-item label="业务类型" v-if="judgeShow('inventoryType')" prop="inventoryType">
<JnpfRadio v-model="dataForm.inventoryType" @change="changeData('inventoryType',-1)"
:disabled="judgeWrite('inventoryType')" optionType="default" direction="horizontal"
size="small" :options="inventoryTypeOptions" :props="inventoryTypeProps">
<JnpfRadio v-model="dataForm.inventoryType" @change="changeData('inventoryType', -1)"
:disabled="judgeWrite('inventoryType')" optionType="default" direction="horizontal" size="small"
:options="inventoryTypeOptions" :props="inventoryTypeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" v-if="judgeShow('warehouseId')">
<jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
placeholder="请选择" :disabled="judgeWrite('warehouseId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
:columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
:disabled="judgeWrite('warehouseId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
:pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" v-if="judgeShow('inventoryTimeStart')">
<jnpf-form-tip-item label="盘点开始时间" v-if="judgeShow('inventoryTimeStart')"
label-width="120px" prop="inventoryTimeStart">
<JnpfDatePicker v-model="dataForm.inventoryTimeStart"
@change="changeData('inventoryTimeStart',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('inventoryTimeStart')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="盘点开始时间" v-if="judgeShow('inventoryTimeStart')" label-width="120px"
prop="inventoryTimeStart">
<JnpfDatePicker v-model="dataForm.inventoryTimeStart" @change="changeData('inventoryTimeStart', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('inventoryTimeStart')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('documentNo')">
<jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
<JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('documentNo')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.documentNo" @change="changeData('documentNo', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('documentNo')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
<jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :disabled="judgeWrite('remark')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
:disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -69,33 +61,27 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('stocktakingMode')">
<jnpf-form-tip-item label="盘点方式" v-if="judgeShow('stocktakingMode')"
prop="stocktakingMode">
<JnpfRadio v-model="dataForm.stocktakingMode"
@change="changeData('stocktakingMode',-1)" :disabled="judgeWrite('stocktakingMode')"
optionType="default" direction="horizontal" size="small"
<jnpf-form-tip-item label="盘点方式" v-if="judgeShow('stocktakingMode')" prop="stocktakingMode">
<JnpfRadio v-model="dataForm.stocktakingMode" @change="changeData('stocktakingMode', -1)"
:disabled="judgeWrite('stocktakingMode')" optionType="default" direction="horizontal" size="small"
:options="stocktakingModeOptions" :props="stocktakingModeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('missingDiskRule')">
<jnpf-form-tip-item label="漏盘规则" v-if="judgeShow('missingDiskRule')"
prop="missingDiskRule">
<JnpfRadio v-model="dataForm.missingDiskRule"
@change="changeData('missingDiskRule',-1)" :disabled="judgeWrite('missingDiskRule')"
optionType="default" direction="horizontal" size="small"
<jnpf-form-tip-item label="漏盘规则" v-if="judgeShow('missingDiskRule')" prop="missingDiskRule">
<JnpfRadio v-model="dataForm.missingDiskRule" @change="changeData('missingDiskRule', -1)"
:disabled="judgeWrite('missingDiskRule')" optionType="default" direction="horizontal" size="small"
:options="missingDiskRuleOptions" :props="missingDiskRuleProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('duplicateInventoryRule')">
<jnpf-form-tip-item label="重复盘点规则" v-if="judgeShow('duplicateInventoryRule')"
label-width="120px" prop="duplicateInventoryRule">
<JnpfRadio v-model="dataForm.duplicateInventoryRule"
@change="changeData('duplicateInventoryRule',-1)"
:disabled="judgeWrite('duplicateInventoryRule')" optionType="default"
direction="horizontal" size="small" :options="duplicateInventoryRuleOptions"
:props="duplicateInventoryRuleProps">
<jnpf-form-tip-item label="重复盘点规则" v-if="judgeShow('duplicateInventoryRule')" label-width="120px"
prop="duplicateInventoryRule">
<JnpfRadio v-model="dataForm.duplicateInventoryRule" @change="changeData('duplicateInventoryRule', -1)"
:disabled="judgeWrite('duplicateInventoryRule')" optionType="default" direction="horizontal"
size="small" :options="duplicateInventoryRuleOptions" :props="duplicateInventoryRuleProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
@ -112,144 +98,167 @@
</div>
<el-table :data="dataForm.warehousingInventoryProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称"
v-if="judgeShow('warehousinginventoryproduct-productId')" prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('warehousinginventoryproduct-productId')"
prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="productBatch"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousinginventoryproductproductId"
<JnpfPopupSelect v-model="scope.row.productId" @change="productBatch" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousinginventoryproductproductId"
placeholder="请选择"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529994958833209925" :pageSize="20"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529994958833209925" :pageSize="20"
:columnOptions="warehousinginventoryproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('warehousinginventoryproduct-spec')"
prop="spec">
<el-table-column label="规格" v-if="judgeShow('warehousinginventoryproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('warehousinginventoryproductList-spec')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('warehousinginventoryproduct-spec',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-spec')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousinginventoryproduct-spec', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-spec')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位"
v-if="judgeShow('warehousinginventoryproduct-inventoryUnitIds')"
<el-table-column label="库存单位" v-if="judgeShow('warehousinginventoryproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-inventoryUnitIds')">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousinginventoryproduct-inventoryUnitIds',scope.$index)"
@change="changeData('warehousinginventoryproduct-inventoryUnitIds', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="商品分类"
v-if="judgeShow('warehousinginventoryproduct-categoryName')" prop="categoryName">
<el-table-column label="商品分类" v-if="judgeShow('warehousinginventoryproduct-categoryName')"
prop="categoryName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-categoryName')">*</span>商品分类
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.categoryName"
@change="changeData('warehousinginventoryproduct-categoryName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-categoryName')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousinginventoryproduct-categoryName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-categoryName')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="品牌"
v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName">
<el-table-column label="品牌" v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-brandName')">*</span>品牌
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.brandName"
@change="changeData('warehousinginventoryproduct-brandName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-brandName')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousinginventoryproduct-brandName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-brandName')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="实盘数量"
v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
<el-table-column label="实盘数量" v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
prop="firmOfferQuantity">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-firmOfferQuantity')">*</span>实盘数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.firmOfferQuantity"
@change="changeData('warehousinginventoryproduct-firmOfferQuantity',scope.$index)"
@change="changeData('warehousinginventoryproduct-firmOfferQuantity', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="批次号"
v-if="judgeShow('warehousinginventoryproduct-batchNumber')" prop="batchNumber">
<el-table-column label="货区名称" v-if="judgeShow('warehousinginventoryproduct-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('warehousinginventoryproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousinginventoryproductcargoId"
placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="warehousinginventoryproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="批次号" v-if="judgeShow('warehousinginventoryproduct-batchNumber')"
prop="batchNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-batchNumber')">*</span>批次号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('warehousinginventoryproduct-batchNumber',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-batchNumber')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousinginventoryproduct-batchNumber', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-batchNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="生产日期"
v-if="judgeShow('warehousinginventoryproduct-dateManufacture')"
<el-table-column label="生产日期" v-if="judgeShow('warehousinginventoryproduct-dateManufacture')"
prop="dateManufacture">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-dateManufacture')">*</span>生产日期
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.dateManufacture"
@change="changeData('warehousinginventoryproduct-dateManufacture',scope.$index)"
@change="changeData('warehousinginventoryproduct-dateManufacture', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-dateManufacture')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-dateManufacture')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50"
v-if="!judgeWrite('warehousinginventoryproductList')">
<el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginventoryproductList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousinginventoryproductList(scope.$index)">删除</el-button>
@ -264,8 +273,8 @@
</el-col>
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -319,6 +328,8 @@ export default {
batchNumber: '',
brandName: '',
categoryName: '',
cargoId: '',
cargoIdOptions: [],
inventoryUnitIds: '',
dateManufacture: '',
productIdOptions: [],
@ -401,6 +412,7 @@ export default {
duplicateInventoryRuleOptions: [{ "fullName": "累加汇总", "id": "1" }, { "fullName": "覆盖更新", "id": "2" }],
duplicateInventoryRuleProps: { "label": "fullName", "value": "id" },
warehousinginventoryproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "批次号", "value": "batchNumber" },],
warehousinginventoryproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -418,6 +430,8 @@ export default {
duplicateInventoryRule: [],
warehousinginventoryproductproductId: [],
warehousinginventoryproductfirmOfferQuantity: [],
warehousinginventoryproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
},
}
},
@ -560,6 +574,7 @@ export default {
let item = {
productId: '',
firmOfferQuantity: undefined,
cargoId: '',
}
this.getwarehousinginventoryproductList(item)
},

@ -1,12 +1,8 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,62 +13,54 @@
</el-col>
<el-col :span="8" v-if="judgeShow('receiveCode')">
<jnpf-form-tip-item label="领用单编号" v-if="judgeShow('receiveCode')" prop="receiveCode">
<JnpfInput v-model="dataForm.receiveCode" @change="changeData('receiveCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('receiveCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.receiveCode" @change="changeData('receiveCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('receiveCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('warehouseId')">
<jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
placeholder="请选择" :disabled="judgeWrite('warehouseId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
:columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
:disabled="judgeWrite('warehouseId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
:pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('usedreturnTime')">
<jnpf-form-tip-item label="领用时间" v-if="judgeShow('usedreturnTime')"
prop="usedreturnTime">
<JnpfDatePicker v-model="dataForm.usedreturnTime"
@change="changeData('usedreturnTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('usedreturnTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="领用时间" v-if="judgeShow('usedreturnTime')" prop="usedreturnTime">
<JnpfDatePicker v-model="dataForm.usedreturnTime" @change="changeData('usedreturnTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('usedreturnTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('usedreturnReason')">
<jnpf-form-tip-item label="领用原因" v-if="judgeShow('usedreturnReason')"
prop="usedreturnReason">
<JnpfSelect v-model="dataForm.usedreturnReason"
@change="changeData('usedreturnReason',-1)" placeholder="请选择"
:disabled="judgeWrite('usedreturnReason')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="领用原因" v-if="judgeShow('usedreturnReason')" prop="usedreturnReason">
<JnpfSelect v-model="dataForm.usedreturnReason" @change="changeData('usedreturnReason', -1)"
placeholder="请选择" :disabled="judgeWrite('usedreturnReason')" clearable :style='{ "width": "100%" }'
:options="usedreturnReasonOptions" :props="usedreturnReasonProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('businessId')">
<jnpf-form-tip-item label="关联单据" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
placeholder="请选择" :disabled="judgeWrite('businessId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='code'
field='businessId' interfaceId="530410134715782917" :pageSize="20"
:columnOptions="businessIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
:disabled="judgeWrite('businessId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='code' field='businessId' interfaceId="530410134715782917"
:pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
<jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :disabled="judgeWrite('remark')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
:disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -86,7 +74,7 @@
<el-col :span="24">
<jnpf-form-tip-item>
<JnpfText
:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":12,"line-height":32,"font-style":"normal","text-align":"left"}'
:textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
content="默认展示关联单据的商品信息,可直接修改商品数量。">
</JnpfText>
</jnpf-form-tip-item>
@ -98,150 +86,168 @@
</div>
<el-table :data="dataForm.warehousingReceiveProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称"
v-if="judgeShow('warehousingreceiveproduct-productId')" prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('warehousingreceiveproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="receiveProductBatch"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreceiveproductproductId"
placeholder="请选择"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="530652311085669125" :pageSize="20"
:templateJson="interfaceRes.warehousingreceiveproductproductId" placeholder="请选择"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="530652311085669125" :pageSize="20"
:columnOptions="warehousingreceiveproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="领用单位"
v-if="judgeShow('warehousingreceiveproduct-usedreturnUnit')"
<el-table-column label="领用单位" v-if="judgeShow('warehousingreceiveproduct-usedreturnUnit')"
prop="usedreturnUnit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-usedreturnUnit')">*</span>领用单位
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.usedreturnUnit"
@change="changeData('warehousingreceiveproduct-usedreturnUnit',scope.$index)"
@change="changeData('warehousingreceiveproduct-usedreturnUnit', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreceiveproductusedreturnUnit"
placeholder="请选择"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-usedreturnUnit')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='unit_name'
:field="'usedreturnUnit'+scope.$index" interfaceId="529938341609623877"
:pageSize="20"
:columnOptions="warehousingreceiveproductusedreturnUnitcolumnOptions"
clearable :style='{"width":"100%"}'>
:templateJson="interfaceRes.warehousingreceiveproductusedreturnUnit" placeholder="请选择"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-usedreturnUnit')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='unit_name' :field="'usedreturnUnit' + scope.$index"
interfaceId="529938341609623877" :pageSize="20"
:columnOptions="warehousingreceiveproductusedreturnUnitcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('warehousingreceiveproduct-spec')"
prop="spec">
<el-table-column label="规格" v-if="judgeShow('warehousingreceiveproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('warehousingreceiveproductList-spec')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('warehousingreceiveproduct-spec',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-spec')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-spec', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-spec')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位"
v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
<el-table-column label="库存单位" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-inventoryUnitIds')">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreceiveproduct-inventoryUnitIds',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-inventoryUnitIds', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="实物库存"
v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
<el-table-column label="实物库存" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-inventoryUnitIds')">*</span>实物库存
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreceiveproduct-inventoryUnitIds',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-inventoryUnitIds', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="可用库存"
v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
<el-table-column label="可用库存" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-inventoryUnitIds')">*</span>可用库存
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreceiveproduct-inventoryUnitIds',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-inventoryUnitIds', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="领用数量"
v-if="judgeShow('warehousingreceiveproduct-usedreturnNumber')"
<el-table-column label="领用数量" v-if="judgeShow('warehousingreceiveproduct-usedreturnNumber')"
prop="usedreturnNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-usedreturnNumber')">*</span>领用数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.usedreturnNumber"
@change="changeData('warehousingreceiveproduct-usedreturnNumber',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-usedreturnNumber')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-usedreturnNumber', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-usedreturnNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="批次号"
v-if="judgeShow('warehousingreceiveproduct-batchNumber')" prop="batchNumber">
<el-table-column label="批次号" v-if="judgeShow('warehousingreceiveproduct-batchNumber')"
prop="batchNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-batchNumber')">*</span>批次号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('warehousingreceiveproduct-batchNumber',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList')||judgeWrite('warehousingreceiveproductList-batchNumber')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreceiveproduct-batchNumber', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreceiveproductList') || judgeWrite('warehousingreceiveproductList-batchNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50"
v-if="!judgeWrite('warehousingreceiveproductList')">
<el-table-column label="货区名称" v-if="judgeShow('warehousingreceiveproduct-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreceiveproductList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('warehousingreceiveproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousingreceiveproductcargoId"
placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="warehousingreceiveproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreceiveproductList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousingreceiveproductList(scope.$index)">删除</el-button>
@ -256,8 +262,8 @@
</el-col>
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -313,6 +319,8 @@ export default {
usedreturnNumberOptions: [],
batchNumber: '',
batchNumberOptions: [],
cargoId: '',
cargoIdOptions: [],
enabledmark: undefined
},
},
@ -370,6 +378,8 @@ export default {
businessIdcolumnOptions: [{ "label": "加工单", "value": "code" }, { "label": "工厂", "value": "businessName" }, { "label": "业务线", "value": "businessfactoryName" }, { "label": "班组", "value": "team_name" },],
warehousingreceiveproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
warehousingreceiveproductusedreturnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
warehousingreceiveproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -387,6 +397,8 @@ export default {
warehousingreceiveproductusedreturnUnit: [],
warehousingreceiveproductusedreturnNumber: [],
warehousingreceiveproductbatchNumber: [],
warehousingreceiveproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
},
}
},
@ -541,6 +553,7 @@ export default {
usedreturnUnit: '',
usedreturnNumber: undefined,
batchNumber: undefined,
cargoId: '',
}
this.getwarehousingreceiveproductList(item)
},

File diff suppressed because one or more lines are too long

@ -1,12 +1,8 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -16,62 +12,52 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reportlossCode')">
<jnpf-form-tip-item label="报损单编号" v-if="judgeShow('reportlossCode')"
prop="reportlossCode">
<JnpfInput v-model="dataForm.reportlossCode" @change="changeData('reportlossCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('reportlossCode')" readonly
:style='{"width":"100%"}'>
<jnpf-form-tip-item label="报损单编号" v-if="judgeShow('reportlossCode')" prop="reportlossCode">
<JnpfInput v-model="dataForm.reportlossCode" @change="changeData('reportlossCode', -1)"
placeholder="系统自动生成" :disabled="judgeWrite('reportlossCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reportlossType')">
<jnpf-form-tip-item label="单据类型" v-if="judgeShow('reportlossType')"
prop="reportlossType">
<JnpfSelect v-model="dataForm.reportlossType"
@change="changeData('reportlossType',-1)" placeholder="请选择"
:disabled="judgeWrite('reportlossType')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="单据类型" v-if="judgeShow('reportlossType')" prop="reportlossType">
<JnpfSelect v-model="dataForm.reportlossType" @change="changeData('reportlossType', -1)" placeholder="请选择"
:disabled="judgeWrite('reportlossType')" clearable :style='{ "width": "100%" }'
:options="reportlossTypeOptions" :props="reportlossTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reportlossTime')">
<jnpf-form-tip-item label="报损时间" v-if="judgeShow('reportlossTime')"
prop="reportlossTime">
<JnpfDatePicker v-model="dataForm.reportlossTime"
@change="changeData('reportlossTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('reportlossTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="报损时间" v-if="judgeShow('reportlossTime')" prop="reportlossTime">
<JnpfDatePicker v-model="dataForm.reportlossTime" @change="changeData('reportlossTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('reportlossTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reportlossReason')">
<jnpf-form-tip-item label="报损原因" v-if="judgeShow('reportlossReason')"
prop="reportlossReason">
<JnpfSelect v-model="dataForm.reportlossReason"
@change="changeData('reportlossReason',-1)" placeholder="请选择"
:disabled="judgeWrite('reportlossReason')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="报损原因" v-if="judgeShow('reportlossReason')" prop="reportlossReason">
<JnpfSelect v-model="dataForm.reportlossReason" @change="changeData('reportlossReason', -1)"
placeholder="请选择" :disabled="judgeWrite('reportlossReason')" clearable :style='{ "width": "100%" }'
:options="reportlossReasonOptions" :props="reportlossReasonProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('warehouseId')">
<jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
placeholder="请选择" :disabled="judgeWrite('warehouseId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
:columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
:disabled="judgeWrite('warehouseId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
:pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
<jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :disabled="judgeWrite('remark')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
:disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -88,134 +74,157 @@
</div>
<el-table :data="dataForm.warehousingReportlossProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称"
v-if="judgeShow('warehousingreportlossproduct-productId')" prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('warehousingreportlossproduct-productId')"
prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="reportlossProductBatch"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreportlossproductproductId"
placeholder="请选择"
:disabled="judgeWrite('warehousingreportlossproductList')||judgeWrite('warehousingreportlossproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529994958833209925" :pageSize="20"
:templateJson="interfaceRes.warehousingreportlossproductproductId" placeholder="请选择"
:disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529994958833209925" :pageSize="20"
:columnOptions="warehousingreportlossproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="报损单位"
v-if="judgeShow('warehousingreportlossproduct-reportlossUnit')"
<el-table-column label="报损单位" v-if="judgeShow('warehousingreportlossproduct-reportlossUnit')"
prop="reportlossUnit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-reportlossUnit')">*</span>报损单位
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.reportlossUnit"
@change="changeData('warehousingreportlossproduct-reportlossUnit',scope.$index)"
@change="changeData('warehousingreportlossproduct-reportlossUnit', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreportlossproductreportlossUnit"
placeholder="请选择"
:disabled="judgeWrite('warehousingreportlossproductList')||judgeWrite('warehousingreportlossproductList-reportlossUnit')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='unit_name' :field="'reportlossUnit'+scope.$index"
interfaceId="529938341609623877" :pageSize="20"
:columnOptions="warehousingreportlossproductreportlossUnitcolumnOptions"
clearable :style='{"width":"100%"}'>
:templateJson="interfaceRes.warehousingreportlossproductreportlossUnit" placeholder="请选择"
:disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-reportlossUnit')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='unit_name'
:field="'reportlossUnit' + scope.$index" interfaceId="529938341609623877" :pageSize="20"
:columnOptions="warehousingreportlossproductreportlossUnitcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('warehousingreportlossproduct-spec')"
prop="spec">
<el-table-column label="规格" v-if="judgeShow('warehousingreportlossproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('warehousingreportlossproductList-spec')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('warehousingreportlossproduct-spec',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreportlossproductList')||judgeWrite('warehousingreportlossproductList-spec')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreportlossproduct-spec', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-spec')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位"
v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
<el-table-column label="库存单位" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-inventoryUnitIds')">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousinginventoryproduct-inventoryUnitIds',scope.$index)"
@change="changeData('warehousinginventoryproduct-inventoryUnitIds', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreportlossproductList')||judgeWrite('warehousingreportlossproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="实物库存"
v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
<el-table-column label="实物库存" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-inventoryUnitIds')">*</span>实物库存
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreportlossproduct-inventoryUnitIds',scope.$index)"
@change="changeData('warehousingreportlossproduct-inventoryUnitIds', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="可用库存"
v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
<el-table-column label="可用库存" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-inventoryUnitIds')">*</span>可用库存
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreportlossproduct-inventoryUnitIds',scope.$index)"
@change="changeData('warehousingreportlossproduct-inventoryUnitIds', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList')||judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="报损数量"
v-if="judgeShow('warehousingreportlossproduct-reportlossNumber')"
<el-table-column label="报损数量" v-if="judgeShow('warehousingreportlossproduct-reportlossNumber')"
prop="reportlossNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-reportlossNumber')">*</span>报损数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.reportlossNumber"
@change="changeData('warehousingreportlossproduct-reportlossNumber',scope.$index)"
@change="changeData('warehousingreportlossproduct-reportlossNumber', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreportlossproductList')||judgeWrite('warehousingreportlossproductList-reportlossNumber')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('warehousingreportlossproductList') || judgeWrite('warehousingreportlossproductList-reportlossNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50"
v-if="!judgeWrite('warehousingreportlossproductList')">
<el-table-column label="货区名称" v-if="judgeShow('warehousingreportlossproduct-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreportlossproductList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('warehousingreportlossproduct-cargoId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreportlossproductcargoId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
:field="'cargoId' + scope.$index" interfaceId="530700536261903749" :pageSize="20"
:columnOptions="warehousingreportlossproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreportlossproductList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousingreportlossproductList(scope.$index)">删除</el-button>
@ -230,8 +239,8 @@
</el-col>
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -285,6 +294,8 @@ export default {
reportlossUnitOptions: [],
reportlossNumber: '',
reportlossNumberOptions: [],
cargoId: '',
cargoIdOptions: [],
enabledmark: undefined
},
},
@ -339,6 +350,8 @@ export default {
warehouseIdcolumnOptions: [{ "label": "仓库名称", "value": "name" }, { "label": "仓库编码", "value": "code" },],
warehousingreportlossproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "批次号", "value": "batchNumber" },],
warehousingreportlossproductreportlossUnitcolumnOptions: [{ "label": "单位", "value": "unit_name" },],
warehousingreportlossproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -351,6 +364,8 @@ export default {
warehousingreportlossproductproductId: [],
warehousingreportlossproductreportlossUnit: [],
warehousingreportlossproductreportlossNumber: [],
warehousingreportlossproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
},
}
},
@ -486,6 +501,7 @@ export default {
productId: '',
reportlossUnit: '',
reportlossNumber: undefined,
cargoId: '',
}
this.getwarehousingreportlossproductList(item)
},

@ -1,12 +1,8 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,57 +13,53 @@
</el-col>
<el-col :span="8" v-if="judgeShow('returnCode')">
<jnpf-form-tip-item label="返库单编号" v-if="judgeShow('returnCode')" prop="returnCode">
<JnpfInput v-model="dataForm.returnCode" @change="changeData('returnCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('returnCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.returnCode" @change="changeData('returnCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('returnCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('warehouseId')">
<jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
placeholder="请选择" :disabled="judgeWrite('warehouseId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
:columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
:disabled="judgeWrite('warehouseId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='warehouseId' interfaceId="529617754022498181"
:pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('returnTime')">
<jnpf-form-tip-item label="返库时间" v-if="judgeShow('returnTime')" prop="returnTime">
<JnpfDatePicker v-model="dataForm.returnTime" @change="changeData('returnTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" :disabled="judgeWrite('returnTime')" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
<JnpfDatePicker v-model="dataForm.returnTime" @change="changeData('returnTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('returnTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('returnReason')">
<jnpf-form-tip-item label="返库原因" v-if="judgeShow('returnReason')" prop="returnReason">
<JnpfSelect v-model="dataForm.returnReason" @change="changeData('returnReason',-1)"
placeholder="请选择" :disabled="judgeWrite('returnReason')" clearable
:style='{"width":"100%"}' :options="returnReasonOptions" :props="returnReasonProps">
<JnpfSelect v-model="dataForm.returnReason" @change="changeData('returnReason', -1)" placeholder="请选择"
:disabled="judgeWrite('returnReason')" clearable :style='{ "width": "100%" }'
:options="returnReasonOptions" :props="returnReasonProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('businessId')">
<jnpf-form-tip-item label="关联单据" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
placeholder="请选择" :disabled="judgeWrite('businessId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='code'
field='businessId' interfaceId="531744380948602437" :pageSize="20"
:columnOptions="businessIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
:disabled="judgeWrite('businessId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='code' field='businessId' interfaceId="531744380948602437"
:pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
<jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :disabled="judgeWrite('remark')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
:disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -80,7 +72,7 @@
<el-col :span="24">
<jnpf-form-tip-item>
<JnpfText
:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":12,"line-height":32,"font-style":"normal","text-align":"left"}'
:textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
content="默认展示关联单据的商品信息,可直接修改商品数量。">
</JnpfText>
</jnpf-form-tip-item>
@ -92,114 +84,131 @@
</div>
<el-table :data="dataForm.warehousingReturnProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('warehousingreturnproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('warehousingreturnproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="returnProductBatch"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreturnproductproductId"
<JnpfPopupSelect v-model="scope.row.productId" @change="returnProductBatch" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousingreturnproductproductId"
placeholder="请选择"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'productId'+scope.$index"
interfaceId="530652311085669125" :pageSize="20"
:columnOptions="warehousingreturnproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId' + scope.$index" interfaceId="530652311085669125"
:pageSize="20" :columnOptions="warehousingreturnproductproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('warehousingreturnproduct-spec')"
prop="spec">
<el-table-column label="规格" v-if="judgeShow('warehousingreturnproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('warehousingreturnproductList-spec')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('warehousingreturnproduct-spec',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-spec')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreturnproduct-spec', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-spec')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位"
v-if="judgeShow('warehousingreturnproduct-inventoryUnitIds')"
<el-table-column label="库存单位" v-if="judgeShow('warehousingreturnproduct-inventoryUnitIds')"
prop="inventoryUnitIds">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-inventoryUnitIds')">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitIds"
@change="changeData('warehousingreturnproduct-inventoryUnitIds',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-inventoryUnitIds')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreturnproduct-inventoryUnitIds', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-inventoryUnitIds')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="返库单位"
v-if="judgeShow('warehousingreturnproduct-returnUnit')" prop="returnUnit">
<el-table-column label="返库单位" v-if="judgeShow('warehousingreturnproduct-returnUnit')" prop="returnUnit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-returnUnit')">*</span>返库单位
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.returnUnit"
@change="changeData('warehousingreturnproduct-returnUnit',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingreturnproductreturnUnit"
@change="changeData('warehousingreturnproduct-returnUnit', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousingreturnproductreturnUnit"
placeholder="请选择"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-returnUnit')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='unit_name'
:field="'returnUnit'+scope.$index" interfaceId="529938341609623877"
:pageSize="20"
:columnOptions="warehousingreturnproductreturnUnitcolumnOptions" clearable
:style='{"width":"100%"}'>
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-returnUnit')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='unit_name' :field="'returnUnit' + scope.$index" interfaceId="529938341609623877"
:pageSize="20" :columnOptions="warehousingreturnproductreturnUnitcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="返库数量"
v-if="judgeShow('warehousingreturnproduct-returnNumber')" prop="returnNumber">
<el-table-column label="返库数量" v-if="judgeShow('warehousingreturnproduct-returnNumber')"
prop="returnNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-returnNumber')">*</span>返库数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.returnNumber"
@change="changeData('warehousingreturnproduct-returnNumber',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-returnNumber')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreturnproduct-returnNumber', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-returnNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="批次号id"
v-if="judgeShow('warehousingreturnproduct-batchNumber')" prop="batchNumber">
<el-table-column label="批次号" v-if="judgeShow('warehousingreturnproduct-batchNumber')"
prop="batchNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-batchNumber')">*</span>批次号id
v-if="judgeRequired('warehousingreturnproductList-batchNumber')">*</span>批次号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('warehousingreturnproduct-batchNumber',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList')||judgeWrite('warehousingreturnproductList-batchNumber')"
clearable :style='{"width":"100%"}'>
@change="changeData('warehousingreturnproduct-batchNumber', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousingreturnproductList') || judgeWrite('warehousingreturnproductList-batchNumber')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50"
v-if="!judgeWrite('warehousingreturnproductList')">
<el-table-column label="货区名称" v-if="judgeShow('warehousingreturnproduct-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingreturnproductList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('warehousingreturnproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.warehousingreturnproductcargoId"
placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="warehousingreturnproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreturnproductList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousingreturnproductList(scope.$index)">删除</el-button>
@ -214,8 +223,8 @@
</el-col>
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -271,6 +280,8 @@ export default {
returnNumberOptions: [],
batchNumber: '',
batchNumberOptions: [],
cargoId: '',
cargoIdOptions: [],
enabledmark: undefined
},
},
@ -328,6 +339,7 @@ export default {
businessIdcolumnOptions: [{ "label": "领用单编号", "value": "receive_code" }, { "label": "关联的加工单", "value": "code" },],
warehousingreturnproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
warehousingreturnproductreturnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
warehousingreturnproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -345,6 +357,8 @@ export default {
warehousingreturnproductreturnUnit: [],
warehousingreturnproductreturnNumber: [],
warehousingreturnproductbatchNumber: [],
warehousingreturnproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
},
}
},
@ -499,6 +513,7 @@ export default {
returnUnit: '',
returnNumber: undefined,
batchNumber: undefined,
cargoId: '',
}
this.getwarehousingreturnproductList(item)
},

File diff suppressed because one or more lines are too long

@ -1,12 +1,8 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -18,16 +14,15 @@
<el-col :span="24">
<jnpf-form-tip-item>
<JnpfText
:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":12,"line-height":32,"font-style":"normal","text-align":"left"}'
:textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
content=" 不同的单据类型,需要选择不同的收货信息">
</JnpfText>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('type')">
<jnpf-form-tip-item label="单据类型" v-if="judgeShow('type')" prop="type">
<JnpfRadio v-model="dataForm.type" @change="changeData('type',-1)"
:disabled="judgeWrite('type')" optionType="button" direction="horizontal"
size="medium" :options="typeOptions" :props="typeProps">
<JnpfRadio v-model="dataForm.type" @change="changeData('type', -1)" :disabled="judgeWrite('type')"
optionType="button" direction="horizontal" size="medium" :options="typeOptions" :props="typeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
@ -39,80 +34,82 @@
</el-col>
<el-col :span="8" v-if="judgeShow('code')">
<jnpf-form-tip-item label="单据编号" v-if="judgeShow('code')" prop="code">
<JnpfInput v-model="dataForm.code" @change="changeData('code',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('code')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('code')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('businessfactoryId')">
<jnpf-form-tip-item label="工厂名称" v-if="judgeShow('businessfactoryId')"
prop="businessfactoryId">
<JnpfPopupSelect v-model="dataForm.businessfactoryId"
@change="changeData('businessfactoryId',-1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.businessfactoryId" placeholder="请选择"
:disabled="judgeWrite('businessfactoryId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='businessfactoryId' interfaceId="521651055751075845" :pageSize="20"
:columnOptions="businessfactoryIdcolumnOptions" clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="工厂名称" v-if="judgeShow('businessfactoryId')" prop="businessfactoryId">
<JnpfPopupSelect v-model="dataForm.businessfactoryId" @change="changeData('businessfactoryId', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessfactoryId" placeholder="请选择"
:disabled="judgeWrite('businessfactoryId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='businessfactoryId' interfaceId="521651055751075845"
:pageSize="20" :columnOptions="businessfactoryIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('businessId')">
<jnpf-form-tip-item label="生产线" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
placeholder="请选择" :disabled="judgeWrite('businessId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='businessId' interfaceId="517979330417001669" :pageSize="20"
:columnOptions="businessIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
:disabled="judgeWrite('businessId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='businessId' interfaceId="517979330417001669"
:pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('workTime')">
<jnpf-form-tip-item label="加工时间" v-if="judgeShow('workTime')" prop="workTime">
<JnpfDatePicker v-model="dataForm.workTime" @change="changeData('workTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" :disabled="judgeWrite('workTime')" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
<JnpfDatePicker v-model="dataForm.workTime" @change="changeData('workTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('workTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('businessCode')">
<jnpf-form-tip-item label="外部单据编号" v-if="judgeShow('businessCode')" prop="businessCode">
<JnpfInput v-model="dataForm.businessCode" @change="changeData('businessCode',-1)"
placeholder="请输入" :disabled="judgeWrite('businessCode')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.businessCode" @change="changeData('businessCode', -1)" placeholder="请输入"
:disabled="judgeWrite('businessCode')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('teamId')">
<jnpf-form-tip-item label="生产班组" v-if="judgeShow('teamId')" prop="teamId">
<JnpfPopupSelect v-model="dataForm.teamId" @change="changeData('teamId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.teamId"
placeholder="请选择" :disabled="judgeWrite('teamId')" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='team_name'
field='teamId' interfaceId="523050983727575621" :pageSize="20"
:columnOptions="teamIdcolumnOptions" clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="dataForm.teamId" @change="changeData('teamId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.teamId" placeholder="请选择"
:disabled="judgeWrite('teamId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='team_name' field='teamId' interfaceId="523050983727575621"
:pageSize="20" :columnOptions="teamIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="状态" prop="status">
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="button" direction="horizontal" size="medium" :options="statusOptions"
:props="statusProps">
<JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)" optionType="button"
direction="horizontal" size="medium" :options="statusOptions" :props="statusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="10" v-if="judgeShow('warehouseId')">
<jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
<JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
interfaceId="529573170819104773" :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
<jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :disabled="judgeWrite('remark')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
:disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -129,161 +126,193 @@
</div> -->
<el-table :data="dataForm.workOrderProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('workorderproductList-productId')">*</span>
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProductList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderproductproductId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'productId'+scope.$index"
interfaceId="519505017699307077" :pageSize="20"
:columnOptions="workorderproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId' + scope.$index" interfaceId="519505017699307077"
:pageSize="20" :columnOptions="workorderproductproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="存货类型" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>存货类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="lastModifyUserId">
<template slot="header">
<span class="required-sign">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="条码" prop="deleteUserId">
<template slot="header">
<span class="required-sign">*</span>条码
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.barCode" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
prop="unitId">
<el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')" prop="unitId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
<span class="required-sign" v-if="judgeRequired('workorderproductList-unitId')">*</span>
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.unitId"
@change="changeData('workorderproduct-unitId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderproductunitId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-unitId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='unit_name' :field="'unitId'+scope.$index"
interfaceId="523054191598383685" :pageSize="20"
:columnOptions="workorderproductunitIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('workorderproduct-unitId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderproductunitId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-unitId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='unit_name' :field="'unitId' + scope.$index" interfaceId="523054191598383685"
:pageSize="20" :columnOptions="workorderproductunitIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="加工数量" v-if="judgeShow('workorderproduct-proportionNum')"
prop="proportionNum">
<el-table-column label="加工数量" v-if="judgeShow('workorderproduct-proportionNum')" prop="proportionNum">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-proportionNum')">*</span>加工数量
<span class="required-sign" v-if="judgeRequired('workorderproductList-proportionNum')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.proportionNum"
@change="changeData('workorderproduct-proportionNum',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-proportionNum')"
clearable :style='{"width":"100%"}'>
@change="changeData('workorderproduct-proportionNum', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-proportionNum')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')"
prop="bomId">
<el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')" prop="bomId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
<span class="required-sign" v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.bomId"
@change="changeData('workorderproduct-bomId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderproductbomId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-bomId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='bom_name' :field="'bomId'+scope.$index"
interfaceId="523054588681531973" :pageSize="20"
:columnOptions="workorderproductbomIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('workorderproduct-bomId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderproductbomId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-bomId')" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='bom_name'
:field="'bomId' + scope.$index" interfaceId="523054588681531973" :pageSize="20"
:columnOptions="workorderproductbomIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')"
prop="cost">
<el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')" prop="cost">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-cost')">*</span>参考成本价
<span class="required-sign" v-if="judgeRequired('workorderproductList-cost')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.cost"
@change="changeData('workorderproduct-cost',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-cost')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.cost" @change="changeData('workorderproduct-cost', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')"
prop="remark">
<el-table-column label="货区名称" v-if="judgeShow('workorderproduct-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-remark')">*</span>备注
<span class="required-sign" v-if="judgeRequired('workorderproductList-cargoId')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('workorderproduct-remark',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-remark')"
clearable :style='{"width":"100%"}'>
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="workorderproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<!-- <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="workorderproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template> -->
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')" prop="remark">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('workorderproductList-remark')">*</span>
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark" @change="changeData('workorderproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-remark')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('workorderproductList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderproductList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addworkorderproductList()"
v-if="!judgeWrite('workorderproductList')">
<div class="table-actions" @click="addworkorderproductList()" v-if="!judgeWrite('workorderproductList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -301,63 +330,69 @@
</div> -->
<el-table :data="dataForm.workOrderPrimaryList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-productId')">*</span>
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="dataForm.productId" @change="changeDataProductList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'productId'+scope.$index"
interfaceId="519505017699307077" :pageSize="20"
:columnOptions="workorderprimaryproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
:templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="519505017699307077" :pageSize="20"
:columnOptions="workorderprimaryproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="存货类型" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>存货类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="lastModifyUserId">
<template slot="header">
<span class="required-sign">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="条码" prop="deleteUserId">
<template slot="header">
<span class="required-sign">*</span>条码
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.barCode" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -377,11 +412,10 @@
</template>
-->
<el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')"
prop="theoryNum">
<el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')" prop="theoryNum">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-theoryNum')">*</span>理论发料量
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-theoryNum')">*</span>
</template>
<!-- <template slot-scope="scope">
<JnpfInput v-model="scope.row.theoryNum"
@ -391,18 +425,18 @@
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template> -->
<template slot-scope="scope">
<JnpfInput v-model="scope.row.theoryNum"
@change="changeData('workorderprimary-theoryNum',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('workorderprimary-theoryNum', scope.$index)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="实际发料量" v-if="judgeShow('workorderprimary-realityNum')"
prop="realityNum">
<el-table-column label="实际发料量" v-if="judgeShow('workorderprimary-realityNum')" prop="realityNum">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际发料量
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>
</template>
<!-- <template slot-scope="scope">
<JnpfInput v-model="scope.row.realityNum"
@ -415,13 +449,33 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.realityNum"
@change="changeData('workorderprimary-realityNum',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('workorderprimary-realityNum', scope.$index)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="货区名称" v-if="judgeShow('workorderprimary-cargoId')" prop="cargoId">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderprimary-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
:pageSize="20" :columnOptions="workorderprimarycargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('workorderprimaryList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderprimaryList(scope.$index)">删除</el-button>
@ -441,8 +495,8 @@
</el-col>
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -502,6 +556,8 @@ export default {
cost: '',
costOptions: [],
remark: '',
cargoId: '',
cargoIdOptions: [],
remarkOptions: [],
enabledmark: undefined
},
@ -511,6 +567,8 @@ export default {
theoryNum: '',
theoryNumOptions: [],
realityNum: '',
cargoId: '',
cargoIdOptions: [],
realityNumOptions: [],
enabledmark: undefined
},
@ -525,6 +583,7 @@ export default {
workTime: undefined,
businessCode: undefined,
teamId: undefined,
warehouseId: undefined,
remark: undefined,
status: "1",
workOrderProductList: [],
@ -569,6 +628,14 @@ export default {
trigger: 'change'
},
],
warehouseId: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
status: [
{
required: true,
@ -584,10 +651,14 @@ export default {
businessfactoryIdcolumnOptions: [{ "label": "工厂编码", "value": "code" }, { "label": "工厂名称", "value": "name" },],
businessIdcolumnOptions: [{ "label": "生产线编码", "value": "code" }, { "label": "生产线名称", "value": "name" },],
teamIdcolumnOptions: [{ "label": "班组编码", "value": "team_code" }, { "label": "班组名称", "value": "team_name" },],
warehouseIdcolumnOptions: [{ "label": "仓库名称", "value": "name" }, { "label": "仓库编码", "value": "code" },],
workorderproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
workorderproductunitIdcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
workorderproductbomIdcolumnOptions: [{ "label": "bom名称", "value": "bom_name" }, { "label": "bom编码", "value": "bom_code" },],
workorderproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
workorderprimaryproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
workorderprimarycargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" },],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -598,6 +669,7 @@ export default {
workTime: [],
businessCode: [],
teamId: [],
warehouseId: [],
status: [],
remark: [],
workorderproductproductId: [],
@ -605,10 +677,13 @@ export default {
workorderproductproportionNum: [],
workorderproductbomId: [],
workorderproductcost: [],
workorderproductcargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
workorderproductremark: [],
workorderprimaryproductId: [],
workorderprimarytheoryNum: [],
workorderprimaryrealityNum: [],
workorderprimarycargoId: [{ "fieldName": "", "field": "businessOrganizeId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "AyAmdw1", "relationField": "warehouseId", "required": "0" }],
},
}
},
@ -800,6 +875,7 @@ export default {
unitId: '',
proportionNum: undefined,
bomId: '',
cargoId: '',
cost: undefined,
remark: undefined,
}
@ -826,6 +902,7 @@ export default {
productId: '',
theoryNum: undefined,
realityNum: undefined,
cargoId: '',
}
this.getworkorderprimaryList(item)
},

@ -1,4 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -16,8 +15,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
:props="typeProps">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -32,11 +30,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -48,8 +44,7 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -72,52 +67,48 @@
<el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save