From a6e40623481eb57531439d4a93eadae280278acd Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 04 九月 2023 18:03:21 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.73.113:9001/r/lims-before --- src/views/inspectionManagement/reportForInspection/index.vue | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue index f400f52..c8db94d 100644 --- a/src/views/inspectionManagement/reportForInspection/index.vue +++ b/src/views/inspectionManagement/reportForInspection/index.vue @@ -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" /> @@ -156,6 +156,7 @@ getChooseVersion, lookProByVer } from '@/api/inspection/rawmaterial' +import ItemVue from '@/layout/components/Sidebar/Item.vue' export default { data() { return { @@ -480,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 -- Gitblit v1.9.3