物资系统修改

src/styles/element-ui.scss

@@ -1,58 +1,67 @@
 // cover some element-ui styles
-
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
-  font-weight: 400 !important;
+    font-weight: 400 !important;
 }
 
 .el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
+    input[type="file"] {
+        display: none !important;
+    }
 }
 
 .el-upload__input {
-  display: none;
+    display: none;
 }
 
 .el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-  .el-dialog__header{
-    background-color: white;
-    border-bottom: 1px solid #ccc;
-    text-indent: 10px;
-    .el-dialog__title{
-      color: black;
+    transform: none;
+    left: 0;
+    position: relative;
+    margin: 0 auto;
+    // .el-dialog__header{
+    //   background-color: white;
+    //   border-bottom: 1px solid #ccc;
+    //   text-indent: 10px;
+    //   .el-dialog__title{
+    //     color: black;
+    //   }
+    //   .el-dialog__headerbtn .el-dialog__close {
+    //     color: #777 !important;
+    // }
+    // }
+    .el-dialog__header {
+        background-color: #2d74e7;
+        border-bottom: 1px solid #ccc;
+        text-indent: 10px;
+        .el-dialog__title {
+            color: #ffffff;
+        }
+        .el-dialog__headerbtn .el-dialog__close {
+            color: #f8f8f8 !important;
+        }
     }
-    .el-dialog__headerbtn .el-dialog__close {
-      color: #777 !important;
-  }
-  }
 }
 
 // refine element ui upload
 .upload-container {
-  .el-upload {
-    width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
+    .el-upload {
+        width: 100%;
+        .el-upload-dragger {
+            width: 100%;
+            height: 200px;
+        }
     }
-  }
 }
 
 // dropdown
 .el-dropdown-menu {
-  a {
-    display: block
-  }
+    a {
+        display: block
+    }
 }
 
 // to fix el-date-picker css style
 .el-range-separator {
-  box-sizing: content-box;
-}
+    box-sizing: content-box;
+}

src/views/mbsys/materialmanage/assetmanage/equipmentvehicles/index.vue

@@ -103,11 +103,11 @@
             ]">
               <!-- <el-input v-model="['在库','在用','报废','出售','闲置'][parseInt(form.assetsState)]" size="small" :readonly="readonly"></el-input> -->
               <el-select v-model="form.assetsState" size="small" placeholder="请选择" style="width:100%" clearable>
-                <el-option label="在库" :value="1"></el-option>
-                <el-option label="在用" :value="2"></el-option>
-                <el-option label="报废" :value="3"></el-option>
-                <el-option label="出售" :value="4"></el-option>
-                <el-option label="闲置" :value="5"></el-option>
+                <el-option label="在库" :value="0"></el-option>
+                <el-option label="在用" :value="1"></el-option>
+                <el-option label="报废" :value="2"></el-option>
+                <el-option label="出售" :value="3"></el-option>
+                <el-option label="闲置" :value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -151,12 +151,12 @@
               <el-input v-model="form.supply" size="small" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="生产厂商">
               <el-input v-model="form.produce" size="small" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="铭牌信息">
               <el-input v-model="form.nameplate" size="small" :readonly="readonly"></el-input>
             </el-form-item>
@@ -224,7 +224,7 @@
               <el-input v-model="form.personLiable" size="small" :readonly="readonly"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item label="使用位置">
               <el-input v-model="form.addre" size="small" :readonly="readonly"></el-input>
             </el-form-item>

src/views/mbsys/materialmanage/configmanage/materialtype/index.vue

@@ -33,10 +33,11 @@
           </el-upload>
           <el-button type="primary" icon="el-icon-download" size="small" @click="downLoadTemplate()">模板</el-button>
           <el-button type="primary" icon="el-icon-download" size="small" @click="downLoadData">导出</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="small" @click="removematter">删除</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="small" @click="removematter" :disabled="removeDisabled">删除</el-button>
         </div>
         <div class="table-div">
           <el-table ref="table" :data="tableData" style="width: 100%" :style="{width: '100%'}" height="100%" border
