切换分支备份

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市医院"
 }
 

src/store/index.js

@@ -16,7 +16,7 @@ export default new Vuex.Store({
     getters,
     modules: {
         app,
-        admin
+        admin,
     },
     strict: debug
     // plugins: debug ? [createLogger()] : []

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 {

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"
@@ -358,6 +361,7 @@ export default {
     components: {
         SidebarItem,
         vTags,
+
     },
     computed: {
         ...mapGetters({

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>

src/views/warehouse/stockOrder.vue

@@ -502,7 +502,7 @@ export default {
             this.detailQuery = {
                 orderIdFk: "",
                 page: 1,
-                limit: 20
+                limit: 200
             };
             this.detailTotal = 0;
         },

src/views/warehouse/stockOrderEditor.vue

@@ -646,7 +646,7 @@ export default {
             this.detailQuery = {
                 orderIdFk: "",
                 page: 1,
-                limit: 20
+                limit: 200
             };
             this.detailTotal = 0;
         },

src/views/warehouse/stockOrderNew.vue

@@ -606,7 +606,7 @@ export default {
             this.detailTotal = {
                 orderIdFk: "",
                 page: 1,
-                limit: 20
+                limit: 200
             };
             this.detailTotal = 0;
         },

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) {

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;