|
|
@@ -2013,6 +2013,33 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 同步队列 -->
|
|
|
+ <el-dialog
|
|
|
+ title="同步队列"
|
|
|
+ :visible.sync="syncListDialog"
|
|
|
+ width="30%"
|
|
|
+ append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ >
|
|
|
+ <div class="content-box">
|
|
|
+ <el-image
|
|
|
+ style="width: 100px; height: 100px"
|
|
|
+ :src="require('@/assets/loader.svg')"
|
|
|
+ fit="contain"></el-image>
|
|
|
+ <div class="mt-14">同步中</div>
|
|
|
+ <div class="mt-14">
|
|
|
+ 同步数量*** 剩余数量***
|
|
|
+ </div>
|
|
|
+ <div class="mt-14">
|
|
|
+ <el-button type="primary" @click="syncListDialog=false">好的，我已知晓</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="mt-14">
|
|
|
+ <el-link type="primary">刷新数据</el-link>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ </el-dialog>
|
|
|
<!-- 同步表单其他配置 -->
|
|
|
<el-dialog
|
|
|
title="同步表单其他配置"
|
|
|
@@ -2151,9 +2178,10 @@ import {
|
|
|
} from "@/api/exctab/excelmodel";
|
|
|
import { getStore, setStore } from "@/util/store";
|
|
|
|
|
|
-import { getTempProject,addSync } from "@/api/manager/ledger";
|
|
|
+import { getTempProject,addSync,getNodeStatus } from "@/api/manager/ledger";
|
|
|
import { selectByNodeTable as findNodeTableByCondition1 } from "@/api/manager/wbstree";
|
|
|
|
|
|
+
|
|
|
export default {
|
|
|
data() {
|
|
|
var checkMajorDataType = (rule, value, callback) => {
|
|
|
@@ -2521,7 +2549,9 @@ export default {
|
|
|
preTableData1:[],
|
|
|
formIds:'',
|
|
|
saveTableSyncLoad:false,
|
|
|
- checkRow:null
|
|
|
+ checkRow:null,
|
|
|
+ syncListDialog:false,
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -4168,8 +4198,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- syncNodeTableHandle(data) {
|
|
|
+ async syncNodeTableHandle(data) {
|
|
|
console.log('后管数据同步',data);
|
|
|
+ await this.getNodeStatusData()
|
|
|
+ if(this.syncListDialog){
|
|
|
+ return
|
|
|
+ }
|
|
|
this.syncForm.range='1'
|
|
|
|
|
|
|
|
|
@@ -4217,6 +4251,10 @@ export default {
|
|
|
//同步元素表单排序到合同段
|
|
|
async syncSortHandle(data) {
|
|
|
console.log('同步到合同');
|
|
|
+ await this.getNodeStatusData()
|
|
|
+ if(this.syncListDialog){
|
|
|
+ return
|
|
|
+ }
|
|
|
this.syncForm.range='2'
|
|
|
|
|
|
this.proSyncTag=true
|
|
|
@@ -4771,8 +4809,9 @@ export default {
|
|
|
});
|
|
|
|
|
|
},
|
|
|
- proSyncbtn(){
|
|
|
+ async proSyncbtn(){
|
|
|
console.log('项目数据同步');
|
|
|
+
|
|
|
this.getTypeOptions()
|
|
|
this.getRangeOptions()
|
|
|
this.getCheckIdList()
|
|
|
@@ -4875,7 +4914,7 @@ export default {
|
|
|
this.proSyncTag=false
|
|
|
|
|
|
},
|
|
|
- saveProTag(){
|
|
|
+ async saveProTag(){
|
|
|
|
|
|
this.syncForm.projectId=this.projectid
|
|
|
if(this.isShowLeft){
|
|
|
@@ -4884,7 +4923,11 @@ export default {
|
|
|
}else{
|
|
|
this.syncForm.nodeId=this.curTreeData.primaryKeyId
|
|
|
}
|
|
|
-
|
|
|
+ await this.getNodeStatusData()
|
|
|
+ if(this.syncListDialog){
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(this.syncForm.rangeName==''){
|
|
|
for (let index = 0; index < this.rangeOptions.length; index++) {
|
|
|
@@ -4935,7 +4978,11 @@ export default {
|
|
|
this.syncForm.formIds=arr.join(',')
|
|
|
}
|
|
|
},
|
|
|
- handleCommand(command,row){
|
|
|
+ async handleCommand(command,row){
|
|
|
+ await this.getNodeStatusData()
|
|
|
+ if(this.syncListDialog){
|
|
|
+ return
|
|
|
+ }
|
|
|
// this.$message('click on item ' + command);
|
|
|
console.log(row,'row');
|
|
|
console.log(command,'command');
|
|
|
@@ -4966,7 +5013,7 @@ export default {
|
|
|
|
|
|
});
|
|
|
}else if(command==='b'){
|
|
|
- console.log(111111111111111);
|
|
|
+
|
|
|
|
|
|
this.syncTableDialog=true
|
|
|
if(this.$refs.proTable1){
|
|
|
@@ -5023,6 +5070,21 @@ export default {
|
|
|
// this.syncForm.formIds=arr.join(',')
|
|
|
}
|
|
|
},
|
|
|
+ refreshData(){
|
|
|
+ console.log('刷新数据');
|
|
|
+
|
|
|
+ },
|
|
|
+ getNodeStatusData(){
|
|
|
+ getNodeStatus({ id:this.curTreeData.primaryKeyId}).then((res) => {
|
|
|
+ if(res.data.code==200){
|
|
|
+ if(res.data===true)
|
|
|
+ this.syncListDialog=true
|
|
|
+ }else{
|
|
|
+ this.syncListDialog=false
|
|
|
+ this.$message.error(res.data.msg)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
"GLExcelFrom.search"(val) {
|
|
|
@@ -5218,11 +5280,8 @@ export default {
|
|
|
}
|
|
|
.sync-container{
|
|
|
display: flex;
|
|
|
- height: 650px;
|
|
|
-
|
|
|
-
|
|
|
+ height: 570px;
|
|
|
.box-card-1{
|
|
|
-
|
|
|
margin-right: 10px;
|
|
|
height: 100%;
|
|
|
overflow-y: auto;
|
|
|
@@ -5231,14 +5290,11 @@ export default {
|
|
|
flex: 1;
|
|
|
height: 100%;
|
|
|
overflow-y: auto;
|
|
|
-
|
|
|
.el-form-item {
|
|
|
border: 1px solid #dcdfe6;
|
|
|
padding: 0 10px 10px 10px;
|
|
|
-
|
|
|
border-radius: 4px;
|
|
|
font-weight: bold;
|
|
|
-
|
|
|
.el-form-item__label {
|
|
|
font-weight: bold;
|
|
|
padding-bottom: 0px;
|
|
|
@@ -5250,6 +5306,16 @@ export default {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+.content-box{
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+ font-weight: bolder;
|
|
|
+ .mt-14{
|
|
|
+ margin-top: 14px;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
|
|
|
|
|
<style lang="scss">
|
