前端gjy

src/api/V2/warehouse/index.js

@@ -9,4 +9,6 @@ export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 // 货名等下拉
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
 // 入库添加
-export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse `
+export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse`
+//流转记录
+export const API_GET_SELECT_INFO = `/warehouseInOutInfo/selectInfo`

src/model/warehouse/index.js

@@ -7,7 +7,8 @@ import {
     API_GET_WAREHOUSE_CUSTOMDROPDOWN,
     API_GET_WAREHOUSE_DELETE,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
-    API_POST_STORAGE_PUT
+    API_POST_STORAGE_PUT,
+    API_GET_SELECT_INFO
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -16,10 +17,12 @@ export const addList = appRx.post(API_POST_ADD_WAREHOUSE_BASEINFO, errorCatcher,
 //仓库查看
 export const getLook = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHandle, filter)
 //仓库下拉
-export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
+export const xiala = appRx.get(API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 //删除
 export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 // 货名等下拉
 export const pullDown = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 // 入库添加
 export const addstorageputList = appRx.post(API_POST_STORAGE_PUT, errorCatcher, errorHandle, filter)
+// 流转记录
+export const addselectinfoList = appRx.get(API_GET_SELECT_INFO, errorCatcher, errorHandle, filter)

src/views/warehouse/warehouseManagementDelivery.vue

@@ -429,7 +429,7 @@ export default {
           this.gradeList = response
         })
       // 类型
-      pullDown({ constId: 'CON5' })
+      pullDown({ constId: 'CON6' })
         .toPromise()
         .then((response) => {
           this.storageType = response

src/views/warehouse/warehouseManagementList.vue

@@ -147,25 +147,25 @@
           </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
-          <!-- <template slot-scope="scope"> -->
-          <ws-button
-            type="primary"
-            @click="record()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >记录</ws-button
-          >
+          <template slot-scope="scope">
+            <ws-button
+              type="primary"
+              @click="record(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+              >记录</ws-button
+            >
 
-          <ws-button
-            type="primary"
-            @click="loss()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >盘损</ws-button
-          >
-          <!-- </template> -->
+            <ws-button
+              type="primary"
+              @click="loss()"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+              >盘损</ws-button
+            >
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -310,8 +310,15 @@ export default {
       this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //记录
-    record() {
-      this.$router.push({ path: 'warehouseManagementRecord' })
+    record(item) {
+      this.$router.push({
+        path: 'warehouseManagementRecord',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+        },
+      })
     },
     //盘损
     loss() {
@@ -373,19 +380,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.getSpanArr(response)
-          // for (var i = 0; i < response.records.length; i++) {
-          //   if (response.records[i].addressUrl != null) {
-          //     response.records[i].addressUrlArray = response.records[
-          //       i
-          //     ].addressUrl.split(',')
-          //   } else {
-          //     response.records[i].addressUrlArray = []
-          //   }
-          // }
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
     },

src/views/warehouse/warehouseManagementRecord.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="20">
+      <el-col :span="18">
         <h2 class="bg-left title">流转记录</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="6" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -12,6 +12,13 @@
           @click="iossrecord()"
           >盘损记录</el-button
         >
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnWarehouse()"
+          >返回</el-button
+        >
       </el-col>
     </el-row>
     <div class="center">
@@ -20,7 +27,7 @@
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <ws-button
           type="primary"
-          @click="1"
+          @click="record('')"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -28,7 +35,7 @@
         >
         <ws-button
           type="primary"
-          @click="1"
+          @click="record(1)"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -36,32 +43,75 @@
         >
         <ws-button
           type="primary"
-          @click="1"
+          @click="record(2)"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
           >入库记录</ws-button
         >
-        <el-table>
+        <el-table :data="warehouseList.records">
+          <el-table-column type="expand">
+            <template #default="props">
+              <ws-form ref="deptBudgetList" :model="deptBudgetList">
+                <ws-info-table>
+                  <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+                    {{ props.row.waterContent }}
+                  </ws-form-item>
+                  <ws-form-item label="容重(%)<=" span="1" prop="bulkDensity">
+                    {{ props.row.bulkDensity }}
+                  </ws-form-item>
+                  <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+                    {{ props.row.jiaorenli }}
+                  </ws-form-item>
+                  <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+                    {{ props.row.impurity }}
+                  </ws-form-item>
+                  <ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+                    {{ props.row.mildewGrain }}
+                  </ws-form-item>
+                  <ws-form-item
+                    label="不完善粒(%)<="
+                    span="1"
+                    prop="imperfectGrain"
+                  >
+                    {{ props.row.imperfectGrain }}
+                  </ws-form-item>
+                  <ws-form-item label="质检员" span="1" prop="qualityInspector">
+                    {{ props.row.qualityInspector }}
+                  </ws-form-item>
+                </ws-info-table>
+              </ws-form>
+            </template>
+          </el-table-column>
           <el-table-column type="index" label="序号">
             <template scope="scope">
               <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="contractNo" label="货名"> </el-table-column>
-          <el-table-column prop="goodsName" label="毛重（吨）"></el-table-column>
-          <el-table-column prop="weight" label="皮重（吨）"> </el-table-column>
-          <el-table-column prop="unitContractPrice" label="净重（吨）"></el-table-column>   
-          <el-table-column prop="packingMethod" label="品级"> </el-table-column>
-          <el-table-column prop="buyer" label="出入库日期"> </el-table-column>
-          <el-table-column prop="buyer" label="类型"> </el-table-column>
-          <el-table-column prop="buyer" label="合同编号"> </el-table-column>
-          <el-table-column prop="buyer" label="车牌号"> </el-table-column>
-          <el-table-column prop="buyer" label="经办人"> </el-table-column>
+          <el-table-column prop="goodsName" label="货名"> </el-table-column>
+          <el-table-column
+            prop="grossWeight"
+            label="毛重（吨）"
+          ></el-table-column>
+          <el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
+          <el-table-column
+            prop="netWeight"
+            label="净重（吨）"
+          ></el-table-column>
+          <el-table-column prop="grade" label="品级"> </el-table-column>
+          <el-table-column prop="inOutDate" label="出入库日期">
+          </el-table-column>
+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号">
+          </el-table-column>
+          <el-table-column prop="carNo" label="车牌号"> </el-table-column>
+          <el-table-column prop="qualityInspector" label="经办人">
+          </el-table-column>
           <el-table-column prop="buyer" label="内勤"> </el-table-column>
-          <el-table-column prop="buyer" label="附件"> </el-table-column>
-          <el-table-column prop="buyer" label="录入时间"> </el-table-column>
+          <el-table-column prop="addressUrl" label="附件"> </el-table-column>
+          <el-table-column prop="createDate" label="录入时间">
+          </el-table-column>
         </el-table>
         <div style="text-align: right; padding: 10px">
           <el-button
@@ -77,12 +127,7 @@
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/contarct/index'
+import { addselectinfoList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -129,13 +174,16 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: {},
+      currentPage: 1,
+      pageSize: 10,
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
       },
-      contractList: [],
+      warehouseList: [],
       deptBudgetList: {},
       historyList: [],
+      searchType: '',
 
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -149,6 +197,10 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.deptBudgetList.baseId = this.$route.query.baseId
+    this.deptBudgetList.positionId = this.$route.query.positionId
+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+    console.log(111)
     this.getList()
     this.showType = this.isShow
   },
@@ -196,33 +248,36 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    record(status) {
+      this.searchType = status
+      this.getList()
+    },
     getList() {
-      getList({
+      addselectinfoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
+        baseId: this.deptBudgetList.baseId,
+        positionId: this.deptBudgetList.positionId,
+        warehouseName: this.deptBudgetList.warehouseName,
+        searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          console.log(response)
+          // for (var i = 0; i < response.records.length; i++) {
+          //   if (response.records[i].addressUrl != null) {
+          //     response.records[i].addressUrlArray = response.records[
+          //       i
+          //     ].addressUrl.split(',')
+          //   } else {
+          //     response.records[i].addressUrlArray = []
+          //   }
+          // }
+          // this.deptCircularPage.currentPage = response.current
+          // this.deptCircularPage.pageSize = response.size
+          // this.deptBudgetTotal = response.total
+          this.warehouseList = response
         })
     },
     selecttaskType(e) {
@@ -306,6 +361,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.el-form .el-form-item {
+  width: 14.28%;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+}
 .center {
   position: relative;
   top: 50px;
@@ -313,22 +374,20 @@ export default {
   height: 500px;
   margin: 0 auto;
 }
-.center button{
+.center button {
   margin-bottom: 15px;
 }
 .container .bg-left {
   margin-left: 40px;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
 }
+.bg-right {
+  text-align: right;
+  padding: 10px;
+}
 /deep/.el-form-item {
   width: 33%;
 }