XMLWAN 3 年前
父节点
当前提交
3203df63ef
共有 2 个文件被更改,包括 90 次插入12 次删除
  1. 89 11
      src/xt_pages/stock/stockOutOrder.vue
  2. 1 1
      src/xt_pages/stock/stockQuery.vue

+ 89 - 11
src/xt_pages/stock/stockOutOrder.vue 查看文件

275
             {{ scope.row.remark }}
275
             {{ scope.row.remark }}
276
           </template>
276
           </template>
277
         </el-table-column>
277
         </el-table-column>
278
-       
278
+        <el-table-column label="操作" align="center">
279
+          <template slot-scope="scope">
280
+            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetail(scope.row.id)">使用明细</span>
281
+          </template>
282
+        </el-table-column>
279
       </el-table>  
283
       </el-table>  
280
     
284
     
281
   </div>
285
   </div>
379
 
383
 
380
             <el-table-column label="" align="center"  >
384
             <el-table-column label="" align="center"  >
381
               <template slot-scope="scope" v-if="scope.row.is_sys == 1">
385
               <template slot-scope="scope" v-if="scope.row.is_sys == 1">
382
-              <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
386
+              <div style="color: #589ff8" @click="GetOrderDetailThree(scope.row.id)">使用明细</div>
383
               </template>
387
               </template>
384
             </el-table-column>
388
             </el-table-column>
385
              
389
              
398
   <!-- 使用明细查询 -->
402
   <!-- 使用明细查询 -->
399
    <el-dialog
403
    <el-dialog
400
     title="出库单详情"
404
     title="出库单详情"
401
-    :visible.sync="editdialogVisible"
405
+    :visible.sync="editdialogVisibleTwo"
402
     width="80%">
406
     width="80%">
403
     <span>
407
     <span>
404
       <div class="filter-container">
408
       <div class="filter-container">
405
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
409
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
406
       </div>
410
       </div>
407
      
411
      
408
-      <div class="cell clearfix">
412
+      <!-- <div class="cell clearfix">
409
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
413
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
410
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
414
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
411
-      </div>
415
+      </div> -->
412
 
416
 
413
        <el-row :gutter="12" style="margin-top: 10px">
417
        <el-row :gutter="12" style="margin-top: 10px">
414
         <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
418
         <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
597
       </span>
601
       </span>
598
   </el-dialog>
602
   </el-dialog>
599
    
603
    
604
+  
605
+    <el-dialog
606
+      title="出库明细"
607
+      :visible.sync="editdialogVisibleTwo"
608
+      width="60%">
609
+      <span>
610
+         <div class="app-container">
611
+
612
+      <div class="filter-container">
613
+        <span style="font-size: 18px;color: #606266">商品使用明细</span>
614
+      </div>
615
+
616
+       <!-- <div class="cell clearfix">
617
+        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
618
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
619
+      </div> -->
620
+
621
+      <el-row :gutter="12" style="margin-top: 10px">
622
+      <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
623
+              border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
624
+          <el-table-column min-width="35" align="center">
625
+            <template slot="header" slot-scope="scope">
626
+              <span>序号</span>
627
+            </template>
628
+            <template slot-scope="scope">
629
+              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
630
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
631
+            </template>
632
+          </el-table-column>
633
+
634
+          <el-table-column min-width="35" align="center">
635
+            <template slot="header" slot-scope="scope">
636
+              <span>使用人</span>
637
+            </template>
638
+            <template slot-scope="scope">
639
+              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
640
+              <span v-if="scope.row.is_total == 1"></span>
641
+            </template>
642
+          </el-table-column>
643
+          <el-table-column min-width="35" align="center">
644
+            <template slot="header" slot-scope="scope">
645
+              <span>使用数量</span>
646
+            </template>
647
+            <template slot-scope="scope">
648
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
649
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
650
+
651
+            </template>
652
+          </el-table-column>
653
+          <el-table-column min-width="35" align="center">
654
+            <template slot="header" slot-scope="scope">
655
+              <span>使用时间</span>
656
+            </template>
657
+            <template slot-scope="scope">
658
+              <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
659
+
660
+            </template>
661
+          </el-table-column>
662
+
663
+        </el-table>
664
+      </el-row>
665
+    </div>
666
+      </span>
667
+      <span slot="footer" class="dialog-footer">
668
+        <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
669
+        <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
670
+      </span>
671
+    </el-dialog>
600
 
672
 
601
    <stock-in-dialog
673
    <stock-in-dialog
602
         ref="dialog"
674
         ref="dialog"
738
       good_type_id:"",
810
       good_type_id:"",
739
       tableShow:false,
811
       tableShow:false,
740
       tableList:[],
812
       tableList:[],
813
+      dialogVisibleTwo:false,
814
+      userList:[],
815
+      editdialogVisibleTwo:false
741
     };
816
     };
742
   },
817
   },
743
   methods: {
818
   methods: {
1030
             this.tableShow = true
1105
             this.tableShow = true
1031
             for (let i = 0; i < response.data.data.list.length; i++) {
1106
             for (let i = 0; i < response.data.data.list.length; i++) {
1032
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
1107
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
1033
-
1108
+              console.log("表格00000000",this.tableList)
1034
               this.tableList.push(response.data.data.list[i])
1109
               this.tableList.push(response.data.data.list[i])
1035
             }
1110
             }
1036
             this.warehousingOutInfo.info = response.data.data.info
1111
             this.warehousingOutInfo.info = response.data.data.info
1105
               is_total: 1,
1180
               is_total: 1,
1106
               total: total,
1181
               total: total,
1107
             })
1182
             })
1108
-            this.type_name = this.userList[0].type.type_name
1109
-            this.specification_name = this.userList[0].info.specification_name
1183
+            // this.type_name = this.userList[0].type.type_name
1184
+            // this.specification_name = this.userList[0].info.specification_name
1110
             console.log("详情数据区",this.userList)
1185
             console.log("详情数据区",this.userList)
1111
-            this.editdialogVisible = true
1186
+            this.editdialogVisibleTwo = true
1112
           }
1187
           }
1113
         })
1188
         })
1114
       },
1189
       },
1202
             }
1277
             }
1203
             this.warehouseOut = response.data.data.info
1278
             this.warehouseOut = response.data.data.info
1204
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
1279
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
1205
-            this.form.manufacturer = this.warehouseOut.manufacturer
1206
-            this.form.dealer = this.warehouseOut.dealer
1280
+            // this.form.manufacturer = this.warehouseOut.manufacturer
1281
+            // this.form.dealer = this.warehouseOut.dealer
1207
             this.editDialogVisible = true
1282
             this.editDialogVisible = true
1208
           }
1283
           }
1209
 
1284
 
1427
           }
1502
           }
1428
         })
1503
         })
1429
       }, 
1504
       }, 
1505
+     
1506
+     
1507
+
1430
   }
1508
   }
1431
 };
1509
 };
1432
 </script>
1510
 </script>

+ 1 - 1
src/xt_pages/stock/stockQuery.vue 查看文件

201
 
201
 
202
          </template>
202
          </template>
203
        </el-table-column>
203
        </el-table-column>
204
-       <el-table-column label="剩余库存量" align="center">
204
+      
205
        <el-table-column label="剩余库存量" align="center">
205
        <el-table-column label="剩余库存量" align="center">
206
          <template slot-scope="scope">
206
          <template slot-scope="scope">
207
            {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
207
            {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}