数据

src/api/stock.js

@@ -649,3 +649,11 @@ export function getOrderDetailById(params) {
     params: params
   })
 }
+
+export function getSingleOutOrderDetail(params) {
+  return request({
+    url: '/api/good/getsingleoutorderdetail',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/consumables.vue

@@ -105,9 +105,9 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
-      <el-table-column label="零售价" width="100" align="center">
+      <el-table-column label="包装零售价" width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.retail_price }}
+          {{ scope.row.packing_price }}
         </template>
       </el-table-column>
        <el-table-column label="社保目录编码" width="110" align="center">

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -9,7 +9,6 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="基础数据" name="first">
         <div>
-          <!--:rules="rules"-->
           <el-form :model="form" ref="form" :rules="rules" label-width="100px"
                    style="display: flex;flex-wrap: wrap;justify-content: space-between;">
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
@@ -46,28 +45,21 @@
               </el-select>
             </el-form-item>
 
-           <div style="width:100%;">
-              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：FX80 * 60盒</span></div>
-          </div>
-          <div style="width:100%;display:flex;align-items:center;">
-               <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
-                 <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
-               </el-form-item>
-                *
-                <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="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>
-            </div>
+           
+        
+            <el-form-item label="规格型号 : " prop="specification_name">
+              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item prop="packing_unit"  label="包装单位:">
+              <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 label="生产厂商 : " prop="manufacturer" style="width:100%">
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -87,7 +87,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -128,7 +128,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -629,8 +629,14 @@ export default {
                this.recordInfo.recordData[i].manufacturer = 0
              }
 
-             this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].drug.last_price.toString()
-             this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+             this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+            //  this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+            
+            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 = {
@@ -764,6 +770,7 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("val2222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id = val.id

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -279,163 +279,6 @@
     </div>
 
 
-
-
-
-    <el-dialog
-      title="出库详细"
-      :visible.sync="dialogVisible"
-      width="60%"
-     >
-      <span>
-        <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
-                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-                  :span-method="merge"
-        >
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>药品名称</span>
-            </template>
-
-            <template slot-scope="scope">
-              <span v-if="scope.row.drug_id != 0">{{
-                scope.row.drug.drug_name
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>规格名称</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.drug_id != 0">{{
-                scope.row.drug?scope.row.drug.drug_spec:''
-              }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="23" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>单价</span>
-            </template>
-            <template slot-scope="scope">
-              <!-- <span>{{scope.row.price}}</span> -->
-              <span>{{getRetailPrice(scope.row.drug_id)}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="23" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>出库数量</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open ==2 ">{{scope.row.count}}</span>
-              <span v-if="drugConfig.is_open ==1">{{getDrugCount(scope.row.drug_id)}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="总价" min-width="20" align="center">
-            <template slot-scope="scope">
-              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open == 2">{{(scope.row.count * getRetailPrice(scope.row.drug_id)).toFixed(2)}}</span>
-              <span v-if="drugConfig.is_open == 1">{{(getRetailPrice(scope.row.drug_id) * getDrugCount(scope.row.drug_id)).toFixed(2)}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="备注" min-width="20" align="center">
-            <template slot-scope="scope">
-              <el-popover placement="top-start" width="250" trigger="hover">
-                <div>{{scope.row.remark}}</div>
-                <span slot="reference"
-                      v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
-                <span slot="reference" v-else>{{ scope.row.remark}}</span>
-              </el-popover>
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="" align="center"  >
-            <template slot-scope="scope" v-if="scope.row.is_sys == 1">
-             <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-
-
-    <el-dialog
-      title="出库明细"
-      :visible.sync="dialogVisibleTwo"
-      width="60%">
-      <span>
-         <div class="app-container">
-
-      <div class="filter-container">
-        <span style="font-size: 18px;color: #606266">商品使用明细</span>
-      </div>
-
-      <div class="cell clearfix">
-        <span style="width: 300px;color: #606266" v-if="userList.length>0">商品类型: {{userList[0].drug.drug_name}} </span>
-        <span style="width: 300px;color: #606266" v-if="userList.length>0">规格名称: {{userList[0].drug.drug_spec}}</span>
-      </div>
-
-      <el-row :gutter="12" style="margin-top: 10px">
-        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
-                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-        >
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>序号</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
-              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>使用人</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span v-if="scope.row.is_total == 1"></span>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>使用数量</span>
-            </template>
-            <template slot-scope="scope">
-              <span >{{scope.row.count}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>使用时间</span>
-            </template>
-            <template slot-scope="scope">
-              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-row>
-    </div>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleTwo = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisibleTwo = false">确 定</el-button>
-      </span>
-    </el-dialog>
-
-
-   
     <el-dialog
       title="提示"
       :visible.sync="drugDialogVisible"
@@ -534,7 +377,7 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
     this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+    // this.fetchAllAdminUsers();
   },
   data() {
     return {
@@ -736,7 +579,7 @@ export default {
        this.getInitializtion()
        this.getSinleOrderDetail(val.id)
        this.list = []
-       this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
+      //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
     },
     GetOrderDetail(order_id) {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -120,7 +120,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " " + item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -98,7 +98,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -544,7 +544,13 @@
                 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 = {
               'stockOut': this.recordInfo.recordData
             }
@@ -613,7 +619,8 @@
             this.recordInfo.recordData.push(tempObj)
           }
         })
-      }, calculate: function(val) {
+      },
+       calculate: function(val) {
         if (val == 0) {
           return ''
         }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -76,7 +76,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +"  " +item.specification_name }}</div>
+                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
                   </template>
                  </el-autocomplete>
             </template>
@@ -752,7 +752,7 @@
               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.packing_unit
+              this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark

src/xt_pages/stock/stockInOrderEdit.vue

@@ -117,7 +117,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +" " + item.specification_name}}</div>
+                    <div class="name">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
             </template>
@@ -405,7 +405,8 @@ export default {
       manufacturer: [],
       dealerList: [],
       goodType: [],
-      manufacturerList:[]
+      manufacturerList:[],
+      numberList:[]
     };
   },
   methods: {
@@ -509,6 +510,7 @@ export default {
       tempObj["remark"] = "";
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
+      tempObj["number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -632,9 +634,17 @@ export default {
               return;
             }
           }
+          console.log("昌吉",this.manufacturerList)
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+
+          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
           };
@@ -685,7 +695,7 @@ 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.packing_unit
+            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "/"+response.data.data.info[i].GoodInfo.packing_unit
             response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
             
            
@@ -731,16 +741,16 @@ export default {
           
             var list = response.data.data.list
             this.goodList = list
-            // var manufacturerList = response.data.data.manufacturerList
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = 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<manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == manufacturerList[j].id){
+                    this.goodList[i].manufacturer = 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){
@@ -774,7 +784,18 @@ export default {
             this.recordInfo.recordData[i].packing_unit = val.packing_unit
             this.recordInfo.recordData[i].dealer = val.dealer
           }
+         
+         if(val.xt_warehouse_info.length > 0){
+           
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+              this.numberList.push(val.xt_warehouse_info[j])
+            }
+            this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
+          }else{
+            this.recordInfo.recordData[i].number = ""
+          }
         }
