冲突提交

components.d.ts

@@ -8,11 +8,21 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
+<<<<<<< HEAD
+=======
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+>>>>>>> dev-songyang
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+<<<<<<< HEAD
+=======
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+>>>>>>> dev-songyang
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']

env.d.ts

@@ -1,2 +1,3 @@
 /// <reference types="vite/client" />
 declare module "nprogress"
+

src/components/Navmenu/index.vue

@@ -11,7 +11,7 @@
         { name: '企业专区', routerName: '/home' }
     ]
 
-    const navMenuClick = (name) => {
+    const navMenuClick = (name: any) => {
         router.push({ name })
     }
 </script>

src/router/index.ts

@@ -80,7 +80,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/equipList',
                 name: 'equipList',
-                component: () => import('@/views/equip/list.vue'),
+                component: () => import('views/equip/list.vue'),
                 meta: {
                     title: ''
                 }

src/views/EnterpriseCertification.vue

@@ -327,7 +327,7 @@
                     </el-col>
                     <el-col :span="5">
                         <el-form-item label="被授权人邮箱">
-                            <el-input></el-input>
+                            <el-input placeholder="请输入被授权人邮箱" clearable>></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -405,14 +405,14 @@
         </div>
 
         <div class="bankInfo card">
-            <div class="top">
+            <!-- <div class="top">
                 <div class="title">
                     银行账号信息
                     <span class="tip">开户行许可示例</span>
                 </div>
             </div>
 
-           <!--  <el-table border :data="bankTableList">
+            <el-table border :data="bankTableList">
                 <el-table-column align="center" label="开户行">
                     <template #default="{ row }">
                         <el-input v-model="row.v_kaihu"></el-input>

src/views/user/orderManagement/index.vue

@@ -44,9 +44,14 @@
     }
 
     /* 续租按钮 */
