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

config/index.js

@@ -17,9 +17,9 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'localhost',
+    // host: 'localhost',
     port:9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -102,37 +102,13 @@
         this.currentGoodTypeId = currentRow.id
         this.goodInfoTableData = []
         this.goodInfo = []
-        console.log(this.propForm.manufacturer)
-        console.log(this.propForm.dealer)
         console.log(this.propForm.goodInfo)
 
 
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.currentGoodTypeId == this.propForm.goodInfo[i].good_type_id) {
-            if(this.propForm.dealer == 0 && this.propForm.manufacturer == 0){
               this.goodInfo.push(this.propForm.goodInfo[i])
               this.goodInfoTableData.push(this.propForm.goodInfo[i])
-
-            }else{
-              if(this.propForm.manufacturer == 0 && this.propForm.dealer != 0){
-                if(this.propForm.goodInfo[i].dealers.id == this.propForm.dealer){
-                  this.goodInfo.push(this.propForm.goodInfo[i])
-                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
-                }
-              }
-              if(this.propForm.manufacturer != 0 && this.propForm.dealer == 0){
-                if(this.propForm.goodInfo[i].manufacturers.id == this.propForm.manufacturer){
-                  this.goodInfo.push(this.propForm.goodInfo[i])
-                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
-                }
-              }
-              if(this.propForm.manufacturer != 0 && this.propForm.dealer != 0){
-                if(this.propForm.goodInfo[i].manufacturers.id == this.propForm.manufacturer && this.propForm.goodInfo[i].dealers.id == this.propForm.dealer){
-                  this.goodInfo.push(this.propForm.goodInfo[i])
-                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
-                }
-              }
-            }
           }
         }
       },

src/xt_pages/stock/salesReturnEdit.vue

@@ -253,11 +253,6 @@
               }
             }
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
-
-
             for (let i = 0; i < this.warehouseInfoList.length; i++) {
               this.goodType.push(this.warehouseInfoList[i].info.type)
             }
@@ -267,7 +262,6 @@
             const obj2 = {}
             const obj3 = {}
 
-            const obj4 = {}
 
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
@@ -285,11 +279,8 @@
               return cur
             }, [])
 
-
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
+            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
 
@@ -353,52 +344,147 @@
         this.currentIndex = index
         this.propForm.goodType = []
 
+        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
+          }
+        }
 
         if (this.form.manufacturer == 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
             this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-          }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-        } else {
+            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
+          }
+        }
 
-          if(this.form.manufacturer == 0 && this.form.dealer != 0){
+        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
             }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer == 0){
-            console.log(this.warehouseInfoList)
+        }
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
-            }
+        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
+            }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer != 0){
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
             }
+          }
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
+            }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
         }
+        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+        const obj4 = {}
+        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+
+        // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+        //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // } else {
+        //
+        //
+        //   if(this.form.manufacturer == 0 && this.form.dealer != 0){
+        //
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   if(this.form.manufacturer != 0 && this.form.dealer == 0){
+        //     console.log(this.warehouseInfoList)
+        //
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //
+        //   }
+        //   if(this.form.manufacturer != 0 && this.form.dealer != 0){
+        //
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // }
         this.$refs.dialog.show()
 
 

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -18,7 +18,8 @@
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
       <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
-        <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false"
+                        style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
@@ -49,10 +50,9 @@
       </div>
 
 
-
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  max-height="450"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
 
@@ -97,7 +97,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count'
                             style="padding-top: 17px">
-                <el-input  placeholder="请输入退货数量" type="number" v-model="scope.row.return_count"></el-input>
+                <el-input placeholder="请输入退货数量" type="number" v-model="scope.row.return_count"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -130,7 +130,7 @@
         </el-table>
       </el-form>
 
-  </div>
+    </div>
   </div>
 
 </template>
@@ -158,7 +158,6 @@
           { path: false, name: '新增退货单' }
         ],
 
-
         type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
@@ -175,22 +174,20 @@
           ]
         },
 
-
-
         // prop
         isVisibility: false,
         propForm: {
           goodType: [],
           goodInfo: [],
           goodUnit: [],
-          manufacturer:0,
-          dealer:0,
+          manufacturer: 0,
+          dealer: 0
         },
         form: {
           manufacturer: 0,
-          dealer: 0,
+          dealer: 0
         },
-        warehouseInfoList:[],
+        warehouseInfoList: [],
         manufacturer: [],
         dealer: [],
         goodType: []
@@ -250,16 +247,12 @@
               }
             }
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
             for (let i = 0; i < this.warehouseInfoList.length; i++) {
               this.goodType.push(this.warehouseInfoList[i].info.type)
             }
             const obj = {}
             const obj2 = {}
             const obj3 = {}
-            const obj4 = {}
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
               obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
@@ -275,11 +268,8 @@
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
-
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
+            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
 
@@ -331,52 +321,103 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        //根据选择经销商和厂商过滤商品类型
 
-        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
               this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-        } else {
+        }
 
+        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
 
-          if(this.form.manufacturer == 0 && this.form.dealer != 0){
+        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
             }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer == 0){
-            console.log(this.warehouseInfoList)
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+          }
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
             }
+          }
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
+            }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer != 0){
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
             }
+          }
+        }
 
+        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
         }
+        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+        const obj4 = {}
+        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
         this.$refs.dialog.show()
       }, back() {
         this.$router.go(-1)
@@ -417,7 +458,7 @@
       }, changeManufacturer(val) {
         this.propForm.manufacturer = val
         console.log(val)
-      },changeDealer(val){
+      }, changeDealer(val) {
         this.propForm.dealer = val
         console.log(val)
       }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -26,32 +26,31 @@
       </div>
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
-                   @change="changeManufacturer">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
           <el-option
-            v-for="(option, index) in manufacturer"
+            v-for="(option, index) in dealer"
             :key="index"
-            :label="option.manufacturer_name"
+            :label="option.dealer_name"
             :value="option.id">
           </el-option>
         </el-select>
       </div>
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <label class="title"><span class="name">厂商</span> : </label>
+
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
+                   @change="changeManufacturer">
           <el-option
-            v-for="(option, index) in dealer"
+            v-for="(option, index) in manufacturer"
             :key="index"
-            :label="option.dealer_name"
+            :label="option.manufacturer_name"
             :value="option.id">
           </el-option>
         </el-select>
       </div>
 
-
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
                   style="width: 100%"
@@ -414,6 +413,8 @@
             this.goodInfo = response.data.data.goodInfo
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+            this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
+            this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
             this.form.manufacturer = 0
             this.form.dealer = 0
           }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -282,14 +282,10 @@
               this.goodType.push(this.warehouseInfoList[i].info.type)
             }
 
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
-            }
+
             const obj = {}
             const obj2 = {}
             const obj3 = {}
-
-            const obj4 = {}
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
               obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
@@ -300,10 +296,6 @@
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
 
             this.goodType = this.goodType.reduce((cur, next) => {
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
@@ -364,43 +356,139 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
+          }
+        }
+
         if (this.form.manufacturer == 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
             this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-        } else {
-          if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
         }
+
+        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
+          }
+        }
+        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+        const obj4 = {}
+        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+
+        // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+        //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // } else {
+        //   if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
+        //       if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // }
         this.$refs.dialog.show()
 
       }, back() {