dedsudiyu 1 rok pred
rodič
commit
17d1d82ba5

+ 57 - 0
src/api/chemicalManage/index.js

@@ -62,3 +62,60 @@ export function chemicalBasicConfigAdd(data) {
     data: data
   })
 }
+/************************* 化学品 ***************************/
+//化学品-列表
+export function chemicalChemicalList(data) {
+  return request({
+    url: '/chemical/chemical/list',
+    method: 'post',
+    data: data
+  })
+}
+//化学品-新增
+export function chemicalChemicalAdd(data) {
+  return request({
+    url: '/chemical/chemical/add',
+    method: 'post',
+    data: data
+  })
+}
+//化学品-编辑
+export function chemicalChemicalUpdate(data) {
+  return request({
+    url: '/chemical/chemical/update',
+    method: 'post',
+    data: data
+  })
+}
+//化学品-删除
+export function chemicalChemicalDelete(data) {
+  return request({
+    url: '/chemical/chemical/delete',
+    method: 'post',
+    data: data
+  })
+}
+//化学品-详情
+export function chemicalChemicalDetail(query) {
+  return request({
+    url: '/chemical/chemical/detail',
+    method: 'get',
+    params: query
+  })
+}
+//化学品-关联MSDS查询
+export function chemicalMsdsDetailByMsds(data) {
+  return request({
+    url: '/chemical/msds/detailByMsds',
+    method: 'post',
+    data: data
+  })
+}
+//化学品-关联MSDS提交
+export function chemicalChemicalUpdateMsds(data) {
+  return request({
+    url: '/chemical/chemical/updateMsds',
+    method: 'post',
+    data: data
+  })
+}

+ 18 - 1
src/components/exportComponent/exportComponent.vue

