修改库存

src/views/layout/components/Navbar.vue

@@ -1,133 +1,134 @@
 <template>
-<div class="top-nav">
-   <div class="nav-logo">
-       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
+  <div class="top-nav">
+    <div class="nav-logo">
+      <img :src="require(`../../../assets/logo/logo.png`)" alt="">
     </div>
-  <el-menu class="navbar" mode="horizontal">
-    <div>
-      <el-dropdown trigger="click" style="color:#fff;">
-        <span class="el-dropdown-link">
-          南山市人民医院<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown" style="margin-top:21px;">
-          <el-dropdown-item >深圳市人民医院</el-dropdown-item>
-          <el-dropdown-item >长沙是透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="system-nav">
-       <div class="system-nav-menu">
-          <a  href="http://jk.kuyicloud.com/">
-          <!-- <a  href="http://test1.sgjyun.com/"> -->
-             <span ><i class="iconfont icon-pengyou"></i> SCRM</span>
-          </a>
-       </div>
-       <div class="system-nav-menu">
-        <a href="http://mall.kuyicloud.com/">
-        <!-- <a href="http://mall.test.sgjyun.com/"> -->
-          <span ><i class="icon iconfont icon-service_fill"></i> 微商城</span>
-        </a>
-      </div>
-      <div class="system-nav-menu active">
-        <a>
-          <span><i class="icon iconfont icon-jiankangshuidi"></i> 血透管理</span>
-        </a>
-      </div>
-      <div class="system-nav-menu">
-        <a href="http://cdm.kuyicloud.com/">
-          <span ><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
-        </a>
+    <el-menu class="navbar" mode="horizontal">
+      <div>
+        <!--<el-dropdown trigger="click" style="color:#fff;">-->
+        <!--<span class="el-dropdown-link">-->
+          <!--南山市人民医院<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+        <!--</span>-->
+          <!--&lt;!&ndash;<el-dropdown-menu slot="dropdown" style="margin-top:21px;">&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>深圳市人民医院</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>长沙是透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+          <!--&lt;!&ndash;</el-dropdown-menu>&ndash;&gt;-->
+        <!--</el-dropdown>-->
       </div>
+      <div class="system-nav">
+        <div class="system-nav-menu">
+          <!--<a  href="http://jk.kuyicloud.com/">-->
+          <a href="http://test1.sgjyun.com/">
+            <span><i class="iconfont icon-pengyou"></i> SCRM</span>
+          </a>
+        </div>
+        <div class="system-nav-menu">
+          <!--<a href="http://mall.kuyicloud.com/">-->
+          <a href="http://mall.test.sgjyun.com/">
+            <span><i class="icon iconfont icon-service_fill"></i> 微商城</span>
+          </a>
+        </div>
+        <div class="system-nav-menu active">
+          <a>
+            <span><i class="icon iconfont icon-jiankangshuidi"></i> 血透管理</span>
+          </a>
+        </div>
+        <div class="system-nav-menu">
+          <!--<a href="http://cdm.kuyicloud.com/">-->
+          <a href=" http://cdm.test.sgjyun.com/">
+            <span><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
+          </a>
+        </div>
 
-      <div class="system-nav-menu">
-        <a href="http://sso.kuyicloud.com/org/app/create">
-        <!-- <a href="http://testsso.sgjyun.com/org/app/create"> -->
-          <span ><i class="icon iconfont icon-suoyou"></i> 应用</span>
-        </a>
+        <div class="system-nav-menu">
+          <!--<a href="http://sso.kuyicloud.com/org/app/create">-->
+          <a href="http://testsso.sgjyun.com/org/app/create">
+            <span><i class="icon iconfont icon-suoyou"></i> 应用</span>
+          </a>
+        </div>
       </div>
-    </div>
 
