数据

src/api/stock.js

@@ -633,3 +633,11 @@ export function getStockDrugCount(params) {
     params: params
   })
 }
+
+export function getOrderDetailByOrderId(params) {
+  return request({
+    url: '/api/good/getorderdetialbyorderid',
+    method: 'get',
+    params: params
+  })
+}

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 }}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</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 }}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

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

src/xt_pages/stock/stockOutOrder.vue

@@ -206,20 +206,20 @@
 
        <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.good_name }}
+            {{ scope.row.good_name }}
           </template>
         </el-table-column>
       
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
-            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
+            {{  getTypeName(scope.row.good_type_id)}}
           </template>
         </el-table-column>
 
 
        <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
+            {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
           </template>
         </el-table-column>
 
@@ -253,7 +253,7 @@
 
          <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
+            {{ getManufactuerName(scope.row.manufacturer)}}
           </template>
         </el-table-column>
 
@@ -604,7 +604,7 @@
   
     <el-dialog
       title="出库明细"
-      :visible.sync="editdialogVisibleTwo"
+      :visible.sync="editdialogVisibleThree"
       width="60%">
       <span>
          <div class="app-container">
@@ -665,8 +665,8 @@
     </div>
       </span>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
-        <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
+        <el-button @click="editdialogVisibleThree = false">取 消</el-button>
+        <el-button type="primary" @click="editdialogVisibleThree = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -697,6 +697,7 @@ import {
   deleteWarehouseOutInfo,
   GetAllGoodInfoByID,
   editWarehouseoutInfo,
+  getOrderDetailByOrderId
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -812,7 +813,8 @@ export default {
       tableList:[],
       dialogVisibleTwo:false,
       userList:[],
-      editdialogVisibleTwo:false
+      editdialogVisibleTwo:false,
+      editdialogVisibleThree:false,
     };
   },
   methods: {
@@ -1086,33 +1088,49 @@ export default {
 
     handleSearch(val){
       this.tableList = []
+    
+      this.editdialogVisibleThree = false
       this.GetOrderDetailOne(val.id)
       this.GetTotalCount(val.warehouse_out_time)
     },
   
     //获取出库单详情数据
-    GetOrderDetailOne(id) {
+    // GetOrderDetailOne(id) {
+    //     const params = {
+    //       'id': id
+    //     }
+    //     console.log("#3333333",id)
+    //   getWarehouseOutInfo(params).then(response => {
+    //       if (response.data.state == 0) {
+
+    //         this.$message.error(response.data.msg)
+    //         return false
+    //       } else {
+    //         this.tableShow = true
+    //         for (let i = 0; i < response.data.data.list.length; i++) {
+    //           this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+    //           console.log("表格00000000",this.tableList)
+    //           this.tableList.push(response.data.data.list[i])
+    //         }
+    //         this.warehousingOutInfo.info = response.data.data.info
+    //       }
+    //     })
+    //  }, 
+     GetOrderDetailOne(id){
         const params = {
           'id': id
         }
-        console.log("#3333333",id)
-      getWarehouseOutInfo(params).then(response => {
-          if (response.data.state == 0) {
-
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.tableShow = true
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-              console.log("表格00000000",this.tableList)
-              this.tableList.push(response.data.data.list[i])
-            }
-            this.warehousingOutInfo.info = response.data.data.info
-            // this.handleSpanTempArr()
-          }
+        getOrderDetailByOrderId(params).then(response=>{
+           if(response.data.state == 1){
+             this.tableShow = true
+             var list = response.data.data.list
+             console.log("list22222222",list)
+             for(let i=0;i<list.length;i++){
+               this.tableList.push(list[i])
+             }
+           }
         })
-     }, 
+     },
 
       getTypeName: function(id) {
         let name = ''
@@ -1158,10 +1176,10 @@ export default {
     },
 
      GetOrderDetail: function(order_id) {
+       this.userList = []
         const params = {
           'id': order_id
         }
-      
         getWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1183,7 +1201,7 @@ export default {
             // this.type_name = this.userList[0].type.type_name
             // this.specification_name = this.userList[0].info.specification_name
             console.log("详情数据区",this.userList)
-            this.editdialogVisibleTwo = true
+            this.editdialogVisibleThree = true
           }
         })
       },

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -32,7 +32,7 @@
       </div>
 
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer" style="width: 200px;">
           <el-option
@@ -42,10 +42,10 @@
             :value="option.id">
           </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" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer" style="width: 200px;">
           <el-option
@@ -55,7 +55,7 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -471,12 +471,14 @@
                 return
               }
             }
-
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+            }
             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)
@@ -579,6 +581,7 @@
             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
+
          }
       }
     }

src/xt_pages/stock/stockQuery.vue

@@ -64,96 +64,7 @@
       </div>
 
 
-      <!-- <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :data="WarehouseInfo.warehouseInfoDate"
-        :class="signAndWeighBoxPatients"
-        border
-        v-loading="WarehouseInfo.loading"
-      >
-        <el-table-column label="商品编码" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.good_code }}
-          </template>
-        </el-table-column>
-        <el-table-column label="耗材名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.good_name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="耗材类型" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.type.type_name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="规格型号" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.specification_name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center">
-          <template slot-scope="scope">
-            <span>{{getUnit(scope.row.good_unit)}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="进货价" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.query_warehousing_info.length>0">{{scope.row.query_warehousing_info[0].price?scope.row.query_warehousing_info[0].price:""}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockInDetailDialog(scope.row.good_id)"
-              >{{ stockInCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="入库退货" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showSaleReturnDetailDialog(scope.row)"
-              >{{ salesReturnCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="实际入库" align="center">
-          <template slot-scope="scope">
-            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockOutDetailDialog(scope.row.good_id)"
-              >{{ stockOutCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="出库退库" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showCancelStockDetailDialog(scope.row)"
-              >{{ cancelStockCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="实际出库" align="center">
-          <template slot-scope="scope">
-            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
-          </template>
-        </el-table-column>
 
-        <el-table-column label="剩余库存" align="center">
-          <template slot-scope="scope">
-            <span>{{stockInCount(scope.row)  - stockOutCount(scope.row) }}</span>
-          </template>
-        </el-table-column>
-      </el-table> -->
        <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{