diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index f583492..f6fe081 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -417,7 +417,10 @@ const dialogTypeChange = async () => { propertyNames.value = [] } else { propertyNames.value = [] - propertyNames.value = deviceTypeList[0].data.maTypeProperties + deviceTypeList[0].data.maTypeProperties.forEach((item: any) => { + propertyNames.value.push({ propertyName: item.propertyName, propertyValue: '' }) + }) + // propertyNames.value = deviceTypeList[0].data.maTypeProperties deviceTypeList[0].data.maTypeProperties.forEach((item: any) => { options.value.push({ label: item.propertyName, value: item.propertyName }) }) @@ -659,9 +662,11 @@ const submitFun = (type: any) => { let SEND_FUN_API: any = null if (type == 1) { SEND_FUN_API = equipmentAddApi + addAndEditForm.maStatus = 1 } if (type == 2) { - SEND_FUN_API = insertDraftApi + SEND_FUN_API = equipmentAddApi + addAndEditForm.maStatus = 0 } if (type == 3) { SEND_FUN_API = equipmentEditApi diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index 530ef01..d6e2115 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -3,7 +3,7 @@ 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 } 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' @@ -336,11 +336,11 @@ const handleViewWord = async(index: Number, row: any) => { picList: [], } const orderId = row.orderId - // const res: any = await getContractDetailApi({ orderId }) + const res: any = await getContractDetailApi({ orderId }) // cardList.value = res.rows - // 打开租赁协议弹框 - wordUrl.value = "http://127.0.0.1:29300/statics/2024/12/16/test_20241216154423A003.docx" + wordUrl.value = res.data.url + dialogFormVisibleSettleWord.value = true dialogFormVisibleSettleWord.value = true setTimeout(() => { const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm")); @@ -360,7 +360,9 @@ const handleViewWord = async(index: Number, row: any) => { } // 下载合同为 Word 文件 -const downloadContract = () => {} +const downloadContract = () => { + window.location.href = wordUrl.value; +} const confirmFail = async (index: number) => { ElMessageBox.confirm('是否确定取消订单?', {