@@ -64,7 +64,17 @@
             cancelButtonText: "取消",
             type: "warning"
           }).then(async () => {
-            self.download(self.exportConfig.api,{}, self.exportConfig.fileName+currentDate+'.xlsx')
+            let obj = {
+              ids :''
+            }
+            self.download(self.exportConfig.api,obj, self.exportConfig.fileName+currentDate+'.xlsx')
+            if(this.$parent.$refs['table-box']){
+              this.$parent.$refs['table-box'].clearSelection();
+            }else if(this.$parent.$parent.$refs['table-box']){
+              this.$parent.$parent.$refs['table-box'].clearSelection();
+            }else if(this.$parent.$parent.$parent.$refs['table-box']){
+              this.$parent.$parent.$parent.$refs['table-box'].clearSelection();
+            }
           }).catch(() => {})
         }else if(item.command == 2){
           if(self.exportConfig.ids.length>0) {
@@ -78,6 +88,13 @@
                 ids :ids
               }
               self.download(self.exportConfig.api,obj, self.exportConfig.fileName+currentDate+'.xlsx')
+              if(this.$parent.$refs['table-box']){
+                this.$parent.$refs['table-box'].clearSelection();
+              }else if(this.$parent.$parent.$refs['table-box']){
+                this.$parent.$parent.$refs['table-box'].clearSelection();
+              }else if(this.$parent.$parent.$parent.$refs['table-box']){
+                this.$parent.$parent.$parent.$refs['table-box'].clearSelection();
+              }
             }).catch(() => {})
           }else{
             this.msgError('请勾选数据')

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 15 - 4
src/components/importComponent/importComponent.vue


+ 53 - 40
src/views/chemicalManage/basicManagement/chemicalInfo/index.vue

@@ -5,8 +5,8 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择类别" style="width: 200px">
+          <el-form-item label="" prop="chemicalCategory">
+            <el-select v-model="queryParams.chemicalCategory" clearable placeholder="请选择类别" style="width: 200px">
               <el-option
                 v-for="dict in optionListA"
                 :key="dict.value"
@@ -15,8 +15,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData3">
-            <el-select v-model="queryParams.queryParamsData3" clearable placeholder="请选择级别" style="width: 200px">
+          <el-form-item label="" prop="chemicalLevel">
+            <el-select v-model="queryParams.chemicalLevel" clearable placeholder="请选择级别" style="width: 200px">
               <el-option
                 v-for="dict in optionListB"
                 :key="dict.value"
@@ -25,10 +25,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData1" label-width="50px">
+          <el-form-item label="" prop="searchValue" label-width="50px">
             <el-input
               maxLength="30"
-              v-model="queryParams.queryParamsData1"
+              v-model="queryParams.searchValue"
               placeholder="化学品/别名/CAS号"
               clearable
               style="width: 200px"
@@ -50,16 +50,17 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange"  :row-key="getRowKeys">
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
+                  ref="table-box" @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-          <el-table-column label="名称" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="CAS号" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="类别" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="级别" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="纯度" prop="content" width="200" show-overflow-tooltip/>
+          <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>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="230" show-overflow-tooltip v-if="tableButtonType">
@@ -99,14 +100,15 @@
     </div>
     <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
     <add-chemicals ref="addChemicals"></add-chemicals>
-    <msds-page v-if="pageType == 2"></msds-page>
+    <msds-page v-if="pageType == 2" :propsData="propsData"></msds-page>
   </div>
 </template>
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
   //import addPage from "./addPage.vue";
+  import { getDicts } from "@/api/commonality/noPermission";
+  import { chemicalChemicalList,chemicalChemicalDelete } from "@/api/chemicalManage/index";
   import addChemicals from "@/views/chemicalManage/components/addChemicals.vue";
   import importComponent from "@/components/importComponent/importComponent.vue";
   import exportComponent from "@/components/exportComponent/exportComponent.vue";
@@ -123,16 +125,16 @@
       return {
         //导出配置
         exportConfig:{
-          api:'system/user/student/export',             //导出接口地址
+          api:'/chemical/chemical/export',             //导出接口地址
           ids:'',                                       //勾选导出,勾选的IDS
           fileName:'化学品信息',                         //导出文件的命名
         },
         //导入配置
         importConfig:{
-          upLoadApi:'/system/user/student/importData',                //上传接口地址
-          downloadApi:'/system/user/student/importTemplate',          //下载模板接口地址
-          loseApi:'/system/user/student/importErrorData',             //失败报表接口地址
-          fileName:'导入模板-',                                   //下载模板命名
+          upLoadApi:'/chemical/chemical/importData',                //上传接口地址
+          downloadApi:'/chemical/chemical/importTemplate',          //下载模板接口地址
+          loseApi:'/chemical/chemical/importErrorData',             //失败报表接口地址
+          fileName:'化学品导入模板-',                                   //下载模板命名
         },
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
@@ -142,14 +144,14 @@
         loading:false,
         //下拉列表数据
         optionListA:[{value:true,label:'启用'},{value:false,label:'停用'}],
-        optionListB:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        optionListB:[{value:1,label:'管控'},{value:2,label:'非管控'}],
         //查询条件
         queryParams:{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
-          queryParamsData2 :null,
-          queryParamsData3 :null,
+          searchValue:"",
+          chemicalCategory :null,
+          chemicalLevel :null,
         },
         selectedNum:0,
         //列表数据
@@ -163,12 +165,23 @@
       }
     },
     created () {
-
+      this.getDicts();
+      this.getList();
     },
     mounted () {
-      //this.getList();
+
     },
     methods: {
+      //获取化学品类别
+      getDicts(){
+        getDicts('chemicals_category').then(response => {
+          this.$set(this,'optionListA',response.data);
+        });
+      },
+      //化学品添加成功
+      submitSuccessful(){
+        this.getList();
+      },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
@@ -177,25 +190,26 @@
       },
       //重置按钮
       resetQuery(){
+        this.$refs['table-box'].clearSelection();
         this.$set(this,'selectedNum',0);
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
-          queryParamsData2 :null,
-          queryParamsData3 :null,
+          searchValue:"",
+          chemicalCategory :null,
+          chemicalLevel :null,
         });
         this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取数据列表
       getList(){
-        // this.$set(this,'loading',true);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'loading',false);
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        this.$set(this,'loading',true);
+        chemicalChemicalList(this.queryParams).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
       },
       //操作按钮
       tableButton(type,row){
@@ -205,10 +219,9 @@
           this.$refs.addChemicals.addChemicalsOpen('1');
         }else if(type == 2){
           //MSDS
-          this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = true;
           this.$set(this,'propsData',obj);
+          this.$set(this,'pageType',2);
         }else if(type == 3){
           //编辑
           this.$refs.addChemicals.addChemicalsOpen('2',row);
@@ -220,7 +233,7 @@
             type: "warning"
           }).then(function() {
           }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
+            chemicalChemicalDelete({chemicalId:row.chemicalId}).then(response => {
               self.msgSuccess(response.message)
               self.getList();
             });
@@ -234,14 +247,14 @@
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.$set(this.queryParams,'selectedNum',selection.length);
-        this.$set(this.exportConfig,'ids',selection.map(item => item.id));
+        this.$set(this.exportConfig,'ids',selection.map(item => item.chemicalId));
       },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"
         需要在selection 添加 :reserve-selection="true"
       */
       getRowKeys(row) {
-        return row.id
+        return row.chemicalId
       },
     },
   }

