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

public/static/payprint.html

@@ -150,14 +150,13 @@
         align-items: center;
       }
       .sfcard-content img {
-        /* height: 50vh; */
         width: 45%;
         height: 50vh;
       }
       .sfcard-title {
         font-size: 28px;
         text-align: center;
-        margin: 50px 0;
+        margin: 10px 0;
       }
       .avatar {
         margin-bottom: 120px;
@@ -171,14 +170,14 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="sfcard" v-if="isShowPrintType1">
-          <div class="sfcard-title">身份证</div>
+          <div class="sfcard-title">{{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl1" class="avatar" />
             <img :src="imageUrl2" class="avatar" />
           </div>
         </div>
         <div class="bankcard" v-if="isShowPrintType2">
-          <div class="sfcard-title">银行卡</div>
+          <div class="sfcard-title">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl3" class="avatar" />
             <img :src="imageUrl4" class="avatar" />
@@ -596,9 +595,10 @@
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         this.printData = JSON.parse(_data)
         let _type = decodeURIComponent(this.getQueryVariable('type'))
-        if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-          this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
-          this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        
+        if (sessionStorage.getItem('cwprint')) {
           this.identity = this.customerList.cardAddressUrl.split(',')
           this.bank = this.customerList.payeeAddressUrl.split(',')
           this.imageUrl1 = this.identity[0]

src/api/V2/houseSelfCollect/index.js

@@ -83,4 +83,7 @@ export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
-export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
+// export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
+//财务开票
+export const API_GET_INVOICING = '/paymentManagement/api/readXmlManagement'
+// export const API_POST_INVOICING ='/paymentManagement/api/readXmlManagement'

src/model/houseSelfCollect/index.js

@@ -43,6 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
+  API_POST_INVOICING,
   API_GET_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
@@ -129,5 +130,8 @@ export const settlementEdit = appRx.post(API_POST_PAYMENT_SETTLEMENTEDIT, errorC
 export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)
 //付款权限查询
 export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, errorCatcher, errorHandle, filter)
-//财务开票
-export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+//财务开票get
+// export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+//财务开票post
+export const invoicing  = appRx.post(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+                                     API_GET_INVOICING

src/router/index.js

@@ -215,7 +215,7 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      console.log('paymentManagementReturn',sessionStorage.getItem('paymentManagementReturn'))
       if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
         next(`/houseSelfCollect/paymentManagement`);
       }else{
@@ -228,6 +228,7 @@ router.beforeEach(async (to, from, next) => {
       next(`/login?redirect=${to.path}`);
     })
   } else {
+    data.routingUri = to.path
     next()
   }
 })

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -30,6 +30,7 @@
           >允许手动编辑重量</el-checkbox>
         </div>
       </template>
+    
     </BaseHeaderLayout>
     <!-- <div class="header">
       <div>
@@ -45,7 +46,7 @@
       <acquisitionManagementAdd></acquisitionManagementAdd>
     </el-dialog>
     <div class="table-content">
-      <el-table :data="tableData" style="width: 100%;margin-top: 20px" border height="780">
+      <el-table :data="tableData" style="width: 100%;margin-top: 20px;" border height="600" >
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -355,5 +356,7 @@ export default {
 
 .paging {
   text-align: center;
+  margin-top:20px
 }
+
 </style>

src/views/houseSelfCollect/component/routers/route.js

@@ -120,7 +120,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'settlement',
         shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.add',
+        module: 'acquisitionManagement.acquisitionPay.view',
         permissicon: [],
         keepAlive: true
       },

src/views/houseSelfCollect/customerManagement.vue

@@ -28,7 +28,7 @@
       </div>
     </div>
 
-    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="780">
+    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="600">
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -53,7 +53,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="text-align: center">
+    <div style="text-align: center;margin-top:20px">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
@@ -226,4 +226,7 @@
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
   }
+//   /deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -61,8 +61,8 @@
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 disabled />
             </ws-form-item>
-            <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" :disabled="disabled2" @change="typeChange">
+            <ws-form-item label="类型" span="1" prop="type"  >
+              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -802,7 +802,7 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
                   this.tipFlag = false
-                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit/1000 +'吨。');
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }

src/views/houseSelfCollect/inspectionManagement.vue

@@ -23,7 +23,8 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
-		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="780">
+		<!-- <div style="height:calc(100vh - 600px)"> -->
+		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -104,6 +105,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
+		
 		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
 			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
 			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
@@ -113,12 +115,13 @@
 				<el-button type="primary" @click="printBig">打印单据</el-button>
 			</div>
 		</el-dialog>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 			</el-pagination>
 		</div>
+		<!-- </div> -->
 	</div>
 </template>
 <script>
