冲突合并
This commit is contained in:
BianLzhaoMin
commit
0c0765ed6e
File diff suppressed because it is too large
Load Diff
|
|
@ -32,6 +32,7 @@
|
|||
"vue": "^3.3.4",
|
||||
"vue-demi": "^0.14.10",
|
||||
"vue-qrcode": "^2.2.2",
|
||||
"vue-quill-editor": "^3.0.6",
|
||||
"vue-router": "^4.2.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
|
|||
|
|
@ -216,6 +216,60 @@
|
|||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 新增和修改弹框 -->
|
||||
<el-dialog
|
||||
v-model="dialogVisibleSettleinEdit"
|
||||
:title="settleinTitle"
|
||||
width="40%"
|
||||
destroy-on-close
|
||||
class="centered-dialog"
|
||||
:close-on-click-modal="false"
|
||||
@close="onDialogClose"
|
||||
>
|
||||
<el-form
|
||||
label-width="140px"
|
||||
ref="addAndEditFormRef"
|
||||
label-position="right"
|
||||
:model="addAndEditForm"
|
||||
:rules="addAndEditFormRules"
|
||||
>
|
||||
<el-row style="font-weight:bold">
|
||||
<el-col><span>资讯信息</span></el-col>
|
||||
<el-divider></el-divider>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="14">
|
||||
<el-form-item label="资讯标题" prop="xwbt">
|
||||
<el-input v-model="dataForm.xwbt" placeholder="请输入资讯标题"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="副标题" prop="fbt">
|
||||
<el-input v-model="dataForm.fbt" placeholder="请输入副标题"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="内容" prop="nr" >
|
||||
<QuillEditor v-model="dataForm.nr" class="editor" :options="editorOption" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" class="primary-lease" @click="onCancel"
|
||||
>取消</el-button
|
||||
>
|
||||
<el-button class="primary-lease" type="primary" @click="onSubmit()">
|
||||
提交
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
|
|
@ -232,6 +286,12 @@ import { ref } from 'vue'
|
|||
import { useStore } from 'store/user'
|
||||
const store = useStore()
|
||||
import { mainStore } from 'store/main'
|
||||
// 引入富文本组件
|
||||
import QuillEditor from 'vue-quill-editor'
|
||||
// 引入富文本组件样式
|
||||
import 'quill/dist/quill.core.css'
|
||||
import 'quill/dist/quill.snow.css'
|
||||
import 'quill/dist/quill.bubble.css'
|
||||
const store2 = mainStore()
|
||||
const isViewForm = ref(false)
|
||||
|
||||
|
|
@ -320,6 +380,7 @@ const addAndEditFormRef = ref()
|
|||
const settleinTitle = ref('')
|
||||
// 合同新增弹框显示隐藏
|
||||
const dialogVisibleSettlein: any = ref(false)
|
||||
const dialogVisibleSettleinEdit: any = ref(false)
|
||||
// 合同新增
|
||||
const addContract = () => {
|
||||
settleinTitle.value = '合同新建'
|
||||
|
|
@ -332,7 +393,7 @@ const onContract = (row: any) => {
|
|||
addAndEditForm.value.contractName = row.contractName
|
||||
console.log('2222',addAndEditForm.value.contractName)
|
||||
settleinTitle.value = '合同修改'
|
||||
dialogVisibleSettlein.value = true
|
||||
dialogVisibleSettleinEdit.value = true
|
||||
}
|
||||
|
||||
const onDialogClose = () => {
|
||||
|
|
@ -400,6 +461,40 @@ const onCancel = () => {
|
|||
dialogVisibleSettlein.value = false
|
||||
}
|
||||
|
||||
const myQuillEditor = ref()
|
||||
|
||||
// 工具栏配置
|
||||
const toolbarOptions = ref<any>([
|
||||
['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
|
||||
['blockquote', 'code-block'], // 引用 代码块
|
||||
[{ header: 1 }, { header: 2 }], // 1、2 级标题
|
||||
[{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
|
||||
[{ script: 'sub' }, { script: 'super' }], // 上标/下标
|
||||
[{ indent: '-1' }, { indent: '+1' }], // 缩进
|
||||
// [{'direction': 'rtl'}], // 文本方向
|
||||
[{ size: ['small', false, 'large', 'huge'] }], // 字体大小
|
||||
[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
|
||||
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
|
||||
[{ font: [] }], // 字体种类
|
||||
[{ align: [] }], // 对齐方式
|
||||
])
|
||||
|
||||
const editorOption = ref<any>({ // 编辑框操作事件
|
||||
theme: 'snow', // or 'bubble'
|
||||
placeholder: '请输入资讯内容...',
|
||||
modules: {
|
||||
toolbar: {
|
||||
container: toolbarOptions,
|
||||
}
|
||||
}
|
||||
})
|
||||
const dataForm = ref<any>( {
|
||||
id: '',
|
||||
xwbt: '',
|
||||
fbt: '',
|
||||
nr: '222222',
|
||||
flag: '',
|
||||
})
|
||||
onMounted(() => {
|
||||
getContractListData()
|
||||
// getEquipmentTypeApi().then((res: any) => {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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('是否确定取消订单？', {
|
||||
|
|
|
|||
Loading…
Reference in New Issue