+ 3 - 3
src/views/chemicalManage/basicManagement/chemicalInfo/msdsInfo.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="msdsInfo">
-      <div class="title-box">
-        <p>{{dialogData.dialogTitle}}</p>
-        <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p" style="margin-left:20px;">{{dialogData.dialogTitle}}</p>
+        <p class="page-top-title-out-p" @click="backPage">返回</p>
       </div>
       <div class="msdsInfo-page scrollbar-box">
         <div class="w-e-text-min-box">

+ 19 - 26
src/views/chemicalManage/basicManagement/chemicalInfo/msdsPage.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="msdsPage">
     <div class="msds-page" v-if="!lookOpen">
-      <div class="title-box">
-        <p>MSDS化学品安全技术说明书</p>
-        <p class="page-out-common-style-button" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p" style="margin-left:20px;">MSDS化学品安全技术说明书</p>
+        <p class="page-top-title-out-p" @click="backPage">返回</p>
+        <p class="page-top-title-submit-p" style="margin-left:20px;" @click="upData">提交</p>
       </div>
       <div class="msdsPage-min">
         <div class="page-form-title-box" style="padding:20px 5px 0 0;">
@@ -22,13 +23,6 @@
               <p class="page-inquire-common-style-button" @click="handleQuery" style="margin-right:10px;">查询</p>
               <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
             </el-form-item>
-            <el-form-item style="float: right;margin-right:0;">
-              <el-col :span="1.5">
-                <p class="page-submit-common-style-button"
-                   @click="upData"
-                >确定</p>
-              </el-col>
-            </el-form-item>
           </el-form>
         </div>
         <div class="page-content-box" style="padding: 0 0 20px 0;">
@@ -74,6 +68,7 @@
 <script>
   import { getHazard_book } from "@/apiDemo/laboratory/hazard_book";
   import { getHazardBookJoinChemical,editChemicalByJoinHazard } from "@/apiDemo/medicUniversity-3_1/index";
