diff --git a/src/utils/dict.js b/src/utils/dict.js
index f3b52249..c48faff3 100644
--- a/src/utils/dict.js
+++ b/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',
}
diff --git a/src/views/ea/electronicOther/index.vue b/src/views/ea/electronicOther/index.vue
index 96a9e05b..8637e8de 100644
--- a/src/views/ea/electronicOther/index.vue
+++ b/src/views/ea/electronicOther/index.vue
@@ -17,25 +17,13 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
-
+
+
+
+
+
-
-
-
- {{ scope.row.fileUrl }}
-
-
-
@@ -134,8 +119,26 @@
label="操作"
align="center"
class-name="small-padding fixed-width"
+ fixed="right"
+ width="180px"
>
+
+ 查看附件
+
+ 查看
+
-
-
+
+
@@ -254,7 +255,20 @@
-
+
+
+
+
@@ -266,19 +280,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -294,6 +295,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ // 处理 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) {