diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js
index 9376d348..059285de 100644
--- a/src/api/cost/cost.js
+++ b/src/api/cost/cost.js
@@ -36,6 +36,15 @@ export function getSltInfo(params){
})
}
+// 协议书详情
+export function getSltAgreementBookApi(data){
+ return request({
+ url: '/material/slt_agreement_info/getSltAgreementBook',
+ method: 'post',
+ data: data
+ })
+}
+
// 查询材料站结算待审核详情(仅需 sltApplyCode)
export function getClzSettledInfo(sltApplyCode) {
return request({
diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue
index 57111d6e..564bb815 100644
--- a/src/views/material/cost/component/applyHome.vue
+++ b/src/views/material/cost/component/applyHome.vue
@@ -134,6 +134,7 @@
维修单查看
+ 直转查看
@@ -360,6 +361,84 @@
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ 待审核
+ 审核中
+
+ 已完成
+
+
+ 已驳回
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
@@ -384,6 +463,8 @@ import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import printJS from 'print-js'
import ExcelJS from 'exceljs'
+import { getReceiveList } from '@/api/business/index'
+
import {
Document,
Packer,
@@ -494,6 +575,27 @@ export default {
{ label: '管理模式', prop: 'manageType' },
],
repairViewList: [],
+ transferView: false,
+ transferQuery: {
+ pageNum: 1,
+ pageSize: 10,
+ keyWord: '',
+ auditProId: '',
+ auditUnitId: '',
+ },
+ transferColumns: [
+ { label: '申请时间', prop: 'createTime', width: '100' },
+ { label: '申请人', prop: 'createName', width: '90', showTooltip: true },
+ { label: '转出单位', prop: 'backUnitName' },
+ { label: '转出工程', prop: 'backProName' },
+ { label: '转入单位', prop: 'leaseUnitName' },
+ { label: '转入工程', prop: 'leaseProName' },
+ { label: '物资类型', prop: 'typeName', showTooltip: true },
+ { label: '状态', prop: 'status', width: '80' },
+ { label: '业务联单', prop: 'businessCode', showTooltip: true },
+ ],
+ transferList: [],
+ transferTotal: 0,
}
},
// updated() {
@@ -691,6 +793,49 @@ export default {
this.repairDialogVisible = true
this.getRepairList()
},
+ handleTransfer(row) {
+ this.transferQuery.keyWord = ''
+ this.transferQuery.pageNum = 1
+ this.transferQuery.pageSize = 10
+ this.transferQuery.auditProId = row.projectId
+ this.transferQuery.auditUnitId = row.unitId
+ this.transferView = true
+ this.getTransferList(row)
+ },
+ async getTransferList(row) {
+ try {
+ this.isLoading = true
+ const res = await getReceiveList(this.transferQuery)
+ console.log('🚀 ~ 获取列表 ~ res:', res)
+ this.transferList = res.rows || []
+ this.transferTotal = res.total || 0
+ } catch (error) {
+ console.log('🚀 ~ 获取列表 ~ error:', error)
+ this.transferList = []
+ this.transferTotal = 0
+ } finally {
+ this.isLoading = false
+ }
+ },
+ handleTransferReset() {
+ this.transferQuery.keyWord = ''
+ this.transferQuery.pageNum = 1
+ this.transferQuery.pageSize = 10
+ this.getTransferList()
+ },
+ handleTransferView(row) {
+ this.transferView = false
+ this.$router.push({
+ name: 'direct-rotation-apply',
+ query: {
+ id: row.id,
+ flowId: row.flowId,
+ taskId: row.id,
+ type: 'detail',
+ nodeId: row.nodeId
+ }
+ })
+ },
async getRepairList() {
try {
this.isLoading = true
diff --git a/src/views/material/standardBox/index.vue b/src/views/material/standardBox/index.vue
index d70ecec6..09952f53 100644
--- a/src/views/material/standardBox/index.vue
+++ b/src/views/material/standardBox/index.vue
@@ -51,11 +51,11 @@
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
-
+
@@ -164,7 +164,7 @@ export default {
endTime: '',
keyWord: '',
startTime: '',
- // taskStatus: 3,
+ boxType: 1
},
open:false,
queryDialogForm:{
diff --git a/src/views/material/standardBox/stereoscopic.vue b/src/views/material/standardBox/stereoscopic.vue
index 0a0f7c06..4c8f5967 100644
--- a/src/views/material/standardBox/stereoscopic.vue
+++ b/src/views/material/standardBox/stereoscopic.vue
@@ -39,6 +39,12 @@
新增
+
+
+
+ 导出数据
+
+
@@ -121,12 +127,7 @@