dedsudiyu 2 rokov pred
rodič
commit
70d047f730

+ 21 - 11
src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -11,23 +11,23 @@
             style="width:260px;"
             clearable/>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParamsData.status" clearable placeholder="请选择状态">
+        <el-form-item label="化学品分类" prop="chemicalClassify" label-width="90px">
+          <el-select v-model="queryParamsData.chemicalClassify" clearable placeholder="请选择状态">
             <el-option
               v-for="item in optionsListOne"
               :key="item.id"
-              :label="item.name"
+              :label="item.classifyName"
               :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="属性" prop="status">
-          <el-select v-model="queryParamsData.status" clearable placeholder="请选择状态">
+        <el-form-item label="属性" prop="classifyAttribute" label-width="50px">
+          <el-select v-model="queryParamsData.classifyAttribute" clearable placeholder="请选择状态">
             <el-option
               v-for="item in optionsListTwo"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
@@ -207,7 +207,7 @@
 </template>
 
 <script>
-  import { filterDept,getSubList,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet } from "@/api/medicUniversity-3_1/index";
+  import { filterDept,getSubList,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet,classifyList } from "@/api/medicUniversity-3_1/index";
   import { getHxpQueryByUser } from "@/api/studentApi/chemicalManagement/index";
   import { getLogoInfo } from "@/api/system/publicConfig";
   export default {
@@ -239,9 +239,9 @@
         total:0,
         tableList:[],
         //实验室列表
-        optionsListOne:[{id:"0",name:"普通化学品"},{id:"1",name:"危险化学品"}],
+        optionsListOne:[],
         //状态列表
-        optionsListTwo:[{id:"0",name:"有毒品"},{id:"1",name:"爆炸品"}],
+        optionsListTwo:[],
         // 搜索数据
         queryParamsData:{
           pageNum:1,
@@ -293,8 +293,18 @@
     mounted(){
       this.getList();
       this.getRecord();
+      this.getDicts("hxp_classifyattribute").then(response => {
+        this.optionsListTwo = response.data;
+      })
+      this.classifyList();
     },
     methods: {
+      //获取化学品分类列表
+      classifyList(){
+        classifyList().then(response => {
+          this.optionsListOne = response.rows;
+        });
+      },
       selectFocus(){
         if(!this.selectList[0]){
           this.getSubList();

+ 1 - 1
src/views/studentViews/chemicalManagement/studentPurchaseRequisition/index.vue

@@ -12,7 +12,7 @@
               clearable
               size="small"/>
           </el-form-item>
-          <el-form-item label="状态" prop="approvalStatus">
+          <el-form-item label="状态" prop="approvalStatus" label-width="44px">
             <el-select v-model="queryParamsData.approvalStatus" clearable placeholder="请选择状态" style="width: 140px">
               <el-option label="审批中" value="0"></el-option>
               <el-option label="已通过" value="1"></el-option>