|
|
|
|
@ -138,7 +138,7 @@
|
|
|
|
|
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
|
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
|
|
|
|
|
<el-table-column label="收货数量" align="center" prop="quality" />
|
|
|
|
|
<el-table-column label="不合格数量" align="center" prop="noOkQuality" />
|
|
|
|
|
<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
|
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" />
|
|
|
|
|
<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
|
|
|
|
|
<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
|
|
|
|
|
@ -215,22 +215,29 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="来料批次号" prop="incomeBatchNo">
|
|
|
|
|
<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
|
|
|
|
|
<el-form-item label="检验类型" prop="checkType" >
|
|
|
|
|
<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in checkTypes"
|
|
|
|
|
:key="dict.id"
|
|
|
|
|
:label="dict.checkName"
|
|
|
|
|
:value="dict.id"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="订单号" prop="orderNo">
|
|
|
|
|
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
|
|
|
|
|
<el-input v-model="form.orderNo" placeholder="请输入订单号">
|
|
|
|
|
<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="物料名称" prop="materialName">
|
|
|
|
|
<el-input v-model="form.materialName" placeholder="请选择物料名称">
|
|
|
|
|
<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
<el-input v-model="form.materialName" placeholder="请选择物料名称"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
@ -240,15 +247,8 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="检验类型" prop="checkType" >
|
|
|
|
|
<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in checkTypes"
|
|
|
|
|
:key="dict.id"
|
|
|
|
|
:label="dict.checkName"
|
|
|
|
|
:value="dict.id"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
<el-form-item label="来料批次号" prop="incomeBatchNo">
|
|
|
|
|
<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
@ -325,11 +325,11 @@
|
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
<!--产品物料选择弹窗-->
|
|
|
|
|
<ItemSelectMaterial
|
|
|
|
|
ref="itemSelectMaterial"
|
|
|
|
|
@onSelected="onSelectMaterial"
|
|
|
|
|
></ItemSelectMaterial>
|
|
|
|
|
<!--订单选择弹窗-->
|
|
|
|
|
<ItemSelectWorkOrder
|
|
|
|
|
ref="itemSelectWorkOrder"
|
|
|
|
|
@onSelected="onSelectWorkOrder"
|
|
|
|
|
></ItemSelectWorkOrder>
|
|
|
|
|
<!--供应商选择弹窗-->
|
|
|
|
|
<ItemSelectSupplier
|
|
|
|
|
ref="itemSelectSupplier"
|
|
|
|
|
@ -351,14 +351,14 @@
|
|
|
|
|
<script>
|
|
|
|
|
import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
|
|
|
|
|
import { getCheckTypes } from "@/api/quality/qcProduce";
|
|
|
|
|
import ItemSelectMaterial from "./selectMaterial.vue";
|
|
|
|
|
import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
|
|
|
|
|
import ItemSelectSupplier from "./selectSupplier.vue";
|
|
|
|
|
import ItemSelectUser from "./selectUser.vue";
|
|
|
|
|
import ItemSelectProject from "./checkProjectType.vue";
|
|
|
|
|
import moment from 'moment';
|
|
|
|
|
export default {
|
|
|
|
|
name: "Income",
|
|
|
|
|
components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
|
|
|
|
|
components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
|
|
|
|
|
dicts: ["unit","check_status","check_result"],
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
@ -414,6 +414,9 @@ export default {
|
|
|
|
|
checkTypes:[],
|
|
|
|
|
// 表单校验
|
|
|
|
|
rules: {
|
|
|
|
|
checkType:[
|
|
|
|
|
{ required: true, message: "检验类型不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
incomeBatchNo: [
|
|
|
|
|
{ required: true, message: "来料批次号不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
@ -611,14 +614,21 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**物料选择弹出框**/
|
|
|
|
|
handleSelectMaterial() {
|
|
|
|
|
this.$refs.itemSelectMaterial.showFlag = true;
|
|
|
|
|
/**工单选择弹出框**/
|
|
|
|
|
handleSelectWorkOrder() {
|
|
|
|
|
this.$refs.itemSelectWorkOrder.showFlag = true;
|
|
|
|
|
},
|
|
|
|
|
//物料选择确认
|
|
|
|
|
onSelectMaterial(obj) {
|
|
|
|
|
this.form.materialCode = obj.code;
|
|
|
|
|
this.form.materialName = obj.name;
|
|
|
|
|
//工单选择确认
|
|
|
|
|
onSelectWorkOrder(obj) {
|
|
|
|
|
this.form.orderNo = obj.orderNo;
|
|
|
|
|
this.form.materialName = obj.materialName;
|
|
|
|
|
this.form.materialCode = obj.materialCode;
|
|
|
|
|
this.form.quality = obj.quality;
|
|
|
|
|
this.form.incomeBatchNo = obj.incomeBatchNo;
|
|
|
|
|
this.form.unit = obj.unit;
|
|
|
|
|
this.form.supplierCode = obj.supplierCode;
|
|
|
|
|
this.form.supplierName = obj.supplierName;
|
|
|
|
|
this.form.incomeTime = obj.incomeTime;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**供应商选择弹出框**/
|
|
|
|
|
|
zhaoxiaolin
12 months ago