heyang

src/views/chemicalManage/basicManagement/chemicalInfo/index.vue

@@ -192,6 +192,10 @@
         });
         this.$set(this.exportConfig,'ids','');
         this.getList();
+      },
+      //化学品添加成功
+      submitSuccessful(){
+
       },
       //获取数据列表
       getList(){

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/addPage.vue

@@ -461,7 +461,7 @@
         this.newData.cabinetDoorModelList.forEach((item,index)=>{
           item.doorName = '默认柜门'+(index+1);
           item.doorLayers = '';
-          item.unlockingMethod = '';
+          item.unlockingMethod = '1';
           item.cabinetLockList = [];
           item.cabinetAdminModelList = [];
           item.userOptions = [];

src/views/chemicalManage/components/addChemicals.vue

@@ -70,7 +70,7 @@
           </el-form-item>
           <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="99"></el-input-number>
+                             :precision="2" :step="0.1" :min="0" :max="99"></el-input-number>
           </el-form-item>
         </div>
         <el-form-item label="实验室存放规定：" prop="depositRequire" label-width="130px">

src/views/chemicalManage/earlyWarningEvent/index.vue

@@ -116,7 +116,7 @@
     chemicalUserecordDetail,
     systemWarningNoticeDetail,
     systemWarningNoticeList,
-    systemWarningNoticeWarningDetail
+    systemWarningNoticeWarningDetail, systemWarningNoticeWarningList
   } from '@/api/chemicalManage'
   export default {
     name: 'index',
@@ -200,7 +200,7 @@
           obj.startTime = "";
           obj.endTime = "";
         }
-        systemWarningNoticeList(obj).then(response => {
+        systemWarningNoticeWarningList(obj).then(response => {
           this.$set(this,'loading',false);
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
@@ -210,7 +210,7 @@
       tableButton(type,row){
         if(type == 2 || type == 3){
           //详情
-          systemWarningNoticeWarningDetail({id:row.noticeId}).then(response => {
+           systemWarningNoticeDetail({id:row.noticeId}).then(response => {
             this.$set(this,'propsData',JSON.parse(JSON.stringify(response.data)));
             this.$set(this,'pageType',2);
           });

src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -10,7 +10,7 @@
         <div class="text-max-box">
           <div class="text-left-box">
             <p>报警时间：</p>
-            <p>{{infoData.warnTime}}</p>
+            <p>{{parseTime(infoData.warnTime,"{y}-{m}-{d} {h}:{i}") }}</p>
           </div>
           <div class="text-center-box">
             <p>预警类型：</p>
@@ -264,7 +264,8 @@
       /** 提交按钮 */
       submitForm() {
         let self=this;
-        systemWarningNoticeWarningHandleMessage(self.infoDataForm).then( response => {
+
+         systemWarningNoticeHandleMessage(self.infoDataForm).then( response => {
           self.msgSuccess("成功")
           self.$parent.tableButton('out');
         });

src/views/chemicalManage/inventoryManagement/inventoryStatistics/inventoryList.vue

@@ -89,7 +89,7 @@
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed="" :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="200" fixed="" show-overflow-tooltip/>
-          <el-table-column label="编码" prop="tagCode" width="120" show-overflow-tooltip/>
+          <el-table-column label="编码" prop="tagCode" width="180" show-overflow-tooltip/>
           <el-table-column label="类别" prop="chemicalCategoryName" width="120" show-overflow-tooltip/>
           <el-table-column label="级别" prop="chemicalLevelName" width="120" show-overflow-tooltip/>
           <el-table-column label="学院" prop="deptName" width="120" show-overflow-tooltip/>

src/views/chemicalManage/inventoryManagement/inventoryStatistics/listPage.vue

@@ -69,7 +69,7 @@
         <p class="num-min-box"></p>
         <div class="page-content-box">
           <el-table  class="table-box" border :data="dataList">
-            <el-table-column label="编号" prop="tagCode" show-overflow-tooltip/>
+            <el-table-column label="编码" prop="tagCode" show-overflow-tooltip/>
             <el-table-column label="规格" prop="specNum" width="130" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{scope.row.specNum}}{{scope.row.specUnit}}/{{scope.row.packUnit}}</span>

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -114,9 +114,9 @@
                   filterable
                   remote
                   reserve-keyword
-                  @change="factoryChange"
+                  @change="(val)=>factoryChange(val, scope.row)"
                   placeholder="请搜索选择厂家"
-                  :remote-method="factorySelectList">
+                  :remote-method="(val)=>factorySelectList(val, scope.row)" >
                   <el-option
                     v-for="item in factoryOptions"
                     :key="item.id"
@@ -596,21 +596,20 @@
         }
       },
       //选中厂家
-      factoryChange(val){
+      factoryChange(val,row){
         let self = this;
-        // for(let i=0;i<self.subOptions.length;i++){
-        //   if(self.subOptions[i].subId == val){
-        //     this.$set(this.newData,'subId',self.subOptions[i].subId);
-        //     this.$set(this.newData,'subName',self.subOptions[i].subName);
-        //     this.$set(this.newData,'roomNum',self.subOptions[i].roomNum);
-        //   }
-        // }
+
       },
       //搜索厂家
-      factorySelectList(query){
+      factorySelectList(query,row){
         if (query !== '' && query.length>1) {
           chemicalAioSearchProducer({"name":query,}).then(response => {
-            this.$set(this,'factoryOptions',response.data);
+
+            if (response.data[0]){
+              this.$set(this,'factoryOptions',response.data);
+            }else{
+              this.$set(this,'factoryOptions',[{producerName:query,id:''}]);
+            }
           });
         } else {
           this.$set(this,'factoryOptions',[]);

src/views/chemicalManage/inventoryManagement/saveRecord/index.vue

@@ -103,7 +103,7 @@
           <el-table-column label="数量" prop="chemicalNumber" width="100" show-overflow-tooltip/>
           <el-table-column label="称重方式" prop="content" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.joinType==1?'手工':'自动'}}</span>
+              <span>{{scope.row.joinType==1?'自动':'手工'}}</span>
             </template>
           </el-table-column>
           <el-table-column label="入库时间" prop="joinTime" width="200" show-overflow-tooltip>

src/views/chemicalManage/useLedger/index.vue

@@ -106,10 +106,10 @@
         <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" fixed :reserve-selection="true" align="center"/>
-          <el-table-column label="化学品名称" align="left" fixed width="250" prop="chemicalName" />
-          <el-table-column label="编码" align="left" width="150" prop="tagCode" />
-          <el-table-column label="CAS" align="left" width="150" prop="casNum" />
-          <el-table-column label="类别" align="left" width="160" prop="chemicalCategory" />
+          <el-table-column label="化学品名称" align="left" fixed width="250" prop="chemicalName" show-overflow-tooltip/>
+          <el-table-column label="编码" align="left" width="150" prop="tagCode" show-overflow-tooltip/>
+          <el-table-column label="CAS" align="left" width="150" prop="casNum" show-overflow-tooltip/>
+          <el-table-column label="类别" align="left" width="160" prop="chemicalCategory" show-overflow-tooltip/>
           <el-table-column label="级别" align="left" width="100" prop="chemicalLevel">
             <template slot-scope="scope">
               <span>{{scope.row.chemicalLevel?'管控':'非管控'}}</span>
@@ -120,7 +120,7 @@
               <span>{{scope.row.subName}}({{scope.row.subRoom}})</span>
             </template>
           </el-table-column>
-          <el-table-column label="安全员" align="left" width="150" prop="safeInfo" />
+          <el-table-column label="安全员" align="left" width="150" prop="safeInfo" show-overflow-tooltip/>
           <el-table-column label="位置" align="left" width="230" prop="name">
             <template slot-scope="scope">
               <span>{{scope.row.cabinetName}}-{{scope.row.doorName}}-{{scope.row.layers}}</span>

src/views/chemicalManage/useLedger/infoPage.vue

@@ -11,9 +11,9 @@
             <li>类别：{{newData.chemicalDetail.chemicalCategory}}<p class="control-state">{{newData.chemicalDetail.chemicalLevel?'管控':'非管控'}}</p></li>
             <li>编码：{{newData.chemicalDetail.tagCode}}</li>
             <li>RFID标签：{{newData.chemicalDetail.rfidCode}}</li>
-            <li>规格：{{newData.chemicalDetail.specNum}}{{newData.chemicalDetail.specUnit}}{{newData.chemicalDetail.packUnit}}</li>
+            <li>规格：{{newData.chemicalDetail.specNum}}{{newData.chemicalDetail.specUnit}}/{{newData.chemicalDetail.packUnit}}</li>
             <li>实时库存：{{newData.chemicalDetail.surplus}}{{newData.chemicalDetail.specUnit}}</li>
-            <li>过期时间：{{newData.chemicalDetail.expireTime}} | {{newData.chemicalDetail.adventWarnDay}}天前提醒</li>
+            <li>过期时间：{{newData.chemicalDetail.expireTime}} | {{newData.chemicalDetail.adventWarnDay}}</li>
             <li>领用时效：{{newData.chemicalDetail.duration}}小时</li>
             <li>实验室：{{newData.chemicalDetail.subName}}({{newData.chemicalDetail.subRoom}})</li>
             <li>安全员：{{newData.chemicalDetail.safeInfo}}</li>

src/views/integratedManagement/messageNotice/warningNotice/index.vue

@@ -127,7 +127,7 @@
   import {
     chemicalUserecordDetail,
     systemWarningNoticeDetail,
-    systemWarningNoticeList,
+    systemWarningNoticeList, systemWarningNoticeWarningDetail,
     systemWarningNoticeWarningList
   } from '@/api/chemicalManage'
   export default {
@@ -219,7 +219,7 @@
           obj.startTime = "";
           obj.endTime = "";
         }
-        systemWarningNoticeWarningList(obj).then(response => {
+         systemWarningNoticeList(obj).then(response => {
           this.$set(this,'loading',false);
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
@@ -233,7 +233,7 @@
           this.$set(this,'pageType',2);
         }else if(type == 2 || type == 3){
           //详情
-          systemWarningNoticeDetail({id:row.noticeId}).then(response => {
+          systemWarningNoticeWarningDetail({id:row.noticeId}).then(response => {
             this.$set(this,'propsData',JSON.parse(JSON.stringify(response.data)));
             this.$set(this,'pageType',3);
           });

src/views/integratedManagement/messageNotice/warningNotice/infoPage.vue

@@ -216,7 +216,7 @@
 
 <script>
 import fullScreenView from "@/components/fullScreenView/fullScreenView.vue";
-import {systemWarningNoticeHandleMessage } from '@/api/chemicalManage'
+import { systemWarningNoticeHandleMessage, systemWarningNoticeWarningHandleMessage } from '@/api/chemicalManage'
 export default {
   name: 'infoPage',
   components: {
@@ -256,7 +256,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       let self=this;
-      systemWarningNoticeHandleMessage(self.infoDataForm).then( response => {
+      systemWarningNoticeWarningHandleMessage(self.infoDataForm).then( response => {
         self.msgSuccess("成功")
         self.$parent.tableButton('out');
       });