bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hongchao-dev'

This commit is contained in:
hongchao 2024-12-16 18:36:13 +08:00
parent 33b004bbe3 640ef4c3b3
commit 66d0cac1a4
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/user/goodsManagement/index.vue
View File

@ -417,7 +417,10 @@ const dialogTypeChange = async () => {
propertyNames.value = [] propertyNames.value = []
} else { } else {
propertyNames.value = [] 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) => { deviceTypeList[0].data.maTypeProperties.forEach((item: any) => {
options.value.push({ label: item.propertyName, value: item.propertyName }) options.value.push({ label: item.propertyName, value: item.propertyName })
}) })
@ -659,9 +662,11 @@ const submitFun = (type: any) => {
let SEND_FUN_API: any = null let SEND_FUN_API: any = null
if (type == 1) { if (type == 1) {
SEND_FUN_API = equipmentAddApi SEND_FUN_API = equipmentAddApi
addAndEditForm.maStatus = 1
} }
if (type == 2) { if (type == 2) {
SEND_FUN_API = insertDraftApi SEND_FUN_API = equipmentAddApi
addAndEditForm.maStatus = 0
} }
if (type == 3) { if (type == 3) {
SEND_FUN_API = equipmentEditApi SEND_FUN_API = equipmentEditApi

12
src/views/user/orderManagement/components/order-home.vue
View File

@ -3,7 +3,7 @@ import { ref } from 'vue'
import PagingComponent from 'components/PagingComponent/index.vue' import PagingComponent from 'components/PagingComponent/index.vue'
import Empty from 'components/Empty/index.vue' import Empty from 'components/Empty/index.vue'
import { useRouter } from 'vue-router' 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 TitleTip from 'components/TitleTip/index.vue'
import { getOverhaulApi } from 'http/api/rent-termination/index' import { getOverhaulApi } from 'http/api/rent-termination/index'
import uploadComponent from 'components/uploadComponent/index.vue' import uploadComponent from 'components/uploadComponent/index.vue'
@ -336,11 +336,11 @@ const handleViewWord = async(index: Number, row: any) => {
picList: [], picList: [],
} }
const orderId = row.orderId const orderId = row.orderId
// const res: any = await getContractDetailApi({ orderId }) const res: any = await getContractDetailApi({ orderId })
// cardList.value = res.rows // 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 dialogFormVisibleSettleWord.value = true
setTimeout(() => { setTimeout(() => {
const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm")); const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm"));
@ -360,7 +360,9 @@ const handleViewWord = async(index: Number, row: any) => {
} }
// 下载合同为 Word 文件 // 下载合同为 Word 文件
const downloadContract = () => {} const downloadContract = () => {
window.location.href = wordUrl.value;
}
const confirmFail = async (index: number) => { const confirmFail = async (index: number) => {
ElMessageBox.confirm('是否确定取消订单？', { ElMessageBox.confirm('是否确定取消订单？', {