库存菜单

config/dev.env.js

@@ -11,6 +11,6 @@ module.exports = {
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
-  MIRCO_MALL_HOST: '"http://mall.sgjyun.com"',
-  CDM_HOST: '"http://cdm.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }

config/sit.env.js

@@ -6,6 +6,6 @@ module.exports = {
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
-  MIRCO_MALL_HOST: '"http://mall.sgjyun.com"',
-  CDM_HOST: '"http://cdm.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }

src/router/modules/stock.js

@@ -10,166 +10,120 @@ export default {
     title: 'stockManage',
     icon: 'stock'
   },
-  children: [{
-    path: '/stock/config',
-    component: () => import('@/xt_pages/stock/index'),
-    name: 'config',
-    meta: {
-      title: 'config'
-    }
-  },
-  {
-    path: '/stock/in',
-    component: () => import('@/xt_pages/stock/stockInOrder'),
-    name: 'stockInOrder',
-    meta: {
-      title: 'stockInOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/in/other',
-    component: () => import('@/xt_pages/stock/otherStockInOrder'),
-    name: 'otherStockInOrder',
-    meta: {
-      title: 'otherStockInOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/return',
-    component: () => import('@/xt_pages/stock/salesReturnOrder'),
-    name: 'salesReturnOrder',
-    meta: {
-      title: 'salesReturnOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/return/other',
-    component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-    name: 'otherSalesReturnOrder',
-    meta: {
-      title: 'otherSalesReturnOrder',
-      noCache: true
-    }
-  },
-  {
-    path: '/stock/out',
-    component: () => import('@/xt_pages/stock/stockOutOrder'),
-    name: 'stockOutOrder',
-    meta: {
-      title: 'stockOutOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/out/other',
-    component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-    name: 'otherStockOutOrder',
-    meta: {
-      title: 'otherStockOutOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/cancel',
-    component: () => import('@/xt_pages/stock/cancelStockOrder'),
-    name: 'cancelStockOrder',
-    meta: {
-      title: 'cancelStockOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/cancel/other',
-    component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-    name: 'otherCancelStockOrder',
-    meta: {
-      title: 'otherCancelStockOrder',
-      noCache: true
-    }
-  }, {
-    path: '/stock/query',
-    component: () => import('@/xt_pages/stock/stockQuery'),
-    name: 'stockQuery',
-    meta: {
-      title: 'stockQuery'
-    }
-  }, {
-    path: '/stock/detail',
-    component: () => import('@/xt_pages/stock/stockDetailIndex'),
-    name: 'stockDetail',
-    meta: {
-      title: 'stockDetail'
-    }
-  },
-  {
-    path: '/stock/in/add',
-    component: () => import('@/xt_pages/stock/stockInOrderAdd'),
-    name: 'stockInOrderAdd',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'stockInOrderAdd'
-    }
-  }, {
-    path: '/stock/in/detail',
-    component: () => import('@/xt_pages/stock/stockInDetail'),
-    name: 'stockInDetail',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'stockInDetail'
-    }
-  }, {
-    path: '/stock/return/detail',
-    component: () => import('@/xt_pages/stock/salesReturnDetail'),
-    name: 'salesReturnDetail',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'salesReturnDetail'
-    }
-  }, {
-    path: '/stock/return/add',
-    component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
-    name: 'salesReturnOrderAdd',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'salesReturnOrderAdd'
-    }
-  }, {
-    path: '/stock/out/add',
-    component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
-    name: 'stockOutOrderAdd',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'stockOutOrderAdd'
-    }
-  }, {
-    path: '/stock/out/detail',
-    component: () => import('@/xt_pages/stock/stockOutDetail'),
-    name: 'stockOutDetail',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'stockOutDetail'
-    }
-  }, {
-    path: '/stock/cancel/add',
-    component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-    name: 'cancelStockOrderAdd',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'cancelStockOrderAdd'
-    }
-  }, {
-    path: '/stock/cancel/detail',
-    component: () => import('@/xt_pages/stock/cancelStockDetail'),
-    name: 'cancelStockDetail',
-    hidden: true,
-    is_menu: false,
-    meta: {
-      title: 'cancelStockDetail'
-    }
-  }
+  children: [
+        {
+          path: '/stock/in',
+          component: () => import('@/xt_pages/stock/stockInOrder'),
+          name: 'stockInOrder',
+          meta: { title: 'stockInOrder', noCache: true }
+        }, {
+          path: '/stock/return',
+          component: () => import('@/xt_pages/stock/salesReturnOrder'),
+          name: 'salesReturnOrder',
+          meta: { title: 'salesReturnOrder', noCache: true }
+        }, 
+        {
+          path: '/stock/out',
+          component: () => import('@/xt_pages/stock/stockOutOrder'),
+          name: 'stockOutOrder',
+          meta: { title: 'stockOutOrder', noCache: true }
+        },  {
+          path: '/stock/cancel',
+          component: () => import('@/xt_pages/stock/cancelStockOrder'),
+          name: 'cancelStockOrder',
+          meta: { title: 'cancelStockOrder', noCache: true }
+        },{
+          path: '/stock/in/other',
+          component: () => import('@/xt_pages/stock/otherStockInOrder'),
+          name: 'otherStockInOrder',
+          meta: { title: 'otherStockInOrder', noCache: true }
+        }, {
+          path: '/stock/return/other',
+          component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+          name: 'otherSalesReturnOrder',
+          meta: { title: 'otherSalesReturnOrder', noCache: true }
+        },{
+          path: '/stock/out/other',
+          component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+          name: 'otherStockOutOrder',
+          meta: { title: 'otherStockOutOrder', noCache: true }
+        }, {
+          path: '/stock/cancel/other',
+          component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+          name: 'otherCancelStockOrder',
+          meta: { title: 'otherCancelStockOrder', noCache: true }
+        }, {
+          path: '/stock/query',
+          component: () => import('@/xt_pages/stock/stockQuery'),
+          name: 'stockQuery',
+          meta: { title: 'stockQuery' }
+        }, {
+          path: '/stock/detail',
+          component: () => import('@/xt_pages/stock/stockDetailIndex'),
+          name: 'stockDetail',
+          meta: { title: 'stockDetail' }
+        },{
+          path: '/stock/in/add',
+          component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+          name: 'stockInOrderAdd',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'stockInOrderAdd' }
+        }, {
+          path: '/stock/in/detail',
+          component: () => import('@/xt_pages/stock/stockInDetail'),
+          name: 'stockInDetail',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'stockInDetail' }
+        }, {
+          path: '/stock/return/detail',
+          component: () => import('@/xt_pages/stock/salesReturnDetail'),
+          name: 'salesReturnDetail',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'salesReturnDetail' }
+        }, {
+          path: '/stock/return/add',
+          component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+          name: 'salesReturnOrderAdd',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'salesReturnOrderAdd' }
+        }, {
+          path: '/stock/out/add',
+          component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+          name: 'stockOutOrderAdd',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'stockOutOrderAdd', noCache: true }
+        }, {
+          path: '/stock/out/detail',
+          component: () => import('@/xt_pages/stock/stockOutDetail'),
+          name: 'stockOutDetail',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'stockOutDetail', noCache: true }
+        }, {
+          path: '/stock/cancel/add',
+          component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+          name: 'cancelStockOrderAdd',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'cancelStockOrderAdd', noCache: true }
+        }, {
+          path: '/stock/cancel/detail',
+          component: () => import('@/xt_pages/stock/cancelStockDetail'),
+          name: 'cancelStockDetail',
+          hidden: true,
+          is_menu: false,
+          meta: { title: 'cancelStockDetail', noCache: true }
+        },
+        {
+          path: '/stock/config',
+          component: () => import('@/xt_pages/stock/index'),
+          name: 'config',
+          meta: { title: 'config' }
+        }
   ]
 }

