数据

src/xt_pages/stock/stockOutOrder.vue

@@ -275,7 +275,11 @@
             {{ scope.row.remark }}
           </template>
         </el-table-column>
-       
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetail(scope.row.id)">使用明细</span>
+          </template>
+        </el-table-column>
       </el-table>  
     
   </div>
@@ -379,7 +383,7 @@
 
             <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>
+              <div style="color: #589ff8" @click="GetOrderDetailThree(scope.row.id)">使用明细</div>
               </template>
             </el-table-column>
              
@@ -398,17 +402,17 @@
   <!-- 使用明细查询 -->
    <el-dialog
     title="出库单详情"
-    :visible.sync="editdialogVisible"
+    :visible.sync="editdialogVisibleTwo"
     width="80%">
     <span>
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
      
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
-      </div>
+      </div> -->
 
        <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
@@ -597,6 +601,74 @@
       </span>
   </el-dialog>
    
+  
+    <el-dialog
+      title="出库明细"
+      :visible.sync="editdialogVisibleTwo"
+      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">商品类型: {{userList[0].type.type_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</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 v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </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.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-row>
+    </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
 
    <stock-in-dialog
         ref="dialog"
@@ -738,6 +810,9 @@ export default {
       good_type_id:"",
       tableShow:false,
       tableList:[],
+      dialogVisibleTwo:false,
+      userList:[],
+      editdialogVisibleTwo:false
     };
   },
   methods: {
@@ -1030,7 +1105,7 @@ export default {
             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
@@ -1105,10 +1180,10 @@ export default {
               is_total: 1,
               total: total,
             })
-            this.type_name = this.userList[0].type.type_name
-            this.specification_name = this.userList[0].info.specification_name
+            // this.type_name = this.userList[0].type.type_name
+            // this.specification_name = this.userList[0].info.specification_name
             console.log("详情数据区",this.userList)
-            this.editdialogVisible = true
+            this.editdialogVisibleTwo = true
           }
         })
       },
@@ -1202,8 +1277,8 @@ export default {
             }
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-            this.form.manufacturer = this.warehouseOut.manufacturer
-            this.form.dealer = this.warehouseOut.dealer
+            // this.form.manufacturer = this.warehouseOut.manufacturer
+            // this.form.dealer = this.warehouseOut.dealer
             this.editDialogVisible = true
           }
 
@@ -1427,6 +1502,9 @@ export default {
           }
         })
       }, 
+     
+     
+
   }
 };
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -201,7 +201,7 @@
 
          </template>
        </el-table-column>
-       <el-table-column label="剩余库存量" align="center">
+      
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
            {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}