-    <div class="right-menu">
-      <el-dropdown class="avatar-container right-menu-item" trigger="click">
-        <div class="avatar-wrapper">
-          <img class="user-avatar" :src="avater">
-          <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
-          <i class="el-icon-caret-bottom"></i>
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>
-            <span @click="modifyUserInfoAction">修改个人信息</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span @click="myServe">我的服务</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-
-      <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
-      <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
+      <div class="right-menu">
+        <el-dropdown class="avatar-container right-menu-item" trigger="click">
+          <div class="avatar-wrapper">
+            <img class="user-avatar" :src="avater">
+            <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
+            <i class="el-icon-caret-bottom"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>
+              <span @click="modifyUserInfoAction">修改个人信息</span>
+            </el-dropdown-item>
+            <el-dropdown-item divided>
+              <span @click="myServe">我的服务</span>
+            </el-dropdown-item>
+            <el-dropdown-item divided>
+              <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
 
-    </div>
-  </el-menu>
-</div>
+        <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
+        <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
+
+      </div>
+    </el-menu>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-// import Breadcrumb from "@/components/Breadcrumb";
-// import Hamburger from "@/components/Hamburger";
-import Screenfull from "@/components/Screenfull";
-import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
-
-export default {
-  components: {
-    // Breadcrumb,
-    // Hamburger,
-    Screenfull,
-    ModifyUserInfoDialog
-  },
-  computed: {
-    ...mapGetters(["sidebar"]),
-    avater: function() {
-      var avatar = this.$store.getters.xt_user.user.avatar;
-      return avatar.length > 0
-        ? avatar
-        : require("../../../assets/home/userData.png");
-    }
-  },
-  methods: {
-    // toggleSideBar() {
-    //   this.$store.dispatch("toggleSideBar");
-    // },
-    logout() {
-      this.$store.dispatch("FrontendLogout");
-      window.location.href = process.env.BASE_API + "/logout";
+  import { mapGetters } from 'vuex'
+  // import Breadcrumb from "@/components/Breadcrumb";
+  // import Hamburger from "@/components/Hamburger";
+  import Screenfull from '@/components/Screenfull'
+  import ModifyUserInfoDialog from '@/xt_pages/home/modify_user_info_dialog'
+
+  export default {
+    components: {
+      // Breadcrumb,
+      // Hamburger,
+      Screenfull,
+      ModifyUserInfoDialog
     },
-    modifyUserInfoAction() {
-      this.$refs.modify_user_info_dialog.show();
+    computed: {
+      ...mapGetters(['sidebar']),
+      avater: function() {
+        var avatar = this.$store.getters.xt_user.user.avatar
+        return avatar.length > 0
+          ? avatar
+          : require('../../../assets/home/userData.png')
+      }
     },
-    myServe() {
-      this.$router.push("/service");
-      return false;
+    methods: {
+      // toggleSideBar() {
+      //   this.$store.dispatch("toggleSideBar");
+      // },
+      logout() {
+        this.$store.dispatch('FrontendLogout')
+        window.location.href = process.env.BASE_API + '/logout'
+      },
+      modifyUserInfoAction() {
+        this.$refs.modify_user_info_dialog.show()
+      },
+      myServe() {
+        this.$router.push('/service')
+        return false
+      }
     }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.top-nav {
-  background: #409eff;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  // z-index: 2052;
+  .top-nav {
+    background: #409eff;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+
   .nav-logo {
     width: 162px;
     display: flex;
@@ -138,10 +139,12 @@ export default {
     padding: 10px 0;
     box-sizing: border-box;
     float: left;
-    img {
-      display: inline-block;
-      width: 100px;
-    }
+
+  img {
+    display: inline-block;
+    width: 100px;
+  }
+
   }
   .navbar {
     border-radius: 0px !important;
@@ -153,81 +156,102 @@ export default {
     border: none;
     background: #409eff;
     float: left;
-    .breadcrumb-container {
-      float: left;
-    }
-    .errLog-container {
-      display: inline-block;
-      vertical-align: top;
-    }
-    .right-menu {
-      float: right;
-      height: 100%;
-      &:focus {
-        outline: none;
-      }
-      .right-menu-item {
-        display: inline-block;
-        margin: 0 8px;
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-      .screenfull {
-        height: 20px;
-      }
-      .international {
-        vertical-align: top;
-      }
-      .theme-switch {
-        vertical-align: 15px;
-      }
-      .avatar-container {
-        margin-right: 10px;
-        .avatar-wrapper {
-          cursor: pointer;
-          margin-top: 3px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          .user-avatar {
-            width: 40px;
-            height: 40px;
-            border-radius: 50%;
-            object-fit: cover;
-            object-position: center;
-          }
-          .user-title {
-            margin: 0 8px;
-            font-size: 14px;
-            color: #fff;
-          }
-          .el-icon-caret-bottom {
-            font-size: 12px;
-            color: #fff;
-          }
-        }
-      }
-    }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
+
+  &
+  :focus {
+    outline: none;
+  }
+
+  .right-menu-item {
+    display: inline-block;
+    margin: 0 8px;
+
+  .iconfont {
+    font-size: 18px;
+  }
+
+  }
+  .screenfull {
+    height: 20px;
+  }
+
+  .international {
+    vertical-align: top;
+  }
+
+  .theme-switch {
+    vertical-align: 15px;
+  }
+
+  .avatar-container {
+    margin-right: 10px;
+
+  .avatar-wrapper {
+    cursor: pointer;
+    margin-top: 3px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+  .user-avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    object-fit: cover;
+    object-position: center;
+  }
+
+  .user-title {
+    margin: 0 8px;
+    font-size: 14px;
+    color: #fff;
+  }
+
+  .el-icon-caret-bottom {
+    font-size: 12px;
+    color: #fff;
+  }
+
+  }
+  }
+  }
   }
   .system-nav {
-    .system-nav-menu {
-      float: left;
-      height: 60px;
-      line-height: 60px;
-      padding: 0 25px;
-      a {
-        font-size: 15px;
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-    }
-    .active {
-      background: #3090eb;
-      border-left: 1px #5fabf7 solid;
-      border-right: 1px #5fabf7 solid;
-    }
+
+  .system-nav-menu {
+    float: left;
+    height: 60px;
+    line-height: 60px;
+    padding: 0 25px;
+
+  a {
+    font-size: 15px;
+
+  .iconfont {
+    font-size: 18px;
+  }
+
+  }
+  }
+  .active {
+    background: #3090eb;
+    border-left: 1px #5fabf7 solid;
+    border-right: 1px #5fabf7 solid;
+  }
+
   }
   .el-menu::after,
   .el-menu::before {
@@ -237,5 +261,6 @@ export default {
     top: 0;
     left: 0;
   }
-}
+
+  }
 </style>

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -111,10 +111,14 @@
         })
       },
       cancle: function(formName) {
+        this.goodInfo = []
+        this.goodInfoTableData = []
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
       },
       comfirm: function(formName) {
+        this.goodInfo = []
+        this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
       },

src/xt_pages/stock/cancelStockOrder.vue

@@ -278,7 +278,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -27,7 +27,7 @@
         </div>
         <div class="cell clearfix">
           <label class="title"><span class="name">厂商</span> : </label>
-          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
             <el-option
               v-for="(option, index) in manufacturer"
               :key="index"
@@ -344,6 +344,13 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {

src/xt_pages/stock/salesReturnEdit.vue

@@ -217,6 +217,10 @@
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
+            console.log(this.propForm.goodInfo)
+            console.log(this.propForm.goodType)
+
+
           }
         })
       }, typeName: function(good_type_id) {
@@ -228,6 +232,7 @@
         }
         return name
       }, specificationName: function(good_info_id) {
+
         let name = ''
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].id == good_info_id) {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -23,7 +23,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
-        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商">
+        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -354,6 +354,14 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        tempObj['price'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -23,7 +23,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
-        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -462,6 +462,7 @@
           const params = {
             id: this.form.manufacturer
           }
+          this.propForm.goodType = []
           GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -550,6 +551,21 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+
       }
     },
     created() {

src/xt_pages/stock/stockInOrderEdit.vue

@@ -377,6 +377,7 @@ export default {
           const params = {
             id: this.form.manufacturer
           }
+          this.propForm.goodType = []
           GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -26,7 +26,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">厂商</span> : </label>
-      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
         <el-option
           v-for="(option, index) in manufacturer"
           :key="index"
@@ -380,6 +380,15 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = 0
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {