前端孟祥旭

src/model/warehouse/index.js

@@ -55,5 +55,6 @@ export const complete = appRx.get(API_GET_WAREHOUSE_COMPLETE, errorCatcher, erro
 // 编辑删除仓位
 
 export const delPosition = appRx.post(API_POST_WAREHOUSE_DEL_POSITION, errorCatcher, errorHandle, filter)
+ 
 
 

src/views/warehouse/warehouseManagementDelete.vue

@@ -43,34 +43,6 @@
         <el-table-column prop="personCharge;" label="负责人"> </el-table-column>
 
         <el-table-column prop="address" label="操作" width="200">
-          <!-- <template slot-scope="scope">
-            <ws-button
-              type="primary"
-              @click="handleHide(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              v-if="scope.row.showFlag == 0"
-              >显示</ws-button
-            >
-            <ws-button
-              type="primary"
-              @click="handleHide(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              v-if="scope.row.showFlag == 1"
-              >隐藏</ws-button
-            >
-            <ws-button
-              type="primary"
-              @click="handleDelete(sv-ifcope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >删除</ws-button
-            >
-          </template> -->
           <template slot-scope="scope">
             <div
               class="record"
@@ -192,6 +164,33 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
+    //删除
+    handleDelete(row) {
+    // console.log(row)
+    this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
+      cancelButtonText: '取消',
+      confirmButtonText: '确定',
+      type: 'warning',
+    })
+      .then(() => {
+        deletewarehouse({ id: row.id })
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '删除成功',
+            })
+            this.getList()
+          })
+          .catch((response) => {
+            // console.log(3333)
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
+      })
+      .catch(() => {
+        return false
+      })
+  },
     //隐藏
     handleHide(row) {
       if (row.showFlag == 1) {
@@ -235,32 +234,7 @@ export default {
       }
     },
   },
-  handleDelete(row) {
-    // console.log(row)
-    this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
-      cancelButtonText: '取消',
-      confirmButtonText: '确定',
-      type: 'warning',
-    })
-      .then(() => {
-        deletewarehouse({ id: row.id })
-          .toPromise()
-          .then((response) => {
-            this.$notify.success({
-              title: '成功',
-              message: '删除成功',
-            })
-            this.getList()
-          })
-          .catch((response) => {
-            // console.log(3333)
-            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
-      })
-      .catch(() => {
-        return false
-      })
-  },
+  
   // deletecontract(){},
   //删除
   approve() {},

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -45,8 +45,8 @@
             </template>
           </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="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="品级">
             <template slot-scope="scope">
@@ -122,6 +122,7 @@ import {
   billoperatehis,
   deletewarehouse,
   warehouseName,
+  addstorageputList,
 } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -224,6 +225,8 @@ export default {
             baseId: row.warehouseId,
             positionId: row.binNumberId,
 
+
+
            }
            })
       }else if(row.inOutFlag==1){
@@ -283,6 +286,7 @@ export default {
           pageSize:this.pageSize,
           currentPage:this.currentPage,
           
+          
           // inOutDate:this.inOutDate
     })
     .toPromise()
@@ -305,7 +309,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-        deletewarehouse({ baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage})
+        deletewarehouse({ id:row.id})
             .toPromise()
             .then((response) => {
               this.$notify.success({

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -184,6 +184,7 @@
             maxlength="120"
             size="small"
           />
+         
         </ws-form-item>
       </div>
       <div class="neifor">
@@ -353,6 +354,8 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
+    this.deptBudgetList1.goodnameList= this.$route.query.goodnameList
+    
   },
   methods: {
     //返回按钮

vue.config.js

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