From cdc9c0a33eb2f8e97eb8141e72fd645b9468906d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 18:11:13 +0800
Subject: [PATCH] modified: src/views/personal/myInformation/index.vue
---
src/views/inspectionManagement/reportForInspection/index.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index f400f52..c4d1f48 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -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" />
@@ -156,6 +156,7 @@
getChooseVersion,
lookProByVer
} from '@/api/inspection/rawmaterial'
+import ItemVue from '@/layout/components/Sidebar/Item.vue'
export default {
data() {
return {
@@ -412,8 +413,7 @@
"unit": val.unit,
"version": this.addInspectionForm.version
}
- // this.createReport(obj);
- console.log("obj---",obj);
+ this.createReport(obj);
this.addReportDialog = false;
}
}));
@@ -480,13 +480,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