Merge remote-tracking branch 'origin/main'

admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue

@@ -69,7 +69,7 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column header-align="center"  fixed="right" align="center" width="150" label="操作">
+      <el-table-column header-align="center" align="center" width="150" label="操作">
         <template slot-scope="scope">
           <template v-if="editingRow === scope.row.id">
             <el-button type="text" size="small" @click="saveDetail(scope.row)">保存</el-button>
@@ -169,7 +169,6 @@ export default {
         orderAmount: row.orderAmount,
         remark: row.remark
       }
-
       console.log('开始编辑，表单数据:', this.editForm)
     },
     // 保存订单明细

admin/src/views/pm/canteen/purchase/order/index.vue

@@ -102,7 +102,6 @@
         label="备注">
       </el-table-column>
       <el-table-column
-        fixed="right"
         header-align="center"
         align="center"
         width="150"

app/utils/request.js

@@ -98,8 +98,11 @@ request.uploadFile = (filePath, name = 'file', formData = {}, options = {}) => {
       uid: store.state.app.uid,
       ...(options.params || {})
     }
-    if (queryObj) {
-      uploadUrl += '?' + new URLSearchParams(queryObj).toString();
+    if (Object.keys(queryObj).length > 0) {
+      const queryString = Object.entries(queryObj)
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+        .join('&');
+      uploadUrl += '?' + queryString;
     }
 		
 		// 添加token，