chenmy 3 년 전
부모
커밋
93f27babed
1개의 변경된 파일22개의 추가작업 그리고 16개의 파일을 삭제
  1. 22 16
      TEAMModelBI/ClientApp/src/view/areaServe/areamanage.vue

+ 22 - 16
TEAMModelBI/ClientApp/src/view/areaServe/areamanage.vue

@@ -83,7 +83,7 @@
               <div class="schoolLeft" v-loading="loadingSchoolList" element-loading-text="数据加载中...">
                 <div class="haveSchool-title">
                   <div>{{ $t(`areaManages.operational.areaAddSchool.schooltitle`) }}</div>
-                  <div class="synchronization-title"><span>已同步省平台</span></div>
+                  <div class="synchronization-title" v-show="currentlySelect.cutArea"><span>已同步省平台</span></div>
                 </div>
                 <ul>
                   <li class="details-list-school" v-for="(item, index) in notjoinSchool" :key="item.id" :class="{ active: position === index }">
@@ -110,7 +110,7 @@
                       </div> -->
                       <el-popconfirm :confirm-button-text="$t(`areaManages.operational.areaAddSchool.add`)" :cancel-button-text="$t(`commonMsg.closes`)" :title="$t(`areaManages.operational.areaAddSchool.addschoolHint`)" @confirm="areaAddschool(item.id,$event)" @cancel="position=''">
                         <template #reference>
-                          <div class="addiconsx" @click="changeStyle(index,item)">
+                          <div class="addiconsx" @click="changeStyle(index,item)" v-show="currentlySelect.cutArea ===false">
                             <svg class="areaaddschool" aria-hidden="true">
                               <use xlink:href="#icon-tianjia"></use>
                             </svg>
@@ -170,12 +170,12 @@
                     </el-table-column>
                     <el-table-column align="center" :label="$t(`areaManages.operational.areaAddSchool.tables.operate`)">
                       <template #default="scope">
-                        <el-button type="text" size="small" @click.prevent="deleteRow(scope.$index, scope.row)">
+                        <el-button type="text" size="small" @click.prevent="deleteRow(scope.$index, scope.row)" v-show="currentlySelect.cutArea ===false">
                           {{$t(`areaManages.operational.areaAddSchool.tables.areaRemove`)}}
                         </el-button>
-                        <div class="haveSchool-title">
-                          <div class="synchronization-title"><span>已同步省平台</span></div>
-                        </div>
+                        <!-- <div class="haveSchool-title"> -->
+                        <div class="synchronization-title" v-show="currentlySelect.cutArea"><span>已同步省平台</span></div>
+                        <!-- </div> -->
                       </template>
                     </el-table-column>
                   </el-table>
@@ -226,7 +226,7 @@
             </div>
           </el-tab-pane>
         </el-tabs>
-        <div class="cut-ability" v-if="activeName === 'adjust'" @click="abilityModel = !abilityModel">
+        <div class="cut-ability" v-if="activeName === 'adjust' && currentlySelect.cutArea ===false" @click="abilityModel = !abilityModel">
           <el-button type="primary" size="small" plain>
             <svg class="cuticon" aria-hidden="true">
               <use :xlink:href="cutbtnTitle.icon"></use>
@@ -234,6 +234,9 @@
             {{ cutbtnTitle.name }}
           </el-button>
         </div>
+        <div class="cut-ability">
+          <div class="synchronization-title cut-ability-synchronization" v-show="currentlySelect.cutArea && activeName === 'adjust'"><span>已同步省平台</span></div>
+        </div>
       </el-dialog>
       <el-dialog v-model="CutNotarize" width="50%" :before-close="handleClose" :show-close="false">
         <div class="reminder">
@@ -466,7 +469,7 @@ export default {
           ? (ElMessage.success(proxy.$t(`commonMsg.addschoolSuccess`)), (addSchoolHint.value = false),
             getNotjoin(),
             getAreaschool())
-          : ElMessage.error(proxy.$t(`commonMsg.addschoolError`))
+          : res.state === 401 ? ElMessage.error('已同步省平台,无法加入学区') : ElMessage.error(proxy.$t(`commonMsg.addschoolError`))
       })
       position.value = ''
     }
@@ -501,7 +504,7 @@ export default {
               type: 'success',
               message: proxy.$t(`commonMsg.operateSuccess`),
             })
-            : ElMessage({
+            : res.state === 401 ? ElMessage.error('已同步省平台,无法进行切换操作') : ElMessage({
               type: 'error',
               message: proxy.$t(`commonMsg.operateError`),
             })
@@ -583,9 +586,9 @@ export default {
             }
             proxy.$api.areaDeleSchool(data).then((res) => {
               console.log(res, '移除返回')
-              res.state !== 200
-                ? ElMessage.error(proxy.$t(`commonMsg.operateError`))
-                : getAreaschool(),
+              res.state == 200
+                ? (ElMessage.success('操作成功'), getAreaschool())
+                : res.state === 401 ? ElMessage.error('已同步省平台,无法移学校') : res.state !== 200 ? (ElMessage.success('操作失败')) : '',
                 getNotjoin()
             })
             done()
@@ -595,10 +598,10 @@ export default {
           }
         },
       }).then((action) => {
-        ElMessage({
-          type: 'success',
-          message: proxy.$t(`commonMsg.operateSuccess`),
-        })
+        // ElMessage({
+        //   type: 'success',
+        //   message: proxy.$t(`commonMsg.operateSuccess`),
+        // })
       })
     }
     function changeStyle (index, item) {
@@ -1059,6 +1062,9 @@ export default {
   overflow: hidden;
   border-color: #ffe58f;
 }
+.cut-ability-synchronization {
+  margin-top: 10px;
+}
 .schoolLeft ul {
   width: 100%;
 }