数据

src/xt_pages/data/components/drugs.vue

@@ -17,7 +17,7 @@
             :value="item.id">
           </el-option>
         </el-select>
-        <label class="title"><span class="name">是否收费</span> : </label>
+        <label class="title"><span class="name">是否备案</span> : </label>
         <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
           <el-option
             v-for="item in options"

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -93,9 +93,9 @@
             <el-form-item label="包装零售价 : " prop="retail_price">
               <el-input v-model="form.packing_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拆零零售价 : " prop="retail_price">
+            <!-- <el-form-item label="拆零零售价 : " prop="retail_price">
               <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
 
             <el-form-item label="进货价 : " prop="buy_price">
               <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
@@ -349,7 +349,7 @@
           statistics_category: '',
           agent: '',
           good_status: '',
-          default_count: '',
+          default_count:1,
           sign: '',
           is_default: '',
           is_charge_use: '',
@@ -389,8 +389,6 @@
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
           ], good_unit: [
             { required: true, message: '请选择单位', trigger: 'blur' }
-          ], retail_price: [
-            { required: true, message: '请输入零价', trigger: 'blur' }
           ], stock_warn_count: [
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ],social_security_directory_code:[

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -71,7 +71,7 @@ export default {
       },
        out_stock: '1',
        stock_attribute:"1",
-       showAttribute:false
+       showAttribute:true
     };
   },
   props: {
@@ -89,13 +89,13 @@ export default {
   },
   methods: {
     show:function(val){
-      console.log("val22222222",this.formValue)
-      if(this.formValue.stock_attribute == "1"){
-        this.showAttribute = false
-      }
-      if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
-        this.showAttribute = true
-      }
+      // console.log("val22222222",this.formValue)
+      // if(this.formValue.stock_attribute == "1"){
+      //   this.showAttribute = false
+      // }
+      // if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
+      //   this.showAttribute = true
+      // }
    
       this.visibility = true
 

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -55,36 +55,36 @@
         :data="tableList"
         border
         style="width: 100%">
-        <el-table-column prop="date" label="序号" width="180">
+        <el-table-column prop="date" label="序号" width="180" align="center">
            <template  slot-scope="scope">
               {{scope.$index + 1}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_type" label="出入库方式" width="180">
+        <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4">手动入库</span>
              <span v-if="scope.row.drug_way == 2">手动出库</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="出/入库单据编码">
+        <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.warehousing_order}}</span>
             
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作日期">
+        <el-table-column prop="drug_name" label="操作日期" align="center">
            <template slot-scope="scope">
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="出入库数量">
+         <el-table-column prop="drug_name" label="出入库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehouse_out_order_number}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.warehousing_order}}</span>
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="剩余库存量">
+         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
              <!-- <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
              <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span> -->
@@ -92,25 +92,25 @@
              <span></span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="进/出货单价">
+        <el-table-column prop="drug_name" label="进/出货单价" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{scope.row.price}}</span>
              <span v-if="scope.row.drug_way == 2">{{scope.row.price}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="有效期">
+         <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
              <span v-if="scope.row.drug_way == 2">{{getTime(scope.row.expiry_date)}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="批号">
+        <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 2"> {{scope.row.number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.number}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="供应商">
+        <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
              <span v-if="scope.row.drug_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
@@ -219,7 +219,7 @@
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("入库数据",list)
+            console.log("入库数据0000",list)
             for(let i=0;i<list.length;i++){
                list[i].drug_way = 4
                this.tableList.push(list[i])
@@ -286,7 +286,7 @@
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
          if(id == this.manufacturerList[i].id){
-            name = this.manufacturerList[i].name
+            name = this.manufacturerList[i].manufacturer_name
          }
        }
        return name
@@ -314,7 +314,7 @@
             this.countList = countlist
             var outcountlist = response.data.data.outCountList
             console.log("出库数据",outcountlist)
-            this.outCountList = this.outCountList
+            this.outCountList = outcountlist
             var aucountlist = response.data.data.auCountList
             console.log("自动数据",aucountlist)
             this.autoCountList = aucountlist

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -118,7 +118,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="厂家" align="center">
+        <!-- <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
           </template>
@@ -128,7 +128,7 @@
           <template slot-scope="scope">
             {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
 
         <el-table-column label="操作" align="center" width="240">
@@ -223,11 +223,11 @@
               {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-          <el-table-column label="批号" align="center">
+          <!-- <el-table-column label="批号" align="center">
             <template slot-scope="scope">
             {{scope.row.number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               {{scope.row.count}}
@@ -235,12 +235,12 @@
           </el-table-column>
           <el-table-column label="进货价" align="center">
             <template slot-scope="scope">
-              {{scope.row.price}}
+              {{scope.row.last_price}}
             </template>
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{scope.row.total_price}}
+              {{scope.row.count * scope.row.last_price}}
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -258,11 +258,11 @@
               {{getTime(scope.row.expiry_date)}}
             </template>
           </el-table-column>
-          <el-table-column label="批准文号" align="center">
+          <!-- <el-table-column label="批准文号" align="center">
             <template slot-scope="scope">
               {{scope.row.number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{scope.row.remark}}
@@ -756,7 +756,7 @@ export default {
               this.tableList.push(response.data.data.list[i])
 
             }
-            console.log("详情",this.tableList)
+            console.log("详情222",this.tableList)
             this.warehousingOutInfo.info = response.data.data.info
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
@@ -955,6 +955,8 @@ export default {
            var drugList = response.data.data.drugList
            console.log("药品列表",drugList)
            this.drugList = drugList
+           var manulist = response.data.data.manufacturerList
+           this.manufacturerList = manulist
          }
       })
     },

src/xt_pages/stock/drugs/query.vue

@@ -118,7 +118,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             {{getOutCount(scope.row.drug_id)}}
+             {{getOutCount(scope.row.drug_id) + getAutoCount(scope.row.drug_id)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
@@ -512,7 +512,7 @@
             this.countList = countlist
             var outcountlist = response.data.data.outCountList
             console.log("出库数据",outcountlist)
-            this.outCountList = this.outCountList
+            this.outCountList = outcountlist
             var aucountlist = response.data.data.auCountList
             console.log("自动数据",aucountlist)
             this.autoCountList = aucountlist

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,7 +38,7 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <span>出入库方式:</span>
+        <!-- <span>出入库方式:</span>
         <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
@@ -46,7 +46,7 @@
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
+        </el-select> -->
         
         
       </div>
@@ -79,19 +79,19 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope" >
-             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+             <span v-if="scope.row.stock_way == 4">{{scope.row.number}} </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.count}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="进货单价" align="center">
+         <el-table-column prop="drug_name" label="进货价" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -114,7 +114,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  import {getStockInList} from "@/api/drug/drug_stock";
   export default {
     name: 'stockIn',
     created() {
@@ -227,12 +227,24 @@
          if(response.data.state == 1){
            var list = response.data.data.list
            console.log("入库数据",list)
+           for(let i=0;i<list.length;i++){
+             list[i].stock_way = 4
+           }
            this.tableList = list
            var total = response.data.data.total
            this.total = total
            console.log("入库数据",this.tableList)
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
+
+          // var outlist =  response.data.data.outList
+          // console.log("outlist",outlist)
+          // for(let i=0;i<outlist.length;i++){
+          //     outlist[i].stock_way = 2
+          //     this.tableList.push(outlist[i])
+          // }
+          
+           
          }
       })
      },
@@ -240,6 +252,8 @@
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
      },
+     
+
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -79,7 +79,7 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="出入库数量"  align="center">
+         <el-table-column prop="drug_name" label="入库数量"  align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
              <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
@@ -109,7 +109,7 @@
              <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="供应商" align="center">
+        <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
              <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
@@ -228,7 +228,7 @@
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
          if(id == this.manufacturerList[i].id){
-            name = this.manufacturerList[i].name
+            name = this.manufacturerList[i].manufacturer_name
          }
        }
        return name
@@ -310,7 +310,7 @@
         var count= ""
         for(let i=0;i<this.autoCountList.length;i++){
           if(id == this.autoCountList[i].good_id){
-            count = this.outCountList[i].count
+            count = this.autoCountList[i].count
           }
         }
         return count

src/xt_pages/stock/stockInOrderAdd.vue

@@ -188,11 +188,11 @@
           </el-table-column>
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
                 <el-option
-                  v-for="(option, index) in manufacturerList"
+                  v-for="(option, index) in dealerList"
                   :key="index"
-                  :label="option.manufacturer_name"
+                  :label="option.dealer_name"
                   :value="option.id">
                 </el-option>
                </el-select>
@@ -667,6 +667,14 @@
                  }
               }
             }
