From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 454 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 299 insertions(+), 155 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index ecff417..04d6918 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox" style="">
+ <div class="testbox">
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
@@ -15,14 +15,24 @@
item.name
}}
</el-button>
- <span v-if="tableHeadFindData.length > 0">
- <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
+ <span v-if="tableHeadFindData.length > 0 ">
+ <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small" @change="searchChange">
<el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
- :value="item.prop"></el-option>
+ :value="item.query"></el-option>
</el-select>
- <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
+ <el-input v-if="!isTimeStatus" v-model="WupinFindValue"
+ placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
@keyup.enter.native="tableFindInp"></el-input>
+ </span>
+ <span v-if="tableHeadFindData.length > 0 && isTimeStatus" class="block">
+ <el-date-picker
+ v-model="dateValue"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small"
+ style="margin-left: 5px"
+ type="date"
+ @change="dateChange">
+ </el-date-picker>
</span>
<span v-if="tableHeadFindData.length > 0" style="margin-left: 10px">
<p style="font-size: 13px;display: inline-block;"> 鐘舵�侊細</p>
@@ -46,15 +56,15 @@
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
<!-- 鐢熷懡鍛ㄦ湡-->
- <el-table-column v-for="(item,index) in lcstatusArray"
- v-if=" lcstatusArray.length !== 0 && !item.hidden"
- key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
- :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
- prop="lcstatus">
- <template slot-scope="scope">
- <span>{{ scope.row.lcstatus_text }}</span>
- </template>
- </el-table-column>
+ <!-- <el-table-column v-for="(item,index) in lcstatusArray"-->
+ <!-- v-if=" lcstatusArray.length >= 0 && !item.hidden"-->
+ <!-- key="index" :show-overflow-tooltip="true" :sortable="item.sortable"-->
+ <!-- :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"-->
+ <!-- prop="lcstatus">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <span>{{ scope.row.lcstatus_text }}</span>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<!-- 缂栧彿-->
<el-table-column v-for="(item, index) in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden"
key="index" :label="item.label" :prop="item.prop"
@@ -67,25 +77,15 @@
</template>
</el-table-column>
<el-table-column v-for="item in this.tableHeadFindData"
- v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus' && Object.keys(item.referConfig).length <= 0"
+ v-if="!item.hidden && item.prop !== 'id'"
:key="item.id"
:formatter="item.formatter"
- :label="item.label" :prop="item.prop"
+ :label="item.label"
+ :prop="item.prop"
:show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
align="center">
- </el-table-column>
- <!-- 鍙傜収鏁版嵁-->
- <el-table-column v-for="(item,index) in referArray"
- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
- :key="index"
- :label="item.title" :show-overflow-tooltip="true"
- :sortable="item.sortable" :width="item.width" align="center"
- prop="jiliangdw">
- <template slot-scope="scope">
- <span>{{ scope.row.jiliangdwname }}</span>
- </template>
</el-table-column>
</el-table>
</div>
@@ -99,8 +99,8 @@
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
- :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
+ :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
+ :title="'鏁版嵁淇'" :visible.sync="amendvisible" status="amend"
type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -111,9 +111,9 @@
</FormTemplateDialog>
<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
+ :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
- :rowOid="rowOid"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -164,6 +164,22 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
+ <el-dialog v-loading="syncLoading" :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px"
+ width="30%" @close="syncClose">
+ <p style="display: inline-block">鏈�鍚庢洿鏂版椂闂达細</p>
+ <el-date-picker
+ v-model="SyncValue"
+ format="yyyy 骞� MM 鏈� dd 鏃� HH 鏃� mm 鍒� ss 绉�"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 300px"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss">
+ </el-date-picker>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="syncClose">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitSync">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
<div class="bottom">
@@ -188,7 +204,8 @@
applyGroupCode,
receiveEditApply,
applySaveCode,
- exportGroupCodeExcel
+ exportGroupCodeExcel,
+ syncSearch
} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
@@ -201,6 +218,7 @@
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
import func from "@/util/func";
+import moment from "moment/moment";
export default {
components: {
@@ -265,6 +283,13 @@
},
data() {
return {
+ //鎵嬪姩鍚屾model
+ SyncValue: '',
+ syncLoading: false,
+ syncDialogBox: false,
+ isTimeStatus: false,
+ isTimeName: '',
+ dateValue: "",
//鎵归噺缂栬緫瀵硅瘽妗�
bulkeditvisible: false,
LinkVisible: false,
@@ -293,7 +318,6 @@
btmtype: '',
code: "",
type: '',
- // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
processName: "",
vars: {
codeClassifyOid: "",
@@ -315,7 +339,6 @@
key: "oid",
label: "name",
},
- tableHeadFindDatas: [],
applyvisible: false,
amendvisible: false,
addvisible: false,
@@ -355,17 +378,10 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions: {},
result: '',
elapsedTime: '',
+ conditionMap: [],
};
},
computed: {
@@ -378,8 +394,6 @@
},
},
created() {
- // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- // this.result = this.$route.query.id.substring(index);
getUserInfo().then(res => {
this.result = res.data.data.realName
})
@@ -393,9 +407,16 @@
this.doLayout()
},
watch: {
+ isLoading: {
+ handler(newval) {
+ // console.log(newval)
+ }
+ },
tableHeadDataFateher: {
handler(newval, oldval) {
- this.options = newval.tableDefineVO.seniorQueryColumns
+ if (Object.keys(newval).length > 0) {
+ this.options = newval.tableDefineVO.seniorQueryColumns;
+ }
}
},
codeClassifyOid: {
@@ -407,8 +428,23 @@
tableDataArray: {
handler(newval, oldval) {
this.tableData = newval;
- this.searchResults = newval
- this.doLayout()
+ this.searchResults = newval;
+ this.doLayout();
+ if (newval.length > 0) {
+ this.fileOptions = {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ hasEdit: true,
+ hasDel: true,
+ height: 'auto'
+ }
+ } else {
+ this.fileOptions = {};
+ }
},
},
tableHeadFindData: {
@@ -429,37 +465,40 @@
}
if (_index == 0) {
- this.keyWordFind = record.queryField
+ this.keyWordFind = record.queryField;
}
+ ;
+ // if(record.fieldType === "datetime"){
+ // this.isTimeStatus = true;
+ // console.log(this.isTimeStatus)
+ // console.log(record)
+ // }
})
- this.tableHeadFindDatas = newval;
- // console.log('new',newval)
- if (!this.isCodeArrayPushed) {
+ if (newval) {
+ this.CodeArray = [];
if (newval.find(item => item.prop === 'id')) {
this.CodeArray.push(newval.find(item => item.prop === 'id'));
} else {
- this.CodeArray.push([]);
+ this.CodeArray = [];
}
- // console.log('CodeArray', this.CodeArray);
- this.isCodeArrayPushed = true;
+
}
- if (!this.islcstatusPushed) {
+ if (newval) {
+ this.lcstatusArray = [];
if (newval.find(item => item.prop === 'lcstatus')) {
this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
} else {
- this.lcstatusArray.push([]);
+ this.lcstatusArray = [];
}
- // console.log('lcstatusArray', this.lcstatusArray);
- this.islcstatusPushed = true;
}
- if (!this.isReferPushed) {
+ if (newval) {
+ this.referArray = [];
if (newval.find(item => Object.keys(item.referConfig).length > 0)) {
this.referArray.push(newval.find(item => Object.keys(item.referConfig).length > 0));
} else {
- this.referArray.push([])
+ this.referArray = [];
}
}
- this.isReferPushed = true;
this.WupinFindValue = ''
},
},
@@ -471,6 +510,7 @@
templateOid: {
handler(newval, oldval) {
this.fileOptions.ownbizOid = "0";
+ this.statusSelect = 'all'
},
deep: true,
},
@@ -482,11 +522,15 @@
},
},
methods: {
+ // 缃┖鏌ヨ鏉′欢
+ resetConditionMap() {
+ this.conditionMap = {};
+ },
+
CodeLinkHandler(row) {
this.LinkObject = row;
this.LinkVisible = true;
this.LinkList = Object.keys(row).map(property => property)
-
},
//鐘舵�佹悳绱�
cellSelectHandler(row) {
@@ -497,6 +541,8 @@
}
},
cellStatusFind(lcstatus) {
+ this.isLoading = true;
+ this.conditionMap["conditionMap[lcstatus]"] = lcstatus;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -504,7 +550,10 @@
limit: this.page.pageSize,
'conditionMap[lcstatus]': lcstatus
}).then(res => {
- this.tableData = res.data.data
+ // console.log(res)
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
},
//灞曞紑闄勪欢
@@ -558,30 +607,72 @@
if (uniqueFlag === 'excelGroupCode') return this.excelGroupCode()
//闆嗗洟鐮佸鍏�
if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
+ //鎵嬪姩鍚屾
+ if (uniqueFlag === 'manualSyncing') return this.manualSyncing("groupCode")
});
},
- importGroupCode(type){
+ //鎵嬪姩鍚屾
+ manualSyncing() {
+ this.syncDialogBox = true;
+ },
+ //鎵嬪姩鍚屾鍏抽棴
+ syncClose() {
+ this.syncDialogBox = false;
+ },
+ //鎵嬪姩鍚屾纭畾
+ async submitSync() {
+ if (this.SyncValue) {
+ this.syncLoading = true;
+ const response = await syncSearch({endDate: this.SyncValue})
+ console.log('response',response)
+ if (response.data.code === 200) {
+ this.$message.success('鍚屾鎴愬姛锛�')
+ this.syncLoading = false;
+ this.syncDialogBox = false;
+ this.SyncValue = "";
+ } else {
+ this.syncLoading = false;
+ this.syncDialogBox = false;
+ this.SyncValue = "";
+ }
+ } else {
+ this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
+ }
+ },
+ //闆嗗洟鐮佸鍏�
+ importGroupCode(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
//闆嗗洟鐮佸鍑�
- excelGroupCode(){
- debugger
+ excelGroupCode() {
this.isLoading = true;
exportGroupCodeExcel({
codeClassifyOid: this.codeClassifyOid,
}).then(res => {
- console.log(res.data)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
- this.isLoading = false;
- }
- }).catch(error=>{
- this.$message.error(error);
+ // let reader = new FileReader();
+ // reader.readAsText(res.data);
+ // reader.onload = () => {
+ // try {
+ // let resData = JSON.parse(reader.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ // if (!resData.success) {
+ // this.$message.error(resData.msg);
+ // this.isLoading = false;
+ // }
+ // } catch (err) {
+ // // 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ // func.downloadFileByBlobHandler(res);
+ // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ // this.isLoading = false;
+ // }
+ // };
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
this.isLoading = false;
- })
+ }).catch(error => {
+ this.$message.error(error);
+ });
},
//鏍囧噯鐢宠
codeApplyHandler() {
@@ -622,7 +713,7 @@
}
});
if (foundItem) {
- if(this.selectRow.length >= 1){
+ if (this.selectRow.length >= 1) {
this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -638,7 +729,7 @@
message: '宸插彇娑堝綋鍓嶆搷浣�'
});
});
- }else {
+ } else {
this.amendvisible = true;
}
} else {
@@ -656,9 +747,9 @@
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- 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
},
addSaveHandler() {
this.$nextTick(() => {
@@ -670,10 +761,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
-
const oids = this.selectRow.map(item => item.oid).join(',');
applyGroupCode({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
@@ -688,9 +775,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
const oids = this.selectRow.map(item => item.oid).join(',');
receiveEditApply({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
@@ -849,6 +933,7 @@
codeClassifyOid: this.codeClassifyOid,
page: this.page.currentPage,
limit: this.page.pageSize,
+ ...this.conditionMap, /**甯︿笂鍒嗛〉鏌ヨ鏉′欢 */
});
const endTime = performance.now();
this.elapsedTime = Math.floor(endTime - startTime) * 1;
@@ -910,7 +995,7 @@
});
});
},
- // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
+ //灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
saveRow() {
this.editingRow = null;
},
@@ -923,40 +1008,46 @@
})
},
// 鎺掑簭
- sortChange(val) {
- // console.log(val)
- this.isLoading = true;
- let order = "";
- if (val.order == "ascending") {
- order = "asc";
- } else {
- order = "desc";
+ async sortChange(val) {
+ try {
+ this.isLoading = true;
+ const order = val.order == 'ascending' ? 'asc' : 'desc';
+ const {data} = await TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ order: order,
+ sort: val.prop,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ ...this.conditionMap
+ });
+ this.data = data.data;
+ } finally {
+ this.isLoading = false;
}
- TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- order: order,
- sort: val.prop,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- }).then((res) => {
- setTimeout(() => {
- this.data = res.data.data;
- this.isLoading = false;
- }, 100);
- });
},
//鍒嗛〉鍒锋柊
async onLoad(val) {
- await TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- }).then((res) => {
+ this.isLoading = true;
+ try {
+ let conditionMap = {};
+ if (this.statusSelect !== 'all') {
+ conditionMap.lcstatus = this.statusSelect;
+ }
+ const res = await TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ conditionMap
+ });
this.tableData = res.data.data;
- this.doLayout()
- });
+ this.doLayout();
+ } catch (error) {
+ this.$message.error(error)
+ } finally {
+ this.isLoading = false;
+ }
},
//澶氶��
handleSelectionChange(list) {
@@ -989,42 +1080,53 @@
this.findvisible = true;
},
// 楂樼骇鏌ヨ
- echoContion(val) {
- FindData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- ...val,
- }).then((res) => {
+ async echoContion(val) {
+ this.conditionMap = val;
+ try {
+ const res = await FindData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ ...val,
+ page: this.page.currentPage = 1, /** 姣忔鐐瑰嚮楂樼骇鏌ヨ閮藉簲璇ヤ粠绗竴椤靛紑濮�*/
+ limit: this.page.pageSize
+ });
this.tableData = res.data.data;
this.page.total = res.data.total
- });
+ } catch (error) {
+
+ }
},
//鐩镐技椤规煡璇�
similarHandler() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else {
- this.similarVisible = true;
+ return;
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ this.similarVisible = true;
},
//鏁版嵁鏇存敼
DataChange() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus != "Released") {
- this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
- } else {
- this.DataVisible = true;
- this.rowOid = this.selectRow[0]['oid']
+ return
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ if (this.selectRow[0].lcstatus != "Released") {
+ this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
+ return;
+ }
+ this.DataVisible = true;
+ this.rowOid = this.selectRow[0]['oid']
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- // console.log('val',val)
if (func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
@@ -1064,22 +1166,57 @@
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
+ searchChange(val) {
+ this.isTimeName = val;
+ this.isTimeStatus = this.tableHeadFindData.some(item => {
+ if (item.fieldType === "datetime" && item.prop === val) {
+ return true;
+ }
+ return false;
+ });
+ // console.log(this.isTimeStatus)
+ },
+ dateChange(val) {
+ if (val) {
+ const momentDate = moment(this.dateValue);
+ const dateString = momentDate.format("yyyy-MM-DD");
+ this.isLoading = true;
+ try {
+ TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ ['conditionMap[' + this.keyWordFind + ']']: dateString
+ }).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ })
+ } finally {
+ this.isLoading = false;
+ }
+ }
+ },
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- /*if (this.WupinFindValue.trim() === '') {
- this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
- return;
- }*/
- TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
- }).then(res => {
- this.tableData = res.data.data;
- // this.page.total = res.data.data.total;
- })
+ this.isLoading = true;
+ try {
+ this.conditionMap = {};
+ // 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
+ this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
+ TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
+ }).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ })
+ } finally {
+ this.isLoading = false;
+ }
}
}
@@ -1087,9 +1224,16 @@
</script>
<style lang="scss" scoped>
+
+/deep/ .el-table__fixed-body-wrapper {
+ .el-table__body {
+ padding-bottom: 15px;
+ }
+}
+
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px) !important;
+ height: calc(100vh - 365px) !important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
@@ -1121,13 +1265,13 @@
.main {
display: flex;
flex-direction: column;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
min-height: 400px;
}
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.9.3