修改问题

src/components/dialog/index.vue

@@ -4,7 +4,7 @@
       <div class="dialog" :style="{width: (width ? width : 680) + 'px'}">
         <div class="head">
           <h3>{{title}} </h3>  
-          <i class="el-icon-close" @click="closeHandle" v-if="showClose || showClose === void 0"></i>
+          <i class="el-icon-close" @click="closeHandle" v-if="showClose || showClose === void 0 || cornerClose"></i>
         </div>
         <div class="content">
           <slot />
@@ -23,7 +23,7 @@
 import { computed, ref } from "vue";
 
 export default {
-  props: ["show", "title", "hideFloor", 'enterText', 'width', 'showClose','showDelete'],
+  props: ["show", "title", "hideFloor", 'enterText', 'width', 'showClose','showDelete','cornerClose'],
   setup(props) {
     const dialogVisible = ref(props.show);
     console.log('props',props);

src/view/dispatch/archives.vue

@@ -60,15 +60,15 @@
       </el-form-item>
       <el-form-item label="附件：" class="mandatory">
         <el-upload
-        :disabled="!!oper.state.fileOssUrl"
           class="upload-demo"
           :http-request="uploadFile"
           :multiple="false"
           :limit="1"
           :before-upload="beforeUpload"
           :before-remove="beforeRemove"
-          :file-list="oper.state.fileList">
-          <el-button size="medium" type="primary" :disabled="!!oper.state.fileOssUrl" @click="ev => oper.state.fileOssUrl && ev.stopPropagation()"><i class="el-icon-upload2 el-icon--left"></i>上传</el-button>
+          :file-list="oper.state.fileList"
+          >
+          <el-button size="medium" type="primary"  :disabled="!!oper.state.fileOssUrl" @click="ev => oper.state.fileOssUrl && ev.stopPropagation()"><i class="el-icon-upload2 el-icon--left"></i>上传</el-button>
           <template v-slot:tip>
             <div class="el-upload__tip">注：可上传100M以内的pdf、jpg、word文件</div>
           </template>
@@ -160,14 +160,16 @@ export default {
         let res = await axios.post(url, {file: data.file})
         this.oper.state.fileOssUrl = res.data.ossUrl
         data.onSuccess()
+        console.log('chengg');
       } catch {
         data.onError()
+        console.log('shib');
       }
     },
     beforeUpload(file) {
       let successTypes = [...imgTypes, ...fileTypes]
       let maxSize = 100 * 1024 * 1024
-
+      console.log('oper.state.fileList',this.oper.state.fileList)
       if (!successTypes.some(type => ~file.type.indexOf(type))) {
         this.$message.error(`请上传${successTypes.join('、')}等格式的文件`, '提示')
         return false
@@ -190,7 +192,7 @@ export default {
       } else if (!this.oper.state.fileName || !this.oper.state.fileName.trim()) {
         return this.$message.error('附件标题不能为空！', '提示')
       }
-
+      console.log('this.oper.state.id ',this.oper.state.id )
       this.oper.state.id ? this.oper.update() : this.oper.insert()
 
       this.$emit('referList')

src/view/dispatch/index.vue

@@ -106,7 +106,7 @@
       </el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }" :width="isTeaching ? 280 : 320">
         <span class="oper-span" @click="queryDetail(row)" v-power="'view'">详情</span>
-        <span class="oper-span" @click="archivesHandle(row)" v-power="'readFile'">档案</span>
+        <span class="oper-span" @click="archivesHandle(row)" v-power="'readFile'" v-if="user.info.id == row.creatorId">档案</span>
         <span class="oper-span" @click="queryScene(row)">场景</span>
         <span class="oper-span" v-if="row.vrLink && !isTeaching" @click="takeLook(row)">带看</span>
         <template v-if="isTeaching">
@@ -118,7 +118,7 @@
             撤销
           </span>
         </template>
-        <template v-else>
+        <template v-else-if="user.info.id == row.creatorId">
           
           <span class="oper-span" v-power="'share'" @click="row.vrLink && shareHandle(row)" :class="{disable: !row.vrLink}">分享</span>
           <span class="oper-span" v-power="'edit'" @click="auth.update && user.info.deptId == row.deptId && editInfo(row)" :class="{disable: !(auth.update && user.info.deptId == row.deptId)}">编辑</span>
@@ -794,6 +794,7 @@ export default {
   line-clamp: 2;
   -webkit-box-orient: vertical;
   /* height: 50px; */
+  padding: 5px 0;
   white-space: initial
 }
 </style>

src/view/organization/list.vue

@@ -191,6 +191,7 @@ export default {
       console.log(data);
     };
     const submit = async () => {
+      
       const { name, deptType, parentId,phone } = data.detail;
       const { detailType } = data;
       if (!name) {
@@ -218,15 +219,14 @@ export default {
         getApp().$message({ message: "操作成功", type: "success" });
       } else {
         getApp().$confirm("组织创建成功，快去创建用户吧", "温馨提示", {
-          confirmButtonText: "我知道了",
-          showCancelButton: false,
-          cancelButtonText: "Cancel",
-          callback:()=>{
-            setTimeout(()=>{
+          confirmButtonText: "去创建",
+          showClose:true,
+          cancelButtonText: "我知道了",  
+        }).then(() => {
+            setTimeout(()=>{  
                 getApp().$router.push({name: 'user'})
               },500)
-          }
-        });
+          })
       }
       data.detail = {};
       data.show = false;

src/view/scene/index.vue

@@ -155,8 +155,8 @@ export default {
       this.list = list
 
       this.loadSuccess = true
-      // this.confirm.show = false
-      // this.showInfo = true  //不默认开启
+      this.confirm.show = false
+      this.showInfo = true  //不默认开启
     },
     goto(item) {
       if (item.type !== 1) {

src/view/user/index.vue

@@ -60,17 +60,18 @@
         <el-table-column
           label="操作"
           v-slot:default="{ row }"
-          v-if="auth.update || auth.updatePwd || auth.delete"
         >
-          <template v-if="row.roleKey == roleKey[user.roleKey]">
-            <span class="oper-span" @click="updateInfo(row)" v-if="auth.update"
+          <!-- v-if="auth.update || auth.updatePwd || auth.delete"  v-if="auth.update"-->
+           <!-- row.roleKey == roleKey[user.roleKey] -->
+          <template v-if="user.roleKey !== 'admin-ordinary'">
+            <span class="oper-span" @click="updateInfo(row)" 
             v-power="'edit'">编辑</span
             >
+              <!-- v-if="auth.delete" -->
             <span
               class="oper-span"
               v-power="'disabled'"
               @click="changeUserStatus(row)"
-              v-if="auth.delete"
               style="color: var(--primaryColor)"
             >
               {{ row.status ? "禁用" : "启用" }}