Merge remote-tracking branch 'origin/master' into master

src/views/bill/statementInvoice/addInvoiceDialog.vue

@@ -174,6 +174,12 @@ const beforeUpload = (file: any) => {
 
 function handleUploadSuccess(response: any, file: any, fileListParam: any[]) {
   if (response.code === 200) {
+    // 为每个上传成功的文件设置 url 属性
+    fileListParam.forEach((f: any) => {
+      if (f.response?.code === 200 && f.response?.data?.url) {
+        f.url = f.response.data.url;
+      }
+    });
     // 更新 fileList
     fileList.value = fileListParam;
     // 收集所有已上传成功的文件URL

src/views/order/saleOrder/index.vue

@@ -101,10 +101,15 @@
         <el-table-column label="业务员" align="center" prop="businessStaff" />
         <el-table-column label="客服" align="center" prop="customerService" />
         <el-table-column label="归属部门" align="center" prop="businessDept" />
-        <el-table-column label="订单来源" align="center" prop="orderSource">
+        <!-- <el-table-column label="订单来源" align="center" prop="orderSource">
           <template #default="scope">
             <dict-tag :options="order_source" :value="scope.row.orderSource" />
           </template>
+        </el-table-column> -->
+        <el-table-column label="所属项目" align="center" prop="dataSource">
+          <template #default="scope">
+            {{ scope.row.dataSource == 'zhongche' ? '中车' : '--' }}
+          </template>
         </el-table-column>
         <!-- <el-table-column label="审核状态" align="center" prop="checkStatus">
           <template #default="scope">
@@ -480,20 +485,17 @@ const handleCheck = async (row?: OrderMainVO) => {
 
 /** 审核按钮操作 */
 const handleCancel = async (row?: OrderMainVO) => {
-  const oldValue = row.checkStatus; // 保存旧值
-
-  // 弹出审核选择对话框
+  const oldValue = row.orderStatus; // 保存旧值
+  await proxy?.$modal.confirm('是否确认取消订单编号【' + row.orderNo + '】的订单吗？').finally(() => (loading.value = false));
+  //todo 发送
   try {
     // 调用接口，传入用户选择的值
     await changeStatus(row.id, '7');
     getList();
     proxy?.$modal.msgSuccess('操作成功');
-  } catch (error) {
-    // 用户取消或操作失败
-    if (error !== 'cancel' && error !== 'close') {
-      row.checkStatus = oldValue; // 失败回滚
-      proxy?.$modal.msgError('操作失败，请重试');
-    }
+  } catch (e) {
+    // 恢复旧值
+    row.orderStatus = oldValue;
   }
 };