前端孟祥旭

package.json

@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
+    "@babel/preset-env": "^7.14.4",
     "axios": "^0.20.0",
     "babel-polyfill": "^6.26.0",
     "base-core-lib": "^1.3.16",
@@ -78,7 +79,7 @@
     "xe-utils": "^2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0",
+    "@babel/core": "^7.0.0",
     "@babel/register": "7.0.0",
     "@pixul/node-rancher-api": "^1.4.0",
     "@vue/cli-plugin-babel": "3.6.0",

src/api/V2/warehouse/index.js

@@ -26,4 +26,5 @@ export const API_POST_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGood
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
 // 入库添加
 export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse `
-
+//待完善记录
+export const API_GET_WAREHOUSE_COMPLETE = '/warehouseInOutInfo/selectWarehouseInOutInfo'

src/model/warehouse/index.js

@@ -13,7 +13,8 @@ import {
     API_POST_WAREHOUSE_IOSS,
     API_POST_WAREHOUSE_NAME,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
-    API_POST_STORAGE_PUT
+    API_POST_STORAGE_PUT,
+    API_GET_WAREHOUSE_COMPLETE,
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -31,7 +32,6 @@ export const delectlist = appRx.get(API_GET_WAREHOUSE_DELETELIST, errorCatcher,
 //隐藏
 export const hide = appRx.post(API_POST_WAREHOUSE_HIDE, errorCatcher, errorHandle, filter)
 
-export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 //仓库编辑
 export const edit = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 //盘损
@@ -42,4 +42,6 @@ export const goodsname = appRx.get(API_POST_WAREHOUSE_NAME, errorCatcher, errorH
 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 complete = appRx.get(API_GET_WAREHOUSE_COMPLETE, errorCatcher, errorHandle, filter)
 

src/views/warehouse/warehouseManagementList.vue

@@ -119,7 +119,7 @@
           <template slot-scope="scope">
             <ws-button
               type="primary"
-              @click="nocomplete()"
+              @click="nocomplete(scope.row)"
               v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
               "
@@ -222,6 +222,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -305,9 +306,16 @@ export default {
         // }
       })
     },
-    //待完成
-    nocomplete() {
-      this.$router.push({ path: 'warehouseManagementNoComplete' })
+    //待完成//传参
+    nocomplete(row) {
+      console.log(row)
+      this.$router.push({
+        path: 'warehouseManagementNoComplete',
+        query:{baseId:row.warehouseId,
+              positionId:row.binNumberId,
+        }                                                                                                                                                                                                                                                                                                                                                          
+        })
+      
     },
     //记录
     record() {

src/views/warehouse/warehouseManagementLook.vue

@@ -254,7 +254,7 @@ export default {
         .toPromise()
         .then((response) => {
          this.deptBudgetList=response
-         console.log(this.deptBudgetList)
+        //  console.log(this.deptBudgetList)
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -24,22 +24,22 @@
               <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="goodsName" label="货名"> </el-table-column>
+          <el-table-column prop="tare" label="毛重（吨）"></el-table-column>
+          <el-table-column prop="grossWeight" 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="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="buyer" 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="agent" label="经办人"> </el-table-column>
+          <el-table-column prop=" backOffice" label="内勤"> </el-table-column>
+          <el-table-column prop="updateDate" label="保存时间"> </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
           <ws-button
             type="primary"
-            @click="edits()"
+            @click="edits(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             "
@@ -47,7 +47,7 @@
           >
           <ws-button
             type="primary"
-            @click="deletes()"
+            @click="handleDelete(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             "
@@ -71,11 +71,13 @@
 </template>
 <script>
 import {
+  complete,
   getList,
   export1,
   editstatus,
   billoperatehis,
-} from '@/model/contarct/index'
+  deletewarehouse,
+} from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -115,6 +117,11 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      deletewarehouse:[],
+      pageSize:10,
+      currentPage:'1',
+      
+
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
@@ -129,7 +136,8 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-
+      deletewarehouse:[],
+    // inOutDate:null,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -142,17 +150,27 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.getList()
+    
+    //接参
+    this.getList(this.$route.query.baseId,this.$route.query.positionId)
     this.showType = this.isShow
   },
   methods: {
+
+    //编辑
+     edits(row){
+       this.$router.push({
+         name:'warehouseManagementPerfectput',
+         query: { baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage },
+       })
+     },
     //返回按钮
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //删除
     deletes(){
-
+     this.$router.push({path:'warehouseManagementDelete'})
     },
     //编辑
     edits(){
@@ -193,63 +211,60 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      getList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
-        .toPromise()
+  //收
+  getList(id,id1){
+   complete({
+          // compId: sessionStorage.getItem('ws-pf_compId'),
+          baseId:id,
+          positionId:id1,
+          pageSize:this.pageSize,
+          currentPage:this.currentPage,
+          // inOutDate:this.inOutDate
+    })
+    .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
+          this.getList = response
         })
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
+    // complete(){
+    //   complete({
+
+    //   })
+    // },
+
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
         query: { id: row.id },
       })
     },
-
+    //删除
+      handleDelete(row) {
+      // console.log(row)
+      this.$confirm(`删除后不可恢复，确认删除？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+        deletewarehouse({ baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              
+            })
+        })
+        .catch(() => {
+          return false
+        })
+      }
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -299,8 +314,8 @@ export default {
     total() {},
     clearfiltQuery() {},
     selectCrtDuty() {},
-  },
-}
+  }
+
 </script>
 <style lang="scss" scoped>
 .center {

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址