From 6dd04121b7008bb4df389f18b63f3ffd34e9f410 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Tue, 26 Mar 2024 16:24:39 +0800
Subject: [PATCH] =?UTF-8?q?3.26=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9?=
=?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/api/store/putInStore.js | 64 ++
.../views/store/warehousing/putInStore.vue | 583 ++++++++++++++++++
sgzb-ui/vue.config.js | 21 +-
3 files changed, 653 insertions(+), 15 deletions(-)
create mode 100644 sgzb-ui/src/api/store/putInStore.js
create mode 100644 sgzb-ui/src/views/store/warehousing/putInStore.vue
diff --git a/sgzb-ui/src/api/store/putInStore.js b/sgzb-ui/src/api/store/putInStore.js
new file mode 100644
index 00000000..ef49fedb
--- /dev/null
+++ b/sgzb-ui/src/api/store/putInStore.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+//机具退料入库
+export function getReturnOfMaterialsInfoAll(query) {
+ return request({
+ url: '/material/returnOfMaterialsInfo/getReturnOfMaterialsInfoAll',
+ method: 'get',
+ params: query
+ })
+ }
+
+
+//机具退料入库--机具类型,规格型号下拉数据
+export function getTypeList(query) {
+ return request({
+ url: '/material/returnOfMaterialsInfo/getTypeList',
+ method: 'get',
+ params: query
+ })
+ }
+
+
+//修试后入库--列表
+export function getRepairedList(data) {
+ return request({
+ url: '/material/RepairTestInput/getRepairedList',
+ method: 'get',
+ params: data
+ })
+ }
+
+//修试后入库--详情
+export function getRepairedDetailList(data) {
+ return request({
+ url: '/material//RepairTestInput/getRepairedDetailList',
+ method: 'get',
+ params: data
+ })
+ }
+ //修试后入库--审核
+export function inputByType(data) {
+ return request({
+ url: '/material/RepairTestInput/inputByType',
+ method: 'post',
+ data: data
+ })
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
new file mode 100644
index 00000000..a6acabf7
--- /dev/null
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -0,0 +1,583 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 数量盘点
+ 编号盘点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击填充
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 通过
+ 不通过
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index d301597a..7c7f517d 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -35,25 +35,16 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://112.29.103.165:21626`,//线上环境-重庆
- // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
+ // target: `http://112.29.103.165:21626`,//线上环境-重庆
+ target: `http://112.29.103.165:21624`,//线上环境-宁夏
// target: `http://192.168.0.14:21624`,//线上环境
// target: `http://1.12.248.179:23028`,//线上环境-南网
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
-
- target: `http://10.40.92.12:8080`,//超
- // target: `http://10.40.92.253:8080`,//韩
- // target: `http://10.40.92.209:8080`,//川/
-
- //******** 注意事项 ********* */
- //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
- //qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
- //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址,打开大屏项目config/index.js更改请求地址,大屏打包node<16.0.0;
- //3.只有南网项目产线gl发布打包时候需要注意:
- // 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
- //4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq
- //******** 注意事项 ********* */
+
+ // target: `http://10.40.92.14:8080`,//超
+ // target: `http://10.40.92.12:8080`,//韩
+ // target: `http://10.40.92.209:8080`,//川
changeOrigin: true,
pathRewrite: {