diff --git a/sgzb-ui/src/api/claimAndRefund/return.js b/sgzb-ui/src/api/claimAndRefund/return.js
index 80e07f15..1cee4bdf 100644
--- a/sgzb-ui/src/api/claimAndRefund/return.js
+++ b/sgzb-ui/src/api/claimAndRefund/return.js
@@ -66,7 +66,6 @@ export function ApiGetMaterialList(query) {
// 删除
export function backApplyDelApi(query) {
- console.log('query====', query);
return request({
url: '/material/backApply/del',
method: 'get',
@@ -149,7 +148,7 @@ export function getBackReceiveList(query) {
params: query
})
}
-// 退料审核新增
+// 退料接收详情列表
export function receiveView(data) {
return request({
url: '/base/backReceive/receiveViewWeb',
@@ -158,3 +157,57 @@ export function receiveView(data) {
})
}
+// 退料接收弹窗详情
+export function getBackMachine(query) {
+ return request({
+ url: '/base/backReceive/getBackMachine',
+ method: 'get',
+ params: query
+ })
+}
+
+// 退料接收 查看记录
+export function backReceiveRecordWeb(data) {
+ return request({
+ url: 'base/backReceive/backReceiveRecordWeb ',
+ method: 'post',
+ data: data
+ })
+}
+
+
+// 退料接收 数量接收
+export function setNumBack(data) {
+ return request({
+ url: 'base/backReceive/setNumBack',
+ method: 'post',
+ data: data
+ })
+}
+
+// 退料接收 编码接收
+export function setCodeBack(data) {
+ return request({
+ url: 'base/backReceive/setCodeBack',
+ method: 'post',
+ data: data
+ })
+}
+
+// 退料接收 完成前判断是否存在记录
+export function getRecord(query) {
+ return request({
+ url: 'base/backReceive/getRecord',
+ method: 'get',
+ params: query
+ })
+}
+// 退料接收 完成接收
+export function endBack(data) {
+ return request({
+ url: 'base/backReceive/endBack',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js
index 7d0a4c78..597d8409 100644
--- a/sgzb-ui/src/router/index.js
+++ b/sgzb-ui/src/router/index.js
@@ -74,19 +74,19 @@ export const constantRoutes = [
}
]
},
- // {
- // path: '/dashboard',
- // component: Layout,
- // redirect: 'dashboard',
- // children: [
- // {
- // path: 'dashboard',
- // component: () => import('@/views/dashboard'),
- // name: 'Dashboard',
- // meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
- // }
- // ]
- // },
+ {
+ path: '/dashboard',
+ component: Layout,
+ redirect: 'dashboard',
+ children: [
+ {
+ path: 'dashboard',
+ component: () => import('@/views/dashboard'),
+ name: 'Dashboard',
+ meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
+ }
+ ]
+ },
{
path: '/user',
component: Layout,
diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
index c5e4287b..a0b6618a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
@@ -150,7 +150,8 @@ export default {
init() {
let params = {
taskId: this.rowObj.taskId,
- agreementId: this.rowObj.agreementId
+ agreementId: this.rowObj.agreementId,
+ badId:this.rowObj.badId,
}
materialReturnNoteByExamine(params).then(res => {
this.tableData = res.data
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 35e3ae35..c4bfe0fa 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -20,20 +20,16 @@
+
+
+
-
-
+
-
-
-
+
查询
@@ -336,6 +330,7 @@
diff --git a/sgzb-ui/src/views/claimAndRefund/return/tree.vue b/sgzb-ui/src/views/claimAndRefund/return/tree.vue
new file mode 100644
index 00000000..1d40b846
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/return/tree.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+