lims-before.git

			@@ -4,27 +4,27 @@
			<div class="top-bar">
			<el-form ref="form" :inline="true" :model="searchData">
			<el-form-item label="材料编码:" position="left" class="sermargin">
			<el-input v-model="searchData.code" class="input-form" placeholder="请输入">
			<el-input size="small" v-model="searchData.code" class="input-form" placeholder="请输入">
			</el-input>
			</el-form-item>
			<el-form-item label="材料名称:" class="sermargin">
			<el-input v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
			<el-input size="small" v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
			</el-input>
			</el-form-item>
			<el-form-item label="状态:" class="sermargin">
			<el-select v-model="searchData.state" placeholder="全部">
			<el-select size="small" v-model="searchData.state" placeholder="全部">
			<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
			</el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="来料日期:" style="margin-right: 20px;">
			<el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
			<el-date-picker size="small" value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
			</el-date-picker>
			</el-form-item>
			<el-form-item>
			<el-button type="primary" @click="search">查询</el-button>
			<el-button type="primary" plain @click="reset">重置</el-button>
			<el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
			<el-button size="small" type="primary" @click="search">查询</el-button>
			<el-button size="small" type="primary" plain @click="reset">重置</el-button>
			<el-button size="small" type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
			</el-form-item>
			</el-form>
			</div>
			@@ -48,7 +48,7 @@
			</el-form-item>
			<el-form-item label="规格型号:" prop="specificationsNumber">
			<el-cascader v-model="insertData.specificationsNumber" :options="childrenOptions"
			:props="{label: 'Name', value: 'Name'}" separator="-"></el-cascader>
			:props="{label: 'Name', value: 'Id'}" separator="-"></el-cascader>
			</el-form-item>
			<el-form-item label="单位:" prop="unit">
			<el-input type="text" v-model="insertData.unit" />
			@@ -72,7 +72,9 @@
			<div class="table-box">
			<el-table ref="inspectionTable" :max-height="450" :cell-style="{textAlign: 'left'}"
			:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
			:data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
			:data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange"
			:default-sort = "{prop: 'createTime', order: 'descending'}"
			>
			<el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
			<el-table-column type="index" label="序号" min-width="8%" />
			<el-table-column prop="dateSurvey" label="来料日期" min-width="8%" />
			@@ -83,6 +85,7 @@
			<el-table-column prop="unit" label="单位" min-width="5%" />
			<el-table-column prop="quantity" label="数量" min-width="5%" />
			<el-table-column prop="inspectionDate" label="报检日期" min-width="8%" />
			<el-table-column v-if="1===0" prop="createTime" label="日期" min-width="8%" />
			<el-table-column prop="surveyor" label="检验人" min-width="8%" />
			<el-table-column prop="type" label="状态" min-width="8%">
			<template slot-scope="scope">
			@@ -143,9 +146,6 @@
			import {
			getRawMaterialList,
			addInspect,
			selectInspectsListById,
			selectUser,
			selectEquipment,
			deleteMaterial,
			addMaterial,
			getMaterielName,
			@@ -402,15 +402,14 @@
			"name": val.materialName,
			"num": val.quantity,
			"specifications": val.specificationsModels,
			"specificationsId": val.specificationsId,
			"specificationId": val.specificationsId,
			"startTime": dateArr[0],
			"supplier": val.supplierName,
			"type": val.type,
			"unit": val.unit,
			"version": this.addInspectionForm.version
			}
			// this.createReport(obj);
			console.log("obj---",obj);
			this.createReport(obj);
			this.addReportDialog = false;
			}
			}));
			@@ -422,7 +421,7 @@
			this.$message.success('报检成功')
			this.$router.push(`/experiment/Viewdetails/${res.data}`)
			}).catch(error =>{
			this.$message.error('报检失败')
			this.$message.error(error.message)
			});
			},
			// 获取分页列表数据
			@@ -477,13 +476,25 @@
			insert() {
			this.$refs['addMaterialForm'].validate((valid) => {
			if (valid) {
			console.log(this.childrenOptions);
			console.log(this.insertData);
			let f=this.childrenOptions.filter(item=>{
			return item.Id===this.insertData.specificationsNumber[0]
			})[0]
			console.log(f);
			let fatherName=f.Name;
			let c=f.children.filter(item=>{
			return item.Id===this.insertData.specificationsNumber[1]
			})[0]
			let sonName=c.Name
			let specificationsId=c.Id;
			var str = {
			"dateSurvey": this.insertData.fromDate,
			"materialCoding": this.insertData.mCode,
			"materialName": this.insertData.mName,
			"quantity": this.insertData.num,
			"specificationsModels": this.insertData.specificationsNumber[0] + '-' + this.insertData
			.specificationsNumber[1],
			"specificationsModels": fatherName+ '-' + sonName,
			"specificationsId": specificationsId,
			"supplierName": this.insertData.supplierName,
			"type": 0,
			"unit": this.insertData.unit