@@ -388,4 +391,7 @@
 		width: 45%;
 		display: inline-block;
 	}
+// 	/deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,7 +125,8 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="260">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
+
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button
@@ -332,9 +333,18 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify({
-        paymentManagement :this.modification
-      })
+      // let data = JSON.stringify({
+      //   paymentManagementList : this.modification
+      // })
+      // //开票
+      //   invoicing(data)
+      //   .toPromise()
+      //   .then(response => {
+      //     console.log(response)
+      //   })
+      let data = {
+        paymentManagementList : this.modification
+      }
       console.log('开票',data)
       //开票
       invoicing(data)
@@ -360,7 +370,7 @@ export default {
          ]
         this.invoicingImgList = response.data.imgList
         if(response.data.imgList.length>0){
-          for(let i = 0;i<response.data.imgList;i++){
+          for(let i = 0;i<response.data.imgList.length;i++){
           //创建标签下载文件
             let a = document.createElement('a');
             a.href = response.data.imgList[i].src;
@@ -371,10 +381,10 @@ export default {
           }
         }
       })
+      .catch(() => {
+      })
     },
     selectType(val) {
-      console.log(val)
-      console.log(this.ruleForm.type)
       for (let i = 0; i < this.ruleForm.type.length; i++) {
         switch (this.ruleForm.type[i]) {
           case '打印身份证（正反面）':
@@ -767,8 +777,10 @@ export default {
     print1(row) {
       this.isShowPrintType = true
       this.rowData = row
+      sessionStorage.setItem('cwprint',true)
     },
     print(row) {
+       sessionStorage.setItem('cwprint',false)
       getpaymentexamine({ id: row.id })
           .toPromise()
           .then(response => {

src/views/houseSelfCollect/settlement.vue

@@ -441,7 +441,6 @@ export default {
     }
   },
   activated() {
-    debugger
     this.types = this.$route.query.type
     if( this.types == 2){
          this.disabled=true

src/views/houseSelfCollect/weighingManagement.vue

@@ -19,7 +19,7 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
-		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
+		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -69,7 +69,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">

src/views/statisticalReport/huoyunList.vue

@@ -108,8 +108,8 @@
           </el-select>
         </el-col>
       </el-row>
-      <!-- v-if="actualFreight && tranPriceIng" -->
-      <div class="freightSet" >
+     
+      <div class="freightSet" v-if="processNo">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1533,6 +1533,7 @@ hr {
  width: 100px;
 }
 .freightSet{
+  margin: 10px 0 0 20px;
   display: flex;
   width:500px;
 }

src/views/statisticalReport/shippingList.vue

@@ -110,7 +110,7 @@
         </el-col>
       </el-row>
       <!-- v-if="actualFreight && tranPriceIng" -->
-       <div class="freightSet">
+       <div class="freightSet" v-if="processNo">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1543,6 +1543,7 @@ hr {
  width: 100px;
 }
 .freightSet{
+  margin: 10px 0 0 20px;
   display: flex;
   width:500px;
 }

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -49,6 +49,7 @@
 				</span>
 				<span v-else>定金: 0 元</span>
 			</div>
+			
 
 			<el-table class="wenzi" :data="saleList.records" style="width: 100%; margin-top: 20px" ref="saleList" border
 				:summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -941,8 +941,8 @@ export default {
         .toPromise()
         .then(response => {
           this.$message.success('编辑成功')
-          this.$router.go(-1)
-          // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+          // this.$router.go(-1)
+          this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
         })
     },
     //提交按钮

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -126,7 +126,7 @@
             >
            </div>
           </div>
-          <div
+        <div
             class="position siji"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             :key="index"
@@ -435,7 +435,7 @@
             <img width="22" height="22" src="../../../public/img/add.png" alt />
             <div class="spans">添加仓位</div>
           </el-button>
-        </div>
+          </div>
       </ws-form>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -931,8 +931,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 90%;
-  // margin: 0 auto;
+  margin: 0 auto;
 }
 
 //表格文字
@@ -999,15 +998,13 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-.position {
-  width: 90%;
-}
+
 //下表格样式
 .position.siji {
   background: white;
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
-  width: 1219px;
+  // width: 1219px;
 }
 /deep/.zi {
   width: 64px;
@@ -1040,7 +1037,7 @@ export default {
 }
 /deep/.basicInformation {
   .el-form-item {
-    width: 25%;
+    // width: 25%;
 
     .el-form-item__label {
       background: transparent;
@@ -1085,22 +1082,23 @@ export default {
 }
 .basicInformation .ws-info-table {
   border: none;
-  width: 1000px;
+  width: 100%;
+  margin: 0 auto;
 }
 /deep/.el-select .el-input__inner {
   border: 1px solid #ccc !important;
   padding: 0 15px !important;
   font-size: 12px !important;
-  width: 125px;
+  // width: 125px;
 }
 .zhong {
-  height: 111px;
   background: #f6f7fc;
   border-radius: 4px;
   border: 1px solid #d8dce6;
-  width: 99%;
-  margin: 0 2%;
-  // margin-left: -76px;
+  width: 100%;
+}
+/deep/.zhong .el-form-item{
+  width: 20%;
 }
 .bg-left {
   padding-left: 30px;
@@ -1109,12 +1107,7 @@ export default {
   padding-left: 30px;
   width: 150px;
 }
-.basicInformation .ws-info-table {
-  border: none;
-  width: 141%;
-  margin: 0 auto;
-  // margin-left: -89px;
-}
+
 .ys {
   // margin-left: 300px;
   width: 100px;
@@ -1166,9 +1159,7 @@ export default {
   left: 0px;
   top: 13px;
 }
-.position {
-  position: relative;
-}
+
 
 .del {
   // position: absolute;
@@ -1189,12 +1180,11 @@ export default {
   width: 300px;
   height: 300px;
 }
-.el-form {
-  padding: 0 15%;
-}
+
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
+  width: 33.3333%;
 }
 .readonly {
   position: relative;
@@ -1227,16 +1217,28 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
+
 /deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  // border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
   padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
+  // border-left: 1px solid transparent;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   text-align: center;
   background: #fff;
-  // border: 1px solid #cdd2dc;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 .button-container {
   display: flex;
@@ -1299,14 +1301,9 @@ export default {
   padding-right: 10px;
   text-align: right;
 }
-.center {
-  width: 86%;
-  // margin: 0 auto;
-  // margin: 0 -29%;
-}
-.el-form-item {
-  width: 50%;
-}
+// .el-form-item {
+//   width: 50%;
+// }
 .el-form-item__label {
   text-align: center;
 }
@@ -1359,8 +1356,6 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     font-size: 14px;
     cursor: text;
@@ -1374,9 +1369,7 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
+
 .readonly:after {
   display: none;
 }
@@ -1385,6 +1378,7 @@ export default {
 }
 .el-form {
   margin-top: 50px;
+  padding: 0 15%;
 }
 .readonly {
   width: 16%;
@@ -1399,35 +1393,8 @@ export default {
   border-left: 0px;
   border-top: 0px;
 }
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-  // margin: 0 auto;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
+
+
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
@@ -1463,20 +1430,7 @@ export default {
 //   border-radius: 10px;
 //   right: 20px;
 // }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  /* background-color: #fff; */
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  background: border-box;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  /* border: 1px solid #d8dce6; */
-  border: none;
-}
+
 /deep/.basicInformation .el-form-item .el-form-item__label {
   background: transparent;
   border: none;
@@ -1487,9 +1441,9 @@ export default {
   line-height: 16px;
   margin-left: 22px;
 }
-/deep/.el-form-item__content .el-select {
-  width: 42%;
-}
+// /deep/.el-form-item__content .el-select {
+//   width: 42%;
+// }
 //减号
 .del {
   position: absolute;

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -811,8 +811,6 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     font-size: 14px;
     cursor: text;
@@ -947,4 +945,5 @@ export default {
     height: 40px;
     margin: 20px 0;
   }
+
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -66,12 +66,12 @@
         /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div v-show="this.warehouseType == '1'">
+    <div v-show="this.warehouseType == '1'" class="main_css">
       <el-table
         class="wenzi"
         :data="warehouseList"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="100%"
       >
         <el-table-column prop="warehouseName" label="仓库名" >
         </el-table-column>
@@ -815,5 +815,8 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+.main_css{
+  height: calc(100vh - 124px);
+}
 
 </style>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -1,3 +1,4 @@
+//检斤待完成
 <template>
   <div class="container">
     <el-row>
@@ -20,7 +21,8 @@
         >
       </el-col>
     </el-row>
-    <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
+    <el-main class="main_css">
+<ws-form ref="deptBudgetList" :v-model="deptBudgetList">
       <div class="center">
         <h2 style="padding-left: 20px">
           <img
@@ -114,6 +116,8 @@
        
       </div>
     </ws-form>
+    </el-main>
+    
   </div>
 </template>
 <script>
@@ -551,4 +555,7 @@ export default {
   color: #ffffff;
   line-height: 20px;
 }
+.main_css{
+height: calc(100vh - 120px);
+}
 </style>

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1371,7 +1371,6 @@ export default {
         .then(() => {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
-              debugger
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3