Browse Source

調整打印

achao 3 năm trước cách đây
mục cha
commit
097b1d6fe1

+ 4 - 1
public/static/weightCheck.html

@@ -12,6 +12,9 @@
         padding: 5px 0;
         height: 43px;
       }
+      body{
+        margin: 0;
+      }
 
       #app {
         /* height: 98vh;
@@ -22,7 +25,7 @@
         width: 1000px;
         padding: 30px 20px 20px 20px;
         font-size: 18px;
-        height: 700px;
+        height: 686px;
          position: relative;
       }
 

+ 27 - 5
src/views/houseSelfCollect/weighingManagement.vue

@@ -131,15 +131,27 @@
             <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
           </el-radio-group>
         </div>
+
+        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
+                 <div>收货单位:</div>
+                  <!-- <div>{{companyName}}</div> -->
+                   <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+                      <el-option
+                        v-for="item in companyNameOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+               </div>
         <div v-if="this.warehouseName=='鲅鱼圈金信库'||this.warehouseName=='白城内陆港'">
           <div class="print-type-ew">
              <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
               <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
           </div>
-
           <div class="ew-print" v-if="printSeparately">
           <div class="row">
-              <div>客户姓名:</div>
+              <div>额外客户姓名:</div>
                <!-- <div>{{companyName}}</div> -->
                 <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
                    <el-option
@@ -151,7 +163,7 @@
                  </el-select>
             </div>
             <div class="row" >
-              <div>收货单位:</div>
+              <div>额外收货单位:</div>
               <!-- <div>{{companyNameEW}}</div> -->
               <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
                  <el-option
@@ -491,9 +503,12 @@
               .toPromise()
               .then((response) => {
                 index1++;
+                  response.compName = this.companyName
+
                 if (response.compName == '黑龙江秋收有限公司') {
                   response.compName = '黑龙江中天昊元贸易有限公司'
                 }
+
                 this.jjSelectPrintList.push(response)
                 if (index1 == this.modification.length) {
                   this.printBig(1, this.radio)
@@ -890,8 +905,8 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 320px;
-    height: 270px;
+    width: 440px;
+    height: 320px;
     background: white;
     border-radius: 10px;
     z-index: 999;
@@ -959,4 +974,11 @@
   /deep/.el-table .cell{
     text-align: center;
   }
+  .shdw-style{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding:  0 20px;
+    margin-top: 20px;
+  }
 </style>

+ 1123 - 1128
src/views/warehousenew/warehouseManagementRecord.vue

@@ -1,1167 +1,1162 @@
 <template>
-	<div class="container">
-		<el-row>
-			<el-col :span="18">
-				<h2 class="bg-left title">流转记录</h2>
-			</el-col>
-			<el-col :span="6" class="bg-right">
-				<el-button class="bg-bottom" type="primary" size="small" @click="iossrecord()"
-					v-show="this.warehouseType != 2">盘损记录</el-button>
-				<el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
-			</el-col>
-		</el-row>
-		<div class="center">
-			<h2 style="padding-left: 20px">
-				<img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png"
-					alt="" />
-				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
-				<div class="ware" v-show="warehouseType==1">
-					<!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
-					<span class="binNo">仓位号:</span>
-					<el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
-              @change="binNumberChange">
-			  <el-option  key="" label="全部仓位"
-                value="全部仓位" />
-              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
-                :value="item.binNumber" />
-            </el-select>
-				</div>
-				<span v-show="warehouseType==2">(临)</span>
-			</h2>
-			<p v-if='remark' style="
+  <div class="container">
+    <el-row>
+      <el-col :span="18">
+        <h2 class="bg-left title">流转记录</h2>
+      </el-col>
+      <el-col :span="6" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="iossrecord()" v-show="this.warehouseType != 2">
+          盘损记录</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
+      </el-col>
+    </el-row>
+    <div class="center">
+      <h2 style="padding-left: 20px">
+        <img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png" alt="" />
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
+        <div class="ware" v-show="warehouseType==1">
+          <!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
+          <span class="binNo">仓位号:</span>
+          <el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+            @change="binNumberChange">
+            <el-option key="" label="全部仓位" value="全部仓位" />
+            <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+              :value="item.binNumber" />
+          </el-select>
+        </div>
+        <span v-show="warehouseType==2">(临)</span>
+      </h2>
+      <p v-if='remark' style="
           margin-left: 42px;
           background: #f6f7fc;
           color: #afb5cb;
           width: 245px;
         ">
-				备注:{{remark }}
-			</p>
-
-			<ws-form ref="deptBudgetList" :model="deptBudgetList">
-				<div class="record" :class="{ active: status == 1 }" @click="record('', 1)">
-					<img v-if="status != 1" width="14" height="14" src="../../../public/img/radio.png" alt="" />
-					<img v-if="status == 1" width="18" height="18" src="../../../public/img/radio-check.png"
-						alt="" />全部记录
-				</div>
-				<div class="record" :class="{ active: status == 2 }" @click="record(2, 2)">
-					<img v-if="status != 2" width="14" height="14" src="../../../public/img/radio.png" alt="" />
-					<img v-if="status == 2" width="18" height="18" src="../../../public/img/radio-check.png"
-						alt="" />出库记录
-				</div>
-				<div class="record" :class="{ active: status == 3 }" @click="record(3, 3)">
-					<img v-if="status != 3" width="14" height="14" src="../../../public/img/radio.png" alt="" />
-					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
-						alt="" />入库记录
-				</div>
-				<el-date-picker  style="margin: 0 10px 0 0" class="dataClass" value-format='yyyy-MM-dd' v-model="value2" @change='datechange' type="daterange" align="right" range-separator="至"
-					start-placeholder="出入库日期起" end-placeholder="出入库日期止" >
-				</el-date-picker>
-		<ws-input
-          v-model="searchKeyWord"
-          placeholder="可按合同编号、车牌号查找"
-          clearable
-          maxlength="250"
-          type="input"
-		  class="input"
-        >
+        备注:{{remark }}
+      </p>
+
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="record" :class="{ active: status == 1 }" @click="record('', 1)">
+          <img v-if="status != 1" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+          <img v-if="status == 1" width="18" height="18" src="../../../public/img/radio-check.png" alt="" />全部记录
+        </div>
+        <div class="record" :class="{ active: status == 2 }" @click="record(2, 2)">
+          <img v-if="status != 2" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+          <img v-if="status == 2" width="18" height="18" src="../../../public/img/radio-check.png" alt="" />出库记录
+        </div>
+        <div class="record" :class="{ active: status == 3 }" @click="record(3, 3)">
+          <img v-if="status != 3" width="14" height="14" src="../../../public/img/radio.png" alt="" />
+          <img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png" alt="" />入库记录
+        </div>
+        <el-date-picker style="margin: 0 10px 0 0" class="dataClass" value-format='yyyy-MM-dd' v-model="value2"
+          @change='datechange' type="daterange" align="right" range-separator="至" start-placeholder="出入库日期起"
+          end-placeholder="出入库日期止">
+        </el-date-picker>
+        <ws-input v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找" clearable maxlength="250" type="input"
+          class="input">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; position: relative; top: 0px"
-            src="../../../public/img/sousuo.png"
-            alt
-          />
+          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px"
+            src="../../../public/img/sousuo.png" alt />
         </ws-button>
-		<el-button type="primary" @click="batchPrint">批量打印</el-button>
-				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="570" v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
-						 <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
-					<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-form-item label="扣重比" span="1" prop="buckleWeightRatio">
-										{{ props.row.buckleWeightRatio }}
-									</ws-form-item>
-									<ws-form-item label="干粮水分(%)" span="1" prop="solidGrainWater">
-										{{ props.row.solidGrainWater }}
-									</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="binNumber" label="仓位号" width="60px"> </el-table-column>
-					<el-table-column prop="goodsName" label="货名" width="100"> </el-table-column>
-					<!-- <el-table-column prop="type" label="类型" width="60px"> </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="deductionWeight" label="扣重(吨)"> </el-table-column>
-					<el-table-column prop="netWeight" label="净重(吨)"></el-table-column>
-					<el-table-column prop="pureWeight" label="纯重(吨)"> </el-table-column>
-					<el-table-column prop="deductionAmount" label="扣款(元/吨)" width="100"> </el-table-column>
-					<el-table-column prop="grade" label="品级" width="80px">
-						<template slot-scope="scope">
-							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+        <el-button type="primary" @click="batchPrint">批量打印</el-button>
+        <el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="570"
+          v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
+          <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-form-item label="扣重比" span="1" prop="buckleWeightRatio">
+                    {{ props.row.buckleWeightRatio }}
+                  </ws-form-item>
+                  <ws-form-item label="干粮水分(%)" span="1" prop="solidGrainWater">
+                    {{ props.row.solidGrainWater }}
+                  </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="binNumber" label="仓位号" width="60px"> </el-table-column>
+          <el-table-column prop="goodsName" label="货名" width="100"> </el-table-column>
+          <!-- <el-table-column prop="type" label="类型" width="60px"> </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="deductionWeight" label="扣重(吨)"> </el-table-column>
+          <el-table-column prop="netWeight" label="净重(吨)"></el-table-column>
+          <el-table-column prop="pureWeight" label="纯重(吨)"> </el-table-column>
+          <el-table-column prop="deductionAmount" label="扣款(元/吨)" width="100"> </el-table-column>
+          <el-table-column prop="grade" label="品级" width="80px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '二等品'" class="second-class">{{
+              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '三等品'" class="third-class">{{
+              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '等外'" class="substandard">{{
+              <span v-if="scope.row.grade == '等外'" class="substandard">{{
                 scope.row.grade
               }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="inOutDate" label="出入库日期" width="100px">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="inOutType" label="类型"> </el-table-column>
-					<el-table-column prop="contractNo" label="合同编号" width="180">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="carNo" label="车牌号">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.carNo }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="boxNo" label="箱号-1">
-					</el-table-column>
-					<el-table-column prop="boxNoOther" label="箱号-2">
-					</el-table-column>
-					<el-table-column prop="titleNo" label="封号-1">
-					</el-table-column>
-					<el-table-column prop="titleNoOther" label="封号-2">
-					</el-table-column>
-					<el-table-column prop="wingNumber" label="车厢号-1">
-					</el-table-column>
-					<el-table-column prop="wingNumberOther" label="车厢号-2">
-					</el-table-column>
-					<el-table-column prop="agent" label="经办人">
-					</el-table-column>
-					<el-table-column prop="backOffice" label="操作人" width="120px">
-					</el-table-column>
-					<el-table-column prop="addressUrl" label="操作" width="100px">
-						<template slot-scope="scope">
-							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            </template>
+          </el-table-column>
+          <el-table-column prop="inOutDate" label="出入库日期" width="100px">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号" width="180">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="carNo" label="车牌号">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.carNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="boxNo" label="箱号-1">
+          </el-table-column>
+          <el-table-column prop="boxNoOther" label="箱号-2">
+          </el-table-column>
+          <el-table-column prop="titleNo" label="封号-1">
+          </el-table-column>
+          <el-table-column prop="titleNoOther" label="封号-2">
+          </el-table-column>
+          <el-table-column prop="wingNumber" label="车厢号-1">
+          </el-table-column>
+          <el-table-column prop="wingNumberOther" label="车厢号-2">
+          </el-table-column>
+          <el-table-column prop="agent" label="经办人">
+          </el-table-column>
+          <el-table-column prop="backOffice" label="操作人" width="120px">
+          </el-table-column>
+          <el-table-column prop="addressUrl" label="操作" width="100px">
+            <template slot-scope="scope">
+              <!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
-
-						</template>
-					</el-table-column>
-					<el-table-column prop="createDate" label="录入时间">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.createDate }}</span>
-						</template>
-					</el-table-column>
-
-				</el-table>
-				<el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
-					<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="容重(g/l)" 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="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="品级">
-						<template slot-scope="scope">
-							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+              <el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'"
+                v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
+
+            </template>
+          </el-table-column>
+          <el-table-column prop="createDate" label="录入时间">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.createDate }}</span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+        <el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560"
+          v-show="this.warehouseType== '2'">
+          <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="容重(g/l)" 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="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="品级">
+            <template slot-scope="scope">
+              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '二等品'" class="second-class">{{
+              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '三等品'" class="third-class">{{
+              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
                 scope.row.grade
               }}</span>
-							<span v-if="scope.row.grade == '等外'" class="substandard">{{
+              <span v-if="scope.row.grade == '等外'" class="substandard">{{
                 scope.row.grade
               }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="inOutDate" label="出入库日期">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="inOutType" label="类型"> </el-table-column>
-					<el-table-column prop="contractNo" label="合同编号">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="carNo" label="车牌号">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.carNo }}</span>
-						</template>
-					</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="addressUrl" label="附件">
-						<template slot-scope="scope">
-							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
-							<!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
+            </template>
+          </el-table-column>
+          <el-table-column prop="inOutDate" label="出入库日期">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.inOutDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.contractNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="carNo" label="车牌号">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.carNo }}</span>
+            </template>
+          </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="addressUrl" label="附件">
+            <template slot-scope="scope">
+              <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+              <!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
                 scope.row.addressUrlArray.length
               }}</span> -->
-							<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-						</template>
-					</el-table-column>
-					<el-table-column prop="createDate" label="录入时间">
-						<template slot-scope="scope">
-							<span style="color: #8890b1">{{ scope.row.createDate }}</span>
-						</template>
-					</el-table-column>
-
-				</el-table>
-
-
-				<div style="text-align: center; padding: 10px">
-					    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100,500,1000,9999]" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-				</div>
-			</ws-form>
-		</div>
-		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="handleClose">
-			<p>查看附件</p>
-			<el-image 
-    style="width: 100px; height: 100px"
-    :src="appendixIdss" 
-    :preview-src-list="srcList">
-  </el-image>
-		</WinseaContentModal>
-	</div>
+              <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+            </template>
+          </el-table-column>
+          <el-table-column prop="createDate" label="录入时间">
+            <template slot-scope="scope">
+              <span style="color: #8890b1">{{ scope.row.createDate }}</span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+
+        <div style="text-align: center; padding: 10px">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 30, 50, 100,500,1000,9999]"
+            layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        </div>
+      </ws-form>
+    </div>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <p>查看附件</p>
+      <el-image style="width: 100px; height: 100px" :src="appendixIdss" :preview-src-list="srcList">
+      </el-image>
+    </WinseaContentModal>
+  </div>
 
 </template>
 
 
 <script>
-	import {
-		addselectinfoList,
-		recordss,
-		getPrintInfo,
-		getbinnumber
-	} from '@/model/warehouse/index'
-	import {
-		downloadFile
-	} from '@/utils/batchDown'
-	import Pagination from '@/components/Pagination'
-	import WsUpload from '@/components/WsUpload'
-	import {
-		dayjs,
-		fmoney,
-		EventBus
-	} from 'base-core-lib'
-	export default {
-		name: 'viewSpareMoney',
-		components: {
-			WsUpload,
-			Pagination,
-		},
-		watch: {
-			vesselId(val) {
-				this.getList()
-			},
-			isShow(val) {
-				this.showType = val
-			},
-		},
-		data() {
-			return {
-				//弹出框
-				dialogViewSpareMoney: false,
-				binnumberList:[],
-				// 船舶类型
-				monetaryKey: null,
-				// 是否显示
-				showType: true,
-				// 年
-				year: '',
-				srcList:[],
-				deptBudgetTotal: 0,
-				currentPage: 1,
-				pageSize: 10,
-				capacity: '',
-				searchKeyWord: '',
-				contractType: 2,
-				startDate: null,
-				endDate: null,
-				remark: '',
-				binNumber: '',
-				status: 1,
-				value2:[],
-				appendixIdss:'',
-				// 提交类型
-				submitType: true,
-				selectpackingMethod: {},
-				size: 10,
-				warehouseType: '1',
-				compId: localStorage.getItem('ws-pf_compId'),
-				deptCircularPage: {},
-				pcFlag: 1,
-				date: {
-					year: dayjs().format('YYYY'),
-					month: dayjs().format('MM'),
-				},
-				warehouseList: [],
-				deptBudgetList: {},
-				historyList: [],
-				searchType: '',
-				allurl: '../../../public/img/radio.png',
-				pickerBeginDateBefore: {
-					disabledDate: (time) => {
-						return time.getTime() > Date.now()
-					},
-				},
-				accessoryTFs: false,
-				modification:[],
-				printList:[],//批量打印数据
-			}
-		},
-
-		activated() {
-			this.deptBudgetList.baseId = this.$route.query.baseId
-			this.deptBudgetList.positionId = this.$route.query.positionId
-			this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-			this.remark = this.$route.query.remark
-			this.binNumber = this.$route.query.binNumber
-			this.capacity = this.$route.query.capacity
-			this.warehouseType = this.$route.query.warehouseType
-			this.getList()
-            this.getPassYearFormatDate()
-			this.showType = this.isShow
-		},
-		updated() {
-			this.$nextTick(() => {
-			this.$refs['tableData'].doLayout();
-			})
-		},
-		methods: {
-			batchPrint(){
-				if(this.modification.length == 0 ){
-					this.$message.error("请勾选要打印的条目!")
-				}else{
-					localStorage.removeItem("warehouseBatchPrint")
-				var count = 0
-				for(var i = 0 ; i < this.modification.length ; i++){
-						getPrintInfo({
-                        id: this.modification[i].id
-                      })
-                        .toPromise()
-                        .then((response) => {
-							count++
-                           this.printList.push(response)
-						     if(count == this.modification.length){
-						   localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
-						  window.open( '../../../../static/warehouseBatchPrint.html')
-					  }
-                     })
-				}
-				}
-				
-			},
-			   handleSelectionChange(val) {
-			this.modification = val
-			console.log("sfasa",this.modification)
-	     	},
-			selectInit(row){
-				 //在这里一定要记得类型匹配的上。
-				if (row.inOutType != '收购入库' && row.inOutType != '期初') {
-					return true
-				} else  {
-				return false
-				}
-			},
-			binNumberChange(e){
-				if(e=='全部仓位'){
-					this.deptBudgetList.positionId=''
-				}else{
-					for (let i = 0; i < this.binnumberList.length; i++) {
-						if(this.binnumberList[i].binNumber==e){
-							this.deptBudgetList.positionId=this.binnumberList[i].id
-						}
-					}
-				}
-				
-				this.getList()
-			},
-			//合计
-			getSummaries(param) {
-				const { columns, data } = param
-				const sums = []
-				columns.forEach((column, index) => {
-					if (index === 0) {
-						sums[index] = '合计'
-					} else if (
-						index === 4||
-						index === 5||
-						index === 6||
-						index === 7||
-						index === 8||
-						index === 9
-					) {
-						const values = data.map((item) => Number(item[column.property]))
-						if (!values.every((value) => isNaN(value))) {
-							sums[index] = values.reduce((prev, curr) => {
-								const value = Number(curr)
-								if (!isNaN(value)) {
-									return prev + curr
-								} else {
-									return prev
-								}
-								}, 0)
-							sums[index] = sums[index].toFixed(3)
-						}
-					} else {
-						sums[index] = '--'
-					}
-				})
-				return sums
-			},
-		getPassYearFormatDate () {
-          var nowDate = new Date()
-          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
-          var seperator1 = '-'
-          var year = nowDate.getFullYear()
-          var month = nowDate.getMonth() + 1
-          var strDate = nowDate.getDate()
-          if (month >= 1 && month <= 9) {
-            month = '0' + month
+  import {
+    addselectinfoList,
+    recordss,
+    getPrintInfo,
+    getbinnumber
+  } from '@/model/warehouse/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        binnumberList: [],
+        // 船舶类型
+        monetaryKey: null,
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        srcList: [],
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        capacity: '',
+        searchKeyWord: '',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        remark: '',
+        binNumber: '',
+        status: 1,
+        value2: [],
+        appendixIdss: '',
+        // 提交类型
+        submitType: true,
+        selectpackingMethod: {},
+        size: 10,
+        warehouseType: '1',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        pcFlag: 1,
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        searchType: '',
+        allurl: '../../../public/img/radio.png',
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        modification: [],
+        printList: [], //批量打印数据
+      }
+    },
+
+    activated() {
+      this.deptBudgetList.baseId = this.$route.query.baseId
+      this.deptBudgetList.positionId = this.$route.query.positionId
+      this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+      this.remark = this.$route.query.remark
+      this.binNumber = this.$route.query.binNumber
+      this.capacity = this.$route.query.capacity
+      this.warehouseType = this.$route.query.warehouseType
+      this.getList()
+      this.getPassYearFormatDate()
+      this.showType = this.isShow
+    },
+    updated() {
+      this.$nextTick(() => {
+        this.$refs['tableData'].doLayout();
+      })
+    },
+    methods: {
+      batchPrint() {
+        if (this.modification.length == 0) {
+          this.$message.error("请勾选要打印的条目!")
+        } else {
+          localStorage.removeItem("warehouseBatchPrint")
+          var count = 0
+          for (var i = 0; i < this.modification.length; i++) {
+            getPrintInfo({
+                id: this.modification[i].id
+              })
+              .toPromise()
+              .then((response) => {
+                count++
+                this.printList.push(response)
+                if (count == this.modification.length) {
+                  localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
+                  window.open('../../../../static/warehouseBatchPrint.html')
+                }
+              })
           }
-          if (strDate >= 0 && strDate <= 9) {
-            strDate = '0' + strDate
+        }
+
+      },
+      handleSelectionChange(val) {
+        this.modification = val
+        console.log("sfasa", this.modification)
+      },
+      selectInit(row) {
+        //在这里一定要记得类型匹配的上。
+        if (row.inOutType != '收购入库' && row.inOutType != '期初') {
+          return true
+        } else {
+          return false
+        }
+      },
+      binNumberChange(e) {
+        if (e == '全部仓位') {
+          this.deptBudgetList.positionId = ''
+        } else {
+          for (let i = 0; i < this.binnumberList.length; i++) {
+            if (this.binnumberList[i].binNumber == e) {
+              this.deptBudgetList.positionId = this.binnumberList[i].id
+            }
           }
-          var formatDate = year + seperator1 + month + seperator1 + strDate
-          this.getNowFormatDate(formatDate)
-        },
-		/* 获取现在时间,并接受过去时间的值 */
-        getNowFormatDate (formatDate) {
-			var date = new Date()
-			date.setTime(date.getTime()+24*60*60*1000)
-			var seperator1 = '-'
-			var year = date.getFullYear()
-			var month = date.getMonth() + 1
-			var strDate = date.getDate()
-			if (month >= 1 && month <= 9) {
-				month = '0' + month
-			}
-			if (strDate >= 0 && strDate <= 9) {
-				strDate = '0' + strDate
-			}
-			var nowData = year + seperator1 + month + seperator1 + strDate
-			this.value2= [formatDate, nowData]  // 默认赋值一年时间
-   		 },
-			print(row){
-				sessionStorage.removeItem('record_print')
-				getPrintInfo({
-                        id: row.id
-                      })
-                        .toPromise()
-                        .then((response) => {
-                                     localStorage.setItem('ck_bd_printData',JSON.stringify(response))
-                         window.open('../../../../static/weightCheckInOut.html?type=2')
-                         
-                        })
-			},
-			//返回按钮
-			returnWarehouse() {
-				this.$router.push({
-					path: 'warehouseManagementList'
-				})
-				this.searchKeyWord = ''
-			},
-			//
-			iossrecord() {
-				this.$router.push({
-					path: 'warehouseManagementIossRecord',
-					query: {
-						baseId: this.deptBudgetList.baseId,
-						positionId: this.deptBudgetList.positionId,
-						warehouseName: this.deptBudgetList.warehouseName,
-						binNumber: this.binNumber,
-					},
-				})
-			},
-			dateFormat(fmt, date) {
-				let ret
-				const opt = {
-					'Y+': date.getFullYear().toString(), // 年
-					'm+': (date.getMonth() + 1).toString(), // 月
-					'd+': date.getDate().toString(), // 日
-					'H+': date.getHours().toString(), // 时
-					// "M+": date.getMinutes().toString(),         // 分
-					// "S+": date.getSeconds().toString()          // 秒
-					// 有其他格式化字符需求可以继续添加,必须转化成字符串
-				}
-				for (let k in opt) {
-					ret = new RegExp('(' + k + ')').exec(fmt)
-					if (ret) {
-						fmt = fmt.replace(
-							ret[1],
-							ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-						)
-					}
-				}
-				return fmt
-			},
-			datechange(){
-				this.getList()
-			},
-			find() {
-      			this.getList()
-    		},
-			handleClose() {
-				this.accessoryTFs = false
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`)
-				this.pageSize = val
-				this.getList()
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				console.log(`当前页: ${val}`)
-				this.getList()
-			},
-			record(status, status1) {
-				this.status = status1
-				this.searchType = status
-				this.currentPage = '1'
-				this.getList()
-			},
-			// 上传附件
-			uploadSuccess(data, files, url) {
-				console.log(data, files, url)
-
-				// this.deptBudgetList.
-				// this.formData.append('files', files)
-				// this.feedbackObj.uploadNameAttachment = data.appendixName
-				// this.feedbackObj.pathUploadAttachment = data.appendixPath
-				// // this.newAppendixs = files
-				// this.onChangeFlag = true
-			},
-			getList() {
-					var startDate=''
-					var endDate=''
-					if(this.value2){
-					startDate=this.value2[0]?this.value2[0]:''
-					endDate=this.value2[1]?this.value2[1]:''
-				}
-				if (this.warehouseType == 1) {
-					getbinnumber({id: this.deptBudgetList.baseId}).toPromise()
-						.then((response) => {
-							
-							this.binnumberList = response.warehousePositionInfoList
-						})
-					addselectinfoList({
-							compId: localStorage.getItem('ws-pf_compId'),
-							baseId: this.deptBudgetList.baseId,
-							positionId: this.deptBudgetList.positionId,
-							warehouseName: this.deptBudgetList.warehouseName,
-							startDate:startDate,
-       					    endDate:endDate,
-							searchType: this.searchType,
-							searchKeyWord: this.searchKeyWord,
-							currentPage: this.currentPage,
-							pcFlag: this.pcFlag,
-							pageSize: this.pageSize
-						})
-						.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.warehouseList = response
-						})
-				} else if (this.warehouseType == 2) {
-					recordss({
-							compId: localStorage.getItem('ws-pf_compId'),
-							baseId: this.deptBudgetList.baseId,
-							positionId: this.deptBudgetList.positionId,
-							warehouseName: this.deptBudgetList.warehouseName,
-							startDate:startDate,
-       					    endDate:endDate,
-							searchType: this.searchType,
-							searchKeyWord: this.searchKeyWord,
-							currentPage: this.currentPage,
-							pageSize: this.pageSize,
-						})
-						.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.warehouseList = 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.addressUrl === null ||
-					row.addressUrl === ''
-				) {
-					EventBus.$emit(
-						'warning',
-						this.$t('system.noticeCircular.NoInformation')
-					)
-				} else {
-					this.accessoryTFs = true
-				}
-				this.appendixIdss = row.addressUrl
-				this.srcList=[row.addressUrl]
-			},
-			// 关闭 dialog时 处理文件url 初始化upload组件
-			handleCloe() {
-				this.dialogViewSpareMoney = false
-			},
-			history(row) {
-				console.log(row)
-				billoperatehis({
-						id: row.id
-					})
-					.toPromise()
-					.then((response) => {
-						this.historyList = response
-					})
-			},
-			// async exportlist() {
-			//   const { data } = await export1(
-			//     {
-			//       compId: localStorage.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,
-			//     },
-			//     {},
-			//     { responseType: 'blob' }
-			//   ).toPromise()
-			//   downloadFile({
-			//     res: data,
-			//     fileName: `${
-			//       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-			//     }_采购合同`,
-			//     type: 'xls',
-			//   })
-			// },
-			// deletecontract(){},
-			//删除
-
-			approve() {},
-			listQuery() {},
-			total() {},
-			clearfiltQuery() {},
-			selectCrtDuty() {},
-		},
-	}
+        }
+
+        this.getList()
+      },
+      //合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === 4 ||
+            index === 5 ||
+            index === 6 ||
+            index === 7 ||
+            index === 8 ||
+            index === 9
+          ) {
+            const values = data.map((item) => Number(item[column.property]))
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+              sums[index] = sums[index].toFixed(3)
+            }
+          } else {
+            sums[index] = '--'
+          }
+        })
+        return sums
+      },
+      getPassYearFormatDate() {
+        var nowDate = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var seperator1 = '-'
+        var year = nowDate.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var strDate = nowDate.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        var formatDate = year + seperator1 + month + seperator1 + strDate
+        this.getNowFormatDate(formatDate)
+      },
+      /* 获取现在时间,并接受过去时间的值 */
+      getNowFormatDate(formatDate) {
+        var date = new Date()
+        date.setTime(date.getTime() + 24 * 60 * 60 * 1000)
+        var seperator1 = '-'
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        var strDate = date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        var nowData = year + seperator1 + month + seperator1 + strDate
+        this.value2 = [formatDate, nowData] // 默认赋值一年时间
+      },
+      print(row) {
+        sessionStorage.removeItem('record_print')
+        getPrintInfo({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+            window.open('../../../../static/weightCheckInOut.html?type=2')
+
+          })
+      },
+      //返回按钮
+      returnWarehouse() {
+        this.$router.push({
+          path: 'warehouseManagementList'
+        })
+        this.searchKeyWord = ''
+      },
+      //
+      iossrecord() {
+        this.$router.push({
+          path: 'warehouseManagementIossRecord',
+          query: {
+            baseId: this.deptBudgetList.baseId,
+            positionId: this.deptBudgetList.positionId,
+            warehouseName: this.deptBudgetList.warehouseName,
+            binNumber: this.binNumber,
+          },
+        })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加,必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
+      datechange() {
+        this.getList()
+      },
+      find() {
+        this.getList()
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      record(status, status1) {
+        this.status = status1
+        this.searchType = status
+        this.currentPage = '1'
+        this.getList()
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+
+        // this.deptBudgetList.
+        // this.formData.append('files', files)
+        // this.feedbackObj.uploadNameAttachment = data.appendixName
+        // this.feedbackObj.pathUploadAttachment = data.appendixPath
+        // // this.newAppendixs = files
+        // this.onChangeFlag = true
+      },
+      getList() {
+        var startDate = ''
+        var endDate = ''
+        if (this.value2) {
+          startDate = this.value2[0] ? this.value2[0] : ''
+          endDate = this.value2[1] ? this.value2[1] : ''
+        }
+        if (this.warehouseType == 1) {
+          getbinnumber({
+              id: this.deptBudgetList.baseId
+            }).toPromise()
+            .then((response) => {
+
+              this.binnumberList = response.warehousePositionInfoList
+            })
+          addselectinfoList({
+              compId: localStorage.getItem('ws-pf_compId'),
+              baseId: this.deptBudgetList.baseId,
+              positionId: this.deptBudgetList.positionId,
+              warehouseName: this.deptBudgetList.warehouseName,
+              startDate: startDate,
+              endDate: endDate,
+              searchType: this.searchType,
+              searchKeyWord: this.searchKeyWord,
+              currentPage: this.currentPage,
+              pcFlag: this.pcFlag,
+              pageSize: this.pageSize
+            })
+            .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.warehouseList = response
+            })
+        } else if (this.warehouseType == 2) {
+          recordss({
+              compId: localStorage.getItem('ws-pf_compId'),
+              baseId: this.deptBudgetList.baseId,
+              positionId: this.deptBudgetList.positionId,
+              warehouseName: this.deptBudgetList.warehouseName,
+              startDate: startDate,
+              endDate: endDate,
+              searchType: this.searchType,
+              searchKeyWord: this.searchKeyWord,
+              currentPage: this.currentPage,
+              pageSize: this.pageSize,
+            })
+            .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.warehouseList = 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.addressUrl === null ||
+          row.addressUrl === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.addressUrl
+        this.srcList = [row.addressUrl]
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      // async exportlist() {
+      //   const { data } = await export1(
+      //     {
+      //       compId: localStorage.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,
+      //     },
+      //     {},
+      //     { responseType: 'blob' }
+      //   ).toPromise()
+      //   downloadFile({
+      //     res: data,
+      //     fileName: `${
+      //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+      //     }_采购合同`,
+      //     type: 'xls',
+      //   })
+      // },
+      // deletecontract(){},
+      //删除
+
+      approve() {},
+      listQuery() {},
+      total() {},
+      clearfiltQuery() {},
+      selectCrtDuty() {},
+    },
+  }
 </script>
 <style lang="scss" scoped>