-    const clickRenewalOfLease = () => {
+    const clickRenewalOfLease = ({ row }: any) => {
-        console.log('续租')
+        console.log('续租', row)
-        router.push({ name: 'renewalOfLease' })
+        router.push({
+            name: 'renewalOfLease',
+            query: {
+                orderId: row.orderId
+            }
+        })
     }
 
     /* 确认收货 */
@@ -108,7 +113,7 @@
         <el-table-column align="center" prop="time" label="订单创建日期" />
         <el-table-column align="center" prop="payType" label="装备类型" />
         <el-table-column align="center" prop="deviceName" label="装备名称" />
-        <el-table-column align="center" prop="orderStatus" label="订单状态">
+        <el-table-column align="center" label="订单状态">
             <template #default="{ row }">
                 <el-tag v-if="row.orderStatus == 31">待确认</el-tag>
                 <el-tag v-if="row.orderStatus == 32">待合同上传</el-tag>
@@ -118,12 +123,28 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="320px">
             <template #default="scope">
-                <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">查看</el-button>
+                <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
-                <el-button size="small" type="danger" @click="clickRentingTermination"  v-if="scope.row.orderStatus == 36">
+                    查看
+                </el-button>
+                <el-button
+                    size="small"
+                    type="danger"
+                    @click="clickRentingTermination"
+                    v-if="scope.row.orderStatus == 36">
                     退租
                 </el-button>
-                <el-button size="small" type="warning" @click="clickRenewalOfLease"   v-if="scope.row.orderStatus == 36">续租</el-button>
+                <el-button
-                <el-button size="small" type="success" @click="clickConfirmReceipt(scope.row)"   v-if="scope.row.orderStatus == 35">
+                    size="small"
+                    type="warning"
+                    @click="clickRenewalOfLease"
+                    v-if="scope.row.orderStatus == 36">
+                    续租
+                </el-button>
+                <el-button
+                    size="small"
+                    type="success"
+                    @click="clickConfirmReceipt(scope.row)"
+                    v-if="scope.row.orderStatus == 35">
                     确认收货
                 </el-button>
             </template>

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

@@ -19,7 +19,7 @@
     <!-- 退租页面 -->
     <el-page-header @back="goBack" @click="$router.go(-1)">
         <template #content>
-            <span>退租</span>
+            <span>续租</span>
         </template>
     </el-page-header>
 

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

@@ -4,8 +4,12 @@
         <el-divider />
         <div class="timelineProcessBox">
             <el-timeline class="timeline" :color="props.themeColor">
-                <el-timeline-item class="lineitem" :class="item.done ? 'active' : 'inactive'"
+                <el-timeline-item
-                    v-for="(item, index) in props.timeLineList" :key="index" :timestamp="item.content">
+                    class="lineitem"
+                    :class="item.done ? 'active' : 'inactive'"
+                    v-for="(item, index) in props.timeLineList"
+                    :key="index"
+                    :timestamp="item.content">
                     <div>
                         {{ item.title }}
                     </div>
@@ -15,8 +19,7 @@
     </div>
 </template>
 <script lang="ts" setup>
- 
+    const props: any = defineProps({
-const props = defineProps({
         themeColor: {
             type: String,
             default: '#2282fe'
@@ -28,7 +31,6 @@ const props = defineProps({
             }
         }
     })
-
 </script>
 <style lang="scss" scoped>
     .processBox {

src/views/user/orderManagementCz/index.vue

@@ -3,12 +3,12 @@
     const queryParams = ref({})
     import PagingComponent from 'components/PagingComponent/index.vue'
     import { getOrderListApi } from 'http/api/usercenter/seekorder'
-    import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+    // import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 
     const router = useRouter()
 
-    const pageSize = ref(20)
+    const pageSize: any = ref(20)
-    const pageNumber = ref(1)
+    const pageNumber: any = ref(1)
     const total: any = ref(0)
 
     // 获取数据列表
@@ -28,18 +28,23 @@
 
     /* 确认按钮 */
     const confirmBtn = (row: any) => {
-        router.push({ name: 'orderConfirm',query:{
+        router.push({
+            name: 'orderConfirm',
+            query: {
                 orderId: row.orderId
-        } })
+            }
-        
+        })
     }
 
     /* 查看按钮 */
     const clickPreviewDetails = (row: any) => {
         console.log('查看')
-        router.push({ name: 'orderDetails',query:{
+        router.push({
+            name: 'orderDetails',
+            query: {
                 orderId: row.orderId
-        } })
+            }
+        })
     }
 
     const tableData: any = ref([{ address: '客户单位' }])
@@ -50,7 +55,6 @@
 <template>
     <!-- 订单管理(承租方) -->
 
-    <el-config-provider :locale="zhCn">
     <el-form :model="queryParams" :inline="true" size="small">
         <el-form-item label="订单编号：" prop="menuName">
             <el-input />
@@ -97,12 +101,28 @@
         <el-table-column align="center" prop="orderStatus" label="订单状态" />
         <el-table-column align="center" prop="name" label="操作" width="260px">
             <template #default="{ row }">
-                    <el-button size="small" type="primary" @click="confirmBtn(row)" v-if="row.orderStatus==31">确认</el-button>
+                <el-button
-                    <el-button size="small" type="warning" @click="clickPreviewDetails(row)"  v-if="row.orderStatus!=31">
+                    size="small"
+                    type="primary"
+                    @click="confirmBtn(row)"
+                    v-if="row.orderStatus == 31">
+                    确认
+                </el-button>
+                <el-button
+                    size="small"
+                    type="warning"
+                    @click="clickPreviewDetails(row)"
+                    v-if="row.orderStatus != 31">
                     查看
                 </el-button>
-                    <el-button size="small" type="danger"  v-if="row.orderStatus=39">删除</el-button>
+                <el-button size="small" type="danger" v-if="(row.orderStatus = 39)">删除</el-button>
-                    <el-button size="small" type="success" @click="settlementBtn" v-if="row.orderStatus=34">结算</el-button>
+                <el-button
+                    size="small"
+                    type="success"
+                    @click="settlementBtn"
+                    v-if="(row.orderStatus = 34)">
+                    结算
+                </el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -112,7 +132,6 @@
         :pageSize="pageSize"
         :pageNumber="pageNumber"
         :total="total" />
-    </el-config-provider>
 </template>
 
 <style>