diff --git a/components.d.ts b/components.d.ts index 847a883..cb2d9f6 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,11 +8,16 @@ export {} declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] + ElBadge: typeof import('element-plus/es')['ElBadge'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] 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'] ElForm: typeof import('element-plus/es')['ElForm'] @@ -20,7 +25,6 @@ declare module 'vue' { ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] @@ -30,7 +34,6 @@ declare module 'vue' { ElSelect: typeof import('element-plus/es')['ElSelect'] ElStep: typeof import('element-plus/es')['ElStep'] ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index d6e2115..0cbdd2b 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -3,7 +3,13 @@ import { ref } from 'vue' import PagingComponent from 'components/PagingComponent/index.vue' import Empty from 'components/Empty/index.vue' import { useRouter } from 'vue-router' -import { getOrderListApi, passApi, failApi, confirmPriceApi, getContractDetailApi, } from 'http/api/usercenter/seekorder' +import { + getOrderListApi, + passApi, + failApi, + confirmPriceApi, + getContractDetailApi, +} from 'http/api/usercenter/seekorder' import TitleTip from 'components/TitleTip/index.vue' import { getOverhaulApi } from 'http/api/rent-termination/index' import uploadComponent from 'components/uploadComponent/index.vue' @@ -13,8 +19,8 @@ import { useStore } from 'store/user' import type { FormInstance } from 'element-plus' const store = useStore() import { mainStore } from 'store/main' -import jsPreviewDocx from "@js-preview/docx"; -import "@js-preview/docx/lib/index.css"; +import jsPreviewDocx from '@js-preview/docx' +import '@js-preview/docx/lib/index.css' const store2 = mainStore() const overhaulDetails = ref({}) @@ -322,11 +328,11 @@ const tableData4: any = ref([ }, ]) -const wordUrl = ref("") +const wordUrl = ref('') const settleWordTitle = ref('') const dialogFormVisibleSettleWord: any = ref(false) //租赁协议 -const handleViewWord = async(index: Number, row: any) => { +const handleViewWord = async (index: Number, row: any) => { settleWordTitle.value = '租赁协议' moneyParams1.value = { /* 设备状态 */ @@ -339,29 +345,27 @@ const handleViewWord = async(index: Number, row: any) => { const res: any = await getContractDetailApi({ orderId }) // cardList.value = res.rows // 打开租赁协议弹框 - wordUrl.value = res.data.url + wordUrl.value = res.data.url dialogFormVisibleSettleWord.value = true dialogFormVisibleSettleWord.value = true setTimeout(() => { - const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm")); - //传递要预览的文件地址即可 - myDocxPreviewer - .preview( - wordUrl.value - ) - .then((res) => { - console.log("预览完成"); - }) - .catch((e) => { - console.log('1111', wordUrl.value) - console.log("预览失败", e); - }); - }, 1000); + const myDocxPreviewer = jsPreviewDocx.init(document.getElementById('mmm')) + //传递要预览的文件地址即可 + myDocxPreviewer + .preview(wordUrl.value) + .then((res) => { + console.log('预览完成') + }) + .catch((e) => { + console.log('1111', wordUrl.value) + console.log('预览失败', e) + }) + }, 1000) } // 下载合同为 Word 文件 const downloadContract = () => { - window.location.href = wordUrl.value; + window.location.href = wordUrl.value } const confirmFail = async (index: number) => { @@ -652,7 +656,9 @@ const costSubmit = () => { 租期 - {{ goods.days }}{{ ' ' + '天' }} + {{ goods.days }}{{ ' ' + '天' }} + 编号 + {{ goods.code }} 租金 @@ -757,7 +763,7 @@ const costSubmit = () => { > 订单详情 - + 租赁协议 @@ -1319,17 +1325,17 @@ const costSubmit = () => { :close-on-click-modal="false" > - + -
- - 关 闭 - 下载 - +
+ + 关 闭 + 下载 +
-
+
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue index 00204cc..0b97f67 100644 --- a/src/views/user/orderManagementCz/components/order-home.vue +++ b/src/views/user/orderManagementCz/components/order-home.vue @@ -18,8 +18,8 @@ import type { FormInstance } from 'element-plus' import { useStore } from 'store/user' const store = useStore() import { mainStore } from 'store/main' -import jsPreviewDocx from "@js-preview/docx"; -import "@js-preview/docx/lib/index.css"; +import jsPreviewDocx from '@js-preview/docx' +import '@js-preview/docx/lib/index.css' const store2 = mainStore() /* 查询参数 *** **** @@ -629,23 +629,21 @@ const handleViewWord = async (index: Number, row: any) => { const res: any = await getContractDetailApi({ orderId }) // cardList.value = res.rows // 打开租赁协议弹框 - wordUrl.value = res.data.url + wordUrl.value = res.data.url dialogFormVisibleSettleWord.value = true setTimeout(() => { - const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm")); - //传递要预览的文件地址即可 - myDocxPreviewer - .preview( - wordUrl.value - ) - .then((res) => { - console.log("预览完成"); - }) - .catch((e) => { - console.log('1111', wordUrl.value) - console.log("预览失败", e); - }); - }, 1000); + const myDocxPreviewer = jsPreviewDocx.init(document.getElementById('mmm')) + //传递要预览的文件地址即可 + myDocxPreviewer + .preview(wordUrl.value) + .then((res) => { + console.log('预览完成') + }) + .catch((e) => { + console.log('1111', wordUrl.value) + console.log('预览失败', e) + }) + }, 1000) } const contract = ref({ @@ -656,12 +654,10 @@ const contract = ref({ // 下载合同为 Word 文件 const downloadContract = () => { - window.location.href = wordUrl.value; + window.location.href = wordUrl.value } -const wordUrl = ref("") - - +const wordUrl = ref('') @@ -2279,8 +2277,8 @@ const wordUrl = ref("") } } } -#mmm{ - width:100%; +#mmm { + width: 100%; height: 500px; }