+                    @selection-change="selectionChange"
                     :header-cell-style="{background:'rgba(250,250,250)',color:'rgb(50,59,65)',height:'39px',textAlign:'center'}">
             <template slot="empty">
               <img src="@/assets/icon/null.png" alt="">
@@ -67,7 +68,7 @@
                 <span>{{['设备类','车辆类','耗材类'][row.categoryType-1]}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="isAssets" label="是否为资产" align="center">
+            <el-table-column prop="isAssets" label="是否为资产" align="center" width="150">
               <template slot-scope="{row}">
                 <el-switch v-model="row.isAssets" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"
                            @change="rowChange(row)" :disabled="row.categoryType==2||row.categoryType==3"></el-switch>
@@ -122,11 +123,11 @@
                            style="width:100%" :disabled="opType2==2"></el-cascader>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="物资类型编码" prop="matterNumber" :rules="[{ required: true, message: '请输入类型编码', trigger: 'blur' }]">
               <el-input v-model="form.matterNumber" size="small" :readonly="opType2==2"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="物资类型名称" prop="matterName" :rules="[{ required: true, message: '请输入类型名称', trigger: 'blur' }]">
               <el-input v-model="form.matterName" size="small" :readonly="opType2==2"></el-input>
@@ -162,7 +163,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible2 = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="submitTypeItem()">确 定</el-button>
+        <el-button size="small" type="primary" @click="submitTypeItem()" v-show="opType2!=2">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -191,8 +192,12 @@ export default {
       opType: 1,
       disabled: false,
       opType2: 1,
-      upLoadDisabled: true
+      upLoadDisabled: true,
+      removeDisabled: true
     };
+  },
+  computed: {
+
   },
   watch: {
     filterText(val) {
@@ -200,7 +205,7 @@ export default {
     },
     'form.categoryType'(val, oldVal) {
       if (val == 2) this.$set(this.form, 'isAssets', 1)
-      else if(val==3) this.$set(this.form, 'isAssets', 0)
+      else if (val == 3) this.$set(this.form, 'isAssets', 0)
     }
   },
   mounted() {
@@ -254,6 +259,9 @@ export default {
      * 新增类型
      */
     addBasetype() {
+      if (!this.typeForm.hasOwnProperty('isAssets')) {
+        this.$set(this.form, 'isAssets', 0)
+      }
       addBasetype(this.typeForm).then(res => {
         if (res.code == 1) {
           this.getTypetree()
@@ -347,12 +355,19 @@ export default {
      * 打开弹窗表单
      */
     openForm(type, data = null) {
+
       this.opType2 = type
       if (type == 1) { // 新增
         this.dialogFormVisible2 = true
+        this.$nextTick(() => {
+          this.$refs.form2.clearValidate()// 清除表单验证
+        })
         this.form = {}
       } else { // 修改,详情
         this.dialogFormVisible2 = true
+        this.$nextTick(() => {
+          this.$refs.form2.clearValidate()// 清除表单验证
+        })
         data['value'] = []
         if (data.baseTypeSmallVOList.length - 1 >= 0)
           data.value.push(data.baseTypeSmallVOList[data.baseTypeSmallVOList.length - 1].id)
@@ -471,6 +486,7 @@ export default {
      * 编辑是否为资产
      */
     rowChange(row) {
+      console.log('输出：change', row)
       let data = JSON.parse(JSON.stringify(row))
       data['value'] = []
       if (data.baseTypeSmallVOList.length - 1 >= 0)
@@ -479,7 +495,34 @@ export default {
         data.value.push(data.baseTypeSmallVOList[data.baseTypeSmallVOList.length - 2].id)
       if (data.baseTypeSmallVOList.length - 3 >= 0)
         data.value.push(data.baseTypeSmallVOList[data.baseTypeSmallVOList.length - 3].id)
-      this.editormatter(data, true);
+      if (row.isAssets == 0) {
+        this.$confirm('该物资信息已同步到资产信息，是否确认修改？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.editormatter(data, true);
+        }).catch(() => {
+          this.getMatterTypes() // 取消修改
+        });
+      } else if (row.isAssets == 1) {
+        this.$confirm('该物资信息将同步到资产信息，是否确认修改？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.editormatter(data, true);
+        }).catch(() => {
+          this.getMatterTypes() // 取消修改
+        });
+      }
+    },
+    /**
+     * 表格选择
+     */
+    selectionChange(selection) {
+      if (selection.length > 0) this.removeDisabled = false;
+      else this.removeDisabled = true;
     },
     /**
      * 类型提交

src/views/mbsys/materialmanage/materialimportmanage/materialimport/index.vue

@@ -9,7 +9,8 @@
           <el-button type="primary" icon="el-icon-search" size="small" @click="query()">搜索</el-button>
         </el-form-item>
       </el-form>
-      <el-button type="primary" icon="el-icon-upload2" size="small" @click="dialogFormVisible=true;upLoadFile=''" style="margin-top:5px">导入</el-button>
+      <el-button type="primary" icon="el-icon-upload2" size="small" @click="dialogFormVisible=true;upLoadFile=''" style="margin-top:5px">导入
+      </el-button>
       <!-- <el-button type="primary" icon="el-icon-download" size="small">导出</el-button> -->
     </div>
     <div class="table-div">
@@ -45,11 +46,11 @@
         <el-form-item label="导入类型">
           <el-radio v-model="importType" :label="1">
             物料入库信息导入
-            <el-button type="text" icon="el-icon-download" :disabled="importType==2" @click="kmTemplate"></el-button>
+            <el-button type="text" icon="el-icon-download" :disabled="importType==2" @click="kmTemplate" title="点击可下载模板"></el-button>
           </el-radio>
           <el-radio v-model="importType" :label="2">
             物资明细信息导入（针对设备、车辆）
-            <el-button type="text" icon="el-icon-download" :disabled="importType==1" @click="sbTemplate"></el-button>
+            <el-button type="text" icon="el-icon-download" :disabled="importType==1" @click="sbTemplate" title="点击可下载模板"></el-button>
           </el-radio>
         </el-form-item>
         <el-form-item label="文件路径">
@@ -125,8 +126,8 @@
           </el-table-column>
           <el-table-column v-if="currentRow.importType&&currentRow.importType==1" prop="produceDate" label="生产日期" align="center">
           </el-table-column>
-          <el-table-column v-if="currentRow.importType&&currentRow.importType==1" prop="outDate" label="出库日期" align="center">
-          </el-table-column>
+          <!-- <el-table-column v-if="currentRow.importType&&currentRow.importType==1" prop="outDate" label="出库日期" align="center">
+          </el-table-column> -->
           <el-table-column v-if="currentRow.importType&&currentRow.importType==1" prop="dept" label="部门管理" align="center"></el-table-column>
           <el-table-column v-if="currentRow.importType&&currentRow.importType==1" prop="remark" label="物资备注" align="center">
           </el-table-column>
@@ -181,12 +182,16 @@ export default {
       deleteItem: null, // 待删除的信息
       checkDeleteInfo: {},
       uploadLoading: false,
-      currentRow: {}
+      currentRow: {},
+      uploadCover: null
     }
   },
   mounted() {
     this.getMaterialImport()
   },
+  destroyed() {
+    this.uploadCover.close();
+  },
   methods: {
     getMaterialImport() {
       let params = JSON.parse(JSON.stringify(this.pagination))
@@ -274,11 +279,13 @@ export default {
             this.$refs.uploadButton.clearFiles()
             this.dialogFormVisible = false
             this.uploadLoading = false
+            this.uploadCover.close();
             this.pagination.current = 1
             this.getMaterialImport()
           }
         }).catch(error => {
           this.uploadLoading = false
+          this.uploadCover.close();
         })
       } else {
         importSb(formData).then(res => {
@@ -287,11 +294,13 @@ export default {
             this.$refs.uploadButton.clearFiles()
             this.dialogFormVisible = false
             this.uploadLoading = false
+            this.uploadCover.close();
             this.pagination.current = 1
             this.getMaterialImport()
           }
         }).catch(error => {
           this.uploadLoading = false
+          this.uploadCover.close();
         })
       }
     },
@@ -300,8 +309,18 @@ export default {
      */
     uploadSubmit() {
       this.uploadLoading = true
+      this.uploadCover = this.$loading({
+        lock: true,
+        text: '正在导入……',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      // setTimeout(() => {
+      //   loading.close();
+      // }, 2000);
       if (!this.upLoadFile) {
         this.uploadLoading = false
+        this.uploadCover.close();
         this.$message.warning("请选择文件！")
         return
       }

src/views/mbsys/materialmanage/materialparameter/fixedassets/index.vue

@@ -37,8 +37,11 @@
         <el-table-column prop="assetsName" label="资产名称" align="center"></el-table-column>
         <el-table-column prop="standards" label="规格型号" align="center"></el-table-column>
         <el-table-column prop="deptName" label="管理部门" align="center"></el-table-column>
-        <el-table-column prop="deviceState" label="资产状态" align="center">
+        <!-- <el-table-column prop="deviceState" label="资产状态" align="center">
           <template slot-scope="{row}">{{['在库','在用','报废','出售','闲置'][parseInt(row.deviceState)]}}</template>
+        </el-table-column> -->
+        <el-table-column prop="assetsState" label="资产状态" align="center">
+          <template slot-scope="{row}">{{['在库','在用','报废','出售','闲置'][parseInt(row.assetsState)]}}</template>
         </el-table-column>
         <el-table-column prop="price" label="采购价格(元)" align="center"></el-table-column>
         <el-table-column prop="nowMoney" label="当前价值(元)" align="center"></el-table-column>
@@ -52,7 +55,7 @@
         <el-table-column prop="bigTypeName" label="资产分类" align="center">
           <template slot-scope="{row}">{{row.categoryType==1||row.categoryType==2?'/':row.bigTypeName}}</template>
         </el-table-column>
-        <el-table-column prop="uniqueNumber" label="出厂唯一编码" align="center"></el-table-column>
+        <el-table-column prop="onlyCode" label="出厂唯一编码" align="center"></el-table-column>
         <el-table-column prop="supply" label="供货商" align="center"></el-table-column>
         <el-table-column prop="produce" label="生产厂商" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="remark" label="备注" align="center"></el-table-column>
@@ -136,12 +139,12 @@
               <el-input v-model="form.supply" size="small" readonly></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="生产厂商">
               <el-input v-model="form.produce" size="small" readonly></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="铭牌信息">
               <el-input v-model="form.nameplate" size="small" readonly></el-input>
             </el-form-item>
@@ -192,7 +195,7 @@
               <el-input v-model="form.personLiable" size="small" readonly></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item label="使用位置">
               <el-input v-model="form.addre" size="small" readonly></el-input>
             </el-form-item>

src/views/mbsys/materialmanage/materialparameter/material/column.config.js

@@ -66,10 +66,6 @@ export const storageColumn = () => [
         label: '入库时间',
         prop: 'prop'
     },
-    {
-        label: '入库时间',
-        prop: 'prop'
-    },
     {
         label: '入库数量',
         prop: 'prop'
@@ -87,7 +83,7 @@ export const storageColumn = () => [
         prop: 'prop'
     },
     {
-        label: '库存位置',
+        label: '入库位置',
         prop: 'prop'
     },
     {
@@ -168,17 +164,25 @@ export const detailColumn = () => [
         label: '生产日期',
         prop: 'produceDate'
     },
+    // {
+    //     label: '采购单号',
+    //     prop: 'purchaseId'
+    // },
+    // {
+    //     label: '出库工单',
+    //     prop: 'streamId'
+    // },
     {
-        label: '采购单号',
-        prop: 'purchaseId'
+        label: '到期时间',
+        prop: 'expireDate'
     },
     {
-        label: '出库工单',
-        prop: 'streamId'
+        label: '入库时间',
+        prop: 'inTime'
     },
     {
-        label: '管理部门',
-        prop: 'dept'
+        label: '出库时间',
+        prop: 'outDate'
     },
     {
         label: '备注',

src/views/mbsys/materialmanage/materialparameter/material/index.vue

@@ -22,7 +22,7 @@
         <el-form-item label="采购时间">
           <el-date-picker v-model="queryForm.cgdate" type="daterange" align="right" unlink-panels range-separator="~" clearable
                           start-placeholder="开始日期" end-placeholder="结束日期" size="small" value-format="yyyy-MM-dd"></el-date-picker>
-          <el-button type="primary" icon="el-icon-search" size="small" @click="query">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="query">搜索</el-button>
         </el-form-item>
 
       </el-form>
@@ -35,9 +35,14 @@
           <img src="@/assets/icon/null.png" alt="">
           <p class="empty-p">暂无数据</p>
         </template>
-        <el-table-column prop="keepGrainNumber" label="入库编号" align="center" width="200"></el-table-column>
-        <el-table-column prop="matterNumber" label="物资类型编号" align="center" width="200"></el-table-column>
-        <el-table-column prop="standards" label="规格型号" align="center"></el-table-column>
+        <!-- <el-table-column prop="keepGrainNumber" label="入库编号" align="center" width="200"></el-table-column> -->
+        <el-table-column prop="matterNumber" label="物资类型编码" align="center" width="200"></el-table-column>
+        <el-table-column prop="matterName" label="物资类型名称" align="center">
+          <template slot-scope="{row}">{{row.matterName?row.matterName:'/'}}</template>
+        </el-table-column>
+        <el-table-column prop="standards" label="规格型号" align="center">
+          <template slot-scope="{row}">{{row.standards?row.standards:'/'}}</template>
+        </el-table-column>
         <el-table-column prop="baseTypeName" label="物资分类" align="center"></el-table-column>
         <el-table-column label="物资类别" align="center">
           <template slot-scope="{row}">{{['设备类','车辆类','耗材类'][parseInt(row.categoryType)-1]}}</template>
@@ -45,15 +50,14 @@
         <el-table-column label="是否为资产" align="center">
           <template slot-scope="{row}">{{['否','是'][parseInt(row.isAssets)]}}</template>
         </el-table-column>
-        <el-table-column prop="matterName" label="物资类型名称" align="center"></el-table-column>
         <el-table-column prop="unit" label="单位" align="center"></el-table-column>
-        <el-table-column prop="inQuantity" label="采购总数量" align="center"></el-table-column>
+        <el-table-column prop="inQuantity" label="入库总数量" align="center"></el-table-column>
         <el-table-column prop="quantity" label="库存数量" align="center"></el-table-column>
         <el-table-column prop="purchaseTotal" label="采购价格合计(元)" align="center"></el-table-column>
         <el-table-column prop="unitPrice" label="最近采购价格(元)" align="center"></el-table-column>
         <el-table-column prop="marketTotal" label="库存市场总价(元)" align="center"></el-table-column>
         <el-table-column label="数据来源" align="center">
-          <template slot-scope="{row}">{{['导入','入库'][parseInt(row.dataSource)-1]}}</template>
+          <template slot-scope="{row}">{{['外部导入','入库管理'][parseInt(row.dataSource)-1]}}</template>
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="{row}">
@@ -63,7 +67,7 @@
       </el-table>
     </div>
     <el-pagination :current-page="pagination.current" :page-sizes="[20, 30, 50, 100, 200]" :page-size="pagination.size"
-                   :total="pagination.total" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                   :total="pagination.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
     <!-- 详情 -->
     <el-dialog title="物资详情" :visible.sync="dialogFormVisible" width="1400px">
       <!-- 基本信息 -->
@@ -222,6 +226,14 @@ export default {
         a.remove()
       })
     },
+    handleSizeChange(size) {
+      this.pagination.size = size
+      this.getMatterList()
+    },
+    handleCurrentChange(current) {
+      this.pagination.current = current
+      this.getMatterList()
+    },
     /**
      * 查询
      */

src/views/mbsys/watersupply/emergencymanage/emergencyplan/widget.vue

@@ -25,11 +25,11 @@
         </el-form>
 
         <el-button type="primary" @click="opendialog(1)" size="small" style="margin-top: 4px;">新增</el-button>
-        <el-button type="danger" @click="dialogFormVisible = true" size="small">删除</el-button>
+        <el-button type="danger" @click="dialogFormVisible = true" size="small" :disabled="removeDisable">删除</el-button>
       </div>
       <div class="table-div">
         <el-table :data="tableData" :style="{ width: '100%' }" height="100%" :header-cell-style="{background: 'rgba(250,250,250)',
-                  color: 'rgb(50,59,65)',height: '38px',textAlign: 'center'}" border>
+                  color: 'rgb(50,59,65)',height: '38px',textAlign: 'center'}" border @selection-change="selectionChange">
           <template slot="empty">
             <img src="@/assets/icon/null.png" alt="" />
             <p class="empty-p">暂无数据</p>
@@ -103,13 +103,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记人">
-              <el-input v-model="addForm.registerStaff" placeholder="请输入内容" disabled></el-input>
+              <el-input v-model="realName" placeholder="请输入内容" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间">
               <!-- <el-input v-model="addForm.registerTime" placeholder="请输入内容"></el-input> -->
-              <el-date-picker v-model="addForm.registerTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:100%">
+              <el-date-picker v-model="addForm.registerTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:100%"
+                              disabled>
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -171,7 +172,11 @@
         <el-table-column prop="matterName" label="物资类型" align="center"></el-table-column>
         <el-table-column prop="standards" label="规格型号" align="center"></el-table-column>
         <el-table-column prop="unit" label="单位" align="center"></el-table-column>
-        <el-table-column prop="quantity" label="数量" align="center"></el-table-column>
+        <el-table-column prop="quantity" label="数量" align="center">
+          <template slot-scope="{row}">
+            <el-input v-model.number="row.quantity" size="medium"></el-input>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="remark" label="备注" align="center"></el-table-column> -->
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
@@ -277,6 +282,7 @@ export default {
       facilityData: [],
       facilitiesData: [],
       fileList: [],
+      realName: '',
       formRules: {
         eventName: [
           { required: true, message: '请输入事故名称', trigger: 'blur' },
@@ -290,17 +296,29 @@ export default {
         procedure: [
           { required: true, message: '请输入处置及流程', trigger: 'blur' },
         ],
-      }
+      },
+      removeDisable: true
     };
   },
   watch: {},
+  computed: {
+    curUser() {
+      let cuser = this.$store.state.user
+      return cuser
+    }
+  },
   mounted() {
     this.getEventGrades()
     this.getEventTypes()
     this.emergencyList()
     this.getHazardAll()
+    this.realName = this.curUser.realName
   },
   methods: {
+    selectionChange(selection) {
+      if (selection.length > 0) this.removeDisable = false;
+      else this.removeDisable = true;
+    },
     getEventGrades() {
       getTypetree({ datatypes: 165, type: 0 }).then(res => {
         if (res.result.length > 0)
@@ -337,7 +355,7 @@ export default {
       this.type = type;
       if (type == 2) {
         this.getEmergencyById(data.id)
-      }else{
+      } else {
         this.addForm = {}
         // 
         this.facilitiesData = []
@@ -345,6 +363,7 @@ export default {
         this.peopleData = []
       }
       this.dialogFormVisible = true;
+      this.addForm['registerTime'] = new Date().toISOString().slice(0, 10)
     },
     // 获取应急预案列表
     async emergencyList(params) {
@@ -361,6 +380,7 @@ export default {
     // 新增应急事件（处置预案、事件分析）
     addEmergency() {
       const formdata = new FormData()
+      this.addForm['registerStaff'] = parseInt(this.curUser.userId)
       for (const key in this.addForm) {
         if (key == "emergencyHazards") {
           let arr = []
@@ -398,6 +418,7 @@ export default {
               type: "success",
             });
             this.emergencyList();
+            this.dialogFormVisible = false
           }
         });
         return
@@ -409,6 +430,7 @@ export default {
             type: "success",
           });
           this.emergencyList();
+          this.dialogFormVisible = false
         }
       });
     },