diff --git a/src/api/claimAndRefund/second-manage.js b/src/api/claimAndRefund/second-manage.js
index 9134f01..a521dbf 100644
--- a/src/api/claimAndRefund/second-manage.js
+++ b/src/api/claimAndRefund/second-manage.js
@@ -46,3 +46,27 @@ export function getScrapListApi(data) {
params: data,
})
}
+// 二级库 报废申请
+export function scrapAuditingApi(data) {
+ return request({
+ url: '/material/secondaryWarehouse/seconfScrap',
+ method: 'post',
+ data,
+ })
+}
+// 二级库 报废申请 详情
+export function getSecondScrapListDetailsApi(data) {
+ return request({
+ url: '/material/secondaryWarehouse/getSecondScrapListDetails',
+ method: 'get',
+ params: data,
+ })
+}
+// 二级库 报废申请 审核
+export function auditSeconfScrapApi(data) {
+ return request({
+ url: '/material/secondaryWarehouse/auditSeconfScrap',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/claimAndRefund/teams-manage.js b/src/api/claimAndRefund/teams-manage.js
index 52c41ac..61d14ca 100644
--- a/src/api/claimAndRefund/teams-manage.js
+++ b/src/api/claimAndRefund/teams-manage.js
@@ -41,3 +41,11 @@ export function getDevStockCountApi(data) {
params: data,
})
}
+// 班组库存台账列表
+// export function getDevStockCountApi(data) {
+// return request({
+// url: '/material/secondaryWarehouse/getList',
+// method: 'get',
+// params: data,
+// })
+// }
diff --git a/src/views/claimAndRefund/secondStore/outbound-record/index.vue b/src/views/claimAndRefund/secondStore/outbound-record/index.vue
index f1ddb05..0188a6e 100644
--- a/src/views/claimAndRefund/secondStore/outbound-record/index.vue
+++ b/src/views/claimAndRefund/secondStore/outbound-record/index.vue
@@ -54,9 +54,9 @@
@@ -118,7 +118,7 @@
@@ -118,7 +118,7 @@
-
-
+
+
-
+
-
+
@@ -102,28 +108,125 @@
v-else
:min="0"
:precision="0"
- :max="scope.row.num"
- v-model="scope.row.outNum"
+ :max="scope.row.stockNum"
+ v-model="scope.row.scrapNum"
style="width: 120px"
placeholder="输入数量"
size="small"
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 在库
+
+
+ 在用
+
+
+
+
+
+
+
+
+
diff --git a/src/views/claimAndRefund/secondStore/scrap-apply-for/components/home-pages.vue b/src/views/claimAndRefund/secondStore/scrap-apply-for/components/home-pages.vue
index 06a8812..f0521c9 100644
--- a/src/views/claimAndRefund/secondStore/scrap-apply-for/components/home-pages.vue
+++ b/src/views/claimAndRefund/secondStore/scrap-apply-for/components/home-pages.vue
@@ -25,12 +25,11 @@
-
+
@@ -73,7 +72,6 @@
+ >
+
+
+ 待审核
+
+
+ 已审核
+
+
+ 驳回
+
+
+
-
-
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/claimAndRefund/secondStore/scrap-apply-for/index.vue b/src/views/claimAndRefund/secondStore/scrap-apply-for/index.vue
index b58037a..72c9918 100644
--- a/src/views/claimAndRefund/secondStore/scrap-apply-for/index.vue
+++ b/src/views/claimAndRefund/secondStore/scrap-apply-for/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -29,6 +29,9 @@ export default {
goBack() {
this.isShowHome = true
},
+ openHomePage() {
+ this.isShowHome = true
+ },
},
}
diff --git a/src/views/claimAndRefund/secondStore/scrap-auditing/components/handle-pages.vue b/src/views/claimAndRefund/secondStore/scrap-auditing/components/handle-pages.vue
new file mode 100644
index 0000000..c3166e3
--- /dev/null
+++ b/src/views/claimAndRefund/secondStore/scrap-auditing/components/handle-pages.vue
@@ -0,0 +1,413 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编码选择
+ {{
+ scope.row.maCodeList.length > 0
+ ? `(${scope.row.maCodeList.length})`
+ : ''
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 在库
+
+
+ 在用
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/claimAndRefund/secondStore/scrap-auditing/components/home-pages.vue b/src/views/claimAndRefund/secondStore/scrap-auditing/components/home-pages.vue
new file mode 100644
index 0000000..d2782b8
--- /dev/null
+++ b/src/views/claimAndRefund/secondStore/scrap-auditing/components/home-pages.vue
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待审核
+
+
+ 已审核
+
+
+ 驳回
+
+
+
+
+
+
+
+ 查看
+
+
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/claimAndRefund/secondStore/scrap-auditing/index.vue b/src/views/claimAndRefund/secondStore/scrap-auditing/index.vue
new file mode 100644
index 0000000..72c9918
--- /dev/null
+++ b/src/views/claimAndRefund/secondStore/scrap-auditing/index.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue b/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
index 6ae7b01..79c1c93 100644
--- a/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
+++ b/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
@@ -204,7 +204,7 @@
diff --git a/vue.config.js b/vue.config.js
index 27db077..f1aaf37 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,7 +42,8 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
- target: `http://192.168.2.125:39080`, //超
+ // target: `http://192.168.2.125:39080`, //超
+ target: `http://192.168.2.122:39080`, //超
// target: `http://192.168.2.74:49080`, //旭/
// target: `http://192.168.2.17:39080`, //帅