+  import { chemicalMsdsDetailByMsds,chemicalChemicalUpdateMsds,chemicalMsdsDetail } from "@/api/chemicalManage/index";
   import msdsInfo from "./msdsInfo.vue"
   export default {
     name: "msdsPage",
@@ -124,26 +119,24 @@
       //提交
       upData(){
         let obj = {
-          id:this.propsData.id,
+          chemicalId:this.propsData.chemicalId,
         }
         if(this.selectioned.id){
-          obj.joinHazardId = this.selectioned.id;
+          obj.msdsId = this.selectioned.id;
         }else{
-          obj.joinHazardId = "";
+          obj.msdsId = "";
         }
-        editChemicalByJoinHazard(obj).then(response => {
+        chemicalChemicalUpdateMsds(obj).then(response => {
           if(response.code == 200){
-            this.msgSuccess(response.msg);
-            this.$parent.pageToggle(1,'get');
+            this.msgSuccess(response.message);
+            this.$parent.tableButton(5);
           }
         });
       },
-
-
       //查看按钮
       lookItem(type,row){
         if(type){
-          getHazard_book(row.id).then( response => {
+          chemicalMsdsDetail({id:row.id}).then( response => {
             this.dialogData.dialogTitle = row.name + '-安全技术说明书';
             this.dialogData.name = response.data.name;
             this.dialogData.code = response.data.code;
@@ -157,14 +150,14 @@
       getList(){
         let self = this;
         this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
-        this.queryParamsData.chemicalId = this.propsData.id;
-        getHazardBookJoinChemical(this.queryParamsData).then(response => {
-          this.tableList = response.rows;
-          this.total = response.total
-          if(response.rows[0].joinHazardId&&this.queryParamsData.pageNum == 1){
+        this.queryParamsData.chemicalId = this.propsData.chemicalId;
+        chemicalMsdsDetailByMsds(this.queryParamsData).then(response => {
+          this.tableList = response.data.records;
+          this.total = response.data.total
+          if(response.data.records[0].msdsId&&this.queryParamsData.pageNum == 1){
             setTimeout(function(){
-              self.$set(self,"selectioned",response.rows[0]);
-              self.$refs.multipleTable.toggleRowSelection(response.rows[0], true);
+              self.$set(self,"selectioned",response.data.records[0]);
+              self.$refs.multipleTable.toggleRowSelection(response.data.records[0], true);
             },50);
           }else{
             self.$set(self,"selectioned",{});

+ 77 - 59
src/views/chemicalManage/components/addChemicals.vue

@@ -31,22 +31,22 @@
              append-to-body>
     <div class="form-box">
       <el-form :model="dialogForm" ref="dialogForm" :inline="true" :rules="dialogRules" class="addCheckPage-min">
-        <el-form-item label="化学品名:" prop="data1" label-width="130px">
-          <el-input v-model="dialogForm.data1" placeholder="请输入化学品名" maxLength="20" style="width:590px;"/>
+        <el-form-item label="化学品名:" prop="chemicalName" label-width="130px">
+          <el-input v-model="dialogForm.chemicalName" placeholder="请输入化学品名" maxLength="20" style="width:590px;"/>
         </el-form-item>
         <div>
-          <el-form-item label="类别:" prop="data2" label-width="130px">
-            <el-select v-model="dialogForm.data2" placeholder="请选择类别" style="width: 245px">
+          <el-form-item label="类别:" prop="chemicalCategory" label-width="130px">
+            <el-select v-model="dialogForm.chemicalCategory" placeholder="请选择类别" style="width: 245px">
               <el-option
                 v-for="dict in categoryOptions"
-                :key="dict.itemId"
+                :key="dict.value"
                 :label="dict.label"
-                :value="dict.itemId"
+                :value="dict.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="级别:" prop="data3" label-width="90px">
-            <el-select v-model="dialogForm.data3" placeholder="请选择级别" style="width: 245px">
+          <el-form-item label="级别:" prop="chemicalLevel" label-width="90px">
+            <el-select v-model="dialogForm.chemicalLevel" placeholder="请选择级别" style="width: 245px">
               <el-option
                 v-for="dict in levelOptions"
                 :key="dict.itemId"
@@ -57,27 +57,27 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="CAS:" prop="data4" label-width="130px">
-            <el-input v-model="dialogForm.data4" placeholder="请输入CAS码" maxLength="20" style="width:245px;"/>
+          <el-form-item label="CAS:" prop="casNum" label-width="130px">
+            <el-input v-model="dialogForm.casNum" placeholder="请输入CAS码" maxLength="20" style="width:245px;"/>
           </el-form-item>
-          <el-form-item label="别名:" prop="data5" label-width="90px">
-            <el-input v-model="dialogForm.data5" placeholder="请输入化学品别名" maxLength="20" style="width:245px;"/>
+          <el-form-item label="别名:" prop="anotherName" label-width="90px">
+            <el-input v-model="dialogForm.anotherName" placeholder="请输入化学品别名" maxLength="20" style="width:245px;"/>
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="纯度:" prop="data6" label-width="130px">
-            <el-input v-model="dialogForm.data6" placeholder="请输入化学品纯度" maxLength="20" style="width:245px;"/>
+          <el-form-item label="纯度:" prop="chemicalPurity" label-width="130px">
+            <el-input v-model="dialogForm.chemicalPurity" placeholder="请输入化学品纯度" maxLength="20" style="width:245px;"/>
           </el-form-item>
-          <el-form-item label="密度:" prop="data7" label-width="90px">
-            <el-input-number v-model="dialogForm.data7" controls-position="right" style="width:245px;"
+          <el-form-item label="密度:" prop="chemicalDensity" label-width="90px">
+            <el-input-number v-model="dialogForm.chemicalDensity" controls-position="right" style="width:245px;"
                              :precision="2" :step="0.1" :min="-10" :max="10"></el-input-number>
           </el-form-item>
         </div>
-        <el-form-item label="实验室存放规定:" prop="data8" label-width="130px">
-          <el-input placeholder="请输入" v-model="dialogForm.data8" style="width:245px;"
+        <el-form-item label="实验室存放规定:" prop="depositRequire" label-width="130px">
+          <el-input placeholder="请输入" v-model="dialogForm.depositRequire" style="width:245px;"
                     maxlength="5" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')">
             <template slot="append">
-              <el-select v-model="dialogForm.data9" placeholder="请选择" style="width: 62px">
+              <el-select v-model="dialogForm.depositUnit" placeholder="请选择" style="width: 62px">
                 <el-option
                   v-for="dict in stateOfMatter"
                   :key="dict.itemId"
@@ -100,6 +100,7 @@
 </template>
 <script>
   import { getDicts } from "@/api/commonality/noPermission";
+  import { chemicalChemicalAdd,chemicalChemicalUpdate,chemicalChemicalDetail } from "@/api/chemicalManage/index";
   export default {
     name: 'addChemicals',
     data () {
@@ -109,34 +110,34 @@
         //化学品类别
         categoryOptions:[],
         //级别
-        levelOptions:[{itemId:'1',label:'管控'},{itemId:'2',label:'非管控'}],
+        levelOptions:[{itemId:1,label:'管控'},{itemId:2,label:'非管控'}],
         //物质状态
-        stateOfMatter:[{itemId:'1',label:'kg'},{itemId:'2',label:'L'}],
+        stateOfMatter:[],
         dialogForm:{
-          data1:null,
-          data2:null,
-          data3:null,
-          data4:null,
-          data5:null,
-          data6:null,
-          data7:1,
-          data8:null,
-          data9:'1',
+          chemicalName:null,
+          chemicalCategory:null,
+          chemicalLevel:null,
+          casNum:null,
+          anotherName:null,
+          chemicalPurity:null,
+          chemicalDensity:1,
+          depositRequire:null,
+          depositUnit:'1',
         },
         dialogRules:{
-          data1: [
+          chemicalName: [
             { required: true, message: "请输入化学品名", trigger: "blur" },
             { required: true, message: "请输入化学品名", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data2: [
+          chemicalCategory: [
             { required: true, message: "请选择类别", trigger: "blur" },
             { required: true, message: "请选择类别", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data3: [
+          chemicalLevel: [
             { required: true, message: "请选择级别", trigger: "blur" },
             { required: true, message: "请选择级别", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data7: [
+          chemicalDensity: [
             { required: true, message: "请输入密度", trigger: "blur" },
             { required: true, message: "请输入密度", validator: this.spaceJudgment, trigger: "blur" }
           ],
@@ -152,37 +153,39 @@
     methods:{
       //调用方法
       addChemicalsOpen(type,row){
+        this.initialize();
         if(type == 1){
           this.initialize();
           this.$set(this,'dialogForm',{
-            data1:null,
-            data2:null,
-            data3:null,
-            data4:null,
-            data5:null,
-            data6:null,
-            data7:1,
-            data8:null,
-            data9:'1',
+            chemicalName:null,
+            chemicalCategory:null,
+            chemicalLevel:null,
+            casNum:null,
+            anotherName:null,
+            chemicalPurity:null,
+            chemicalDensity:1,
+            depositRequire:null,
+            depositUnit:'1',
           });
           this.$set(this,'lookImgDialogTitle','添加化学品');
           this.$set(this,'lookImgDialogType',true);
         }else if(type == 2){
-          this.initialize();
-          this.$set(this,'dialogForm',{
-            id:row.id,
-            data1:row.data1,
-            data2:row.data2,
-            data3:row.data3,
-            data4:row.data4,
-            data5:row.data5,
-            data6:row.data6,
-            data7:row.data7,
-            data8:row.data8,
-            data9:row.data9,
+          chemicalChemicalDetail({chemicalId:row.chemicalId}).then(response => {
+            this.$set(this,'dialogForm',{
+              chemicalId:row.chemicalId,
+              chemicalName:response.data.chemicalName,
+              chemicalCategory:response.data.chemicalCategory,
+              chemicalLevel:response.data.chemicalLevel,
+              casNum:response.data.casNum,
+              anotherName:response.data.anotherName,
+              chemicalPurity:response.data.chemicalPurity,
+              chemicalDensity:response.data.chemicalDensity,
+              depositRequire:response.data.depositRequire,
+              depositUnit:response.data.depositUnit,
+            });
+            this.$set(this,'lookImgDialogTitle','编辑化学品');
+            this.$set(this,'lookImgDialogType',true);
           });
-          this.$set(this,'lookImgDialogTitle','编辑化学品');
-          this.$set(this,'lookImgDialogType',true);
         }else if(type == 3){
           this.$set(this,'dialogForm',{});
           this.$set(this,'lookImgDialogTitle','');
@@ -195,13 +198,28 @@
         getDicts('chemicals_category').then(response => {
           this.$set(this,'categoryOptions',response.data);
         });
+        //存放单位
+        getDicts('storage_unit').then(response => {
+          this.$set(this,'stateOfMatter',response.data);
+        });
       },
       //提交
       dialogSubmit(){
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
-            this.$parent.submitSuccessful();
-            this.addChemicalsOpen(3);
+            if(this.dialogForm.chemicalId){
+              chemicalChemicalUpdate(this.dialogForm).then(response => {
+                this.msgSuccess(response.message)
+                this.$parent.submitSuccessful();
+                this.addChemicalsOpen(3);
+              });
+            }else{
+              chemicalChemicalAdd(this.dialogForm).then(response => {
+                this.msgSuccess(response.message)
+                this.$parent.submitSuccessful();
+                this.addChemicalsOpen(3);
+              });
+            }
           }
         })
       }