Browse Source

Merge branch 'master' into 测试

lxf 1 year ago
parent
commit
0a4bb729ee

+ 12 - 3
src/views/shengde/warehouse/putInStorage/storage.vue

@@ -47,7 +47,8 @@
 import { mapGetters } from 'vuex'
 import { getList } from '@/api/shengde/group/subcompany/subcompanyManagement/index.js'
 import { warehouseList } from '@/api/shengde/warehouse/management'
-import { purchaseContractList } from '@/api/shengde/productionSystem/purchase/contract'
+// import { purchaseContractList } from '@/api/shengde/productionSystem/purchase/contract'
+import { purchaseReturnList } from '@/api/shengde/productionSystem/purchase/contract'
 
 export default {
   props: {
@@ -74,8 +75,16 @@ export default {
     warehouseList({ pageNum: 1, pageSize: 9999 }).then((res) => {
       this.warehouseList = res.data.data.list
     })
-    purchaseContractList({ pageNum: 1, pageSize: 99999, purchaseStatus: 20 }).then((res) => {
-      this.purchaseContract = res.data.data.records.map((item) => {
+    // purchaseContractList({ pageNum: 1, pageSize: 99999, purchaseStatus: 20 }).then((res) => {
+    //   this.purchaseContract = res.data.data.records.map((item) => {
+    //     return {
+    //       ...item,
+    //       text: item.code + ', ' + item.deliveryTime + ', ' + item.supplyName,
+    //     }
+    //   })
+    // })
+    purchaseReturnList({ pageNum: 1, pageSize: 99999, purchaseStatus: 20 }).then((res) => {
+      this.purchaseContract = res.data.data.map((item) => {
         return {
           ...item,
           text: item.code + ', ' + item.deliveryTime + ', ' + item.supplyName,

+ 1 - 0
src/views/shengde/warehouse/record/details.vue

@@ -95,6 +95,7 @@
 
           <el-table :data="tableList" :cell-style="{ padding: '0' }" :row-style="{ height: '35px' }" v-loading="loading" header-row-class-name="tableHeader">
             <!-- <el-table-column label="规格图片" align="center" prop="AAAA" width="120" /> -->
+            <el-table-column label="仓库" prop="warehouseName" width="160" />
             <el-table-column label="品号" prop="colorCode" width="180" />
             <el-table-column label="品名" prop="colorName" min-width="200" />
             <el-table-column label="结存单价" width="100" v-if="!userInfo.subsidiaryId">