From a4e0b8f640d739b17724b2e648196741b42631b8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 14:40:10 +0800
Subject: [PATCH] 流程管理更改状态
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 162 +++++++++++++++++++++++++++--------------------------
1 files changed, 82 insertions(+), 80 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index ecff417..a30dac6 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -46,15 +46,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 +67,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 +89,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 +101,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>-->
@@ -341,7 +331,7 @@
datetime: "datetime",
},
tableData: [],
- tableHeight: 'calc(100vh - 350px)',
+ tableHeight: 'calc(100vh - 300px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -355,15 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions:{},
result: '',
elapsedTime: '',
};
@@ -393,6 +375,11 @@
this.doLayout()
},
watch: {
+ isLoading: {
+ handler(newval) {
+ // console.log(newval)
+ }
+ },
tableHeadDataFateher: {
handler(newval, oldval) {
this.options = newval.tableDefineVO.seniorQueryColumns
@@ -406,13 +393,24 @@
},
tableDataArray: {
handler(newval, oldval) {
+ // console.log('tableData',newval)
this.tableData = newval;
this.searchResults = newval
- this.doLayout()
+ this.doLayout();
+ this.fileOptions= {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
handler(newval, oldval) {
+ // console.log(newval)
newval.forEach((record, _index) => {
if (record.queryField == 'id' && validatenull(record.templet)) {
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -433,33 +431,31 @@
}
})
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 = ''
},
},
@@ -497,6 +493,7 @@
}
},
cellStatusFind(lcstatus) {
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -504,7 +501,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;
})
},
//灞曞紑闄勪欢
@@ -513,7 +513,7 @@
this.tableHeight = 'calc(100vh - 630px)';
this.$refs.dataTable.doLayout()
} else {
- this.tableHeight = 'calc(100vh - 350px)';
+ this.tableHeight = 'calc(100vh - 310px)';
this.$refs.dataTable.doLayout()
}
},
@@ -560,28 +560,39 @@
if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
});
},
- importGroupCode(type){
+ 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;
- }
+ // 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);
- this.isLoading = false;
- })
+ });
},
//鏍囧噯鐢宠
codeApplyHandler() {
@@ -622,7 +633,7 @@
}
});
if (foundItem) {
- if(this.selectRow.length >= 1){
+ if (this.selectRow.length >= 1) {
this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -638,7 +649,7 @@
message: '宸插彇娑堝綋鍓嶆搷浣�'
});
});
- }else {
+ } else {
this.amendvisible = true;
}
} else {
@@ -656,9 +667,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 +681,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 +695,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) {
@@ -1066,10 +1070,7 @@
},
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- /*if (this.WupinFindValue.trim() === '') {
- this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
- return;
- }*/
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1078,7 +1079,8 @@
['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
this.tableData = res.data.data;
- // this.page.total = res.data.data.total;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
}
@@ -1127,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.9.3