dedsudiyu 2 周之前
父節點
當前提交
f9e1c0c677

+ 4 - 3
src/views/chemicalManage/basicManagement/chemicalInfo/index.vue

@@ -56,9 +56,10 @@
           <el-table-column label="名称" prop="chemicalName"  show-overflow-tooltip/>
           <el-table-column label="CAS号" prop="casNum" width="200" show-overflow-tooltip/>
           <el-table-column label="类别" prop="chemicalCategoryName" width="200" show-overflow-tooltip/>
-          <el-table-column label="级别" prop="chemicalLevelName" width="200" show-overflow-tooltip/>
-          <el-table-column label="纯度" prop="chemicalPurity" width="200" show-overflow-tooltip/>
-          <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
+          <el-table-column label="子类别" prop="chemicalCategoryClassName" width="200" show-overflow-tooltip/>
+          <el-table-column label="级别" prop="chemicalLevelName" width="100" show-overflow-tooltip/>
+          <el-table-column label="纯度" prop="chemicalPurity" width="160" show-overflow-tooltip/>
+          <el-table-column label="创建时间" prop="createTime" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>

+ 17 - 0
src/views/chemicalManage/components/addChemicals.vue

@@ -231,6 +231,7 @@
       },
       //提交
       dialogSubmit(){
+        let self = this;
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
             if(this.dialogForm.casNum){//
@@ -244,9 +245,25 @@
             if(obj.chemicalCategory[1]){
               obj.chemicalCategoryClass = obj.chemicalCategory[1]
               obj.chemicalCategory = obj.chemicalCategory[0]
+              for(let i=0; i<self.categoryOptions.length;i++){
+                if(self.categoryOptions[i].value == obj.chemicalCategory){
+                  for(let o=0;o<self.categoryOptions[i].children.length;o++){
+                    if(self.categoryOptions[i].children[o].value == obj.chemicalCategoryClass){
+                      obj.chemicalCategoryName = self.categoryOptions[i].label
+                      obj.chemicalCategoryClassName =self.categoryOptions[i].children[o].label
+                    }
+                  }
+                }
+              }
             }else{
               obj.chemicalCategoryClass = null;
               obj.chemicalCategory = obj.chemicalCategory[0]
+              for(let i=0; i<self.categoryOptions.length;i++){
+                if(self.categoryOptions[i].value == obj.chemicalCategory){
+                  obj.chemicalCategoryName = self.categoryOptions[i].label
+                  obj.chemicalCategoryClassName = '';
+                }
+              }
             }
             if(this.dialogForm.chemicalId){
               chemicalChemicalUpdate(obj).then(response => {