de716782 by 杨炀

no message

1 parent 7889dbb6
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
92 </div> 92 </div>
93 <div v-loading="loadingProject" id="projectbox" style="height: 50vh;overflow: auto;"> 93 <div v-loading="loadingProject" id="projectbox" style="height: 50vh;overflow: auto;">
94 <el-checkbox-group v-model="projectIds" @change="changeProject"> 94 <el-checkbox-group v-model="projectIds" @change="changeProject">
95 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id"> 95 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id"
96 v-show="!c.disabled">
96 <div class="flexBetween w100"> 97 <div class="flexBetween w100">
97 <div class="l"> 98 <div class="l">
98 {{ c.code }}:{{ c.name }}({{c.danceType}}) 99 {{ c.code }}:{{ c.name }}({{c.danceType}})
...@@ -579,13 +580,44 @@ function switchTabletype() { ...@@ -579,13 +580,44 @@ function switchTabletype() {
579 } 580 }
580 581
581 watch(projectIds, (newVal, oldVal) => { 582 watch(projectIds, (newVal, oldVal) => {
583 let currProject = {}
582 if (newVal.length > oldVal.length) { 584 if (newVal.length > oldVal.length) {
583 currProjectId.value = _.last(newVal) 585 currProjectId.value = _.last(newVal)
584 } else { 586 } else {
585 currProjectId.value = '' 587 currProjectId.value = ''
586 } 588 }
589 for(let p of projectList.value){
590 if(p.id==_.last(newVal)){
591 currProject = p
592 }
593 }
594 if(newVal.length>0){
595 console.log(currProject.pproperty,currProject.plevel)
596 for(let pp of projectList.value){
597 console.log(pp.pproperty,pp.plevel)
598 if((currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty))||
599 currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel)||
600 (currProject.pproperty&&pp.plevel&&currProject.pproperty=='A'&&pp.plevel!='6')||
601 (currProject.pproperty&&pp.plevel&&currProject.pproperty=='B'&&(pp.plevel!='2'||pp.plevel!='4'))||
602 (currProject.pproperty&&pp.plevel&&currProject.pproperty=='C'&&(pp.plevel!='2'||pp.plevel!='4'))||
603 (currProject.plevel&&pp.pproperty&&currProject.plevel=='6'&&pp.pproperty!='A')||
604 (currProject.plevel&&pp.pproperty&&currProject.plevel=='4'&&(pp.pproperty!='B'||pp.pproperty!='C'))||
605 (currProject.plevel&&pp.pproperty&&currProject.plevel=='2'&&(pp.pproperty!='B'||pp.pproperty!='C'))
606 ){
607 pp.disabled = true
608 } else {
609 pp.disabled = false
610 }
611 }
612 } else {
613 resetProjectList()
614 }
587 }) 615 })
588 616 function resetProjectList(){
617 for(var p of projectList.value){
618 p.disabled = false
619 }
620 }
589 function changeProject(e) { 621 function changeProject(e) {
590 var obj = {} 622 var obj = {}
591 obj = _.find(projectList.value, (c) => { 623 obj = _.find(projectList.value, (c) => {
...@@ -599,7 +631,7 @@ function changeProject(e) { ...@@ -599,7 +631,7 @@ function changeProject(e) {
599 } 631 }
600 } 632 }
601 //obj需要wdsf 且 currProjectId非空 633 //obj需要wdsf 且 currProjectId非空
602 if (obj.checkMemberFlag == '1' && currProjectId.value != '' && n > 0) { 634 if (obj&&obj.checkMemberFlag == '1' && currProjectId.value != '' && n > 0) {
603 const params = { 635 const params = {
604 title: language.value == 0 ? '验证WDSF' : 'Verify WDSF', 636 title: language.value == 0 ? '验证WDSF' : 'Verify WDSF',
605 groupId: groupId.value, 637 groupId: groupId.value,
......
...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 // target: 'http://192.168.1.118:8081/',
86 // target: 'http://192.168.1.131:8081/', 86 target: 'http://192.168.1.131:8081/',
87 target: 'https://jijin.wtwuxicenter.com/stage-api', 87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 // target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 changeOrigin: true,
90 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!