diff --git a/package.json b/package.json
index 4e4662a5682f069a1b12b059534b6d44f58c0778..a4f2cef02c3920e9b1e97d424dcd297f6368bec6 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@ztree/ztree_v3": "^3.5.42",
-    "axios": "^0.18.1",
+    "axios": "^0.21.1",
     "babel-polyfill": "^6.26.0",
     "core-js": "^2.6.5",
     "crypto": "^1.0.1",
diff --git a/src/config/api.js b/src/config/api.js
index c5a44be7f28ac91dbfae1400aca85e7758d9f1f8..1fcca9b58b52d3bfe4e9fb7fae859e814e193312 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -6,6 +6,14 @@ import {get, post, save, deletep, put, upload, putX} from './http'
  */
 export const login_Url = p => post('/login/auth', p);
 
+
+/**
+ * 根据 ID 查询
+ * @param p
+ * @returns {Promise<unknown>}
+ */
+export const findById = p => post('/user/findById', p);
+
 /**
  * 查询所有
  * @param p
@@ -18,18 +26,20 @@ export const findAll = p => post('/user/findAll', p);
  * @param p
  * @returns {Promise<unknown>}
  */
-export const insert = p => save('/user/findAll', p);
+export const insert = p => save('/user/insert', p);
 
 /**
- * 删除
+ * 修改
  * @param p
  * @returns {Promise<unknown>}
  */
-export const deleteSafetyAimInfo_Url = p => deletep('/quality/safety/safetyAim/deleteSafetyAimInfo', p);
+export const update = p => put('/user/update', p);
 
 /**
- * 修改
+ * 删除
  * @param p
  * @returns {Promise<unknown>}
  */
-export const updateSafetyAimInfo_Url = p => put('/quality/safety/safetyAim/updateSafetyAimInfo', p);
+export const del = p => deletep('/user/delete', p);
+
+
diff --git a/src/views/user/basicInformation.vue b/src/views/user/basicInformation.vue
index 0944467591ab97f294d2ee3d57f19e1aad4360fc..4abbfe82263c6c844640d0782b51a5cf88de55aa 100644
--- a/src/views/user/basicInformation.vue
+++ b/src/views/user/basicInformation.vue
@@ -95,9 +95,6 @@
                        @click="skip(scope.$index, scope.row, scope)">{{ scope.row.id }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="password" label="密码" align="center"
-                                 width="auto">
-                </el-table-column>
                 <el-table-column prop="school" label="学校" align="center"
                                  width="auto">
                 </el-table-column>
@@ -166,18 +163,9 @@
 </template>
 
 <script>
-import {
-  addSafetyConferenceInfo_Url,
-  deleteSafetyConferenceInfo_Url,
-  updateSafetyConferenceInfo_Url
-} from "@/config/securityapi";
-import {findAll} from "@/config/api";
-import securityConferenceDetail from "./basicInformationDetail";
+import {findAll, del} from "@/config/api";
 import XLSX from "xlsx";
 import FileSaver from "file-saver";
-import ztree from "ztree"
-import "ztree/css/zTreeStyle/zTreeStyle.css";
-import commonTree from "../../components/security/companyTreeData"
 
 export default {
   name: "basicInformation",
@@ -214,85 +202,19 @@ export default {
         desc: ''
       },
 
-      //展开和收缩树形图的标识
-      expandAndShrinkMark: false,
-      nowHeight: "",
-      divHeight: window.innerHeight - 290,
-      setting: {
-        view: {
-          showLine: true,
-          showIcon: false,
-          txtSelectedEnable: true
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            idKey: "ID",
-            pIdKey: "PID"
-          }
-        },
-        callback: {
-          onClick: this.zTreeOnClick, //点击选中事件　　
-        },
-      },
-      znodes: [],
+
       link: true,
-      SMS_NO_FIND: "",
-      SMS_NO: "",
-      TYPES_OF_MEETING: "",
-      DISPATCH_DATE: "",
-      CLASSIFY: "",
-      CLASSIFICATION: "",
-      REGISTRANTDESC: "",
-      SUBJECT: "",
-      COMPANY: "",
       addOrUpadte: "1",
       disabled: false,
 
       loading: false,
       editVisible: false,
       delVisible: false,
-      securityConferenceList: [],
-      multipleSelection: [],
-      userData: [],
-      securityConferenceEntityQuery: {
-        conference_NAME: "",
-        sms_NO: "",
-        types_OF_MEETING: "",
-        company: "",
-        dispatch_DATE: "",
-        classify: "",
-        subject: "",
-      },
-      companyData: [],
+
       totallRows: 0 /* 总数据行数 */,
       pageSize: 10 /* 当前页数据显示条数 */,
       currentPageNo: 1 /* 当前页码 */,
 
-      securityConferenceEntity: {
-        company: "",
-        conference_NAME: "",
-        content: "",
-        data_OWNER: "",
-        description: "",
-        dispatch_DATE: "",
-        insert_DATE: "",
-        insert_USER: "",
-        modify_DATE: "",
-        modify_USER: "",
-        place: "",
-        project: localStorage.getItem("project_id"),
-        registrant: "",
-        roster: "",
-        rowstamp: "",
-        sms_NO: "",
-        special_ITEM_STATUS: "",
-        status: "0",
-        subject: "",
-        to_GROUPS: "",
-        to_USERS: "",
-        types_OF_MEETING: "",
-      },
       show: false,
     };
   },