-	/deep/.totalStorage .el-input__inner {
-		color: #afb5cb;
-		background: #f5f7fa;
-	}
-
-	.small-title {
-		position: relative;
-		padding: 10px;
-		font-weight: 600;
-	}
-
-	.small-title::before {
-		position: absolute;
-		content: '';
-		display: block;
-		background: #5473e8;
-		width: 4px;
-		height: 14px;
-		left: 0px;
-		top: 13px;
-	}
-
-	.position {
-		position: relative;
-	}
-
-	.add,
-	.del {
-		position: absolute;
-		right: -38px;
-		top: 9px;
-		cursor: pointer;
-	}
-
-	.del {
-		right: -70px;
-	}
-
-	.amap-page-container {
-		width: 300px;
-		height: 300px;
-	}
-
-	.ware {
-		font-size: 12px;
-		color: rgb(255, 255, 255);
-		padding: 3px;
-		position: relative;
-		top: -1px;
-		border-radius: 3px;
-		display: inline-block;
-		text-align: center;
-	}
-
-	.title {
-		position: relative;
-	}
-
-	.title::before {
-		content: '';
-		display: inline-block;
-		width: 5px;
-		height: 30px;
-		background: #5473e8;
-		position: absolute;
-		left: 0;
-	}
-
-	.ws-info-table {
-		border-left: 1px solid transparent;
-		border-top: 1px solid transparent;
-	}
-
-	.el-button--primary {
-		background-color: #5878e8;
-		border-color: #5878e8;
-	}
-
-	.adjustment.el-button--primary {
-		background-color: #51cdd9;
-		border-color: #51cdd9;
-	}
-
-	.el-col {
-		background: #f6f7fc;
-	}
-
-	.record {
-		background: #fff;
-		color: #8890b1;
-		border-color: #fff;
-		display: inline-block;
-		margin-bottom: 10px;
-		cursor: pointer;
-		margin-left: 5px;
-		margin-right: 5px;
-	}
-
-	.record img {
-		position: relative;
-		top: 2px;
-	}
-
-	.record.active img {
-		position: relative;
-		top: 4px;
-	}
-
-	.record.active {
-		color: #262626;
-	}
-
-	.button-container {
-		display: flex;
-		flex-wrap: nowrap;
-		justify-content: space-between;
-		align-items: center;
-		background-color: #fff;
-		width: 100%;
-		height: 50px;
-		padding: 0 10px;
-
-		&>div {
-			margin-left: 10px;
-			display: flex;
-			flex-wrap: nowrap;
-			flex-direction: row;
-
-			&>span {
-				line-height: 50px;
-			}
-		}
-
-		/deep/.auditFlow-box {
-			position: unset;
-			margin-left: 10px;
-
-			&/deep/.auditFlow-icon {
-				width: auto;
-				padding-right: 30px;
-			}
-
-			&/deep/.auditFlow-main {
-				position: absolute;
-			}
-		}
-	}
-
-	.box-app {
-		display: inline-block;
-		float: left;
-		margin-left: 30px;
-		line-height: 50px;
-	}
-
-	/deep/.el-dialog {
-		.el-form-item {
-			margin-bottom: 0 !important;
-
-			.el-input--medium {
-				textarea {
-					min-height: 100px !important;
-				}
-			}
-		}
-	}
-
-	.top-grade {
-		background: linear-gradient(90deg, #5678e9, #7993f6);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.second-class {
-		background: linear-gradient(90deg, #50cdd9, #82e2ea);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.third-class {
-		background: linear-gradient(90deg, #ffa735, #ffbf70);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.substandard {
-		background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.collapse-bottom {
-		margin-bottom: 20px;
-	}
-
-	.input-main .textarea .el-textarea__inner {
-		width: 100%;
-		z-index: 1;
-	}
-
-	.bg-left {
-		padding-left: 30px;
-	}
-
-	.bg-right {
-		padding-right: 10px;
-		text-align: right;
-	}
-
-	.bg-bottom {
-		margin: 15px 0px;
-	}
-
-	.wenzi {
-		width: 900px;
-		margin: 0 auto;
-	}
-
-	.wenzi h3 {
-		display: inline-block;
-		left: 10px;
-	}
-
-	.wenzi p {
-		display: inline-block;
-	}
-
-	.center {
-		padding: 0 1%;
-	}
-
-	.el-form-item {
-		width: 50%;
-	}
-
-	.el-form-item__label {
-		text-align: center;
-	}
-
-	.ce {
-		width: 900px;
-		margin: 0 auto;
-	}
-
-	/*.crt-main .textarea /deep/ .el-form-item__label {*/
-	/*  height: 82px;*/
-	/*}*/
-	// 控制select为只读的时候显示样式
-
-	.hide-sel {
-		.el-input__inner {
-			border: 0px;
-		}
-
-		.el-icon-arrow-up {
-			display: none;
-		}
-
-		.el-textarea__inner {
-			background-color: #fff !important;
-			border: 0;
-		}
-
-		.el-date-editor {
-			i {
-				display: none;
-			}
-		}
-
-		.is-disabled {
-			.el-input__inner:hover {
-				background-color: #fff !important;
-				border: 0;
-			}
-
-			color: #606266;
-
-			.el-input__inner {
-				background-color: #fff !important;
-				border: 0;
-				color: #606266;
-			}
-
-			.el-textarea__inner {
-				background-color: #fff !important;
-				border: 0;
-				color: #606266;
-			}
-		}
-	}
-
-	// 控制select为只读的时候显示样式
-	/deep/.ws-class-table-col {
-		height: auto;
-		padding: 0px 2px;
-
-		/deep/.el-input__inner {
-			padding: 0px 2px;
-		}
-	}
-
-	/deep/.is-disabled {
-		.el-input__prefix,
-		.el-input__suffix {
-			display: none;
-		}
-
-		.el-input__inner {
-			background-color: #fff;
-			border-color: #fff !important;
-			color: #000 !important;
-			font-size: 14px;
-			cursor: text;
-			padding: 0 !important;
-		}
-	}
-
-	.winseaview-view {
-		padding: 0 0 20px;
-	}
-
-	.container {
-		overflow: scroll;
-		height: 93vh;
-	}
-
-	.el-textarea__inner {
-		display: none;
-	}
-
-	.readonly {
-		width: 16%;
-	}
-
-	.ws-info-table .el-form-item {
-		width: 14.28%;
-	}
-	.dataClass {
-       width: 20% !important;
-	}
-	.input {
-		width: 20% !important;
-	}
-
-
-	/deep/.ws-info-table .el-form-item .el-form-item__label {
-		background-color: #f6f7fc;
-		font-size: 12px;
-		height: 45px;
-	}
-
-	//去边框
-	/deep/.el-form-item {
-		border-right: 0px;
-		border-bottom: 0px;
-	}
-
-	/deep/.ws-info-table {
-		border-left: 0px;
-		border-top: 0px;
-	}
-
-	.ws-info-table .el-form-item .el-form-item__content {
-		border-right: 0px;
-		border-bottom: 0px;
-		border-left: 0px;
-		border-top: 0px;
-	}
-
-	/deep/.ws-info-table .el-form-item {
-		border-right: 0px;
-		border-bottom: 0px;
-		border-left: 0px;
-		border-top: 0px;
-	}
-
-	/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__content {
-		border: 0px;
-	}
-	/deep/.el-table td , /deep/.el-table .el-table__header .cell{
-		text-align: center;
-	}
-	.binNo{
-		color: #333;
-		font-size: 18px;
-		margin-left: 20px;
-	}
+  /deep/.totalStorage .el-input__inner {
+    color: #afb5cb;
+    background: #f5f7fa;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  .position {
+    position: relative;
+  }
+
+  .add,
+  .del {
+    position: absolute;
+    right: -38px;
+    top: 9px;
+    cursor: pointer;
+  }
+
+  .del {
+    right: -70px;
+  }
+
+  .amap-page-container {
+    width: 300px;
+    height: 300px;
+  }
+
+  .ware {
+    font-size: 12px;
+    color: rgb(255, 255, 255);
+    padding: 3px;
+    position: relative;
+    top: -1px;
+    border-radius: 3px;
+    display: inline-block;
+    text-align: center;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .ws-info-table {
+    border-left: 1px solid transparent;
+    border-top: 1px solid transparent;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .adjustment.el-button--primary {
+    background-color: #51cdd9;
+    border-color: #51cdd9;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  .record {
+    background: #fff;
+    color: #8890b1;
+    border-color: #fff;
+    display: inline-block;
+    margin-bottom: 10px;
+    cursor: pointer;
+    margin-left: 5px;
+    margin-right: 5px;
+  }
+
+  .record img {
+    position: relative;
+    top: 2px;
+  }
+
+  .record.active img {
+    position: relative;
+    top: 4px;
+  }
+
+  .record.active {
+    color: #262626;
+  }
+
+  .button-container {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
+
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
+
+      &>span {
+        line-height: 50px;
+      }
+    }
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
+    }
+  }
+
+  .box-app {
+    display: inline-block;
+    float: left;
+    margin-left: 30px;
+    line-height: 50px;
+  }
+
+  /deep/.el-dialog {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-input--medium {
+        textarea {
+          min-height: 100px !important;
+        }
+      }
+    }
+  }
+
+  .top-grade {
+    background: linear-gradient(90deg, #5678e9, #7993f6);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .second-class {
+    background: linear-gradient(90deg, #50cdd9, #82e2ea);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .third-class {
+    background: linear-gradient(90deg, #ffa735, #ffbf70);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .substandard {
+    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .collapse-bottom {
+    margin-bottom: 20px;
+  }
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
+  }
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .wenzi {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .wenzi h3 {
+    display: inline-block;
+    left: 10px;
+  }
+
+  .wenzi p {
+    display: inline-block;
+  }
+
+  .center {
+    padding: 0 1%;
+  }
+
+  .el-form-item {
+    width: 50%;
+  }
+
+  .el-form-item__label {
+    text-align: center;
+  }
+
+  .ce {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
+  /*  height: 82px;*/
+  /*}*/
+  // 控制select为只读的时候显示样式
+
+  .hide-sel {
+    .el-input__inner {
+      border: 0px;
+    }
+
+    .el-icon-arrow-up {
+      display: none;
+    }
+
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+    }
+
+    .el-date-editor {
+      i {
+        display: none;
+      }
+    }
+
+    .is-disabled {
+      .el-input__inner:hover {
+        background-color: #fff !important;
+        border: 0;
+      }
+
+      color: #606266;
+
+      .el-input__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+
+      .el-textarea__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+    }
+  }
+
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
+    padding: 0px 2px;
+
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
+  }
+
+  /deep/.is-disabled {
+    .el-input__prefix,
+    .el-input__suffix {
+      display: none;
+    }
+
+    .el-input__inner {
+      background-color: #fff;
+      border-color: #fff !important;
+      color: #000 !important;
+      font-size: 14px;
+      cursor: text;
+      padding: 0 !important;
+    }
+  }
+
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .el-textarea__inner {
+    display: none;
+  }
+
+  .readonly {
+    width: 16%;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 14.28%;
+  }
+
+  .dataClass {
+    width: 20% !important;
+  }
+
+  .input {
+    width: 20% !important;
+  }
+
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #f6f7fc;
+    font-size: 12px;
+    height: 45px;
+  }
+
+  //去边框
+  /deep/.el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+  }
+
+  /deep/.ws-info-table {
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  .ws-info-table .el-form-item .el-form-item__content {
+    border-right: 0px;
+    border-bottom: 0px;
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  /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__content {
+    border: 0px;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table .el-table__header .cell {
+    text-align: center;
+  }
+
+  .binNo {
+    color: #333;
+    font-size: 18px;
+    margin-left: 20px;
+  }
 </style>