diff --git a/src/api/purchase/goodsAccept.js b/src/api/purchase/goodsAccept.js new file mode 100644 index 00000000..59ea7a14 --- /dev/null +++ b/src/api/purchase/goodsAccept.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' +import { parseStrEmpty } from '@/utils/bonus' +// 查询新购验收任务列表 +export function getPurchaseList(query) { + return request({ + url: '/material/purchase_check_info/list', + method: 'get', + params: query + }) + } + +// 查询新购验收任务详细列表 +export function getPurchaseDetailsList(query) { + return request({ + url: '/material/purchase_check_info/getInfo', + method: 'get', + params: query + }) +} + +// 外层批量验收合格API +export function acceptancePurchase(data) { + return request({ + url: '/material/purchase_check_info/acceptance', + method: 'post', + data: data + }) +} +//根据任务id查询报告附件 +export function getPurchaseFileList(query) { + return request({ + url: '/material/purchase_check_details/fileList', + method: 'get', + params: query + }) +} +// 上传报告附件 - 异步 +export function uploadPurchaseFile(data) { + return request({ + url: '/material/purchase_check_details/uploadFile', + method: 'post', + data: data + }) +} + + +// 查询新购验收任务详细列表 +export function getPurchaseCheckFormByTaskId(taskId) { + return request({ + url: '/material/purchase_check_info/getPurchaseCheckFormByTaskId/'+taskId, + method: 'get' + }) +} + + + + + + + + + + diff --git a/src/api/purchase/goodsEntry.js b/src/api/purchase/goodsEntry.js new file mode 100644 index 00000000..e69de29b diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue index 0be95521..8d5e6174 100644 --- a/src/views/material/ma/typeConfigKeeper/index.vue +++ b/src/views/material/ma/typeConfigKeeper/index.vue @@ -16,6 +16,7 @@ />
+
组织人员树
+
物资类型树
+ +
@@ -317,6 +325,8 @@ export default { queryParams: { typeName: undefined, level: 0, + pageNum: 1, + pageSize: 10, // phonenumber: undefined, // status: undefined, // typeId: undefined @@ -481,7 +491,8 @@ export default { /** 搜索按钮操作 */ handleQuery() { // this.queryParams.pageNum = 1; - this.$refs.multipleTable.clearSelection(); + this.$refs.multipleTable.clearSelection(); + this.queryParams.pageNum = 1; this.getList(); }, /** 重置按钮操作 */ @@ -517,6 +528,13 @@ export default { this.multiple = !selection.length; }, + + // //单选操作-跨页 + // handlerSelect(val, row) { + // this.ids.indexOf(row.deviceCode) === -1 + // ? this.currentSelection.push(row.deviceCode) + // : this.currentSelection.splice(this.currentSelection.indexOf(row.deviceCode), 1) + // }, handleSelect(selection, row) { this.toggleSelection(selection, row); }, @@ -527,49 +545,49 @@ export default { }, - //选择某行 - selectTr(selection,row){ - this.$set(row,'isChecked',!row.isChecked); - this.$nextTick(()=>{ - this.isAllSelect = row.isChecked; - this.toggleSelect(row,row.isChecked,'tr'); - }); - }, + // //选择某行 + // selectTr(selection,row){ + // this.$set(row,'isChecked',!row.isChecked); + // this.$nextTick(()=>{ + // this.isAllSelect = row.isChecked; + // this.toggleSelect(row,row.isChecked,'tr'); + // }); + // }, - //递归子级 - toggleSelect(data,flag,type){ - if(type === 'all'){ - if(data.length > 0){ - data.forEach(item=>{ - this.toggleSelection(item, flag); - if(item.children && item.children.length > 0){ - this.toggleSelect(item.children,flag,type) - } - }) - } - }else { - if(data.children && data.children.length > 0){ - data.children.forEach(item =>{ - item.isChecked = !item.isChecked; - this.$refs.multipleTable.toggleRowSelection(item, flag); - this.toggleSelect(item,flag,type); - }) - } - } - }, + // //递归子级 + // toggleSelect(data,flag,type){ + // if(type === 'all'){ + // if(data.length > 0){ + // data.forEach(item=>{ + // this.toggleSelection(item, flag); + // if(item.children && item.children.length > 0){ + // this.toggleSelect(item.children,flag,type) + // } + // }) + // } + // }else { + // if(data.children && data.children.length > 0){ + // data.children.forEach(item =>{ + // item.isChecked = !item.isChecked; + // this.$refs.multipleTable.toggleRowSelection(item, flag); + // this.toggleSelect(item,flag,type); + // }) + // } + // } + // }, - //改变选中 - toggleSelection(row, flag) { - this.$set(row,'isChecked',flag); - this.$nextTick(()=>{ - if (flag) { - this.$refs.multipleTable.toggleRowSelection(row, flag); - } else { - this.$refs.multipleTable.clearSelection(); - } - }); - }, + // //改变选中 + // toggleSelection(row, flag) { + // this.$set(row,'isChecked',flag); + // this.$nextTick(()=>{ + // if (flag) { + // this.$refs.multipleTable.toggleRowSelection(row, flag); + // } else { + // this.$refs.multipleTable.clearSelection(); + // } + // }); + // }, /** 绑定按钮操作 */ @@ -596,6 +614,7 @@ export default { this.$modal.msgSuccess("绑定成功"); this.ids = null; this.userList = null; + this.userIdTemp = -1 this.getTreeData(); this.getList(); this.$refs.multipleTable.clearSelection(); @@ -720,6 +739,13 @@ export default { font-size: 16px; } } +.grid-content { + border-radius: 4px; + min-height: 24px; +} +.bg-purple-dark { + background: #e5e9f2; +} ::v-deep .el-tree .el-tree-node__expand-icon.expanded { -webkit-transform: rotate(0deg); diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue new file mode 100644 index 00000000..e67bc0ad --- /dev/null +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -0,0 +1,372 @@ + + + + \ No newline at end of file diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue new file mode 100644 index 00000000..46731f2f --- /dev/null +++ b/src/views/material/purchase/goodsAccept/index.vue @@ -0,0 +1,467 @@ + + + + \ No newline at end of file diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue new file mode 100644 index 00000000..7eec6a49 --- /dev/null +++ b/src/views/material/purchase/goodsEntry/detail.vue @@ -0,0 +1,250 @@ + + + + \ No newline at end of file diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue new file mode 100644 index 00000000..0e3004a6 --- /dev/null +++ b/src/views/material/purchase/goodsEntry/index.vue @@ -0,0 +1,250 @@ + + + + \ No newline at end of file