@@ -386,10 +308,10 @@ export default {
 
     //确认删除
     deleteRow() {
-      deleteSafetyConferenceInfo_Url({
+      del({
         id: this.id
       }).then(res => {
-        if (res.data.success === true) {
+        if (res.data.status) {
           this.$message.success("删除成功 !");
           this.delVisible = false;
           this.getData();
diff --git a/src/views/user/basicInformationDetail.vue b/src/views/user/basicInformationDetail.vue
index 6a32019286cc89ecc14ca3bd36a731f99ae48891..80c47e860fdefecdd9c84659a5b7cc444dd7307d 100644
--- a/src/views/user/basicInformationDetail.vue
+++ b/src/views/user/basicInformationDetail.vue
@@ -45,86 +45,67 @@
                   icon="el-icon-delete"
                   size="medium"
                   circle
-                  @click="delP" style="float: right; margin-top: -7px;margin-right: 20px">
+                  @click="del" style="float: right; margin-top: -7px;margin-right: 20px">
               </el-button>
             </el-tooltip>
           </div>
         </div>
       </div>
-      <el-form ref="form" :rules="rules" :model="securityConferenceEntity" label-width="180px">
+      <el-form ref="form" :rules="rules" :model="basicInformationEntity" label-width="180px">
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="conference_NAME" label="会议名称：">
-              <el-input v-model="securityConferenceEntity.conference_NAME" clearable
-                        placeholder="会议名称"></el-input>
+            <el-form-item prop="userName" label="姓名: ">
+              <el-input v-model="basicInformationEntity.userName" clearable
+                        placeholder="姓名"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item class="input-space" prop="types_OF_MEETING" label="会议类型：">
-              <el-select clearable filterable v-model="securityConferenceEntity.types_OF_MEETING"
-                         style="width:100%">
-                <el-option v-for="item in typeData"
-                           :key="item.index"
-                           :label="item.description"
-                           :value="item.code_table_item" style="width:600px;">
-                </el-option>
-              </el-select>
+            <el-form-item prop="studentNumber" label="学号: ">
+              <el-input v-model="basicInformationEntity.studentNumber" clearable
+                        placeholder="学号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item class="input-space" prop="description" label="主办单位：">
-              <el-select clearable filterable v-model="securityConferenceEntity.company"
-                         style="width:100%">
-                <el-option v-for="item in companyData"
-                           :key="item.index"
-                           :value="item.COMPANY"
-                           :label="item.DES" style="width: 600px"/>
-              </el-select>
+            <el-form-item prop="gender" label="性别: ">
+              <el-input v-model="basicInformationEntity.gender" clearable
+                        placeholder="性别"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item prop="classify" label="单位类型：">
-              <el-select clearable filterable v-model="securityConferenceEntity.classify"
-                         style="width:100%">
-                <el-option v-for="item in classifyData"
-                           :key="item.index"
-                           :label="item.description"
-                           :value="item.code_table_item" style="width:600px;">
-                </el-option>
-              </el-select>
+            <el-form-item prop="contact" label="联系方式: ">
+              <el-input v-model="basicInformationEntity.contact" clearable
+                        placeholder="联系方式"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item class="input-space" prop="dispatch_DATE" label="会议时间：">
-              <el-date-picker v-model="securityConferenceEntity.dispatch_DATE" type="date"
-                              placeholder="会议时间"></el-date-picker>
+            <el-form-item prop="school" label="学校: ">
+              <el-input v-model="basicInformationEntity.school" clearable
+                        placeholder="学校"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
-            <el-form-item class="input-space" label="状态：">
-              <el-select v-model="securityConferenceEntity.status" disabled>
-                <el-option value="0" label="初始化"></el-option>
-                <el-option value="1" label="批准"></el-option>
-              </el-select>
+            <el-form-item prop="classGrade" label="班级: ">
+              <el-input v-model="basicInformationEntity.classGrade" clearable
+                        placeholder="班级"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
-            <el-form-item prop="registrant" label="登记人员：">
-              <el-select clearable filterable v-model="defaultUser"
-                         style="width:100%" disabled>
-              </el-select>
+            <el-form-item prop="education" label="教育学历: ">
+              <el-input v-model="basicInformationEntity.education" clearable
+                        placeholder="教育学历"></el-input>
             </el-form-item>
           </el-col>
-
         </el-row>
+
       </el-form>
     </el-card>
 
@@ -133,14 +114,14 @@
       <!-- 头部区块描述 -->
       <div class="divtitle">
         <div class="divtitle-left"></div>
-        <div class="divtitle-text">会议摘要</div>
+        <div class="divtitle-text">备注信息</div>
         <el-form ref="form" :rules="rules" :model="securityConferenceEntity">
 
           <el-row>
             <el-col :span="24">
               <el-form-item class="input-space" prop="content">
                 <el-input clearable v-model="securityConferenceEntity.content"
-                          placeholder="提示信息：请简要输入会议信息（4000子）" type="textarea" size="medium"
+                          placeholder="提示信息：请简要输入备注信息（4000字）" type="textarea" size="medium"
                           :rows="5"></el-input>
               </el-form-item>
             </el-col>
@@ -176,15 +157,9 @@
 
 
 <script>
-import {
-  addSafetyConferenceInfo_Url,
-  updateSafetyConferenceInfo_Url,
-  deleteSafetyConferenceInfo_Url, deleteSafetySecurityeosInfo_Url
-} from "@/config/securityapi";
-import {executionSql, getAllUsers_Url, queryCompanyMsg_Url} from "@/config/api";
+import {findById, insert, update, del} from "@/config/api";
 import uploadTable from "../../components/security/uploadTable.vue";
 import gridInput from "../../components/input/gridInput.vue";
-import securityConference from "./basicInformation";
 
 export default {
   name: "basicInformationDetail",
@@ -196,75 +171,36 @@ export default {
     addOrUpdate: {
       type: String
     },
-    securityConferenceProp: {
-      type: Object
-    },
-    transStatus: {
-      type: String
-    },
-    SMSNO: {
-      type: String
-    },
-    link: {
-      type: Boolean
-    },
-    INSERT_USER: {
+    id: {
       type: String
     }
   },
   data() {
     return {
-      delVisibleP: false,
-      tempUser: "",
-      queryMap: {
-        menuName: "系统"
+
+      // Table Data
+      basicInformationData: [],
+
+      // Insert / Update Data Entity
+      basicInformationEntity: {
+        id: "",
+        userName: "",
+        school: "",
+        parentId: "",
+        gender: "",
+        education: "",
+        classGrade: "",
+        contact: "",
+        studentNumber: ""
       },
-      SMS_NO: "",
-      TYPES_OF_MEETING: "",
-      DISPATCH_DATE: "",
-      CLASSIFY: "",
-      CLASSIFICATION: "",
-      REGISTRANTDESC: "",
-      SUBJECT: "",
-      COMPANY: "",
+
+      basicId: "",
+
       addOrUpadte: "1",
       disabled: false,
       loading: false,
       editVisible: false,
       delVisible: false,
-      securityConferenceList: [],
-      multipleSelection: [],
-      companyData: [],//责任单位
-      typeData: [],
-      classifyData: [],
-      userData: [],//用户信息
-      contractData: [],//合同数据
-      securityConferenceEntity: {
-        company: "",
-        conference_NAME: "",
-        content: "",
-        data_OWNER: "",
-        description: "",
-        dispatch_DATE: "",
-        insert_DATE: "",
-        insert_USER: "",
-        modify_DATE: "",
-        modify_USER: "",
-        place: "",
-        project: "",
-        registrant: "",
-        roster: "",
-        rowstamp: "",
-        sms_NO: "",
-        special_ITEM_STATUS: "",
-        status: "",
-        subject: "",
-        to_GROUPS: "",
-        to_USERS: "",
-        types_OF_MEETING: "",
-      },
-
-      defaultUser: "",
 
       linkTableType: "6",
 
@@ -272,164 +208,27 @@ export default {
 
       addAndUpdate: 1,
 
-      fileList: [{
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
-      }, {
-        name: 'food2.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
-      }],
       rules: {
-        conference_NAME: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        types_OF_MEETING: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        dispatch_DATE: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        description: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        subject: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        roster: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        company: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        registrant: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        special_ITEM_STATUS: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        content: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        classify: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
-        place: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}]
+        userName: [{required: true, message: "不能为空，请输入内容！", trigger: "blur"}],
       },
     };
   },
   created() {
-    // this.securityConferenceEntity = this.$route.params.securityConfenceProp;
     this.refresh();
-    this.getPoNo();
-    this.getUserData();
-    this.getCompanyData();
-    this.getTypeData();
-    this.getClassifyData();
-    this.getSmsNoData();
     this.getData();
-    this.getUserDataOnly();
-    // this.getDataForAdd();
   },
 
   methods: {
 
-    // 新增时，填充默认数据
-    getDefaultData() {
-      executionSql({
-        dsCode: "默认单位类型",
-        USER: localStorage.getItem("ms_username")
-      }).then(res => {
-        if (res.data.success) {
-          var temp = res.data.data[0];
-          if (temp.COMPANY === 'HDJT') {
-            this.securityConferenceEntity.classify = '01';
-          } else if (temp.COMPANY === 'HDJS') {
-            this.securityConferenceEntity.classify = '02';
-          } else if (temp.COMPANY !== 'HDJT' && temp.COMPANY !== 'HDJS' && temp.COMPANY_TYPE === 'OWN') {
-            this.securityConferenceEntity.classify = '03';
-          } else if (temp.COMPANY !== 'HDJT' && temp.COMPANY !== 'HDJS' && temp.COMPANY_TYPE === 'SPV') {
-            this.securityConferenceEntity.classify = '04';
-          } else if (temp.COMPANY !== 'HDJT' && temp.COMPANY !== 'HDJS' && temp.COMPANY_TYPE === 'CON') {
-            this.securityConferenceEntity.classify = '05';
-          } else {
-            this.securityConferenceEntity.classify = '06';
-          }
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-      executionSql({
-        dsCode: "默认单位信息",
-        USER: localStorage.getItem("ms_username")
-      }).then(res => {
-        if (res.data.success) {
-          var temp = res.data.data[0];
-          this.securityConferenceEntity.company = temp.COMPANY;
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-      executionSql({
-        dsCode: "默认合同信息",
-        USER: localStorage.getItem("ms_username")
-      }).then(res => {
-        if (res.data.success) {
-          var temp = res.data.data[0];
-          this.securityConferenceEntity.po_NO = temp.PO_NO;
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-    },
-
     // 刷新修改状态
     refresh() {
       if (this.addOrUpdate === "2") {
         this.addAndUpdate = 2;
-      }
-    },
-    /**
-     * 获取合同号
-     */
-    getPoNo() {
-      executionSql({
-        dsCode: "CONTRACTINFO",
-      }).then(res => {
-        if (res.data.success === true) {
-          this.contractData = res.data.data;
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-    },
-
-    getUserDataOnly() {
-
-      if (this.securityConferenceEntity.insert_USER) {
-        this.defaultUser = this.securityConferenceEntity.insert_USER;
-      } else {
-        let no = this.INSERT_USER;
-        if (!no) {
-          no = localStorage.getItem("ms_username");
-        }
-        executionSql({
-          dsCode: "锁定默认登记人",
-          UC: no
-        }).then(res => {
-          if (res.data.success) {
-            this.defaultUser = res.data.data[0].SHOW_NAME;
-          }
-        })
+      } else if (this.addOrUpadte === '1') {
+        this.addAndUpdate = 1;
       }
     },
 
-    /**
-     * 获取项目分类
-     */
-    getClassifyData() {
-      executionSql({
-        dsCode: "CODE_TABLE_ITEM",
-        codeTable: "AQ1"
-      }).then(res => {
-        if (res.data.success === true) {
-          this.classifyData = res.data.data;
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-    },
-
-    getTypeData() {
-      executionSql({
-        dsCode: "CODE_TABLE_ITEM",
-        codeTable: "Z05"
-      }).then(res => {
-        if (res.data.success === true) {
-          this.typeData = res.data.data;
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-    },
-
 
     /**
      * 文件上传
@@ -441,180 +240,91 @@ export default {
     showCont: function () {
       this.show = !this.show;
     },
-    dateFtt(fmt, dateStr) {
-      var date = new Date(dateStr);
-      var o = {
-        "M+": date.getMonth() + 1,     //月份
-        "d+": date.getDate(),     //日
-        "h+": date.getHours(),     //小时
-        "m+": date.getMinutes(),     //分
-        "s+": date.getSeconds(),     //秒
-        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
-        "S": date.getMilliseconds()    //毫秒
-      };
-      if (/(y+)/.test(fmt))
-        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-      for (var k in o)
-        if (new RegExp("(" + k + ")").test(fmt))
-          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-      return fmt;
-    },
 
     // 获取数据
     getData() {
       if (this.addAndUpdate === 2) {
-        let conditionSql = " where 1 = 1 ";
-        if (this.SMS_NO) {
-          conditionSql += " and SMM.SMS_NO = '" + this.SMS_NO + "'";
-        } else if (this.SMSNO) {
-          conditionSql += " and SMM.SMS_NO = '" + this.SMSNO + "'";
-        }
-
-        conditionSql += " and SMM.PROJECT = '" + localStorage.getItem("project_id") + "'";
 
-        executionSql({
-          dsCode: "SECURITY_MANAGEMENT_MEETING",
-          CONDITION: conditionSql
+        findById({
+          id: this.id
         }).then(res => {
-          if (res.data.success) {
-            if (res.data.data[0].STATUS === '1') {
-              this.updateflag = false;
+          if (res.data.status) {
+            this.basicInformationEntity = {
+              id: res.data.data[0].id,
+              userName: res.data.data[0].userName,
+              school: res.data.data[0].school,
+              parentId: res.data.data[0].parentId,
+              gender: res.data.data[0].gender,
+              education: res.data.data[0].education,
+              classGrade: res.data.data[0].classGrade,
+              contact: res.data.data[0].contact,
+              studentNumber: res.data.data[0].studentNumber
             }
-            this.securityConferenceEntity = {
-              classify: res.data.data[0].CLASSIFY,
-              company: res.data.data[0].COMPANY,
-              conference_NAME: res.data.data[0].CONFERENCE_NAME,
-              content: res.data.data[0].CONTENT,
-              data_OWNER: res.data.data[0].DATA_OWNER,
-              description: res.data.data[0].DESCRIPTION,
-              dispatch_DATE: res.data.data[0].DISPATCH_DATE,
-              insert_DATE: res.data.data[0].INSERT_DATE,
-              insert_USER: res.data.data[0].INSERT_USER,
-              modify_DATE: res.data.data[0].MODIFY_DATE,
-              modify_USER: res.data.data[0].MODIFY_USER,
-              place: res.data.data[0].PLACE,
-              project: res.data.data[0].PROJECT,
-              registrant: res.data.data[0].REGISTRANT,
-              roster: res.data.data[0].ROSTER,
-              rowstamp: res.data.data[0].ROWSTAMP,
-              sms_NO: res.data.data[0].SMS_NO,
-              special_ITEM_STATUS: res.data.data[0].SPECIAL_ITEM_STATUS,
-              status: res.data.data[0].STATUS,
-              subject: res.data.data[0].SUBJECT,
-              to_GROUPS: res.data.data[0].TO_GROUPS,
-              to_USERS: res.data.data[0].TO_USERS,
-              types_OF_MEETING: res.data.data[0].TYPES_OF_MEETING
-
-            };
+
           } else {
             this.$message.error(res.data.msg);
           }
         });
       } else {
-        this.securityConferenceEntity = {
-          classify: "",
-          company: "",
-          conference_NAME: "",
-          content: "",
-          data_OWNER: "",
-          description: "",
-          dispatch_DATE: "",
-          insert_DATE: "",
-          insert_USER: "",
-          modify_DATE: "",
-          modify_USER: "",
-          place: "",
-          project: "",
-          registrant: "",
-          roster: "",
-          rowstamp: "",
-          sms_NO: "",
-          special_ITEM_STATUS: "",
-          status: "0",
-          subject: "",
-          to_GROUPS: "",
-          to_USERS: "",
-          types_OF_MEETING: "",
-        }
-        // 新增填充默认信息
-        this.getDefaultData();
+        this.basicInformationEntity = {
+          id: "",
+          userName: "",
+          school: "",
+          parentId: "",
+          gender: "",
+          education: "",
+          classGrade: "",
+          contact: "",
+          studentNumber: ""
+        };
       }
 
     },
 
-    //年份设置
-    checkDataFormat(row, column) {
-      if (row.DISPATCH_DATE != null) {
-        return this.dateFtt('yyyy', row.DISPATCH_DATE);
-      }
-    },
+
     //批准
     check() {
-      executionSql({
-        dsCode: 'SECURITY_UPLOAD_FILES',
-        smsNo: this.securityConferenceEntity.sms_NO
-      }).then(res => {
-        if (res.data.data.length > 0) {
-          this.securityConferenceEntity.status = "1";
-          updateSafetyConferenceInfo_Url(this.securityConferenceEntity).then(res => {
-            if (res.data.success === true) {
-              this.updateflag = false;
-              this.$message.success("批准成功");
-            } else {
-              this.$message.warning("批准失败" + res.data.msg);
-            }
-          });
-        } else {
-          this.$message.warning("附件为空 !");
-        }
-      })
     },
+
     // 新增
     save() {
-      this.securityConferenceEntity.project = localStorage.getItem("project_id");
       this.$refs['form'].validate(valid => {
         if (valid) {
           // 从增加进来
           if (this.addOrUpdate === "1") {
-            // 防汛字段
-            if (this.securityConferenceEntity.special_ITEM_STATUS === '1') {
-              this.securityConferenceEntity.special_ITEM_STATUS = 'Y';
-            } else if (this.securityConferenceEntity.special_ITEM_STATUS === '0') {
-              this.securityConferenceEntity.special_ITEM_STATUS = 'N';
-            }
+
             // 增加
             if (this.addAndUpdate === 1) {
-              addSafetyConferenceInfo_Url(this.securityConferenceEntity).then(res => {
-                if (res.data.success === true) {
+              insert(this.basicInformationEntity).then(res => {
+                if (res.data.status) {
                   this.$message.success("新增成功");
-                  this.securityConferenceEntity.sms_NO = res.data.data;
-                  this.SMS_NO = res.data.data;
+                  this.basicId = res.data.data;
                   this.addAndUpdate = 2;
                   this.query();
                 } else {
-                  this.$message.success("新增失败：" + res.data.msg);
+                  this.$message.error("新增失败：" + res.data.message);
                 }
               });
               // 增加后是修改
             } else if (this.addAndUpdate === 2) {
-              updateSafetyConferenceInfo_Url(this.securityConferenceEntity).then(res => {
-                if (res.data.success === true) {
+              update(this.basicInformationEntity).then(res => {
+                if (res.data.status) {
                   this.$message.success("修改成功");
                   this.query();
                 } else {
-                  this.$message.success("修改失败：" + res.data.msg);
+                  this.$message.error("修改失败：" + res.data.message);
                 }
               });
             }
 
             // 修改
           } else {
-            updateSafetyConferenceInfo_Url(this.securityConferenceEntity).then(res => {
-              if (res.data.success === true) {
+            update(this.basicInformationEntity).then(res => {
+              if (res.data.status === true) {
                 this.$message.success("修改成功");
                 this.getData();
               } else {
-                this.$message.success("修改失败：" + res.data.msg);
+                this.$message.error("修改失败：" + res.data.message);
               }
             })
           }
@@ -627,29 +337,26 @@ export default {
     },
 
     //删除（打开弹出框）
-    del(index, row) {
+    del() {
       this.delVisible = true;
-      this.SMS_NO = row.SMS_NO;
+      this.id = this.basicInformationEntity.id;
     },
 
     //确认删除
     deleteRow() {
-      deleteSafetyConferenceInfo_Url({
-        SMS_NO: this.SMS_NO
+      del({
+        id: this.id
       }).then(res => {
-        if (res.data.success === true) {
+        if (res.data.status) {
           this.$message.success("删除成功");
-          this.query();
           this.delVisible = false;
+          this.goback();
         } else {
-          this.$message.success("删除失败：" + res.data.msg);
+          this.$message.error("删除失败：" + res.data.msg);
         }
       });
     },
 
-    //发起流程
-    startBpm() {
-    },
     /* 当选择项发生改变时触发该事件 */
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -675,26 +382,6 @@ export default {
 
     },
 
-    //删除（打开弹出框）
-    delP() {
-      this.delVisibleP = true;
-      this.SMS_NO = this.securityConferenceEntity.sms_NO;
-    },
-    //确认删除
-    deleteRowP() {
-      deleteSafetyConferenceInfo_Url({
-        SMS_NO: this.SMS_NO
-      }).then(res => {
-        if (res.data.success) {
-          this.$message.success("删除成功");
-          this.delVisibleP = false;
-          this.goback();
-        } else {
-          this.$message.error("删除失败：" + res.data.msg);
-        }
-      });
-    },
-
     goback() {
       this.$router.push({
         path: '/basicInformation',