+
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              for(let j=0;j<this.dealerList.length;j++){
+                 if(this.recordInfo.recordData[i].dealer == this.dealerList[j].dealer_name){
+                    this.recordInfo.recordData[i].dealer = this.dealerList[j].id
+                 }
+              }
+            }
             const params = {
               'stockIn': this.recordInfo.recordData
             }
@@ -710,7 +718,7 @@
              this.goodList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
-             var dealer =  response.data.data.dealer
+             var dealer =  response.data.data.dealerList
              this.dealerList = dealer
              for(let i=0;i<this.goodList.length;i++){
                 for(let j=0;j<this.manufacturerList.length;j++){
@@ -719,6 +727,14 @@
                   }
                 }
              }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
            
              cb(this.goodList)
           } else {
@@ -744,7 +760,7 @@
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
               this.recordInfo.recordData[i].packing_unit = val.packing_unit
-
+              this.recordInfo.recordData[i].dealer = val.dealer
            }
          }
       }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -211,6 +211,18 @@
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
+          <el-table-column label="生产厂家" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
@@ -228,7 +240,6 @@
 
           <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
-              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -242,7 +253,6 @@
           </el-table-column>
           <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
-              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -254,6 +264,18 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column label="经销商" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -311,9 +333,6 @@ import {
   GetAllConfig,
   getWarehouseInfoList,
   GetAllGoodInfoByID,
-  getWarehouseInfoByOrdeNumber,
-  modifyWarehouseInfo,
-  deleteWarehouseInfo,
   DeleteWarehouseInfoItem,
   EditWarehouse,
   postSearchGoodList
@@ -384,8 +403,9 @@ export default {
       },
       warehouse: {},
       manufacturer: [],
-      dealer: [],
-      goodType: []
+      dealerList: [],
+      goodType: [],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -447,11 +467,13 @@ export default {
           return false;
         } else {
           this.manufacturer = response.data.data.manufacturer;
+          this.manufacturerList = response.data.data.manufacturer
+          this.dealerList = response.data.data.dealer
           this.dealer = response.data.data.dealer;
           this.goodType = response.data.data.goodType;
           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: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
         loading.close();
       });
@@ -617,6 +639,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params2222",params)
+       
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -649,6 +672,7 @@ export default {
           return false;
         } else {
           console.log("列表2222222",response.data.data.info)
+         
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -661,8 +685,10 @@ export default {
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
             response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
-            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.min_unit
-            response.data.data.info[i].min_unit = response.data.data.info[i].GoodInfo.min_unit
+            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.packing_unit
+            response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
+            
+           
            
             this.recordInfo.recordData.push(response.data.data.info[i]);
            
@@ -670,8 +696,7 @@ export default {
           }
 
           this.warehouse = response.data.data.warehousing;
-          this.form.manufacturer = this.warehouse.manufacturer;
-          this.form.dealer = this.warehouse.dealer;
+        
 
           this.warehousing_time = this.getTime(
             this.warehouse.warehousing_time,
@@ -701,22 +726,28 @@ export default {
         if (keyword != undefined) {
           key = keyword
         }
-        console.log("keyrowrd",key)
         postSearchGoodList(key).then(response => {
           if (response.data.state == 1) {
           
             var list = response.data.data.list
             this.goodList = list
-            var manufacturerList = response.data.data.manufacturerList
-            this.manufacturerList = manufacturerList
-            for(let i=0;i<this.goodList.length;i++){
-                for(let j=0;j<this.manufacturerList.length;j++){
-                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                  }
-                }
-            }
-          
+            // var manufacturerList = response.data.data.manufacturerList
+            // this.dealerList = response.data.data.dealerList
+            // this.manufacturerList = manufacturerList
+            // for(let i=0;i<this.goodList.length;i++){
+            //     for(let j=0;j<this.manufacturerList.length;j++){
+            //       if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+            //       }
+            //     }
+            // }
+            // for(let i=0;i<this.goodList.length;i++){
+            //    for(let j=0;j<this.dealerList.length;j++){
+            //       if(this.goodList[i].dealer == this.dealerList[j].id){
+            //         this.goodList[i].dealer = this.dealerList[j].dealer_name
+            //       }
+            //    }
+            //  }
             cb(this.goodList)
           } else {
             cb([])
@@ -740,7 +771,8 @@ export default {
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-            this.recordInfo.recordData[i].min_unit = val.min_unit
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
+            this.recordInfo.recordData[i].dealer = val.dealer
           }
         }
     }

src/xt_pages/stock/stockOutOrder.vue

@@ -107,17 +107,7 @@
             {{ getXuserName(scope.row.creater) }}
           </template>
         </el-table-column>
-        <el-table-column label="厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="经销商" align="center">
-          <template slot-scope="scope">
-            {{ getDealerName(scope.row.dealer) }}
-          </template>
-        </el-table-column>
+       
 
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
@@ -211,11 +201,11 @@
               {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
             </template>
           </el-table-column>
-          <el-table-column label="批号" align="center">
+          <!-- <el-table-column label="批号" align="center">
             <template slot-scope="scope">
               {{ scope.row.number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
@@ -237,7 +227,7 @@
               {{ getManufactuerName(scope.row.manufacturer)}}
             </template>
           </el-table-column>
-          <el-table-column label="生产日期" align="center">
+          <!-- <el-table-column label="生产日期" align="center">
             <template slot-scope="scope">
               {{ getTime(scope.row.product_date)}}
             </template>
@@ -246,7 +236,7 @@
             <template slot-scope="scope">
               {{ getTime(scope.row.expiry_date)}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -54,7 +54,7 @@
         ></el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -72,9 +72,9 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
         <el-select
           size="small"
@@ -92,7 +92,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -159,14 +159,14 @@
             </template>
           </el-table-column>
           
-          <el-table-column  width="150" align="center">
+          <!-- <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red">*</span></span>
+              <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -355,7 +355,7 @@ export default {
       },
       warehouseInfoList: [],
       manufacturer: [],
-      dealer: [],
+      dealerList: [],
       goodType: [],
       goodInfo:[],
       goodList:[],
@@ -579,11 +579,18 @@ export default {
           for(let i=0;i<this.recordInfo.recordData.length;i++){
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            for(let j=0;j<this.manufacturerList.length;j++){
+              if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                 this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+              }
+            }
+          }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-          
+        
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -649,7 +656,6 @@ export default {
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
-            // this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].price = val.buy_price

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -164,6 +164,18 @@
               {{calculate(scope.row.price*scope.row.count)}}
             </template>
           </el-table-column>
+          <el-table-column label="生产厂商"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
           <el-table-column label="备注" min-width="20" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -311,7 +323,8 @@
         this.propForm.goods = [];
 
         this.propForm.goodType = [];
-      }, GetConfigInfo: function() {
+      }, 
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: "Loading",
@@ -323,12 +336,12 @@
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.manufacturer = response.data.data.manufacturer;
+            this.manufacturerList = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
             this.goodType = response.data.data.goodType;
             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: 0, manufacturer_name: "全部" });
+            // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
           loading.close();
         });
@@ -477,8 +490,9 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            
+           
             console.log("stockout",params)
+            
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -492,7 +506,8 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      }, 
+      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -507,6 +522,7 @@
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
               response.data.data.list[i].name = response.data.data.list[i].GoodInfo.good_name + "*" + response.data.data.list[i].GoodInfo.specification_name
+
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.warehouseOut = response.data.data.info
@@ -548,15 +564,15 @@
           
             var list = response.data.data.list
             this.goodList = list
-            var manufacturerList = response.data.data.manufacturerList
-            this.manufacturerList = manufacturerList
-            for(let i=0;i<this.goodList.length;i++){
-              for(let j=0;j<this.manufacturerList.length;j++){
-                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                }
-              }
-            }
+            // var manufacturerList = response.data.data.manufacturerList
+            // this.manufacturerList = manufacturerList
+            // for(let i=0;i<this.goodList.length;i++){
+            //   for(let j=0;j<this.manufacturerList.length;j++){
+            //     if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+            //     }
+            //   }
+            // }
           
             cb(this.goodList)
         } else {

src/xt_pages/stock/stockQuery.vue

@@ -96,7 +96,7 @@
             {{scope.row.price}}
           </template>
         </el-table-column>
-        <el-table-column label="厂商" align="center">
+        <el-table-column label="生产商" align="center">
           <template slot-scope="scope">
            {{getManufacture(scope.row.manufacturer)}}
           </template>
@@ -509,7 +509,7 @@ export default {
      var count= ""
      for(let i=0;i<this.autoCountList.length;i++){
        if(id == this.autoCountList[i].good_id){
-         count = this.outCountList[i].count
+         count = this.autoCountList[i].count
        }
      }
      return count