合并代码

components.d.ts

@@ -15,19 +15,27 @@ declare module 'vue' {
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
->>>>>>> dev-songyang
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
+    ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
     ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTag: typeof import('element-plus/es')['ElTag']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
     FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']

src/views/user/orderManagement/index.vue

@@ -35,7 +35,9 @@
     /* 查看按钮 */
     const clickPreviewDetails = (row:any) => {
         console.log('查看',row)
-        router.push({ name: 'orderDetails',query:{} })
+        router.push({ name: 'orderDetails',query:{
+            orderId:row.orderId
+        } })
     }
 
     /* 续租按钮 */
@@ -45,9 +47,12 @@
     }
 
     /* 确认收货 */
-    const clickConfirmReceipt = () => {
+    const clickConfirmReceipt = (row:any) => {
         console.log('确认收货')
-        router.push({ name: 'orderDetails' })
+        router.push({ name: 'orderDetails',query:{
+            orderId:row.orderId,
+            confirm:"true"
+        } })
     }
 
     const time = ref([])
@@ -100,7 +105,7 @@
             <el-table-column align="center" prop="orderStatus" label="订单状态" />
             <el-table-column align="center" prop="name" label="操作" width="320px">
                 <template #default="scope">
-                    <el-button size="small" type="primary" @click="clickPreviewDetails(scope)">
+                    <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
                         查看
                     </el-button>
                     <el-button size="small" type="danger" @click="clickRentingTermination">
@@ -109,7 +114,7 @@
                     <el-button size="small" type="warning" @click="clickRenewalOfLease">
                         续租
                     </el-button>
-                    <el-button size="small" type="success" @click="clickConfirmReceipt">
+                    <el-button size="small" type="success" @click="clickConfirmReceipt(scope.row)">
                         确认收货
                     </el-button>
                 </template>

src/views/user/orderManagement/orderCom/orderDetails.vue

@@ -176,7 +176,7 @@ const confirmFn = async () => {
     }
 }
 
-const confimFlag: any = ref(false)
+const confimFlag: any = ref("")
 const initPage = () => {
     confimFlag.value = route.query.confirm
 

src/views/user/orderManagementCz/index.vue

@@ -27,14 +27,19 @@
     }
 
     /* 确认按钮 */
-    const confirmBtn = () => {
+    const confirmBtn = (row:any) => {
-        router.push('/myuser/orderConfirm')
+        router.push({ name: 'orderConfirm',query:{
+            orderId:row.orderId
+        } })
+        
     }
 
     /* 查看按钮 */
-    const clickPreviewDetails = () => {
+    const clickPreviewDetails = (row:any) => {
         console.log('查看')
-        router.push({ name: 'orderDetails' })
+        router.push({ name: 'orderDetails',query:{
+            orderId:row.orderId
+        } })
     }
 
     const tableData: any = ref([{ address: '客户单位' }])
@@ -93,7 +98,7 @@
             <el-table-column align="center" prop="name" label="操作" width="260px">
                 <template #default="{ row }">
                     <el-button size="small" type="primary" @click="confirmBtn(row)">确认</el-button>
-                    <el-button size="small" type="warning" @click="clickPreviewDetails">
+                    <el-button size="small" type="warning" @click="clickPreviewDetails(row)">
                         查看
                     </el-button>
                     <el-button size="small" type="danger">删除</el-button>