src/views/layout/components/Navbar.vue

@@ -133,7 +133,7 @@
         return false
       },
       SCRMWebsit() {
-        return process.env.SCRM_HOST
+        return process.env.SRCM_HOST
       },
       MircoMallWebsit() {
         return process.env.MIRCO_MALL_HOST

src/xt_pages/stock/stockInOrderAdd.vue

@@ -159,15 +159,10 @@
             </template>
           </el-table-column>
 
-
           <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
-
-
-
-
                 <el-button
                   size="mini"
                   type="primary"
@@ -185,21 +180,13 @@
                 </el-button>
               </el-tooltip>
 
-
             </template>
           </el-table-column>
 
-
-
-
-
-
         </el-table>
       </el-form>
 
 
-
-
     </div>
   </div>
 
@@ -429,7 +416,6 @@
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
             this.form.manufacturer = 0
             this.form.dealer = 0
-
           }
           loading.close()
 
@@ -568,29 +554,20 @@
       submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
-
-
-
-
-
-
-            if (array[i].good_id == 0) {
-              this.$message.error('规格名称不能为空')
-              return
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('商品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
             }
-          }
 
-          const params = {
-            'stockIn': this.recordInfo.recordData
-          }
-          postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              this.$message.success('入库成功')
-
-              this.$router.back(-1)
+            const params = {
+              'stockIn': this.recordInfo.recordData
             }
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
@@ -638,38 +615,11 @@
       tempObj['remark'] = ''
       tempObj['dealer'] = ''
       tempObj['manufacturer'] = ''
+
       this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
     }
-  }
-  ,
-  created()
-  {
-    var nowDate = new Date()
-    var nowYear = nowDate.getFullYear()
-    var nowMonth = nowDate.getMonth() + 1
-    var nowDay = nowDate.getDate()
-    this.warehousing_time =
-      nowYear +
-      '-' +
-      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-      '-' +
-      (nowDay < 10 ? '0' + nowDay : nowDay)
-    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)
-    this.GetConfigInfo()
-    this.propForm.goodUnit = this.$store.getters.good_unit
-  }
 
   }
 </script>
@@ -710,4 +660,3 @@
   }
 
 </style>
-s