Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/stock.js

   })
 }
 
-export function EditWarehouse(params, warehousing_time, id,type) {
+export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id,type) {
+export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id,type) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id,type) {
+export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })

src/views/layout/components/Navbar.vue

       </div>
       <div class="system-nav">
         <div class="system-nav-menu">
-          <!--<a  href="http://jk.kuyicloud.com/">-->
-          <a href="http://test1.sgjyun.com/">
+          <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/">
+          <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>
           </a>
         </div>
         <div class="system-nav-menu">
-          <!--<a href="http://cdm.kuyicloud.com/">-->
-          <a href=" http://cdm.test.sgjyun.com/">
+          <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">
+          <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>

src/xt_pages/stock/cancelStockOrderAdd.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseOutInfoList:[],
         manufacturer: [],
         dealer: [],
         goodType: []
           } else {
             var warehouseOutList = response.data.data.warehouseOutList
             var warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            this.warehouseOutInfoList = response.data.data.warehouseOutInfoList
+
             for (let i = 0; i < warehouseOutList.length; i++) {
               if (warehouseOutList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseOutList[i].Manufacturer)
           return
         } else {
           this.$refs.dialog.show()
-          console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
             }
           }
           const obj3 = {}

src/xt_pages/stock/cancelStockOrderEdit.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseOutInfoList:[],
         cancelStock: {},
         manufacturer: [],
         dealer: [],
             return false
           } else {
             var warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            this.warehouseOutInfoList = response.data.data.warehouseOutInfoList
+
             for (let i = 0; i < warehouseOutInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+        for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+          if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
           }
         }
         const obj3 = {}
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/detail/salesReturnDetail.vue

             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/detail/stockInDetail.vue

             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/detail/stockOutDetail.vue

             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/salesReturnEdit.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseInfoList:[],
         salesReturn: {},
         manufacturer: [],
         dealer: [],
             return false
           } else {
             var warehouseInfoList = response.data.data.warehouseInfoList
+            this.warehouseInfoList = response.data.data.warehouseInfoList
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
       }, showDialog(index, row) {
         this.currentIndex = index
         this.$refs.dialog.show()
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+        for (let i = 0; i < this.warehouseInfoList.length; i++) {
+          if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
           }
         }
         const obj3 = {}
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/salesReturnOrderAdd.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseInfoList:[],
         manufacturer: [],
         dealer: [],
         goodType: []
           } else {
             var warehouseList = response.data.data.warehouseList
             var warehouseInfoList = response.data.data.warehouseInfoList
+            this.warehouseInfoList =  response.data.data.warehouseInfoList
+
             for (let i = 0; i < warehouseList.length; i++) {
               if (warehouseList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseList[i].Manufacturer)
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
+
           }
         })
       }, typeName: function(good_type_id) {
         } else {
           this.$refs.dialog.show()
 
-          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
             }
           }
           const obj3 = {}

src/xt_pages/stock/stockInOrderEdit.vue

             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockOutOrderAdd.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseInfoList:[],
         manufacturer: [],
         dealer: [],
         goodType: []
           } else {
             var warehouseList = response.data.data.warehouseList
             var warehouseInfoList = response.data.data.warehouseInfoList
+            this.warehouseInfoList = response.data.data.warehouseInfoList
             for (let i = 0; i < warehouseList.length; i++) {
               if (warehouseList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseList[i].Manufacturer)
         } else {
           this.$refs.dialog.show()
 
-          console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
             }
           }
           const obj3 = {}

src/xt_pages/stock/stockOutOrderEdit.vue

           manufacturer: '',
           dealer: ''
         },
-
+        warehouseInfoList:[],
         warehouseOut: {},
         manufacturer: [],
         dealer: [],
             return false
           } else {
             var warehouseInfoList = response.data.data.warehouseInfoList
+            this.warehouseInfoList = response.data.data.warehouseInfoList
+
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+        for (let i = 0; i < this.warehouseInfoList.length; i++) {
+          if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
           }
         }
         const obj3 = {}
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
             }
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.warehouseOut.manufacturer
+
           }
 
           if (this.recordInfo.recordData.length == 0) {