用料预设

src/api/zdsz/enginMaterialQuality.js

@@ -42,3 +42,9 @@ export function delEnginMaterialQuality(id) {
     method: 'delete'
   })
 }
+export function getEnginMaterialQualityList() {
+  return request({
+    url: '/zdsz/enginMaterialQuality/getEnginMaterialQualityList',
+    method: 'get',
+  })
+}

src/api/zdsz/enginSpecifications.js

@@ -42,3 +42,12 @@ export function delEnginSpecifications(id) {
     method: 'delete'
   })
 }
+export function getEnginSpecificationsList(materId) {
+  return request({
+    url: '/zdsz/enginSpecifications/getEnginSpecificationsList',
+    method: 'get',
+    params:{
+      materId:materId
+    }
+  })
+}

src/views/zdsz/engineeringMaterialsResets/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="小区名称" prop="name">
-        <el-select v-model="queryParams.areaId" filterable clearable placeholder="请选择小区">
+        <el-select v-model="queryParams.areaId" filterable  placeholder="请选择小区">
           <el-option
             v-for="item in areaList"
             :key="item.id"
@@ -11,14 +11,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="预估尺寸" prop="estimatedSize">
-        <el-input
-          v-model="queryParams.estimatedSize"
-          placeholder="请输入预估尺寸"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="预估尺寸" prop="estimatedSize">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.estimatedSize"-->
+<!--          placeholder="请输入预估尺寸"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -73,13 +73,12 @@
 
     <el-table v-loading="loading" :data="engineeringMaterialsResetsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="" align="center" prop="areaId" />
-      <el-table-column label="材质" align="center" prop="materialQuality" />
-      <el-table-column label="规格" align="center" prop="estimatedSpecifications" />
+<!--      <el-table-column label="小区" align="center" prop="areaName" />-->
+      <el-table-column label="材质" align="center" prop="materialQualityName" />
+      <el-table-column label="规格" align="center" prop="estimatedSpecificationsName" />
       <el-table-column label="预估尺寸" align="center" prop="estimatedSize" />
       <el-table-column label="工程周期" align="center" prop="enginCycle" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -109,8 +108,8 @@
     />
 
     <!-- 添加或修改工程用料预设对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="小区名称" prop="areaId">
           <el-select v-model="form.areaId" filterable clearable multiple placeholder="请选择小区"  style="width: 100%">
             <el-option
@@ -124,6 +123,32 @@
         <el-form-item label="预估尺寸" prop="estimatedSize">
           <el-input-number  v-model="form.estimatedSize" controls-position="right" placeholder="请输入预估尺寸" style="width: 100%" />
         </el-form-item>
+        <el-form-item label="工程周期" prop="enginCycle">
+          <el-input-number  v-model="form.enginCycle" controls-position="right" placeholder="请输入工程周期" style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="材质" prop="materialQuality">
+<!--          <el-input-number  v-model="form.materialQuality" controls-position="right" placeholder="请选择材质" style="width: 100%" />-->
+          <el-select v-model="form.materialQuality" placeholder="请选择材质" style="width: 100%" @change="selectEstimated">
+            <el-option
+              v-for="dict in enginMaterialQualityList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规格" prop="estimatedSpecifications">
+<!--          <el-input-number  v-model="form.estimatedSpecifications" controls-position="right" placeholder="请选择规格" style="width: 100%" />-->
+          <el-select v-model="form.estimatedSpecifications" placeholder="请选择规格" style="width: 100%">
+            <el-option
+              v-for="dict in enginSpecificationsList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -139,6 +164,8 @@
 <script>
 import { listEngineeringMaterialsResets, getEngineeringMaterialsResets, delEngineeringMaterialsResets, addEngineeringMaterialsResets, updateEngineeringMaterialsResets } from "@/api/zdsz/engineeringMaterialsResets";
 import {getAreaList} from "@/api/zdsz/area";
+import {getEnginMaterialQualityList} from "@/api/zdsz/enginMaterialQuality";
+import {getEnginSpecificationsList} from "@/api/zdsz/enginSpecifications";
 
 export default {
   name: "EngineeringMaterialsResets",
@@ -160,6 +187,8 @@ export default {
       total: 0,
       // 工程用料预设表格数据
       engineeringMaterialsResetsList: [],
+      enginMaterialQualityList: [],
+      enginSpecificationsList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -179,7 +208,7 @@ export default {
       // 表单校验
       rules: {
         id: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: false, message: "不能为空", trigger: "blur" }
         ],
         areaId: [
           { required: true, message: "不能为空", trigger: "change" }
@@ -197,7 +226,7 @@ export default {
           { required: true, message: "工程周期不能为空", trigger: "change" }
         ],
         remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
+          { required: false, message: "备注不能为空", trigger: "blur" }
         ],
       },
       areaList: []
@@ -208,11 +237,19 @@ export default {
   },
   mounted() {
     this.getAreaList();
+    this.getEnginMaterialQualityList();
   },
   methods: {
     getAreaList() {
       getAreaList().then(res => this.areaList = res.data)
     },
+    getEnginMaterialQualityList() {
+      getEnginMaterialQualityList().then(res => this.enginMaterialQualityList = res.data)
+    },
+    selectEstimated(materId) {
+      this.form.estimatedSpecifications = undefined
+      getEnginSpecificationsList(materId).then(res => this.enginSpecificationsList = res.data)
+    },
     /** 查询工程用料预设列表 */
     getList() {
       this.loading = true;
@@ -237,7 +274,7 @@ export default {
         estimatedSize: undefined,
         enginCycle: undefined,
         remark: undefined,
-        delFlag: undefined,
+        delFlag: 0,
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
@@ -252,6 +289,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.areaId = undefined
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -275,6 +313,7 @@ export default {
       getEngineeringMaterialsResets(id).then(response => {
         this.loading = false;
         this.form = response.data;
+        this.form.areaId = this.form.areaId.split(",")
         this.open = true;
         this.title = "修改工程用料预设";
       });
@@ -285,6 +324,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
+            this.form.areaId = this.form.areaId.join()
             updateEngineeringMaterialsResets(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -293,6 +333,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
+            this.form.areaId = this.form.areaId.join()
             addEngineeringMaterialsResets(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;