冲突合并

Dockerfile

@@ -0,0 +1,18 @@
+FROM nginx:latest
+
+RUN mkdir -p /zlpt-front
+
+WORKDIR /zlpt-front
+
+
+COPY zrpt_front-sit/assets   /zlpt-front/assets
+COPY zrpt_front-sit/favicon.ico /zlpt-front/favicon.ico
+COPY zrpt_front-sit/index.html /zlpt-front/index.html
+
+RUN rm /usr/share/nginx/html/*
+
+RUN cp -r /zlpt-front/*  /usr/share/nginx/html/
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

components.d.ts

@@ -3,27 +3,33 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-export {}
+export { }
 
 declare module 'vue' {
-  export interface GlobalComponents {
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElCarousel: typeof import('element-plus/es')['ElCarousel']
-    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
-    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']
-    ElEmpty: typeof import('element-plus/es')['ElEmpty']
-    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']
+    export interface GlobalComponents {
+        ElButton: typeof import('element-plus/es')['ElButton']
+        ElCarousel: typeof import('element-plus/es')['ElCarousel']
+        ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+        ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+        ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+        ElCascader: typeof import('element-plus/es')['ElCascader']
+        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']
+        ElEmpty: typeof import('element-plus/es')['ElEmpty']
+        ElForm: typeof import('element-plus/es')['ElForm']
+        ElFormItem: typeof import('element-plus/es')['ElFormItem']
+        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']
+<<<<<<< HEAD
+        ElPagination: typeof import('element-plus/es')['ElPagination']
+        ElTable: typeof import('element-plus/es')['ElTable']
+        ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+=======
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
@@ -35,16 +41,17 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     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']
-    FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
-    Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
-    PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
-    UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
-    UploadImg: typeof import('./src/components/uploadImg.vue')['default']
-  }
+>>>>>>> dev-songyang
+        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']
+        FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
+        Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
+        PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
+        RouterLink: typeof import('vue-router')['RouterLink']
+        RouterView: typeof import('vue-router')['RouterView']
+        TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
+        UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
+        UploadImg: typeof import('./src/components/uploadImg.vue')['default']
+    }
 }

env/.env.dev

@@ -13,7 +13,7 @@ VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 # VITE_proxyTarget = 'http://10.40.92.253:8080'  # 牛 (个人中心 基础信息企业申请认证) 
 
 
-
+VITE_UPLOAD_URL='apiUpload
 
 
 

src/components/uploadComponent/index.vue

@@ -31,12 +31,12 @@
     import { ref, nextTick } from 'vue'
     import { ElMessage } from 'element-plus'
     import { Base64 } from 'js-base64'
-
+    import {apiUpload} from "http/api/myInfo"
     const props = defineProps({
         actionUrl: {
             //上传的地址
             type: String,
-            default: ''
+            default: ""
         },
         width: {
             //上传的地址

src/views/equip/detail.vue

@@ -248,18 +248,16 @@
 import ShowImg from './comoonents/showImg.vue'
 import {reactive, ref} from 'vue'
 import EquipCard from 'components/equipCard.vue'
-import {getDetail,getHotList,equipCollect,apiSubmitLease} from "@/http/api/equip"
+import {getDetail,getHotList,equipCollect,apiSubmitLease,apiGetAddressList} from "@/http/api/equip"
 import {useRoute, useRouter} from "vue-router";
 import Navmenu from '@/components/Navmenu/index.vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import equipDetailTable from '@/components/equipDetailTable.vue'
 import {ElMessage} from "element-plus";
-import address from "@/assets/temporaryAddress.json"
 
 const router = useRouter()
 const route = useRoute()
 
-const addressData = reactive(address)
 
 const pageParams = route.params
 //设备简略基本信息
@@ -399,7 +397,7 @@ const ruleForm = ref({
     entryTime: '',//进场时间
     duration: '',//工期时长
     machinist: 0,//是否需要机手
-    invoiceType: 0,//发票类型
+    invoiceType: '',//发票类型
     projectDescription: ''//项目说明
 })
 const rules = reactive({
@@ -462,30 +460,44 @@ const that = {
     openPdf
 }
 
+
 const addressCascader = {
     lazy:true,
     label:'name',
     value:'id',
-    lazyLoad(node,resolve){
-        const { level } = node
-        setTimeout(() => {
-           let nodes = []
-           if(level == 0){
-               nodes = addressData.province
-           }else if(level == 1){
-               nodes = addressData.city
-           }else if(level == 2){
-               nodes = addressData.county.map((item) => ({
-                   ...item,
-                   leaf:true
-               }))
-           }
-
-            resolve(nodes)
-        },1000)
+    lazyLoad: async (node,resolve) =>{
+        const { level,data } = node
+        let nodes = []
+        if(level == 0){
+            const arr = await getAddressData()
+            nodes = arr
+        }else if(level == 1){
+            const arr = await getAddressData(data.code)
+            nodes = arr
+        }else if(level == 2){
+            const arr = await getAddressData(data.code)
+            nodes = arr.map((item) => ({
+                ...item,
+                leaf:true
+            }))
+        }
+        resolve(nodes)
     }
 }
 
+
+//获取地址列表
+const getAddressData = async (code = '') => {
+    let params = {}
+    if(code){
+        params = { code }
+    }
+
+    const res = await apiGetAddressList(params)
+
+    return res.data || []
+}
+
 const handelDetailListClick = (fnName, arg) => {
     if (fnName) {
         that[fnName](arg)
@@ -529,7 +541,7 @@ const submit = async() => {
         realStartTime: ruleForm.value.entryTime,
         duration: ruleForm.value.duration,
         isMachinist: ruleForm.value.machinist,
-        invoiceType: -1,
+        invoiceType: ruleForm.value.invoiceType,
         description: ruleForm.value.projectDescription
     }
 
@@ -554,6 +566,7 @@ init()
 <style scoped lang="scss">
 :deep(.dialoglease){
     margin: 10px auto 0 !important;
+    min-width: 855px !important;
 }
 
 :deep(.el-form-item){

src/views/user/orderManagementCz/index.vue

@@ -83,48 +83,33 @@
         </el-form-item>
     </el-form>
 
-    <!-- 表格 -->
-    <el-table
-        :data="tableData"
-        :header-cell-style="{
-            background: '#3E98FF',
-            color: '#fff'
-        }"
-        fit>
-        <el-table-column align="center" prop="code" label="订单编号" />
-        <el-table-column align="center" prop="supplierCompany" label="客户单位" />
-        <el-table-column align="center" prop="time" label="订单创建日期" />
-        <el-table-column align="center" prop="orderPhone" label="联系方式" />
-        <el-table-column align="center" prop="typeName" label="装备类型" />
-        <el-table-column align="center" prop="deviceName" label="装备名称" />
-        <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
-                    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="success"
-                    @click="settlementBtn"
-                    v-if="(row.orderStatus = 34)">
-                    结算
-                </el-button>
-            </template>
-        </el-table-column>
-    </el-table>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData"
+            show-overflow-tooltip
+            :header-cell-style="{
+                background: '#3E98FF',
+                color: '#fff'
+            }"
+            fit>
+            <el-table-column align="center" prop="code" label="订单编号" />
+            <el-table-column align="center" prop="supplierCompany" label="客户单位" />
+            <el-table-column align="center" prop="time" label="订单创建日期" />
+            <el-table-column align="center" prop="orderPhone" label="联系方式" />
+            <el-table-column align="center" prop="typeName" label="装备类型" />
+            <el-table-column align="center" prop="deviceName" label="装备名称" />
+            <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 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="success" @click="settlementBtn" v-if="row.orderStatus=34">结算</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
     <PagingComponent
         @getList="getList"