|
|
|
|
@ -251,34 +251,12 @@
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<!-- <el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')" align="center" prop="unitId"
|
|
|
|
|
width="150px">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<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%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
|
|
<el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
|
|
|
|
|
align="center" prop="unitId" width="180px">
|
|
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.unitId"
|
|
|
|
|
@change="changeData('workorderproduct-unitId', scope.$index)"
|
|
|
|
|
@ -417,26 +395,222 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
<!-- <div class="table-actions" @click="addworkorderproductList()" v-if="!judgeWrite('workorderproductList')">
|
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
|
</div> -->
|
|
|
|
|
<!-- <div class="table-actions" @click="choice()"
|
|
|
|
|
v-if="!judgeWrite('workorderproductList')">
|
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
|
</div> -->
|
|
|
|
|
|
|
|
|
|
<div class="table-actions" @click="choice()"
|
|
|
|
|
v-if="this.dataForm.workOrderProductList<=0">
|
|
|
|
|
<!-- <el-button type="text" icon="el-icon-plus">添加</el-button> -->
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- <el-col :span="24">
|
|
|
|
|
<jnpf-form-tip-item>
|
|
|
|
|
<JnpfGroupTitle content="原材料" contentPosition="left">
|
|
|
|
|
</JnpfGroupTitle>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col> -->
|
|
|
|
|
|
|
|
|
|
<template v-if="this.dataForm.workOrderProductList1!=0">
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<div style="padding:15px 0px">
|
|
|
|
|
<span style="color: #409EFF;">▋</span>
|
|
|
|
|
<!-- 如果-- workOrderProductList1 为null 这个副产品就不显示。如果有则显示 -->
|
|
|
|
|
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">副产品</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24" v-if="judgeShow('-${html.relationField}')">
|
|
|
|
|
<jnpf-form-tip-item label-width="0">
|
|
|
|
|
<el-table :data="dataForm.workOrderProductList1" size='mini' border>
|
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
|
|
|
|
|
<el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')"
|
|
|
|
|
align="center" fixed="left" prop="productId" width="150px">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<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 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="productTypeId" width="150px" align="center">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign">*</span>存货类型
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.productTypeId" placeholder="请输入" disabled
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="规格" prop="spec" width="200px" align="center">
|
|
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign">*</span>规格
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="库存单位" prop="inventoryUnitId" width="150px" align="center">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign">*</span>库存单位
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.inventoryUnitId" placeholder="请输入" disabled
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="条码" prop="barCode" width="250px" align="center">
|
|
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign">*</span>条码
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.barCode" placeholder="请输入" disabled clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
|
|
|
|
|
align="center" prop="unitId" width="180px">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.unitId"
|
|
|
|
|
@change="changeData('workorderproduct-unitId', scope.$index)"
|
|
|
|
|
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')"
|
|
|
|
|
prop="bomId" align="center" width="300px">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfPopupSelect v-model="scope.row.bomId" @change="changeDataBom"
|
|
|
|
|
:formData="dataForm" :templateJson="interfaceRes.workorderproductbomId"
|
|
|
|
|
placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
|
|
|
|
|
popupTitle="选择数据" popupType="dialog" relationField='bomName'
|
|
|
|
|
:field="'bomId' + scope.$index" interfaceId="523054588681531973"
|
|
|
|
|
:pageSize="20" :columnOptions="workorderproductbomIdcolumnOptions" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="加工数量" align="center" prop="proportionNum" width="180px">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<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')) || dataForm.type==2"
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')"
|
|
|
|
|
prop="cost" align="center" width="180px">
|
|
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<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>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="货区名称" v-if="judgeShow('workorderproduct-cargoId')"
|
|
|
|
|
align="center" prop="cargoId" width="180px">
|
|
|
|
|
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
|
|
|
|
|
</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="请选择"
|
|
|
|
|
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
|
|
|
|
|
popupType="dialog" relationField='cargo_name'
|
|
|
|
|
:field="'cargoId' + scope.$index"
|
|
|
|
|
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
|
|
|
|
|
interfaceId="530700536261903749" :pageSize="20"
|
|
|
|
|
:columnOptions="workorderproductcargoIdcolumnOptions" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="成品批次号" v-if="judgeShow('workorderproduct-batchNumber')"
|
|
|
|
|
width="180px" prop="batchNumber">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('workorderproductList-batchNumber')">*</span>成品批次号
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.batchNumber"
|
|
|
|
|
@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')"
|
|
|
|
|
align="center" prop="remark" width="200px">
|
|
|
|
|
|
|
|
|
|
<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')"
|
|
|
|
|
align="center">
|
|
|
|
|
|
|
|
|
|
<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>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<div style="padding:15px 0px">
|
|
|
|
|
<span style="color: #409EFF;">▋</span>
|
|
|
|
|
@ -785,7 +959,28 @@ export default {
|
|
|
|
|
cargoId: '',
|
|
|
|
|
cargoIdOptions: [],
|
|
|
|
|
remarkOptions: [],
|
|
|
|
|
enabledmark: undefined
|
|
|
|
|
enabledmark: undefined,
|
|
|
|
|
isInput: '1'
|
|
|
|
|
},
|
|
|
|
|
workOrderProductList1: {
|
|
|
|
|
productId: '',
|
|
|
|
|
productIdOptions: [],
|
|
|
|
|
unitId: '',
|
|
|
|
|
unitIdOptions: [],
|
|
|
|
|
proportionNum: 0,
|
|
|
|
|
batchNumber: 'JG24000PZ',
|
|
|
|
|
planNum: '',
|
|
|
|
|
proportionNumOptions: [],
|
|
|
|
|
bomId: '',
|
|
|
|
|
bomIdOptions: [],
|
|
|
|
|
cost: '',
|
|
|
|
|
costOptions: [],
|
|
|
|
|
remark: '',
|
|
|
|
|
cargoId: '',
|
|
|
|
|
cargoIdOptions: [],
|
|
|
|
|
remarkOptions: [],
|
|
|
|
|
enabledmark: undefined,
|
|
|
|
|
isInput: '2'
|
|
|
|
|
},
|
|
|
|
|
workOrderPrimaryList: {
|
|
|
|
|
batchNumber: '',
|
|
|
|
|
@ -817,6 +1012,7 @@ export default {
|
|
|
|
|
remark: undefined,
|
|
|
|
|
status: "1",
|
|
|
|
|
workOrderProductList: [],
|
|
|
|
|
workOrderProductList1: [],
|
|
|
|
|
workOrderPrimaryList: [],
|
|
|
|
|
version: 0,
|
|
|
|
|
},
|
|
|
|
|
@ -972,7 +1168,6 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
changeDataBom(model, index) {
|
|
|
|
|
|
|
|
|
|
// this.dataForm.workOrderPrimaryList = index.productWarehouseEntityList
|
|
|
|
|
this.dataForm.workOrderPrimaryList = []
|
|
|
|
|
for (let i = 0; i < index.productWarehouseEntityList.length; i++) {
|
|
|
|
|
const e = index.productWarehouseEntityList[i];
|
|
|
|
|
@ -989,23 +1184,30 @@ export default {
|
|
|
|
|
reportlossNum: 0,
|
|
|
|
|
cargoId: e.cargoId,
|
|
|
|
|
batchNumber: e.batchNumber,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// name: e.name,
|
|
|
|
|
// inventoryType: e.inventoryTypes,
|
|
|
|
|
// inventoryUnitIds: e.inventoryUnitIds,
|
|
|
|
|
// salesMainUnitIds: e.salesMainUnitIds,
|
|
|
|
|
// operateUnitIds: e.operateUnitId,
|
|
|
|
|
// productTypeIds: e.productTypeId,
|
|
|
|
|
// productName: e.name,
|
|
|
|
|
// spec: e.spec,
|
|
|
|
|
// inventoryUnitId: e.inventoryUnitIds,
|
|
|
|
|
// productTypeId: e.inventoryType,
|
|
|
|
|
}
|
|
|
|
|
this.dataForm.workOrderPrimaryList.push(item)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.dataForm.workOrderProductList1 = []
|
|
|
|
|
for (let i = 0; i < index.productWarehouseEntityList1.length; i++) {
|
|
|
|
|
const e = index.productWarehouseEntityList[i];
|
|
|
|
|
let item = {
|
|
|
|
|
productId: e.productId,
|
|
|
|
|
productTypeId: e.productTypeId,
|
|
|
|
|
spec: e.spec,
|
|
|
|
|
inventoryUnitId: e.inventoryUnitId,
|
|
|
|
|
unitId: e.inventoryUnitId,
|
|
|
|
|
barCode: e.barCode,
|
|
|
|
|
theoryNum: e.theoryNum,
|
|
|
|
|
itemsnum: e.itemsnum,
|
|
|
|
|
cargoId: e.cargoId,
|
|
|
|
|
batchNumber: "PZINPUT001",
|
|
|
|
|
isInput: '2',
|
|
|
|
|
bomId: e.bomId,
|
|
|
|
|
}
|
|
|
|
|
this.dataForm.workOrderProductList1.push(item)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.itemnums = this.dataForm.workOrderPrimaryList
|
|
|
|
|
this.oldtheoryNum = JSON.parse(JSON.stringify(this.dataForm.workOrderPrimaryList))
|
|
|
|
|
|
XI_TENG\xixi_
4 months ago