lims-before.git

			@@ -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">
			@@ -153,6 +156,7 @@
			getChooseVersion,
			lookProByVer
			} from '@/api/inspection/rawmaterial'
			import ItemVue from '@/layout/components/Sidebar/Item.vue'
			export default {
			data() {
			return {
			@@ -477,13 +481,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