Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/stock/Dialog/goodInfoDailog.vue

             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
-              <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
-            <el-form-item label="五笔 : " prop="wubi" style="width:50%">
-              <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
-            </el-form-item> -->
             <el-form-item label="耗材种类 : " prop="good_kind">
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                 <el-option
                 <el-form-item prop="min_number" class="noMargin">
                   <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
                 </el-form-item>
-                <!-- <el-form-item prop="min_unit" class="noMargin">
-                  <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                <el-form-item prop="packing_unit" class="noMargin">
+                  <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
                     <el-option
                       v-for="(item,index) in getDataConfig('hemodialysis','units')"
                       :key="index"
                       :value="item.name">
                     </el-option>
                   </el-select>
-              </el-form-item> -->
-
-              <el-form-item prop="packing_unit" class="noMargin">
-                <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
-                  <el-option
-                    v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.name">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+                </el-form-item>
             </div>
 
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">

src/xt_pages/stock/drugs/drugStockInOrder.vue

 <template>
   <div class="main-contain">
     <div class="position">
-      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-button
         size="small"
           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
-          >删除</el-button
-        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+        <el-button size="small" type="primary" @click="drugPrint()">打印</el-button>
       </div>
 
       <el-table
       dialogVisible:false,
       showOne:false,
       drugTypeList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      order_id:""
     };
   },
   methods: {
       }
     },
     select(selection) {
+      console.log("selection",selection)
+      this.order_id = selection[0].id
       this.selectedTableData = selection;
     },
     batchDelete() {
      getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
+    drugPrint(){
+      if(this.order_id == 0){
+         this.$message.error("请选择入库单")
+      }else{
+        this.$router.push({path:"/stock/drugStockInOrderDetailPrint?id="+this.order_id})
+      }
+      
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      <el-button  size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
       </el-button>
     </div>
     <div class="app-container ">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
-          >删除</el-button
-        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
       </div>
 
       <el-table
       tableShow:false,
       manufacturerList:[],
       drugDialogVisible:false,
+      order_id:0,
     };
   },
   methods: {
       }
     },
     select(selection) {
+      this.order_id = selection[0].id
       this.selectedTableData = selection;
     },
     batchDelete() {
        }
      })
    },
-
+   toPrint(){
+     if(this.order_id == 0){
+        this.$message.error("请选择出库单")
+     }else{
+       this.$router.push({path:"/stock/drugStockOutOrderDetailPrint?id="+this.order_id})
+     }
+   }
     
   }
 };

src/xt_pages/stock/stockInOrder.vue

           </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="260px">
           <template slot-scope="scope">
             <!-- <el-tooltip

src/xt_pages/stock/stockInOrderAdd.vue

 
             </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 label="备注" align="center" width="150">
             <template slot-scope="scope">
         },
 
         manufacturer: [],
-        dealer: [],
+        dealerList: [],
         goodType: [],
         manufacturerList:[],
         goodList:[]
           if (valid) {
             const array = this.recordInfo.recordData
             console.log("array9999999",array)
-           
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
               this.$message.success('请添加入库商品')
               return
             }
-          
+            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 = {
               'stockIn': this.recordInfo.recordData
             }
+            console.log("stockIn",this.recordInfo.recordData)
            
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
       ,
       changeManufacturer(val) {
 
-      }, changeDealer(val) {
+      }, 
+      changeDealer(val) {
 
       },
       getDataConfig(module, filed_name){
         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
+             var dealer =  response.data.data.dealer
+             this.dealerList = dealer
              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.recordInfo.recordData[i].good_type_id = val.id
               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
+              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+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
               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
+
            }
          }
       }