diff --git a/sgzb-ui/src/api/scrap/forecastWaste.js b/sgzb-ui/src/api/scrap/forecastWaste.js new file mode 100644 index 00000000..92415dba --- /dev/null +++ b/sgzb-ui/src/api/scrap/forecastWaste.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +/* 预报废列表 */ +export const getForecastWasteListApi = (data) => { + return request.post('/material/scrap/getScrapApplyList', data) +} + +/* 预报废列表查询框内数据 */ +export const getDialogListApi = (data) => { + return request.get('/material/details/questList', data) +} \ No newline at end of file diff --git a/sgzb-ui/src/assets/styles/index.scss b/sgzb-ui/src/assets/styles/index.scss index 2f3b9ef9..4371698a 100644 --- a/sgzb-ui/src/assets/styles/index.scss +++ b/sgzb-ui/src/assets/styles/index.scss @@ -180,3 +180,11 @@ aside { margin-bottom: 10px; } } + +i { + font-style: normal; +} + +ul { + list-style: none; +} diff --git a/sgzb-ui/src/views/claimAndRefund/return/apply.json b/sgzb-ui/src/views/claimAndRefund/return/apply.json deleted file mode 100644 index ebbf78cc..00000000 --- a/sgzb-ui/src/views/claimAndRefund/return/apply.json +++ /dev/null @@ -1,143 +0,0 @@ -/** 退料ID */ -@ApiModelProperty(value = "退料ID") -private Long id; - -/** 退料ID-字符串 */ -@ApiModelProperty(value = "退料ID-字符串") -private String ids; - -/** 退料单号 */ -@Excel(name = "退料单号") -@ApiModelProperty(value = "退料单号") -private String code; - -/** 任务ID */ -@ApiModelProperty(value = "任务ID") -private Integer taskId; - -/** 任务ID */ -@ApiModelProperty(value = "任务类型") -private Integer taskType; - -/** 签订日期 */ -@ApiModelProperty(value = "签订日期") -private String signTime; - -/** 退料人员 */ -@Excel(name = "退料人员") -@ApiModelProperty(value = "退料人员") -private String backPerson; - -/** 联系电话 */ -@Excel(name = "退料人联系电话") -@ApiModelProperty(value = "联系电话") -private String phone; - -/** 机具公司审核人 */ -@ApiModelProperty(value = "机具公司审核人") -private Integer directAuditBy; - -/** 机具公司审批时间 */ -@ApiModelProperty(value = "机具公司审批时间") -private String directAuditTime; - -/** 机具公司审批备注 */ -@ApiModelProperty(value = "机具公司审批备注") -private String directAuditRemark; - - -/** 创建者 */ -@ApiModelProperty(value = "创建者") -private String createBy; - -/** 创建时间 */ -@ApiModelProperty(value = "创建时间") -private Date createTime; - -/** 更新者 */ -@ApiModelProperty(value = "更新者") -private String updateBy; - -/** 更新时间 */ -@ApiModelProperty(value = "更新时间") -private Date updateTime; - -/** 备注 */ -@ApiModelProperty(value = "备注") -private String remark; - -/** 数据所属组织 */ -@ApiModelProperty(value = "数据所属组织") -private Long companyId; - -@ApiModelProperty(value = "关键字") -private String keyWord; - -@ApiModelProperty(value = "工程id") -private Integer lotId; - -@Excel(name = "退料工程名称") -@ApiModelProperty(value = "工程名称") -private String lotName; - -@ApiModelProperty(value = "单位id") -private Integer unitId; - -@Excel(name = "退料单位名称") -@ApiModelProperty(value = "单位名称") -private String unitName; - -@Excel(name = "退料申请时间") -@ApiModelProperty(value = "退料日期") -private String backTime; - -@Excel(name = "协议号") -@ApiModelProperty(value = "协议编号") -private String agreementCode; - -@Excel(name = "退料状态") -@ApiModelProperty(value = "任务状态") -private String taskStatus; - -@ApiModelProperty(value = "协议id") -private Integer agreementId; - -@ApiModelProperty(value = "类型id") -private String typeId; - -@Excel(name = "退料工机具类型") -@ApiModelProperty(value = "类型名称") -private String typeName; - -@ApiModelProperty(value = "规格编号") -private String typeCode; - -@ApiModelProperty(value = "数量") -private String num; - -@ApiModelProperty(value = "详情id和数量") -private String detailsIdByNum; - -@ApiModelProperty(value = "类型id和数量") -private String typeIdByNum; - -@ApiModelProperty(value = "详情id") -private String detailsId; - -@ApiModelProperty(value = "编码") -private String maCode; - -@ApiModelProperty(value = "在用数量") -private String useNum; - -@ApiModelProperty(value = "操作人") -private String createName; - -@ApiModelProperty(value = "审核人") -private String examineName; - -@ApiModelProperty(value = "开始时间") -private String startTime; - -@ApiModelProperty(value = "结束时间") -private String endTime; \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue index 66ed72d0..6442db69 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue @@ -13,7 +13,6 @@ v-model="queryParams.keyWord" placeholder="请输入关键字" clearable - style="width: 240px" /> @@ -22,7 +21,6 @@ clearable filterable @change="getAgreementByUnit" - style="width: 240px" placeholder="请选择" > @@ -80,7 +76,6 @@ v-model="queryParams.taskStatus" clearable filterable - style="width: 240px" placeholder="请选择" > - + /> --> - + - + 待审核 + 退料完成 + 退料核查 + 退料通过 + 退料驳回 + - 退料完成 - + --> - + 查看 审批 - 审批 + > --> 退料单 @@ -337,11 +369,11 @@ @pagination="getList" /> - + @@ -359,7 +390,7 @@ v-model="dialogQueryParams.unitName" placeholder="请输入退料单位" clearable - style="width: 240px" + style="width: 200px" /> @@ -368,7 +399,7 @@ v-model="dialogQueryParams.lotName" placeholder="请输入退料工程" clearable - style="width: 240px" + style="width: 200px" /> @@ -377,12 +408,12 @@ v-model="dialogQueryParams.agreementCode" placeholder="请输入退料协议编号" clearable - style="width: 240px" + style="width: 200px" /> @@ -408,18 +439,15 @@ v-model="dialogQueryParams.phone" placeholder="请输入退料人电话" clearable - style="width: 240px" + style="width: 200px" /> - - - @@ -440,7 +468,7 @@ - + - + /> --> - 通过 - 不通过 - 取消 + 通 过 + 驳 回 + 取消 @@ -506,7 +538,7 @@ { - if (res.code == 200) { - this.open = false - this.getList() - } - }).catch(() => { }) - }, - /** 提交按钮 拒绝 */ - submitForm2() { - const isNum = this.loadingList.some( - (item) => item.num == '' || item.num == undefined - ); - if (isNum) { - this.$message.error('退料数量不能为空!'); - return; - } - let params = { - ids: this.rowObj.id - } - ApiBackApplyRefuse(params).then(res => { - if (res.code == 200) { - this.open = false - this.getList() - } - }).catch(() => { }) - }, - handleAdd() { - let params = { - ids: this.rowObj.id - } - ApiBackApplyAudit(params).then(res => { - if (res.code == 200) { - this.open = false - this.$message.error(res.msg); - this.getList() - } - }).catch(() => { }) - }, - selectable(row){ - if(row.taskStatus==37){ - return true - }else{ - return false - } - }, - checkNum(row){ - const maxNum = row.num; - if(row.num<=1){ - row.num = 1; - }else if(row.num>=maxNum){ - row.num = maxNum; - } - }, - handleExam() { - let params = { - ids: this.ids.join(',') - } - ApiBackApplyAudit(params).then(res => { - if (res.code == 200) { - this.ids = [] - this.$message.error(res.msg); - this.getList() - } - }).catch(() => { }) - }, + let params = { + ids: this.rowObj.id, + backApplyDetails: this.loadingList, + } + // console.log(params) + ApiBackApplyAudit(params) + .then((res) => { + if (res.code == 200) { + this.open = false + this.getList() + } + }) + .catch(() => {}) + }, + /** 提交按钮 拒绝 */ + submitForm2() { + const isNum = this.loadingList.some( + (item) => item.num == '' || item.num == undefined, + ) + if (isNum) { + this.$message.error('退料数量不能为空!') + return + } + let params = { + ids: this.rowObj.id, + } + ApiBackApplyRefuse(params) + .then((res) => { + if (res.code == 200) { + this.open = false + this.getList() + } + }) + .catch(() => {}) + }, + handleAdd() { + let params = { + ids: this.rowObj.id, + } + ApiBackApplyAudit(params) + .then((res) => { + if (res.code == 200) { + this.open = false + this.$message.error(res.msg) + this.getList() + } + }) + .catch(() => {}) + }, + selectable(row) { + if (row.taskStatus == 37) { + return true + } else { + return false + } + }, + checkNum(row) { + const maxNum = row.num + if (row.num <= 1) { + row.num = 1 + } else if (row.num >= maxNum) { + row.num = maxNum + } + }, + handleExam() { + let params = { + ids: this.ids.join(','), + } + ApiBackApplyAudit(params) + .then((res) => { + if (res.code == 200) { + this.ids = [] + this.$message.error(res.msg) + this.getList() + } + }) + .catch(() => {}) + }, /** 删除按钮操作 */ handleDelete(row) { diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue index 5c965a22..7e14553e 100644 --- a/sgzb-ui/src/views/index.vue +++ b/sgzb-ui/src/views/index.vue @@ -174,9 +174,11 @@ - {{ - sendMessageParams.message - }} + +