From 41ba68d6b5cd5ee6aa50f34fee68bb0bc65bb70f Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Thu, 26 Oct 2023 17:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=EF=BC=8C?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/archives/record.js | 10 ++++
src/components/FileSelect/single.vue | 3 ++
src/views/archives/turnOver/index.vue | 62 +++++++++++++++----------
src/views/fileAuth/authRecord/index.vue | 3 ++
4 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/src/api/archives/record.js b/src/api/archives/record.js
index fa308c54..83247dad 100644
--- a/src/api/archives/record.js
+++ b/src/api/archives/record.js
@@ -69,4 +69,14 @@ export function createCodeRule(data) {
method: 'post',
data: data
})
+}
+
+
+// 生成WS
+export function createWS(data) {
+ return request({
+ url: '/archives/code-rule/createWS',
+ method: 'post',
+ data: data
+ })
}
\ No newline at end of file
diff --git a/src/components/FileSelect/single.vue b/src/components/FileSelect/single.vue
index fa7c52db..3e072251 100644
--- a/src/components/FileSelect/single.vue
+++ b/src/components/FileSelect/single.vue
@@ -38,6 +38,9 @@
+
+
+
diff --git a/src/views/archives/turnOver/index.vue b/src/views/archives/turnOver/index.vue
index 503f3094..f2df2f7c 100644
--- a/src/views/archives/turnOver/index.vue
+++ b/src/views/archives/turnOver/index.vue
@@ -187,11 +187,15 @@
-
-
+
+
-
+
@@ -222,7 +223,11 @@
>
-->
-
+
@@ -306,7 +311,11 @@
clearable
@change="handleOldSiteChanged"
/> -->
-
+
@@ -364,7 +373,7 @@ import {
} from "@/api/archives/turnOver";
import { getOrganizationPage } from "@/api/setting/organization";
import { listUser } from "@/api/system/user";
-import { createCodeRule } from "@/api/archives/record";
+import { createWS } from "@/api/archives/record";
import { getSiteTree } from "@/api/setting/organization";
import FileSelect from "@/components/FileSelect/single.vue";
@@ -435,6 +444,7 @@ export default {
company: null,
outputName: null,
inputName: null,
+ id: null, //档案历史记录ID
};
},
created() {
@@ -455,12 +465,11 @@ export default {
});
},
// 生成移交单号
- creatApplyNo() {
+ createWS(val) {
const data = {
- catalogNum: "archives",
- caseNum: "turn-over",
+ id: val,
};
- createCodeRule(data).then((response) => {
+ createWS(data).then((response) => {
this.form.applyNo = response.data;
});
},
@@ -514,14 +523,14 @@ export default {
console.log(this.siteOptions);
});
},
- //选择旧位置
- handleOldSiteChanged(obj) {
- if (obj != null) {
- this.form.fromOrganizationId = obj[0];
- this.form.fromDepotId = obj[1];
- this.form.fromCabinetId = obj[2];
- }
- },
+ // //选择旧位置
+ // handleOldSiteChanged(obj) {
+ // if (obj != null) {
+ // this.form.fromOrganizationId = obj[0];
+ // this.form.fromDepotId = obj[1];
+ // this.form.fromCabinetId = obj[2];
+ // }
+ // },
//选择新位置
handleNewSiteChanged(obj) {
if (obj != null) {
@@ -580,7 +589,6 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- this.creatApplyNo();
this.open = true;
this.title = "添加移交";
},
@@ -653,11 +661,17 @@ export default {
.catch(() => {});
},
//选择档案
- handleFileSelect() {
+ handleSelectFile() {
this.$refs.FileSelect.showFlag = true;
},
onFileSelected(obj) {
console.log(obj);
+ if (obj != undefined && obj != null) {
+ this.form.company = obj.company;
+ this.form.position = obj.position;
+ this.form.filesNum = obj.filesNum;
+ this.createWS(obj.id);
+ }
},
},
};
diff --git a/src/views/fileAuth/authRecord/index.vue b/src/views/fileAuth/authRecord/index.vue
index d73adb2f..c5ea933d 100644
--- a/src/views/fileAuth/authRecord/index.vue
+++ b/src/views/fileAuth/authRecord/index.vue
@@ -56,6 +56,9 @@
+
+
+