From 86854eb94747f38082c54813331c0f0a7292b3b0 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 29 Nov 2022 10:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
=?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/config.json | 4 ++--
src/store/index.js | 2 +-
src/views/home/index-3.0.1.vue | 1 +
src/views/home/index.vue | 16 ++++++++++------
src/views/warehouse/editCode.vue | 2 +-
src/views/warehouse/stockOrder.vue | 2 +-
src/views/warehouse/stockOrderEditor.vue | 2 +-
src/views/warehouse/stockOrderNew.vue | 2 +-
.../warehouse/stockOrderNewSelectProduct.vue | 16 ++++++++--------
src/views/warehouse/stockOrderSearch.vue | 4 ++--
10 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/public/config.json b/public/config.json
index f987e7a..1a40d85 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
{
- "BASE_URL": "http://192.168.0.109:9906",
- "SERVER_IP": "http://192.168.0.109:9906",
+ "BASE_URL": "http://192.168.1.9:9906",
+ "SERVER_IP": "http://192.168.1.9:9906",
"hosp_name": "福建省XX市医院"
}
diff --git a/src/store/index.js b/src/store/index.js
index 11a58c6..adcc3ee 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,7 +16,7 @@ export default new Vuex.Store({
getters,
modules: {
app,
- admin
+ admin,
},
strict: debug
// plugins: debug ? [createLogger()] : []
diff --git a/src/views/home/index-3.0.1.vue b/src/views/home/index-3.0.1.vue
index f4caa94..455fa04 100644
--- a/src/views/home/index-3.0.1.vue
+++ b/src/views/home/index-3.0.1.vue
@@ -375,6 +375,7 @@ export default {
height: 130%;
line-height: 60px;
@include clearfix;
+ background: #FFFFFF;
}
.header-right {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 00f0314..1b6d2be 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -66,9 +66,14 @@
<router-link>{{ item.name }}</router-link>
</el-breadcrumb-item>
</el-breadcrumb>
- </div>
-
+ <!-- <tags-view />-->
+ <!-- <el-card>-->
+ <!-- <div class="header-tabs">-->
+ <!-- <tabs-view v-on:listenChildParentMenuHide="menuShow = false"></tabs-view>-->
+ <!-- </div>-->
+ <!-- </el-card>-->
+ </div>
<div class="header-right">
<div>
<h3>
@@ -159,7 +164,7 @@
<el-main class="main">
<div class="content-box" :class="{ 'content-collapse': collapse }">
- <!-- <v-tags>标签</v-tags>-->
+ <v-tags>标签</v-tags>
<div class="content">
<transition name="move" mode="out-in">
<keep-alive :include="tagsList">
@@ -191,8 +196,6 @@
<!-- >-->
<!-- </div>-->
</el-container>
-
-
<el-dialog
:title="selectMap[isSup]"
:visible.sync="selInvVisible"
@@ -254,7 +257,7 @@
</div>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button>
-<!-- <el-button type="primary" @click="closeDialog">取消</el-button>-->
+ <!-- <el-button type="primary" @click="closeDialog">取消</el-button>-->
</div>
</el-form>
</el-dialog>
@@ -358,6 +361,7 @@ export default {
components: {
SidebarItem,
vTags,
+
},
computed: {
...mapGetters({
diff --git a/src/views/warehouse/editCode.vue b/src/views/warehouse/editCode.vue
index 2444b4c..3495c3e 100644
--- a/src/views/warehouse/editCode.vue
+++ b/src/views/warehouse/editCode.vue
@@ -64,7 +64,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="serialNo">
- <el-input v-model="editData.serialNo" auto-complete="off" :disabled="xlhEnable"></el-input>
+ <el-input v-model="editData.serialNo" auto-complete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index b1afe2d..67e8447 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -502,7 +502,7 @@ export default {
this.detailQuery = {
orderIdFk: "",
page: 1,
- limit: 20
+ limit: 200
};
this.detailTotal = 0;
},
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 33fa953..d5faf39 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -646,7 +646,7 @@ export default {
this.detailQuery = {
orderIdFk: "",
page: 1,
- limit: 20
+ limit: 200
};
this.detailTotal = 0;
},
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index 0e83e76..ca1b459 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -606,7 +606,7 @@ export default {
this.detailTotal = {
orderIdFk: "",
page: 1,
- limit: 20
+ limit: 200
};
this.detailTotal = 0;
},
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 6f146cb..b7a4356 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -325,14 +325,14 @@ export default {
return;
}
- if (this.ids.length > 0) {
- for (var i = 0; i < this.ids.length; i++) {
- if (this.ids[i] == this.multipleSelection.rlId) {
- this.$message.error("该产品已录入！");
- return
- }
- }
- }
+ // if (this.ids.length > 0) {
+ // for (var i = 0; i < this.ids.length; i++) {
+ // if (this.ids[i] == this.multipleSelection.rlId) {
+ // this.$message.error("该产品已录入！");
+ // return
+ // }
+ // }
+ // }
let str = this.multipleSelection.zczbhhzbapzbh;
if (str.search(",") != -1) {
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 7862399..af89e5b 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -523,7 +523,7 @@ export default {
detailQuery: {
orderIdFk: "",
page: 1,
- limit: 20
+ limit: 100
},
busTypes: [],
enableDept: false,
@@ -638,7 +638,7 @@ export default {
this.detailQuery = {
orderIdFk: "",
page: 1,
- limit: 20
+ limit: 200
}
this.detailList = [];
this.detailTotal = 0;