diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js index b3045a72..fb6ad59b 100644 --- a/sgzb-ui/src/api/store/newBuy.js +++ b/sgzb-ui/src/api/store/newBuy.js @@ -133,18 +133,64 @@ export function delMacodeList(maCode) { }) } - - - - - - - - - - - - +//新购验收-验收-通知-常用人员 +export function getNoticeUserList(query) { + return request({ + url: '/system/person/list', + method: 'get', + params: query + }) +} +//新购验收-验收-通知-所有人员 +export function getAllNotificationList(query) { + return request({ + url: '/system/person/notification', + method: 'get', + params: query + }) +} +//新购验收-验收-通知-常用人员-添加 +export function addNoticeUser(data) { + return request({ + url: '/system/person', + method: 'post', + data: data + }) +} +// 删除 +export function delNoticeUser(id) { + return request({ + url: '/system/person/' + id, + method: 'delete' + }) +} + + + +//新购验收-入库列表 +export function getPutInList(query) { + return request({ + url: '/material/purchaseCheckInfo/putInList', + method: 'get', + params: query + }) +} +export function getPutinDetailsList(query) { + return request({ + url: '/material/purchaseMacode/putinDetails', + method: 'get', + params: query + }) +} + +// 修改状态-审核 +export function changePutinStatus(data) { + return request({ + url: '/material/purchaseMacode/manageStatus', + method: 'put', + data: data + }) +} diff --git a/sgzb-ui/src/api/store/warehousing.js b/sgzb-ui/src/api/store/warehousing.js index 0b18cccd..f1cabc18 100644 --- a/sgzb-ui/src/api/store/warehousing.js +++ b/sgzb-ui/src/api/store/warehousing.js @@ -23,24 +23,24 @@ export function getTypeList(query) { //修试后入库--列表 export function getRepairedList(data) { return request({ - url: '/material/RepairTestInput/getRepairedList', - method: 'post', - data: data + url: '/sgzb-material/RepairTestInput/getRepairedList', + method: 'get', + params: data }) } //修试后入库--详情 export function getRepairedDetailList(data) { return request({ - url: '/material//RepairTestInput/getRepairedDetailList', - method: 'post', - data: data + url: '/sgzb-material//RepairTestInput/getRepairedDetailList', + method: 'get', + params: data }) } //修试后入库--审核 export function inputByType(data) { return request({ - url: '/material/RepairTestInput/inputByType', + url: '/sgzb-material/RepairTestInput/inputByType', method: 'post', data: data }) diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue index 1a16e0cc..d1a01e37 100644 --- a/sgzb-ui/src/views/base/section/index.vue +++ b/sgzb-ui/src/views/base/section/index.vue @@ -188,9 +188,9 @@ export default { lotName: [ { required: true, message: "标段工程名称不能为空", trigger: "blur" } ], - ownPro: [ - { required: true, message: "所属工程项目不能为空", trigger: "blur" } - ], + // ownPro: [ + // { required: true, message: "所属工程项目不能为空", trigger: "blur" } + // ], typeId: [ { required: true, message: "工程类型不能为空", trigger: "blur" } ], diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 01bb76ce..50890816 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -190,7 +190,19 @@ - + + + + @@ -202,7 +214,9 @@ - + + + @@ -211,7 +225,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { getAgreementList, getAgreementInfoId,addAgreement, updateAgreement, removeAgreement,getUnitList, getProjectList } from "@/api/claimAndRefund/receive"; - +import { imgUpLoad,fileUpLoad } from "@/api/system/upload"; export default { @@ -253,6 +267,16 @@ export default { }, // 表单参数 form: {}, + //图片上传 + uploadHeader: process.env.VUE_APP_BASE_API, + imageUrl:'', + imageName:'', + fileList:[], + field101fileList:[], + dialogImageUrl: '', + dialogVisible: false, + //上传地址 + uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // 表单校验 rules: { contractCode: [ @@ -331,9 +355,12 @@ export default { agreementId: undefined, dictName: undefined, dictType: undefined, + fileUrl: undefined, + fileName: undefined, status: "0", remark: undefined }; + this.fileList = [] this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -353,9 +380,50 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.open = true; + this.title = "新建"; }, + // 图片上传 + imgUpLoad(param,name,index) { + console.log(param,'image') + param.type = 'ma' + imgUpLoad(param).then(res => { + if(res.code == 200) { + this.form.fileUrl = res.data.fileUrl; + this.form.fileName = res.data.fileName; + this.imageUrl = res.data.fileUrl; + this.imageName = res.data.fileName; + }else{ + // this.$msgError(res.msg) + this.$modal.msgError(res.msg); + } + }).catch((error) => { + // this.$msgError(error) + this.$modal.msgError(error); + }) + }, + handleAvatarSuccess(res,file) { + console.log("success") + }, + handleRemove(file, fileList) { + console.log(file, fileList); + this.imageUrl = ""; + this.form.fileUrl = ""; + this.form.fileName = ""; + }, + //图片点击查看 + handlePictureCardPreview(file) { + console.log(file) + this.dialogImageUrl = file.url; + this.dialogVisible = true; + }, + //图片查看 + openImg(url){ + this.dialogImageUrl = this.uploadUrl + url; + this.dialogVisible = true; + }, // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.agreementId) diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index fa6930c0..e2c22588 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -79,6 +79,8 @@ 未验收 已验收 待通知 + 不通过 + 已入库 @@ -87,6 +89,7 @@ size="mini" type="text" icon="el-icon-edit" + v-show="scope.row.status==0 || scope.row.status==3" @click="handleCheck(scope.row)" >验收 - + + + - - + +
- 人员添加 + 人员添加 消息通知
@@ -210,9 +213,9 @@ - - - + + + - +