Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/weightCheckOut.html

@@ -162,11 +162,11 @@
             <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>箱号</td>
             <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
             <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
-            <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
-              {{tableData.boxNo}},{{tableData.boxNoOther}}
+            <td class="col" colspan="2" v-if='(tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
+              {{tableData.boxNo}} {{tableData.boxNoOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
-              {{tableData.wingNumber}},{{tableData.wingNumberOther}}
+              {{tableData.wingNumber}} {{tableData.wingNumberOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
           </tr>

src/api/V2/warehouse/index.js

@@ -98,6 +98,8 @@ export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
 export const API_get_goodsName_All = '/commonSysParameter/getInfo'
 //退回
 export const API_SEND_BACK ='/warehouseInOutInfo/returnWarehouse'
+//删除
+export const API_DELETE_WAREHOUSE ='/warehouseInOutInfo/api/deleteWarehouse'
 
 
 

src/components/balanceAlert.vue

@@ -58,7 +58,9 @@ export default {
           const port = await navigator.serial.requestPort()
           if (this.deptBudgetList.warehouseName == '白城内陆港'||this.deptBudgetList.warehouseName == '肇东金信库') {
             this.param = 1200
-          } else {
+          } else if(this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
+            this.param = 2400
+          }else {
             this.param = 9600
           }
           console.log(this.param)

src/model/warehouse/index.js

@@ -47,7 +47,8 @@ import {
     API_POST_TURNAROUND_ADD,
     API_GET_TURNAROUND_XIALA,
     API_get_goodsName_All,
-    API_SEND_BACK
+    API_SEND_BACK,
+    API_DELETE_WAREHOUSE
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -145,5 +146,7 @@ export const turnAroundXiaLa = appRx.get(API_GET_TURNAROUND_XIALA,errorCatcher,
 export const turnAroundGoodsNameAll = appRx.get(API_get_goodsName_All,errorCatcher, errorHandle, filter)
 //退回
 export const sendback = appRx.post(API_SEND_BACK,errorCatcher, errorHandle, filter)
+//删除
+export const postdeletewarehouse = appRx.post(API_DELETE_WAREHOUSE,errorCatcher, errorHandle, filter)
 
 

src/views/contractManagement/purchaseContract.vue

@@ -73,7 +73,7 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status !='已驳回'">
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
             }}</span> -->
@@ -122,6 +122,9 @@
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt="" /> -->
           </div>
+          <div v-else-if="scope.row.status == '已驳回'">
+            已驳回
+          </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
@@ -238,8 +241,8 @@
         tableDate: [],
         size: 10,
         statusList:[{
-          value:'已完成',
-        },{value:'发运结束',}],
+          value:'发运结束',
+        },{value:'已完成',}],
         // 是否显示
         showType: true,
         // 年

src/views/contractManagement/salesContract.vue

@@ -75,7 +75,7 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status != '已驳回'">
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
             }}</span> -->
@@ -90,8 +90,6 @@
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
-            <el-option label="待执行" value="待执行"
-              style="color: #8890b1" />
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
           </el-select>
@@ -124,6 +122,9 @@
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt="" /> -->
           </div>
+          <div v-else-if="scope.row.status == '已驳回'">
+            已驳回
+          </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
@@ -280,8 +281,8 @@
           },
         },
         statusList:[{
-          value:'已完成',
-        },{value:'发运结束',}],
+          value:'发运结束',
+        },{value:'已完成',}],
         accessoryTFs: false,
         accesscard: false,
         accessurl: '',

src/views/contractManagement/salesContractAdd.vue

@@ -78,12 +78,12 @@
               placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
-              我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">
-              对方自提</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio>
+              <!--  v-if="deptBudgetList.priceType == '随行就市'" disabled label="1" -->
+            <!-- <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio> -->
+            <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+               <!-- v-if="deptBudgetList.priceType == '随行就市'" disabled label="2" -->
+            <!-- <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio> -->
           </ws-form-item>
           <!--卖方电话-->
           <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
@@ -165,7 +165,8 @@
           </ws-form-item>
           <!--价格类型-->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" @change="selectpriceType">
+            <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" >
+              <!-- @change="selectpriceType" -->
               <ws-option v-for="item in priceTypeList" :key="item" :label="item" :value="item" />
             </ws-select>
           </ws-form-item>
@@ -1535,11 +1536,11 @@
           }
         }
       },
-      selectpriceType(e) {
-        if (e == '随行就市') {
-          this.deptBudgetList.deliverType = '1'
-        }
-      },
+      // selectpriceType(e) {
+      //   if (e == '随行就市') {
+      //     this.deptBudgetList.deliverType = '1'
+      //   }
+      // },
       weightchange(e) {
         this.deptBudgetList.finalTradingVolume = e
       },

src/views/houseSelfCollect/inspectInfo.vue

@@ -113,7 +113,7 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据</div>
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"
@@ -219,6 +219,7 @@
         carNumberList: [],
         disabled: false,
         disabled1: false,
+        checked:false,
         disabled2: false,
         disabled3:false,
         disabledName: false,
