diff --git a/base-vue/src/utils/lodop/LodopFuncs.js b/base-vue/src/utils/lodop/LodopFuncs.js index 9e0566b..796702b 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.30:8000/CLodopfuncs.js?priority=2' +oscript.src = 'http://localhost:8000/CLodopfuncs.js?priority=2' head.insertBefore(oscript, head.firstChild) // 加载双端口(8000和18000）避免其中某个端口被占用： oscript = document.createElement('script') -oscript.src = 'http://192.168.10.30:18000/CLodopfuncs.js?priority=1' +oscript.src = 'http://localhost:18000/CLodopfuncs.js?priority=1' head.insertBefore(oscript, head.firstChild) // 下载loadLodop diff --git a/base-vue/src/views/modules/contract/contract-add-or-update.vue b/base-vue/src/views/modules/contract/contract-add-or-update.vue index abaf581..8b097a0 100644 --- a/base-vue/src/views/modules/contract/contract-add-or-update.vue +++ b/base-vue/src/views/modules/contract/contract-add-or-update.vue @@ -3,39 +3,230 @@ :title="!dataForm.contractId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 选择物料 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 取消 - 确定 + 取消 + 确定 + + + + + + + 查询 + + + + + + + + + + + + + + + + + + + + + + 取消 + 确定 + + @@ -44,50 +235,63 @@ data () { return { visible: false, + innerVisible: false, + contractTypeOpt: [], + clientIdOpt: [], dataForm: { contractId: 0, contractType: '', - isMaster: '', + isMaster: 0, contractNumber: '', clientId: '', materialJson: '', - isAcceptance: '', - createTime: '', - acceptanceTime: '', + isAcceptance: 0, remarks: '' }, dataRule: { contractType: [ { required: true, message: '合同类型不能为空', trigger: 'blur' } ], - isMaster: [ - { required: true, message: '是否是主合同不能为空', trigger: 'blur' } - ], contractNumber: [ { required: true, message: '合同编号不能为空', trigger: 'blur' } ], clientId: [ - { required: true, message: '客户id不能为空', trigger: 'blur' } + { required: true, message: '客户不能为空', trigger: 'blur' } ], materialJson: [ { required: true, message: '物料信息不能为空', trigger: 'blur' } - ], - isAcceptance: [ - { required: true, message: '是否验收不能为空', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '创建日期不能为空', trigger: 'blur' } - ], - acceptanceTime: [ - { required: true, message: '创建日期不能为空', trigger: 'blur' } - ], - remarks: [ - { required: true, message: '备注不能为空', trigger: 'blur' } ] - } + }, + innerDataForm: { + key: '' + }, + dataList: [], + pageIndex: 1, + pageSize: 10, + totalPage: 0, + dataListLoading: false, + dataListSelections: [], + materData: [{materialName: 'aaa'}] } }, + created () { + this.getDictDetail() + }, methods: { + getDictDetail () { + this.$http({ + url: this.$http.adornUrl('/api/dict/dictDetail?code=contract_type&page=0&size=9999'), + method: 'get' + }).then(({data}) => { + this.contractTypeOpt = [...data.content] + }) + this.$http({ + url: this.$http.adornUrl('/client/client/list?page=0&limit=9999'), + method: 'get' + }).then(({data}) => { + this.clientIdOpt = data.page.list + }) + }, init (id) { this.dataForm.contractId = id || 0 this.visible = true @@ -106,14 +310,16 @@ this.dataForm.clientId = data.contract.clientId this.dataForm.materialJson = data.contract.materialJson this.dataForm.isAcceptance = data.contract.isAcceptance - this.dataForm.createTime = data.contract.createTime - this.dataForm.acceptanceTime = data.contract.acceptanceTime this.dataForm.remarks = data.contract.remarks } }) } }) }, + addMaterial () { + this.innerVisible = true + this.getDataList() + }, // 表单提交 dataFormSubmit () { this.$refs['dataForm'].validate((valid) => { @@ -129,8 +335,6 @@ 'clientId': this.dataForm.clientId, 'materialJson': this.dataForm.materialJson, 'isAcceptance': this.dataForm.isAcceptance, - 'createTime': this.dataForm.createTime, - 'acceptanceTime': this.dataForm.acceptanceTime, 'remarks': this.dataForm.remarks }) }).then(({data}) => { @@ -150,7 +354,58 @@ }) } }) + }, + // 获取数据列表 + getDataList () { + this.dataListLoading = true + this.$http({ + url: this.$http.adornUrl('/material/material/list'), + method: 'get', + params: this.$http.adornParams({ + 'page': this.pageIndex, + 'limit': this.pageSize, + 'key': this.dataForm.key + }) + }).then(({data}) => { + if (data && data.code === 0) { + this.dataList = data.page.list + this.totalPage = data.page.totalCount + } else { + this.dataList = [] + this.totalPage = 0 + } + this.dataListLoading = false + }) + }, + // 每页数 + sizeChangeHandle (val) { + this.pageSize = val + this.pageIndex = 1 + this.getDataList() + }, + // 当前页 + currentChangeHandle (val) { + this.pageIndex = val + this.getDataList() + }, + // 多选 + selectionChangeHandle (val) { + this.dataListSelections = val + }, + innerSubmit () { + this.innerVisible = false + this.materData = [...this.materData, ...this.dataListSelections] + }, + deleteHandle(index) { + this.materData.splice(index, 1) } } } + + diff --git a/base-vue/src/views/modules/contract/contract.vue b/base-vue/src/views/modules/contract/contract.vue index f9f7ca1..7b3fa99 100644 --- a/base-vue/src/views/modules/contract/contract.vue +++ b/base-vue/src/views/modules/contract/contract.vue @@ -1,6 +1,6 @@