+     
     }
   },
   created() {

src/xt_pages/stock/stockOutOrder.vue

@@ -201,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> 

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -123,7 +123,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -150,7 +150,7 @@
           
           <el-table-column width="140" 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-form-item style="padding-top: 20px">
@@ -159,14 +159,22 @@
             </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>
             </template>
             <template slot-scope="scope">
-               <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
+                <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
             </template>
-          </el-table-column> -->
+          </el-table-column>
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -227,7 +235,7 @@
             </template>   
           </el-table-column>
 
-         <!-- <el-table-column label="生产日期"  width="150" align="center">
+         <el-table-column label="生产日期"  width="150" align="center">
            <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -253,7 +261,22 @@
                 value-format="yyyy-MM-dd"
               ></el-date-picker>
             </template>
-          </el-table-column> -->
+          </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="备注"  width="150" align="center">
@@ -262,7 +285,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="150">
+          <el-table-column label="操作" align="center" min-width="150" fixed="right">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -359,7 +382,8 @@ export default {
       goodType: [],
       goodInfo:[],
       goodList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      numberList:[],
     };
   },
   methods: {
@@ -463,6 +487,7 @@ export default {
       tempObj["good_unit"] = "";
       tempObj["number"] = ""
       tempObj["specification_name"] = ""
+      tempObj["number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -590,7 +615,7 @@ export default {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-        
+         
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -628,6 +653,7 @@ export default {
         if (response.data.state == 1) {
           
             var list = response.data.data.list
+            console.log("33334445555",list)
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -655,7 +681,7 @@ export default {
             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 +"/"+val.packing_unit
+            this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].price = val.buy_price
@@ -663,6 +689,15 @@ export default {
             this.recordInfo.recordData[i].good_id = val.id
          }
       }
+
+       if(val.xt_warehouse_info.length > 0){
+           var obj = {id:"",name:""}
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+            this.numberList.push(val.xt_warehouse_info[j])
+          }
+          
+        }
+        console.log("9999999",this.numberList)
     }
   },
   created() {
@@ -685,6 +720,7 @@ export default {
     tempObj["good_unit"] = ""
     tempObj["number"] = ""
     tempObj["specification_name"] = ""
+    tempObj["number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -83,7 +83,7 @@
                     >
                       <i class="el-icon-search el-input__icon" slot="suffix"></i>
                     <template slot-scope="{ item }">
-                      <div class="name">{{ item.good_name }}</div>
+                      <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                     </template>
                   </el-autocomplete>
                 </el-form-item>
@@ -108,7 +108,7 @@
              
           <el-table-column width="140" 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-form-item style="padding-top: 20px">
@@ -116,22 +116,25 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column min-width="35" align="center">
+
+          <el-table-column width="140" 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-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                          :value="specificationName(scope.row.good_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              <el-form-item style="padding-top: 20px">
+               <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
               </el-form-item>
-
             </template>
-          </el-table-column> -->
-
-
+          </el-table-column>
+         
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
@@ -181,7 +184,7 @@
               <el-input v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" min-width="30"  fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -215,7 +218,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -282,6 +285,7 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        numberList:[],
       }
     },
     methods: {
@@ -340,8 +344,6 @@
             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: "全部" });
           }
           loading.close();
         });
