diff --git a/src/views/ea/electronicConsultation/index.vue b/src/views/ea/electronicConsultation/index.vue
index a6392a76..1af34a42 100644
--- a/src/views/ea/electronicConsultation/index.vue
+++ b/src/views/ea/electronicConsultation/index.vue
@@ -17,16 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="创建日期	" prop="createTime">-->
-      <!--        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"-->
-      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="业务实体	" prop="company">-->
-      <!--        <el-input v-model="queryParams.company" placeholder="请输入业务实体	" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="所属部门	" prop="systemDept">-->
-      <!--        <el-input v-model="queryParams.systemDept" placeholder="请输入所属部门	" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
       <el-form-item label="咨询编号	" prop="consultationId">
         <el-input
           v-model="queryParams.consultationId"
@@ -45,48 +35,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="咨询标题	" prop="consultationTitle">
-        <el-input
-          v-model="queryParams.consultationTitle"
-          placeholder="请输入咨询标题	"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="咨询人	" prop="consultorName">
-        <el-input
-          v-model="queryParams.consultorName"
-          placeholder="请输入咨询人	"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="咨询时间	" prop="consultationTime">
-        <el-date-picker
-          v-model="queryParams.consultationTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        />
-      </el-form-item>
-      <el-form-item label="处理人员	" prop="handler">
-        <el-input
-          v-model="queryParams.handler"
-          placeholder="请输入处理人员	"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!--      <el-form-item label="处理日期	" prop="handleTime">-->
-      <!--        <el-date-picker v-model="queryParams.handleTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"-->
-      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />-->
-      <!--      </el-form-item>-->
       <el-form-item label="处理结果	" prop="handleResult">
-        <!--        <el-input v-model="queryParams.handleResult" placeholder="请输入处理结果	" clearable @keyup.enter.native="handleQuery"/>-->
         <el-select
           v-model="queryParams.handleResult"
           placeholder="请选择处理结果"
@@ -195,17 +144,6 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="制单人	" align="center" prop="createBy" />
-      <el-table-column
-        label="创建日期	"
-        align="center"
-        prop="createTime"
-        width="98px"
-      >
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="业务实体	" align="center" prop="company" />
       <el-table-column label="所属部门	" align="center" prop="systemDept" />
       <el-table-column label="咨询编号	" align="center" prop="consultationId" />
@@ -247,7 +185,7 @@
         width="98px"
       >
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.handleTime) }}</span>
+          <span>{{ parseTime2(scope.row.handleTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="处理结果	" align="center" prop="handleResult">
@@ -275,7 +213,7 @@
         width="98px"
       >
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
+          <span>{{ parseTime2(scope.row.recordTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="纸档位置	" align="center" prop="position" />
@@ -292,12 +230,32 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="制单人	" align="center" prop="createBy" />
+      <el-table-column
+        label="创建日期	"
+        align="center"
+        prop="createTime"
+        width="98px"
+      >
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        fixed="right"
+        width="180px"
       >
         <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            >查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -335,14 +293,22 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="98px">
         <el-row>
-          <!-- <el-col :span="8">
-            <el-form-item label="制单人	" prop="createBy">
-              <el-input v-model="form.createBy" placeholder="请输入制单人	" />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="业务实体	" prop="company">
-              <el-input v-model="form.company" placeholder="请输入业务实体	" />
+              <el-select
+                v-model="form.company"
+                placeholder="请选择业务实体"
+                value-key="id"
+                @change="handleCompanyChange"
+              >
+                <el-option
+                  v-for="item in organizationList"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.organizationName"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -440,7 +406,6 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="年度	" prop="year">
-              <!--          <el-input v-model="form.year" placeholder="请输入年度	" />-->
               <el-date-picker
                 format="yyyy年"
                 v-model="form.year"
@@ -464,42 +429,20 @@
                 placeholder="请选择会计月份"
               >
               </el-date-picker>
-              <!--          <el-input v-model="form.period" placeholder="请输入月份	" />-->
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="借阅状态	" prop="borrowStatus">
-              <el-select
-                v-model="form.borrowStatus"
-                placeholder="请选择借阅状态	"
-              >
-                <el-option
-                  v-for="dict in this.getDictDatas(DICT_TYPE.BORROW_STATUS)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="归档时间	" prop="recordTime">
-              <el-date-picker
+            <el-form-item label="纸档位置	" prop="position">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
                 clearable
-                v-model="form.recordTime"
-                type="date"
-                value-format="timestamp"
-                placeholder="选择归档时间	"
+                @change="handleSiteChanged"
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="纸档位置	" prop="position">
-              <el-input v-model="form.position" placeholder="请输入纸档位置	" />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="完整性	" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择归档状态">
@@ -512,24 +455,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="归档状态" prop="fileStatus">
-              <el-select v-model="form.fileStatus" placeholder="请选择归档状态">
-                <el-option
-                  v-for="dict in this.getDictDatas(
-                    DICT_TYPE.ARCHIVES_FILE_STATUS
-                  )"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType != 'view'"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -547,6 +478,8 @@ import {
 } from "@/api/ea/electronicConsultation/electronicConsultation";
 import Editor from "@/components/Editor";
 import ScrollPane from "@/layout/components/TagsView/ScrollPane";
+import { getSiteTree } from "@/api/setting/organization";
+import { getOrganizationPage } from "@/api/setting/organization";
 
 export default {
   name: "ElectronicConsultation",
@@ -558,6 +491,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      optType: undefined,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -599,10 +533,14 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      siteOptions: [], //归档位置数据
+      siteArray: [], //归档位置选中值
     };
   },
   created() {
     this.getList();
+    this.getSiteList();
+    this.getOrganizationList();
   },
   methods: {
     /** 查询列表 */
@@ -615,6 +553,51 @@ export default {
         this.loading = false;
       });
     },
+    // 获取业务实体
+    getOrganizationList() {
+      getOrganizationPage().then((response) => {
+        this.organizationList = response.data.list;
+      });
+    },
+    // 业务实体选择事件
+    handleCompanyChange(val) {
+      this.form.companyId = val.id;
+      this.form.company = val.organizationName;
+    },
+    //获取归档位置
+    getSiteList() {
+      getSiteTree().then((response) => {
+        this.siteOptions = response.data;
+        this.siteOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/depotId/g, "lId")
+              .replace(/cabinetId/g, "pId")
+              .replace(/cabinetName/g, "pName");
+            l.children = JSON.parse(lstr);
+          });
+
+          let wstr = JSON.stringify(w.children)
+            .replace(/organizationId/g, "wId")
+            .replace(/depotId/g, "pId")
+            .replace(/depotName/g, "pName");
+          w.children = JSON.parse(wstr);
+        });
+        let ostr = JSON.stringify(this.siteOptions)
+          .replace(/organizationId/g, "pId")
+          .replace(/organizationName/g, "pName");
+        this.siteOptions = JSON.parse(ostr);
+        // console.log(this.siteOptions);
+      });
+    },
+    //选择默认的归档位置
+    handleSiteChanged(obj) {
+      if (obj != null) {
+        this.form.organizationId = obj[0];
+        this.form.depotId = obj[1];
+        this.form.cabinetId = obj[2];
+      }
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -660,11 +643,24 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.optType = "add";
       this.title = "添加咨询档案";
     },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      this.optType = "view";
+      const id = row.id;
+      getElectronicConsultation(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看咨询档案";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.optType = "edit";
       const id = row.id;
       getElectronicConsultation(id).then((response) => {
         this.form = response.data;