From e81f448084ab4f340860598498f035df23a9d014 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期二, 20 一月 2026 12:46:42 +0800
Subject: [PATCH] 修改了相关代码
---
src/views/archiveManager/index.vue | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/src/views/archiveManager/index.vue b/src/views/archiveManager/index.vue
index 950aa35..0719d6f 100644
--- a/src/views/archiveManager/index.vue
+++ b/src/views/archiveManager/index.vue
@@ -378,7 +378,7 @@
<el-table-column label="鎿嶄綔" align="center" width="190" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
- v-if="scope.row.ownData"
+ v-if="scope.row.ownData && scope.row.recordStatus!='褰曞叆瀹屾垚'"
size="mini"
type="text"
@@ -396,7 +396,7 @@
v-hasPermi="['system:records:edit']"
>鏌ョ湅鍗峰唴鐩綍</el-button>
<el-button
- v-if="userId===1"
+
size="mini"
type="text"
@@ -406,7 +406,7 @@
>瀵煎嚭澶囪�冭〃</el-button>
<el-button
- v-if="userId===1"
+
size="mini"
type="text"
@@ -417,7 +417,7 @@
<el-button
- v-if="userId===1"
+
size="mini"
type="text"
@@ -474,7 +474,15 @@
</el-dropdown>
</template>
</el-table-column>
-
+ <el-table-column label="褰撳墠鎺堟潈褰曞叆鐨勭敤鎴�" align="center" sortable="custom" prop="userName" width="120" v-if="userId==1">
+ <template slot-scope="scope">
+ <el-button
+ :type="scope.row.userName === '' ? 'default' : 'primary'"
+ size="mini">
+ {{ scope.row.userName === null ? '鏈垎閰�' : scope.row.userName }}
+ </el-button>
+ </template>
+ </el-table-column>
<el-table-column label="鐘舵��" align="center" sortable="custom" prop="recordStatus" width="120">
<template slot-scope="scope">
<el-button :type="scope.row.recordStatus === '鏈綍鍏�' ? 'danger' : 'success'" size="mini">
@@ -723,6 +731,9 @@
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
</el-form-item>
+ <el-form-item label="澶囪�冭〃澶囨敞" prop="noteRemark">
+ <el-input v-model="form.noteRemark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
<el-form-item label="鍘嗗彶鐩稿叧鍙戞枃鍙�" prop="historicalReferenceNumber">
<el-input v-model="form.historicalReferenceNumber" placeholder="璇疯緭鍏ュ巻鍙茬浉鍏冲彂鏂囧彿" disabled/>
</el-form-item>
@@ -908,6 +919,9 @@
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
+ <el-form-item label="澶囪�冭〃澶囨敞" prop="noteRemark">
+ <el-input v-model="form.noteRemark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
<el-form-item label="鍘嗗彶鐩稿叧鍙戞枃鍙�" prop="historicalReferenceNumber">
<el-input v-model="form.historicalReferenceNumber" placeholder="璇疯緭鍏ュ巻鍙茬浉鍏冲彂鏂囧彿" />
</el-form-item>
@@ -978,7 +992,7 @@
components: {
VueOfficeExcel
},
- name: "Records",
+ name: "InfoManager",
data() {
return {
openSearch: false,
@@ -1047,7 +1061,7 @@
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 50,
recordId: null,
inquiryNumber: null,
categoryType: null, // 绫诲埆绫诲瀷
@@ -1093,8 +1107,8 @@
"鍏紑灞炴�у繀椤诲綍鍏ワ紝涓诲姩鍏紑銆佷緷鐢宠鍏紑銆佸厤浜堝叕寮�",
"淇濈鏈熼檺:30骞存垨姘镐箙",
"椤靛彿鎸夌収姝ｅ紡褰曞叆椤电爜涓哄噯"], // 閫変腑鐨勬敞瑙ｅ垪琛�
- includeSignature: false, // 鏄惁鍖呭惈绛惧悕鏍�
- selectedSignatures: ['涓氬姟绉戝绉讳氦浜�:', '瀹℃壒绉戠Щ浜や汉:', '妗ｆ鏁寸悊鍏徃:'], // 閫変腑鐨勭鍚嶆爮鍒楄〃
+ includeSignature: false, // 鏄惁鍖呭惈绛惧悕鏍�
+ selectedSignatures: ['涓氬姟绉戝绉讳氦浜�:','瀹℃壒绉�/娉曡绉戠Щ浜や汉:', '瀹℃壒绉戠Щ浜や汉:', '妗ｆ鏁寸悊鍏徃:'], // 閫変腑鐨勭鍚嶆爮鍒楄〃
subselectedSignatures: [],
subselectedAnnotations: [],
signaturePosition: 'bottom' // 绛惧悕鏍忎綅缃細top/bottom
@@ -1496,23 +1510,37 @@
/*鏌ョ湅璇︽儏*/
CheckInfo(row)
{
+ var recordStrId = row.recordId
- if(row.pageCount==null)
+
+ console.log(recordStrId==='')
+ console.log("+---------------------")
+ if(recordStrId===''||recordStrId==null)
{
- this.$modal.msgWarning("璇峰厛琛ュ厖椤电爜淇℃伅锛�")
+ this.$modal.msgWarning("璇疯ˉ鍏呮。妗堝彿淇℃伅锛屽啀缂栬緫鍗峰唴鐩綍锛�")
+
+ return
+ }
+ if( row.projectName==null||row.pageCount==null||row.caseTitle==null||row.constructionUnit==null)
+ {
+ this.$modal.msgWarning("璇峰厛琛ュ厖椤电爜绛夌浉鍏充俊鎭紒")
return;
}
var mid = row.id
const roleId = 2
// alert(mid)
+var filingNumber = row.filingNumber
+
+if(filingNumber==="")
+ filingNumber = ' '
var recordId = mid
var pageCount = row.pageCount
var recordStrId = row.recordId
var inquiryNumber = row.inquiryNumber
var sho = false
// this.$router.push("/archiveManager/infoManagerAu/user/" + roleId+"/"+recordId)
- this.$router.push("/archiveManager/infoManagerAu/archiveMaterialManager/" + recordId+"/"+pageCount+"/"+sho+"/"+recordStrId+"/"+inquiryNumber)
+ this.$router.push("/archiveManager/infoManagerAu/archiveMaterialManager/" + recordId+"/"+pageCount+"/"+sho+"/"+recordStrId+"/"+inquiryNumber+"/"+filingNumber)
},
/*瀵煎嚭澶囪�冭〃*/
@@ -1565,8 +1593,17 @@
var valid = false;
var pageCount = row.pageCount
var recordStrId = row.recordId
+ var filingNumber = row.filingNumber
var inquiryNumber = row.inquiryNumber
- if(row.projectName!=null&&row.pageCount!=null&&row.caseTitle!=null&&row.constructionUnit)
+ console.log(recordStrId==='')
+ console.log("+---------------------")
+ if(recordStrId===''||recordStrId==null)
+ {
+ this.$modal.msgWarning("璇疯ˉ鍏呮。妗堝彿淇℃伅锛屽啀缂栬緫鍗峰唴鐩綍锛�")
+
+ return
+ }
+ if( row.projectName!=null&&row.pageCount!=null&&row.caseTitle!=null&&row.constructionUnit!=null)
valid = true;
if (valid) {
var mid = row.id
@@ -1574,10 +1611,11 @@
// alert(mid)
var recordId = mid
-
+if(filingNumber==="")
+ filingNumber = ' '
var sho = true
// this.$router.push("/archiveManager/infoManagerAu/user/" + roleId+"/"+recordId)
- this.$router.push("/archiveManager/infoManagerAu/archiveMaterialManager/" + recordId+"/"+pageCount+"/"+sho+"/"+recordStrId+"/"+inquiryNumber)
+ this.$router.push("/archiveManager/infoManagerAu/archiveMaterialManager/" + recordId+"/"+pageCount+"/"+sho+"/"+recordStrId+"/"+inquiryNumber+"/"+filingNumber)
}else
{
this.$modal.msgWarning("璇疯ˉ鍏呴〉鍙风瓑鐩稿叧淇℃伅锛屽啀缂栬緫鍗峰唴鐩綍锛�")
--
Gitblit v1.9.1