diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index 7054f2f2..961f2c49 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -162,7 +162,7 @@ import { getLeaseAuditListAll,getUnitData,getProData,deleteTask } from "@/api/cl export default { - name: "ReceiveApply", + // name: "ReceiveApply", dicts: ['sys_normal_disable'], data() { return { diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue index 89e0ec73..82b64797 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue @@ -5,7 +5,7 @@
领料单号：{{ queryParams.code }}
- + 领料管理 + + + + @@ -75,25 +79,9 @@ - - - - - - - - - - - - - - - - diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue index 96d6d026..425a08b8 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue @@ -86,12 +86,20 @@ + + + + + @@ -162,7 +170,7 @@ import { getLeaseAuditListAll,getUnitData,getProData,deleteTask } from "@/api/cl export default { - name: "ReceiveApply", + // name: "ReceiveApply", dicts: ['sys_normal_disable'], data() { return { diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue index d9e488bd..36af1f27 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue @@ -50,9 +50,9 @@ @@ -456,6 +456,8 @@ export default { this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson this.queryParams.agreementCode = data.agreementCode this.queryParams.agreementId = data.agreementId + this.queryParams.estimateLeaseTime = data.estimateLeaseTime + // this.queryParams.leaseType = data.leaseType this.$set(this.queryParams,'leaseType',data.leaseType) this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark @@ -485,6 +487,7 @@ export default { this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson this.queryParams.agreementCode = data.agreementCode this.queryParams.agreementId = data.agreementId + this.queryParams.estimateLeaseTime = data.estimateLeaseTime // this.queryParams.leaseType = data.leaseType this.$set(this.queryParams,'leaseType',data.leaseType) this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue index faba8524..9957cd2e 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue @@ -5,9 +5,17 @@
领料单号：{{ queryParams.code }}
 - - - + + + + + + - + - + + + + @@ -43,6 +59,10 @@ >领料管理 + + + + @@ -75,25 +95,9 @@ - - - - - - - - - - - - - - - - @@ -323,9 +327,7 @@ export default { }, /** 查询 */ async getData(taskId) { - const res = await getLeaseListAllCq({ - taskId - }) + const res = await getLeaseListAllCq({taskId}) this.queryParams = {...this.queryParams,...res.rows[0]} this.$set(this.queryParams,'leaseApplyInfo',this.queryParams.leaseApplyInfoList[0]) this.queryParams.leaseApplyDetails.forEach(v => { @@ -335,7 +337,15 @@ export default { this.$set(v,'createTime',this.queryParams.createTimes) this.$set(v,'updateTime',this.queryParams.updateTimes) }) - console.log(this.queryParams.examineStatusId) + if(this.queryParams.leaseType=='0'){ + this.$set(this.queryParams,'leaseTypeName','工程租赁') + }else if(this.queryParams.leaseType=='1'){ + this.$set(this.queryParams,'leaseTypeName','长期租赁') + }else{ + this.$set(this.queryParams,'leaseTypeName','') + } + + // console.log(this.queryParams.examineStatusId) for (let i=0; i < this.flowPath.length; i++ ){ if(this.flowPath[i].id < this.queryParams.examineStatusId){ this.flowPath[i].color = '#0bbd87' @@ -350,7 +360,7 @@ export default { break } } - console.log(this.flowPath) + // console.log(this.flowPath) if(this.queryParams.examineStatusId==98){ this.flowPath[0].color = 'red' this.flowPath[0].icon = 'el-icon-close' diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue index 592aafd7..891fb585 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue @@ -84,12 +84,19 @@ + + + + diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue index 928f63a0..def63c4c 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue @@ -346,7 +346,7 @@ import dialogForm from "./dialogForm.vue"; // 10:42开始日期startTime,结束日期endTime 机具类型typeId // http://localhost/claimAndRefund/return/returnApply export default { - name: "ReturnApply", + name: "", dicts: ['sys_normal_disable'], components: { dialogForm, }, data() { diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue index adb63207..9fe7058c 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue @@ -346,7 +346,7 @@ import dialogForm from "./dialogForm.vue"; // 10:42开始日期startTime,结束日期endTime 机具类型typeId // http://localhost/claimAndRefund/return/returnApply export default { - name: "ReturnApply", + name: "", dicts: ['sys_normal_disable'], components: { dialogForm, }, data() { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue index cf75cc54..bc24ce10 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue @@ -138,7 +138,7 @@ size="mini" type="success" icon="el-icon-edit" - v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'&&scope.row.purchasingStatus!='待审核'" + v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'&&scope.row.purchasingStatus!='待审核'&&scope.row.purchasingStatus!='驳回'" @click="handleAccept(scope.row)" >验收 已验收合格 已入库 待审核 - 已驳回 + 已驳回