其他合同档案界面修改

src/utils/dict.js

@@ -161,6 +161,8 @@ export const DICT_TYPE = {
 CONSULTATION_TYPE: 'consultation_type',
 //资产类型
   ASSET_TYPE: 'asset_type',
+//其他档案业务类型
+OTHER_BUSINESS_TYPE: 'other_business_type',
 
 }
 

src/views/ea/electronicOther/index.vue

@@ -17,25 +17,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="OA/ERP流程编号	" prop="flowCode">-->
+
-      <!--        <el-input v-model="queryParams.flowCode" placeholder="请输入OA/ERP流程编号	" clearable-->
-      <!--                  @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="年度" prop="year">-->
-      <!--        <el-input v-model="queryParams.year" placeholder="请输入年度" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="月份" prop="period">-->
-      <!--        <el-input v-model="queryParams.period" placeholder="请输入月份" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
       <el-form-item label="业务类型" prop="businessType">
-        <el-select
+
-          v-model="queryParams.businessType"
+        <el-select v-model="form.businessType" placeholder="请选择业务类型	">
-          placeholder="请选择业务类型"
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.OTHER_BUSINESS_TYPE)" :key="dict.value" :label="dict.label"
-          clearable
+                  :value="dict.value" />
-          size="small"
+              </el-select>
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
@@ -99,7 +87,11 @@
       <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="businessType" />
+      <el-table-column label="业务类型" align="center" prop="businessType" >
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.OTHER_BUSINESS_TYPE" :value="scope.row.businessType" />
+        </template>
+        </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -112,13 +104,6 @@
       </el-table-column>
       <el-table-column label="制单人" align="center" prop="createBy" />
       <el-table-column label="业务实体" align="center" prop="company" />
-      <el-table-column label="文件地址" align="center" prop="fileUrl">
-        <template slot-scope="scope">
-          <el-button type="text" @click="openLink(scope.row.fileUrl)">
-            {{ scope.row.fileUrl }}
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="流程号" align="center" prop="flowId" />
       <el-table-column label="摘要" align="center" prop="note" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
@@ -134,8 +119,26 @@
         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"
+            v-if="scope.row.contractAttachment"
+            @click="handleViewFJ(scope.row)"
+            >查看附件
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            >查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -242,11 +245,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务类型" prop="businessType">
-              <el-select
+              <el-select v-model="form.businessType" placeholder="请选择业务类型	">
-                v-model="form.businessType"
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.OTHER_BUSINESS_TYPE)" :key="dict.value" :label="dict.label"
-                placeholder="请选择业务类型"
+                  :value="dict.value" />
-              >
-                <el-option label="请选择字典生成" value="" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -254,7 +255,20 @@
         <el-row>
           <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">
@@ -266,19 +280,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="流程号" prop="flowId">
-              <el-input v-model="form.flowId" placeholder="请输入流程号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="所属部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入所属部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8"> </el-col>
           <el-col :span="8">
             <el-form-item label="归档状态" prop="fileStatus">
               <el-select v-model="form.fileStatus" placeholder="请选择归档状态">
@@ -294,6 +295,39 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="流程号" prop="flowId">
+              <el-input v-model="form.flowId" placeholder="请输入流程号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属部门" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"> </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="纸档位置" prop="site">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
+            </el-form-item>
+          </el-col> -->
+          
+        </el-row>
         <el-form-item label="摘要" prop="note">
           <el-input
             v-model="form.note"
@@ -321,12 +355,20 @@ import {
   exportElectronicOtherExcel,
 } from "@/api/ea/electronicOther/electronicOther";
 import { getAccessToken, getTenantId } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getSiteTree } from "@/api/setting/organization";
+import { getOrganizationPage } from "@/api/setting/organization";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
 
 export default {
   name: "ElectronicOther",
-  components: {},
+  components: { Treeselect,},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -352,6 +394,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         name: null,
+        contractAttachment:null,
+        site:null,
         flowCode: null,
         source: null,
         year: null,
@@ -377,9 +421,12 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      siteOptions: [], //归档位置数据
+      siteArray: [], //归档位置选中值
+      organizationList: [],
       fileList: [], // 文件列表
       uploadUrl:
-        process.env.VUE_APP_BASE_API + "/admin-api/ea/electronic-other/upload", // 上传地址地址
+        process.env.VUE_APP_BASE_API + "/admin-api/accounting/attachment/upload", // 上传地址地址
       headers: {
         Authorization: "Bearer " + getAccessToken(),
         "tenant-id": getTenantId(),
@@ -388,6 +435,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getSiteList();
+    this.getOrganizationList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询列表 */
@@ -399,6 +449,72 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+    },
+     /** 查询部门下拉树结构 + 岗位下拉 */
+     getTreeselect() {
+      listSimpleDepts().then((response) => {
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
+    //获取归档位置
+    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];
+      }
+    },
+    // 获取业务实体
+    getOrganizationList() {
+      getOrganizationPage().then((response) => {
+        this.organizationList = response.data.list;
+      });
+    },
+    // 业务实体选择事件
+    handleCompanyChange(val) {
+      this.form.companyId = val.id;
+      this.form.company = val.organizationName;
     },
     /** 取消按钮 */
     cancel() {
@@ -410,6 +526,7 @@ export default {
       this.form = {
         id: undefined,
         name: undefined,
+        site:undefined,
         flowCode: undefined,
         source: undefined,
         year: undefined,
@@ -429,6 +546,7 @@ export default {
         recordId: undefined,
         userId: undefined,
         fileStatus: undefined,
+        contractAttachment:undefined,
       };
       this.resetForm("form");
     },
@@ -445,7 +563,7 @@ export default {
     // 上传成功的函数
     handleSuccess(res) {
       console.log(res);
-      this.form.fileUrl = res.data.url;
+      this.form.contractAttachment = res.data.url;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -502,6 +620,23 @@ export default {
           this.getList();
         });
       });
+    },
+      /** 查看附件按钮操作 */
+      handleViewFJ(row) {
+      this.openLink(row.contractAttachment);
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      this.optType = "view";
+      const id = row.id;
+      getElectronicOther(id).then((response) => {
+        this.form = response.data;
+        // this.form.signDate = this.form.effectiveDate;
+        // this.form.expiryDate;
+        this.open = true;
+        this.title = "查看其他档案";
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {