小修改

src/api/busStudentInfo.js

@@ -49,7 +49,7 @@ export function updateBusStudentInfo(data) {
   })
 }
 
-// 5. 逻辑删除学生信息
+// 5. 逻辑删除学生信息，同时逻辑删除对应用户
 export function delBusStudentInfo(businessId, userId) {
   return request({
     url: '/busstudentinfo/deleteLogical/' + businessId + '/' + userId,
@@ -66,3 +66,13 @@ export function exportBusStudentInfo(query) {
     responseType: 'blob'
   })
 }
+
+// 测试数据传输
+export function testDataTransfer(data) {
+  // data = Qs.stringify(data)
+  return request({
+    url: '/busstudentinfo/testDataTransfer',
+    method: 'post',
+    data: data
+  })
+}

src/api/busTeacherInfo.js

@@ -48,10 +48,10 @@ export function updateBusTeacherInfo(data) {
   })
 }
 
-// 5. 逻辑删除教师信息表
-export function delBusTeacherInfo(businessId) {
+// 5. 逻辑删除教师信息，同时逻辑删除对应用户
+export function delBusTeacherInfo(businessId, userId) {
   return request({
-    url: '/busteacherinfo/deleteLogical/' + businessId,
+    url: '/busteacherinfo/deleteLogical/' + businessId + '/' + userId,
     method: 'delete'
   })
 }

src/views/busStudentInfo/index.vue

@@ -59,35 +59,42 @@
             <el-button
               :class="commonField.queryClass"
               :type="commonField.typePrimary"
-              :icon="commonField.queryIcon"
               :size="commonField.smallSize"
-              @click="handleQuery"
-            >查询</el-button>
-            <el-button
-              :class="commonField.resetClass"
-              :type="commonField.typePrimary"
-              :icon="commonField.resetIcon"
-              :size="commonField.smallSize"
-              @click="resetQuery"
-            >重置</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              :class="commonField.addClass"
-              :type="commonField.typePrimary"
-              :icon="commonField.addIcon"
-              :size="commonField.smallSize"
-              @click="handleAdd"
-            >新增</el-button>
-            <el-button
-              :class="commonField.exportClass"
-              :type="commonField.typePrimary"
-              :icon="commonField.exportIcon"
-              :size="commonField.smallSize"
-              @click="handleExport"
-            >导出</el-button>
-          </el-form-item>
-        </div>
+              @click="test"
+            >数据传输测试</el-button>
+            <el-form-item>
+              <el-button
+                :class="commonField.queryClass"
+                :type="commonField.typePrimary"
+                :icon="commonField.queryIcon"
+                :size="commonField.smallSize"
+                @click="handleQuery"
+              >查询</el-button>
+              <el-button
+                :class="commonField.resetClass"
+                :type="commonField.typePrimary"
+                :icon="commonField.resetIcon"
+                :size="commonField.smallSize"
+                @click="resetQuery"
+              >重置</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                :class="commonField.addClass"
+                :type="commonField.typePrimary"
+                :icon="commonField.addIcon"
+                :size="commonField.smallSize"
+                @click="handleAdd"
+              >新增</el-button>
+              <el-button
+                :class="commonField.exportClass"
+                :type="commonField.typePrimary"
+                :icon="commonField.exportIcon"
+                :size="commonField.smallSize"
+                @click="handleExport"
+              >导出</el-button>
+            </el-form-item>
+          </el-form-item></div>
       </el-form>
     </div>
     <div style="padding:5px 10px">
@@ -216,6 +223,7 @@ import {
   delBusStudentInfo,
   addBusStudentInfo,
   updateBusStudentInfo,
+  testDataTransfer,
   exportBusStudentInfo } from '@/api/busStudentInfo'
 import { listBusClassesInfo } from '@/api/busClassesInfo'
 import commonField from '@/utils/commonField'
@@ -341,6 +349,13 @@ export default {
       this.open = false
       this.reset()
     },
+    // 数据传输
+    test() {
+      const code = 'lvWpJfxYt67CA29WH76ZROY2LrdISOuoTjtFO/AB3CU2n2iqZGkmBzrdQQa5+FBPLDE0g3Apk3j36v2BPYRuig==rzYgX+1HznI8Un1vaebOgfyD0JKMwBvw1AHcr22BjZp1+Kyd+/5LxW0gSiHvgwWr3pYoVC7FcrR7/Fkg/D8byg==gAy7HMu68q3flqoglmX65Pk2SkeHPp36sv8kXMAJKKSBlTLEA2D7FbQvm2Pog/mPh6OKK+ixj+DF3/oBquweYA==bAEXqVoLbIkZ0YYn9d7SOF9zMEWheZXuCV7QqxbzN3VQ1mB/cqZlLGZqogYirSy7kLD86KoEA1/+gu6yRJTFtQ==FKQf9cmpaHHVMPngkDK/0TvP9j4YrOwm1MQxc5TMzHT2XdNCXkw5FgSilzx+DeHuWZjoxmTXYQD48tsVyxRFFA=='
+      testDataTransfer(code).then(res => {
+        // 测试
+      })
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -441,7 +456,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.businessId
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -449,10 +463,10 @@ export default {
       }).then(function() {
         /**
          * 删除接口
-         * @param id bus_student_info表主键
+         * @param row.businessId bus_student_info表主键
          * @param row.userId sys_user表主键
          */
-        return delBusStudentInfo(id, row.userId)
+        return delBusStudentInfo(row.businessId, row.userId)
       }).then(() => {
         this.getList()
         this.$message({

src/views/busTeacherInfo/index.vue

@@ -383,13 +383,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.businessId
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delBusTeacherInfo(id)
+        return delBusTeacherInfo(row.businessId, row.teaId)
       }).then(() => {
         this.getList()
         this.$message({

src/views/system/sysSettings/index.vue

@@ -39,13 +39,13 @@
                   ref="upload"
                   v-model="sysSettingsList.systemBg"
                   class="avatar-uploader"
-                  action="your-upload-endpoint"
-                  :auto-upload="true"
+                  action="http://192.168.10.185/upload/wmsGoods"
                   list-type="picture-card"
-                  :http-request="handleUpload"
                   :show-file-list="true"
                   :file-list="fileList"
-                  :before-upload="handleBefore"
+                  :on-success="handleUploadSuccess"
+                  :on-error="handleUploadError"
+                  :before-upload="handleUpload"
                   accept="image/png"
                   :on-remove="handleFileRemove"
                 >
@@ -223,16 +223,12 @@
 </template>
 <script lang="ts">
 import {
-  getSysSettings,
   updateSysSettings,
-  addSysSettings,
-  delSysSettings,
-  exportSysSettings,
   listSysSettings
 } from '@/api/sysSettings'
 import commonField from '@/utils/commonField'
 // import {  setDataCache } from '@/assets/js/filterData'
-import { uploadPublic } from '@/api/fileUploadPublic'
+// import { uploadPublic } from '@/api/fileUploadPublic'
 
 export default {
   name: 'SysSettings',
@@ -316,6 +312,20 @@ export default {
     this.getList()
   },
   methods: {
+    // 处理文件上传成功
+    handleUploadSuccess(res, file, fileList) {
+      console.log('文件上传成功')
+      console.log(res)
+      console.log(file)
+      console.log(fileList)
+    },
+    // 处理文件上传失败
+    handleUploadError(err, file, fileList) {
+      console.log('文件上传失败')
+      console.log(err)
+      console.log(file)
+      console.log(fileList)
+    },
     /**
      * @description: 处理上传接口
      * @author:
@@ -323,13 +333,15 @@ export default {
      * @return:
      **/
     handleUpload(file) {
-      const formData = new FormData()
-      formData.append('file', file.file)
-      formData.append('temp', 'sysSettings')
-      uploadPublic(formData).then(res => {
-        this.pictureId.push(res.data.businessId)
-        console.log(this.pictureId)
-      })
+      console.log('文件上传之前')
+      console.log(file)
+      // const formData = new FormData()
+      // formData.append('file', file.file)
+      // formData.append('temp', 'sysSettings')
+      // uploadPublic(formData).then(res => {
+      //   this.pictureId.push(res.data.businessId)
+      //   console.log(this.pictureId)
+      // })
     },
     loadCachedImage() {
       const cachedUrl = localStorage.getItem('systemBg')
@@ -391,6 +403,8 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate() {
+      this.$refs.upload.submit()
+      return
       console.log('修改提交的数据=========>', this.sysSettingsList)
       // const id = this.sysSettingsList.businessId
       // updateSysSettings(id).then(response => {

src/views/system/user/index.vue

@@ -46,7 +46,6 @@
             :size="commonField.smallSize"
             @click="resetQuery"
           >{{ commonField.resetName }}</el-button>
-        </el-form-item>
           <!--          //新增按钮-->
           <el-button
             v-hasPermi="hasAddPerm"
@@ -149,36 +148,40 @@
             </template>
           </el-table-column>
           <el-table-column
+            operate-column
             label="操作"
             width="200"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <!--              //修改-->
-              <el-button
-                v-hasPermi="hasUpdatePerm"
-                :class="commonField.updateClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleUpdate(scope.row)"
-              >{{ commonField.updateName }}</el-button>
-              <!--              //重置密码-->
-              <el-button
-                v-hasPermi="hasResetPerm"
-                :class="commonField.resetPasClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleResetPwd(scope.row)"
-              >{{ commonField.resetPassword }}</el-button>
-              <!--              //删除-->
-              <el-button
-                v-if="scope.row.businessId !== 1"
-                v-hasPermi="hasDelPerm"
-                :class="commonField.delClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleDelete(scope.row)"
-              >{{ commonField.deleteName }}</el-button>
+              <div class="operate-column">
+                <!--              //修改-->
+                <el-button
+                  v-if="scope.row.userType !== '6' && scope.row.userType !== '7'"
+                  v-hasPermi="hasUpdatePerm"
+                  :class="commonField.updateClass"
+                  :type="commonField.typeParent"
+                  :size="commonField.size"
+                  @click="handleUpdate(scope.row)"
+                >{{ commonField.updateName }}</el-button>
+                <!--              //重置密码-->
+                <el-button
+                  v-hasPermi="hasResetPerm"
+                  :class="commonField.resetPasClass"
+                  :type="commonField.typeParent"
+                  :size="commonField.size"
+                  @click="handleResetPwd(scope.row)"
+                >{{ commonField.resetPassword }}</el-button>
+                <!--              //删除-->
+                <el-button
+                  v-if="scope.row.userType !== '6' && scope.row.userType !== '7'"
+                  v-hasPermi="hasDelPerm"
+                  :class="commonField.delClass"
+                  :type="commonField.typeParent"
+                  :size="commonField.size"
+                  @click="handleDelete(scope.row)"
+                >{{ commonField.deleteName }}</el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -672,6 +675,7 @@ export default {
         this.userList = response.rows
         this.total = Number(response.total)
         this.loading = false
+        console.log('用户数据', this.userList)
       }
       )
     },
@@ -1044,4 +1048,9 @@ export default {
     text-align: LEFT;
   }
 }
+.operate-column{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>