From a3d588a997397578a4a241f694156ead3eb15bb9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 10:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 75413c2..238d714 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -36,7 +36,7 @@
size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
</div>
<el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
- @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ @cell-click="handleCellClick" @row-click="handleRowClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
<el-table-column fixed type="selection" width="55"></el-table-column>
<el-table-column fixed label="搴忓彿" type="index" width="55">
</el-table-column>
@@ -76,23 +76,30 @@
</div>
<BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
</BatchImport>
+ <el-collapse v-model="visibleNames">
+ <el-collapse-item title="闄勪欢鍒楄〃" name="1">
+ <fileInHtml :options="fileOptions"></fileInHtml>
+ </el-collapse-item>
+ </el-collapse>
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData} from "@/api/GetItem";
+import {MasterTable, TableData, FindData,addSaveCode,editSaveCode} from "@/api/GetItem";
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
+import fileInHtml from "@/components/file/inHtml.vue";
export default {
components: {
integrationTransfer,
SetPersonnel,
ResembleQueryDialog,
- BatchImport
+ BatchImport,
+ fileInHtml
},
name: "Crud.vue",
props: {
@@ -151,6 +158,8 @@
codeClassifyOid: ""
}
},
+ visibleNames:['1'],
+ visibleFile:false,
visibleFlow: false,
transferData: [],
transferProps: {
@@ -193,7 +202,15 @@
codeClassifyOid: ''
},
// 涓绘暟鎹寜閽�
- masterVrBtnList: []
+ masterVrBtnList: [],
+ fileOptions:{
+ ownbizOid:"1",
+ ownbizBtm:"1",
+ fileDocClassify:'!=processAuditSuggest',
+ fileDocClassifyName:'',
+ hasDownload:true,
+ hasUpload:true
+ }
};
},
computed: {},
@@ -213,7 +230,8 @@
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
- this.parameter.vars.codeClassifyOid = newval
+ this.parameter.vars.codeClassifyOid = newval;
+ console.log('瀛�',newval)
},
deep: true,
},
@@ -333,6 +351,10 @@
this.editShow = column.property;
this.rowOid = row.oid;
},
+ handleRowClick(row,column){
+ this.fileOptions.ownbizOid= row.oid;
+ this.fileOptions.ownbizBtm=row.btmname;
+ },
//鍒犻櫎
enumDeleteRow(row) {
this.tableData.splice(row, 1);
@@ -421,6 +443,7 @@
},
//澶氶��
handleSelectionChange(row) {
+ console.log(row)
if (this.row) {
this.rowOid = row[0].oid;
} else {
@@ -485,16 +508,26 @@
}
},
//澧炲姞淇濆瓨
- AddSumbit() {
+ AddSumbit(val) {
this.addvisible = false;
+ console.log(val)
+ addSaveCode(val).then(res=>{
+ console.log(res)
+ this.onLoad()
+ })
},
EditSumbit(val) {
this.editvisible = false;
+ console.log(val)
+ editSaveCode(val).then(res=>{
+ console.log(res)
+ this.onLoad()
+ })
},
openBatchImport(type) {
- this.batchImportData.visible = true
- this.batchImportData.type = type
- this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ this.batchImportData.visible = true;
+ this.batchImportData.type = type;
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid;
}
},
};
@@ -505,7 +538,6 @@
.el-table--scrollable-x .el-table__body-wrapper {
overflow: auto !important;
}
-
.el-table__fixed-right-patch {
background-color: #f5f7fa !important;
}
--
Gitblit v1.10.0