@@ -370,6 +372,7 @@
         tempObj['count'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
+        tempObj['number'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -486,13 +489,23 @@
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+              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
             }
            
+            for(let i=0;i<this.goodList.length;i++){
+             
+            }
+
+           
             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)
@@ -564,15 +577,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 {
@@ -584,29 +597,73 @@
       this.currentIndex = val
     },
     handleSelect(val){
-      console.log("val",val)
+       console.log("val22222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             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 +"/"+val.packing_unit
-            // this.recordInfo.recordData[i].number =  val.number
+            this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
             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
-
          }
       }
+      console.log("hhhhh232323232",val.xt_warehouse_info)
+      if(val.xt_warehouse_info.length > 0){
+         console.log("hhhhhhhhhh")
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+            this.numberList.push(val.xt_warehouse_info[j])
+          }
+         this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
+      }else{
+        this.recordInfo.recordData[i].number = ""
+      }
+    },
+     getSingleOutOrderDetail(order_id){
+       const params = {
+          'id': order_id
+        }
+      getSingleOutOrderDetail(params).then(response=>{
+        if(response.data.state == 1){
+          console.log("详情",response.data.data.list)
+          var dealerList = response.data.data.dealerList
+          this.dealerList = dealerList
+          var manufacturerList = response.data.data.manufacturerList
+          console.log("hhhhhhhhh",manufacturerList)
+          this.manufacturerList = manufacturerList
+          this.goodType = response.data.data.goodType
+          for (let i = 0; i < response.data.data.list.length; i++) {
+           
+            response.data.data.list[i].price = response.data.data.list[i].price.toString()
+            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].good_name
+            response.data.data.list[i].name = response.data.data.list[i].specification_name + "/" + response.data.data.list[i].packing_unit
+            response.data.data.list[i].good_type_id = response.data.data.list[i].good_type_id
+            this.numberList.push(response.data.data.list[i])
+            this.recordInfo.recordData.push(response.data.data.list[i])
+          }
+         
+        }
+      })
     }
     },
     created() {
-      this.GetConfigInfo()
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.warehouse_out_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.propForm.goodUnit = this.$store.getters.good_unit
-      const order_id = this.$route.query.id
-      this.GetOrderDetail(order_id)
+      const order_id = this.$route.query.id  
+      this.getSingleOutOrderDetail(order_id)
     }
 
   }

src/xt_pages/stock/stockQuery.vue

@@ -88,7 +88,7 @@
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.specification_name }}*{{scope.row.min_number}}{{scope.row.min_unit}}</span>
+              <span>{{ scope.row.specification_name }} / {{scope.row.packing_unit}}</span>
             </template>
          </el-table-column>
         <el-table-column label="进货单价" align="center">