@@ -465,6 +466,7 @@
               inspectAdd(this.inspect)
                 .toPromise()
                 .then((response) => {
+                  this.checked=false
                   this.$message.success('保存成功')
                   getinspectLook({
                       id: response
@@ -505,6 +507,7 @@
                 .toPromise()
                 .then((response) => {
                   this.$message.success('修改成功')
+                  this.checked=false
                   this.$router.push({
                     path: 'inspectionManagement'
                   })
@@ -743,149 +746,152 @@
             return
           }
         }
-        if (!this.inspect.grade) {
-          this.$message({
-            message: '等级不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.impurity) {
-          this.$message({
-            message: '杂质不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this
-            .inspect.impurity).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        if(!this.checked){
+          if (!this.inspect.grade) {
+            this.$message({
+              message: '等级不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.impurity) {
+            this.$message({
+              message: '杂质不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this
+              .inspect.impurity).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '杂质输入错误',
+              type: 'warning',
+            })
+            return
+          }
 
-        if (this.inspect.impurity < 0 || this.inspect.impurity > 40) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if( this.information != '编辑复检'){
-        if (!this.inspect.waterContent) {
-          this.$message({
-            message: '水分不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.waterContent < 0 || this.inspect.waterContent > 50) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(
-            this.inspect.waterContent).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning',
-          })
-          return
-        }
+          if (this.inspect.impurity < 0 || this.inspect.impurity > 40) {
+            this.$message({
+              message: '杂质输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if( this.information != '编辑复检'){
+          if (!this.inspect.waterContent) {
+            this.$message({
+              message: '水分不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.waterContent < 0 || this.inspect.waterContent > 50) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(
+              this.inspect.waterContent).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          }
+          
+          if (!this.inspect.mildewGrain) {
+            this.$message({
+              message: '霉变粒不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.mildewGrain < 0 || this.inspect.mildewGrain > 40) {
+            this.$message({
+              message: '霉变粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(
+              this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '霉变粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.bulkDensity) {
+            this.$message({
+              message: '容重不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.bulkDensity < 500 || this.inspect.bulkDensity > 1000) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(
+              this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.jiaorenli) {
+            this.$message({
+              message: '热损伤不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.jiaorenli < 0 || this.inspect.jiaorenli > 40) {
+            this.$message({
+              message: '热损伤输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this
+              .inspect.jiaorenli).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '热损伤输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.inspect.imperfectGrain) {
+            this.$message({
+              message: '不完善粒不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.inspect.imperfectGrain < 0 || this.inspect.imperfectGrain > 40) {
+            this.$message({
+              message: '不完善粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (
+              String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
+            this.$message({
+              message: '不完善粒输入错误',
+              type: 'warning',
+            })
+            return
+          }
         }
         
-        if (!this.inspect.mildewGrain) {
-          this.$message({
-            message: '霉变粒不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.mildewGrain < 0 || this.inspect.mildewGrain > 40) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(
-            this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.bulkDensity) {
-          this.$message({
-            message: '容重不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.bulkDensity < 500 || this.inspect.bulkDensity > 1000) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(
-            this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.jiaorenli) {
-          this.$message({
-            message: '热损伤不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.jiaorenli < 0 || this.inspect.jiaorenli > 40) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this
-            .inspect.jiaorenli).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.inspect.imperfectGrain) {
-          this.$message({
-            message: '不完善粒不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.inspect.imperfectGrain < 0 || this.inspect.imperfectGrain > 40) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (
-            String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
         getamount({
             compId: localStorage.getItem('ws-pf_compId'),
             customerNumberCard: this.inspect.customerNumberCard,
@@ -1307,4 +1313,4 @@
     text-align: center;
     // margin: 20px auto;
   }
-</style>
+</style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -702,7 +702,7 @@
         } = param
         const sums = []
         var _number = []
-        if (this.warehouseName == "鲅鱼圈金信库") {
+        if (this.warehouseName == '鲅鱼圈金信库') {
           _number = [11, 12, 16, 17, 18]
         } else {
           _number = [10, 11, 15, 16, 17]

src/views/houseSelfCollect/weightCheck.vue

@@ -1340,7 +1340,7 @@ export default {
   display: flex;
 
   .left {
-    min-width: 500px;
+    min-width: 570px;
      position: relative;
     // padding:0 20px 20px 20px;
 
@@ -1349,7 +1349,7 @@ export default {
       color: #2aff7c;
       font-size: 32px;
       text-align: right;
-      padding: 0 20px;
+       padding: 0 10px 0 20px;
       border-radius: 10px;
       margin: 0 20px 20px 20px;
         position: absolute;

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -145,10 +145,28 @@
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
+              v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,2)"></i>
+          </template>
+        </el-table-column>
+        <el-table-column  width='130' class="table_td"  prop="amountIngReceivable" label="应收金额（元）">
+          <template slot-scope="scope">
+            <div class="inputChenge">
+              <el-input v-model="scope.row.amountIngReceivable" v-if="scope.row.identification3 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification3 == 'false'" class="inputs">
+                <span>{{scope.row.amountIngReceivable}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification3 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,5)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,5)"></i>
           </template>
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column width='120' class="table_td" prop="amountEdReceivable" label="已收金额（元）">
         </el-table-column>
         <el-table-column width='120' class="table_td" prop="amountNotReceivable" label="未收金额（元）">
@@ -252,9 +270,23 @@
               v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
+        <el-table-column class="table_td" prop="amountIngReceivable" width='130' label="应收金额(元)">
           <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
+            <div class="inputChenge">
+              <el-input v-model="scope.row.amountIngReceivable" v-if="scope.row.identification3 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification3 == 'false'" class="inputs">
+                <span>{{scope.row.amountIngReceivable}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification3 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,5)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,5)"></i>
           </template>
         </el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额(元)">
@@ -715,15 +747,17 @@
       whether(row, flag) {
         if (flag == 1) {
           row.identification = 'true'
-        } else {
+        } else if(flag==5){
+          row.identification3 = 'true'
+        }else {
           row.identification1 = 'true'
         }
 
       },
       weightClick(row, flag) {
         if (
-          row.settlementWeight > 200 ||
-          row.settlementWeight < 1 ||
+          row.settlementWeight > 200&&flag==1 ||
+          row.settlementWeight < 1&&flag==1 ||
           (String(row.settlementWeight).indexOf(
               '.'
             ) != -1 &&
@@ -749,6 +783,13 @@
             id: row.id,
             flag: flag
           }
+        }else if (flag == 5) {
+          title = '确定要修改应收金额？'
+          data = {
+            amountIngReceivable: row.amountIngReceivable,
+            id: row.id,
+            flag: flag
+          }
         } else {
           title = '确定要修改结算单价？'
           data = {
@@ -771,6 +812,11 @@
                     title: '成功',
                     message: '结算重量修改成功',
                   })
+                }if (flag == 5) {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '应收金额修改成功',
+                  })
                 } else {
                   this.$notify.success({
                     title: '成功',
@@ -1215,8 +1261,10 @@
               response.records[i].identification = 'false'
               response.records[i].identification1 = 'false'
               response.records[i].identification2 = 'false'
+              response.records[i].identification3 = 'false'
               if (response.records[i].amountIngReceivable) {
                 this.amountReceivable += Number(response.records[i].amountIngReceivable.toFixed(2))
+                response.records[i].amountIngReceivable=response.records[i].amountIngReceivable.toFixed(2)
               }
               if (response.records[i].amountEdReceivable) {
                 this.amountReceived += Number(response.records[i].amountEdReceivable.toFixed(2))

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -90,6 +90,11 @@
           " class="putstorage" @click="exchange(scope.row)">
                   换仓
                 </ws-button>
+                <el-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.huan`
+          "  type="danger" class="putstorage" @click="deletewarehousefunction(scope.row)">
+                  删除
+                </el-button>
                 <!-- <el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button > -->
 
                 <!-- <div class="record" @click="edits(scope.row)">编辑</div>
@@ -132,7 +137,8 @@
     completeList,
     getPrintInfo,
     getbinnumber,
-    addstorageputList
+    addstorageputList,
+    postdeletewarehouse
     // deletewarehouse,
     // warehouseName,
     // addstorageputList,
@@ -229,6 +235,20 @@
       this.showType = this.isShow
     },
     methods: {
+      deletewarehousefunction(row){
+        postdeletewarehouse({id:row.id}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+							this.getList(
+              this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType
+            )
+						})
+      },
       handleClose(){
         this.dialogVisible=false
       },
@@ -239,7 +259,7 @@
             type: 'warning',
           })
           .then(() => {
-              addstorageputList({statusFlag:1,id:this.id,positionId:this.deptBudgetList.positionId,binNumber:this.binNumber,warehouseInOutDetail:{}}).toPromise()
+              addstorageputList({statusFlag:1,id:this.id,positionId:this.deptBudgetList.positionId,binNumber:this.binNumber,warehouseInOutDetail: JSON.parse(this.warehouseInOutDetail)}).toPromise()
 						.then((response) => {
               this.$notify.success({
                   title: '成功',
@@ -275,6 +295,7 @@
               this.$forceUpdate()
 						})
          this.id=row.id
+         this.warehouseInOutDetail= JSON.stringify(row.warehouseInOutDetail),
          this.dialogVisible=true
 
        },

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -191,7 +191,8 @@
               </ws-form-item>
               <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
               dataList.outType == '汽运' ||
-              dataList.outType == '集装箱船'
+              dataList.outType == '集装箱船' ||
+              dataList.outType == '散船'
             ">
                 <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />

src/views/warehouse/warehouseManagementTare.vue

@@ -182,7 +182,7 @@
               </ws-form-item>
 
               <ws-form-item label="车牌号" span="1" prop="carNo"
-                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船' || deptBudgetList.outType == '散船'">
                 <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号"
                   maxlength="7" size="small" />
                 <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo"