tangning пре 3 година
родитељ
комит
149858086d

+ 22 - 3
src/components/dialog/index.vue

@@ -3,7 +3,7 @@
     <div class="dialog-bg" v-if="dialogVisible">
       <div class="dialog" :style="{width: (width ? width : 680) + 'px'}">
         <div class="head">
-          <h3>{{title}} </h3>  
+          <h3>{{title}}</h3>  
           <i class="el-icon-close" @click="closeHandle" v-if="showClose || showClose === void 0 || cornerClose"></i>
         </div>
         <div class="content">
@@ -12,7 +12,8 @@
         <div class="floot" v-if="showFloor">
           <el-button type="danger" v-if="showDel" @click="deleteHandle" >删 除</el-button>
           <el-button @click="closeHandle" v-if="showClose || showClose === void 0">取 消</el-button>
-          <el-button type="primary" @click="enterHandle">{{enterText || '保 存'}}</el-button>
+          <el-button  type="primary" :disabled="disabled()"  @click="enterHandle">{{enterText || '保 存'}}</el-button>
+          <!-- <el-button v-if="power" v-else type="primary" @click="enterHandle">{{enterText || '保 存'}}</el-button> -->
         </div>
       </div>
     </div>
@@ -21,9 +22,10 @@
 
 <script>
 import { computed, ref } from "vue";
+import user from '@/state/user'
 
 export default {
-  props: ["show", "title", "hideFloor", 'enterText', 'width', 'showClose','showDelete','cornerClose'],
+  props: ["show", "title", "hideFloor", 'enterText', 'width','power', 'showClose','showDelete','cornerClose'],
   setup(props) {
     const dialogVisible = ref(props.show);
     console.log('props',props);
@@ -49,12 +51,29 @@ export default {
       this.dialogVisible = false;
     },
     enterHandle() {
+      console.log('enterHandle',this.$route,'user',user)
       this.$emit('submit')
       // this.dialogVisible = false;
     },
     deleteHandle() {
       console.log('deleteHandle')
       this.$emit('delete')
+    },
+    disabled(){
+    if(!this.power){
+      return false
+    }
+    let replacelist = {
+      'organizationlist':'organization',
+    }
+    let roleKeyList = user._value.roleKeyList
+    let routeName = this.$route.name
+    let rokeName =  `${replacelist[routeName] || routeName}:${this.power}`
+    if(!roleKeyList.includes(rokeName)){
+      return true
+    }else{
+      return false
+    }
     }
   },
 };

+ 1 - 0
src/view/dispatch/archives.vue

@@ -4,6 +4,7 @@
     enterText="上传附件"
     :hideFloor="user.info.departmentId != organizerDeptId"
     :show="show"
+    power="doc:upload"
     @submit="oper.readyInsert"
     @update:show="val => $emit('update:show', val)"
   >

+ 1 - 1
src/view/dispatch/index.vue

@@ -113,7 +113,7 @@
         <!-- <span class="oper-span" @click="queryScene(row)" v-power="'readFile'" >场景</span> -->
         <span class="oper-span" v-power="'look'" :class="{disable: !row.sceneNum}" v-if="!isTeaching" @click="takeLook(row)">带看</span>
         <template v-if="isTeaching">
-          <span class="oper-span" v-power="'message'" @click="leaveMsgHandle(row)">留言</span>
+          <span class="oper-span" v-power="'message:look'" @click="leaveMsgHandle(row)">留言</span>
           <span class="oper-span" v-power="'cancel'" @click="revokeTeaching(row)" style="color: var(--primaryColor)">撤销</span>
         </template>
         <template v-else-if="user.info.id == row.creatorId || user.roleKey == 'admin-dept'">

+ 1 - 0
src/view/dispatch/leaveMsg.vue

@@ -3,6 +3,7 @@
     title="留言"
     enterText="发表留言"
     :show="show"
+    power="message:add"
     @submit="oper.readyInsert"
     @update:show="val => $emit('update:show', val)"
   >

+ 2 - 2
vue.config.js

@@ -19,8 +19,8 @@ module.exports = {
     // 设置代理proxy
     proxy: {
       '/__api': {
-        target: 'http://192.168.0.135:8585/',
-        // target: 'https://testxfhd.4dkankan.com',
+        // target: 'http://192.168.0.135:8585/',
+        target: 'https://testxfhd.4dkankan.com',
         // target: 'https://testhuodiao.4dkankan.com/',
         changeOrigin: true,  
         pathRewrite: {