页面优化修改

src/views/ea/electronicAssets/index.vue

@@ -17,15 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="资产名称" prop="assetName">
         <el-input
           v-model="queryParams.assetName"
@@ -34,28 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="资产类型" prop="assetType">
-        <el-select
-          v-model="queryParams.assetType"
-          placeholder="请选择资产类型"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="购买日期" prop="purchaseDate">
-        <el-date-picker
-          v-model="queryParams.purchaseDate"
-          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="disposalDate">
         <el-date-picker
           v-model="queryParams.disposalDate"
@@ -68,16 +37,7 @@
           :default-time="['00:00:00', '23:59:59']"
         />
       </el-form-item>
-      <el-form-item label="资产状态" prop="assetStatus">
+
-        <el-select
-          v-model="queryParams.assetStatus"
-          placeholder="请选择资产状态"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="购买渠道" prop="purchaseChannel">
         <el-input
           v-model="queryParams.purchaseChannel"
@@ -102,16 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="借阅状态" prop="borrowStatus">
-        <el-select
-          v-model="queryParams.borrowStatus"
-          placeholder="请选择借阅状态"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="纸档位置" prop="position">
         <el-input
           v-model="queryParams.position"
@@ -120,16 +70,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="归档状态" prop="fileStatus">
-        <el-select
-          v-model="queryParams.fileStatus"
-          placeholder="请选择归档状态"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="创建日期" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -142,14 +82,6 @@
           :default-time="['00:00:00', '23:59:59']"
         />
       </el-form-item>
-      <el-form-item label="制单人" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入制单人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
           >搜索</el-button
@@ -191,10 +123,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <!-- <el-table-column label="资产档案id" align="center" prop="id" />
-      <el-table-column label="业务实体id" align="center" prop="companyId" /> -->
       <el-table-column label="业务实体名称" align="center" prop="company" />
-      <!-- <el-table-column label="部门id" align="center" prop="deptId" /> -->
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="资产编号" align="center" prop="assetCode" />
       <el-table-column label="资产名称" align="center" prop="assetName" />
@@ -231,11 +160,28 @@
       <el-table-column label="文件来源" align="center" prop="source" />
       <el-table-column label="年度" align="center" prop="year" />
       <el-table-column label="月份" align="center" prop="period" />
-      <el-table-column label="借阅状态" align="center" prop="borrowStatus" />
+      <el-table-column label="借阅状态" align="center" prop="borrowStatus">
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.BORROW_STATUS"
+            :value="scope.row.borrowStatus"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="纸档位置" align="center" prop="position" />
-      <el-table-column label="完整性" align="center" prop="cherks" />
+      <el-table-column label="完整性" align="center" prop="cherks">
-      <!-- <el-table-column label="归档id" align="center" prop="recordId" /> -->
+        <template v-slot="scope">
-      <el-table-column label="归档状态" align="center" prop="fileStatus" />
+          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+        </template>
+      </el-table-column>
+      <el-table-column label="归档状态" align="center" prop="fileStatus">
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.ARCHIVES_FILE_STATUS"
+            :value="scope.row.fileStatus"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建日期"
         align="center"
@@ -289,21 +235,25 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="98px">
-        <!-- <el-form-item label="业务实体id" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入业务实体id" />
-        </el-form-item> -->
         <el-row>
           <el-col :span="8">
             <el-form-item label="业务实体名称" prop="company">
-              <el-input
+              <el-select
                 v-model="form.company"
-                placeholder="请输入业务实体名称"
+                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-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item> -->
           <el-col :span="8">
             <el-form-item label="部门名称" prop="deptName">
               <el-input v-model="form.deptName" placeholder="请输入部门名称" />
@@ -419,17 +369,16 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="借阅状态" prop="borrowStatus">
-              <el-input
-                v-model="form.borrowStatus"
-                placeholder="请输入借阅状态"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="纸档位置" prop="position">
-              <el-input v-model="form.position" placeholder="请输入纸档位置" />
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -439,17 +388,6 @@
               <el-input v-model="form.cherks" placeholder="请输入完整性" />
             </el-form-item>
           </el-col>
-          <!-- <el-form-item label="归档id" prop="recordId">
-          <el-input v-model="form.recordId" placeholder="请输入归档id" />
-        </el-form-item> -->
-          <el-col :span="8">
-            <el-form-item label="归档状态" prop="fileStatus">
-              <el-input
-                v-model="form.fileStatus"
-                placeholder="请输入归档状态"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
               <el-input v-model="form.createBy" placeholder="请输入制单人" />
@@ -475,6 +413,8 @@ import {
   exportElectronicAssetsExcel,
 } from "@/api/ea/electronicAssets/assetFile";
 import Editor from "@/components/Editor";
+import { getOrganizationPage } from "@/api/setting/organization";
+import { getSiteTree } from "@/api/setting/organization";
 
 export default {
   name: "ElectronicAssets",
@@ -483,6 +423,11 @@ export default {
   },
   data() {
     return {
+      propName: {
+        label: "pName",
+        value: "pId",
+        multiple: false,
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -530,10 +475,15 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      organizationList: [],
+      siteOptions: [], //归档位置数据
+      siteArray: [], //归档位置选中值
     };
   },
   created() {
     this.getList();
+    this.getSiteList();
+    this.getOrganizationList();
   },
   methods: {
     /** 查询列表 */
@@ -546,6 +496,40 @@ export default {
         this.loading = false;
       });
     },
+    //获取归档位置
+    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;
@@ -578,6 +562,9 @@ export default {
         recordId: undefined,
         fileStatus: undefined,
         createBy: undefined,
+        organizationId: undefined,
+        depotId: undefined,
+        cabinetId: undefined,
       };
       this.resetForm("form");
     },
@@ -607,6 +594,17 @@ export default {
         this.title = "修改资产档案";
       });
     },
+    // 获取业务实体
+    getOrganizationList() {
+      getOrganizationPage().then((response) => {
+        this.organizationList = response.data.list;
+      });
+    },
+    // 业务实体选择事件
+    handleCompanyChange(val) {
+      this.form.companyId = val.id;
+      this.form.company = val.organizationName;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {