diff --git a/base-vue/src/utils/lodop/LodopFuncs.js b/base-vue/src/utils/lodop/LodopFuncs.js index 2d27e23..9e0566b 100644 --- a/base-vue/src/utils/lodop/LodopFuncs.js +++ b/base-vue/src/utils/lodop/LodopFuncs.js @@ -5,11 +5,11 @@ var head = document.head || document.getElementsByTagName('head')[0] || document var oscript = document.createElement('script') // 让本机的浏览器打印(更优先一点)： oscript = document.createElement('script') -oscript.src = 'http://192.168.10.54:8000/CLodopfuncs.js?priority=2' +oscript.src = 'http://192.168.10.30:8000/CLodopfuncs.js?priority=2' head.insertBefore(oscript, head.firstChild) // 加载双端口(8000和18000）避免其中某个端口被占用： oscript = document.createElement('script') -oscript.src = 'http://192.168.10.54:18000/CLodopfuncs.js?priority=1' +oscript.src = 'http://192.168.10.30:18000/CLodopfuncs.js?priority=1' head.insertBefore(oscript, head.firstChild) // 下载loadLodop @@ -28,7 +28,7 @@ function getLodop() { } //设置打印版权 LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '') - LODOP.SET_SHOW_MODE('SETUP_ENABLESS', '11111111100001') + LODOP.SET_SHOW_MODE('SETUP_ENABLESS', '10000000000000') return LODOP } catch (err) { MessageBox({ diff --git a/base-vue/src/views/modules/client/client-add-or-update.vue b/base-vue/src/views/modules/client/client-add-or-update.vue index d5e91d5..e36ddae 100644 --- a/base-vue/src/views/modules/client/client-add-or-update.vue +++ b/base-vue/src/views/modules/client/client-add-or-update.vue @@ -17,10 +17,11 @@ - - - - + @@ -41,8 +42,7 @@ juridicalPerson: '', address: '', industry: '', - isOn: '', - createTime: '' + isOn: false }, dataRule: { clientName: [ @@ -56,12 +56,6 @@ ], industry: [ { required: true, message: '行业不能为空', trigger: 'blur' } - ], - isOn: [ - { required: true, message: '是否启用不能为空', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '创建日期不能为空', trigger: 'blur' } ] } } diff --git a/base-vue/src/views/modules/contract/contract.vue b/base-vue/src/views/modules/contract/contract.vue index 261ead7..f9f7ca1 100644 --- a/base-vue/src/views/modules/contract/contract.vue +++ b/base-vue/src/views/modules/contract/contract.vue @@ -143,7 +143,7 @@ getDataList () { this.dataListLoading = true this.$http({ - url: this.$http.adornUrl('/tickets/contract/list'), + url: this.$http.adornUrl('/flow/contract/list'), method: 'get', params: this.$http.adornParams({ 'page': this.pageIndex, diff --git a/base-vue/src/views/modules/contract/temp-add-or-update.vue b/base-vue/src/views/modules/contract/temp-add-or-update.vue index f91b748..647e233 100644 --- a/base-vue/src/views/modules/contract/temp-add-or-update.vue +++ b/base-vue/src/views/modules/contract/temp-add-or-update.vue @@ -15,14 +15,14 @@

一、产品明细单

- - - - - - - - + + + + + + + + @@ -87,7 +87,7 @@ export default { data () { return { visible: false, - dataList: [{materialCode: 'S9410002000002'}] + dataList: [{materialCode: 'S9410002000002'}, {materialCode: 'S9410002000003'}] } }, methods: { @@ -99,15 +99,9 @@ export default { // 打印 addAndPrint () { const LODOP = getLodop() - LODOP.PRINT_INIT("打印合同模板") - // 设置纸张大小为 A4 + LODOP.PRINT_INITA("0mm", "0mm", "210mm", "297mm", "打印合同模板") LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4") - LODOP.SET_SHOW_MODE("BKIMG_IN_PREVIEW", 1) - LODOP.SET_SHOW_MODE("SETUP_ENABLES", "11111111100001") - LODOP.ADD_PRINT_SETUP_BKIMG("./bg.jpg") LODOP.ADD_PRINT_TEXT(0, 0, 700, 50, "产品供应合同") - LODOP.SET_PRINT_STYLEA(0, "Alignment", 2); // 2 表示水平居中 - LODOP.SET_PRINT_STYLEA(0, "FontSize", 12); // 设置字号为 12 // 获取弹窗内容并转换为 HTML 字符串 const popupContent = document.getElementById('popupContent').innerHTML const printHtml = ` @@ -116,12 +110,12 @@ export default { .zd-col-12 {width: 50%;} .dialog_content {width: 100%;} .det_table {width: 100%; border-collapse: collapse;border: 1px solid #000;} - .det_table th, .det_table td {border: 1px solid #000;font-size: 10px; line-height: 23px;} + .det_table th, .det_table td {border: 1px solid #000;font-size: 10px; line-height: 23px; padding: 0;} ${popupContent} ` // 添加弹窗内容到打印任务 - LODOP.ADD_PRINT_HTM(50, 50, "100%", "100%", printHtml) + LODOP.ADD_PRINT_HTM("0mm", "0mm", "RightMargin:0mm", "BottomMargin:0mm", printHtml) LODOP.PREVIEW()// 预览 }, } diff --git a/base-vue/src/views/modules/tickets/tickets-add-or-update.vue b/base-vue/src/views/modules/tickets/tickets-add-or-update.vue index ce8db49..9676432 100644 --- a/base-vue/src/views/modules/tickets/tickets-add-or-update.vue +++ b/base-vue/src/views/modules/tickets/tickets-add-or-update.vue @@ -3,37 +3,42 @@ :title="!dataForm.ticketsId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> - + - + + + + - + + + + - + - - - - + - - - - - - 取消 @@ -47,6 +52,8 @@ data () { return { visible: false, + carTypeOpt: [], + errorTypeOpt: [], dataForm: { ticketsId: null, carType: '', @@ -54,11 +61,8 @@ contractNumber: '', clientId: '', description: '', - deptPeople: '', deptPhone: '', - isCheck: '', - status: '', - updateTime: '' + isCheck: '' }, dataRule: { carType: [ @@ -67,29 +71,11 @@ errorType: [ { required: true, message: '异常类型不能为空', trigger: 'blur' } ], - contractNumber: [ - { required: true, message: '合同编号不能为空', trigger: 'blur' } - ], clientId: [ { required: true, message: '客户id不能为空', trigger: 'blur' } ], description: [ { required: true, message: '故障描述不能为空', trigger: 'blur' } - ], - deptPeople: [ - { required: true, message: '部门对接人不能为空', trigger: 'blur' } - ], - deptPhone: [ - { required: true, message: '客户联系电话不能为空', trigger: 'blur' } - ], - isCheck: [ - { required: true, message: '是否验收不能为空', trigger: 'blur' } - ], - status: [ - { required: true, message: '工单状态不能为空', trigger: 'blur' } - ], - updateTime: [ - { required: true, message: '工单关闭时间不能为空', trigger: 'blur' } ] } } @@ -100,10 +86,16 @@ methods: { getDictDetail () { this.$http({ - url: this.$http.adornUrl('/api/dict/dictDetail?code=DEMAND_TYPE'), + url: this.$http.adornUrl('/api/dict/dictDetail?code=car_type&page=0&size=9999'), + method: 'get' + }).then(({data}) => { + this.carTypeOpt = [...data.content] + }) + this.$http({ + url: this.$http.adornUrl('/api/dict/dictDetail?code=error_type&page=0&size=9999'), method: 'get' }).then(({data}) => { - console.log(data) + this.errorTypeOpt = [...data.content] }) }, init (id) { @@ -123,11 +115,8 @@ this.dataForm.contractNumber = data.tickets.contractNumber this.dataForm.clientId = data.tickets.clientId this.dataForm.description = data.tickets.description - this.dataForm.deptPeople = data.tickets.deptPeople this.dataForm.deptPhone = data.tickets.deptPhone this.dataForm.isCheck = data.tickets.isCheck - this.dataForm.status = data.tickets.status - this.dataForm.updateTime = data.tickets.updateTime } }) } @@ -140,19 +129,7 @@ this.$http({ url: this.$http.adornUrl(`/tickets/tickets/${!this.dataForm.ticketsId ? 'save' : 'update'}`), method: 'post', - data: this.$http.adornData({ - 'ticketsId': this.dataForm.ticketsId || undefined, - 'carType': this.dataForm.carType, - 'errorType': this.dataForm.errorType, - 'contractNumber': this.dataForm.contractNumber, - 'clientId': this.dataForm.clientId, - 'description': this.dataForm.description, - 'deptPeople': this.dataForm.deptPeople, - 'deptPhone': this.dataForm.deptPhone, - 'isCheck': this.dataForm.isCheck, - 'status': this.dataForm.status, - 'updateTime': this.dataForm.updateTime - }) + data: this.$http.adornData(this.dataForm) }).then(({data}) => { if (data && data.code === 0) { this.$message({
物料编号物料名称型号数量单位单价（元）总价（元）备注物料编号物料名称型号数量单位单价（元）总价（元）备注
{{ e.materialCode }}