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

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

src/views/houseSelfCollect/weighingManagement.vue

@@ -159,6 +159,8 @@ export default {
       warehouseList: [],
       warehouseId: '',
       cangid: '',
+      monitorUrl1: '',
+      monitorUrl2: '',
       isShowPrint:false,//打印弹出
       dialogData:{
         qualityInspectionManagement:{},
@@ -201,7 +203,9 @@ export default {
           this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
           this.WAREHOUSE[2].payname = this.warehouseList[i].value
-          this.common.name  =  this.warehouseList[0].value
+          this.common.name  =  this.warehouseList[i].value
+          this.monitorUrl1 =  this.warehouseList[i].monitorUrl1
+          this.monitorUrl2 =  this.warehouseList[i].monitorUrl2
           sessionStorage.setItem('ck',e)
         }
       }
@@ -225,6 +229,8 @@ export default {
           netWeight: row.netWeight,
           relationId: row.relationId,
           warehouseId: this.warehouseId,
+          monitorUrl1: this.monitorUrl1,
+          monitorUrl2: this.monitorUrl2,
           purchasePriceList: this.purchasePriceList,
           allowEdit:this.allowEdit
         },
@@ -255,7 +261,9 @@ export default {
               value: response[i].warehouseName,
               warehouseId: response[i].id,
               warehouseList:response[i].purchasePriceList,
-              allowEdit:response[i].allowEdit
+              allowEdit:response[i].allowEdit,
+              monitorUrl1:response[i].monitorUrl1,
+              monitorUrl2:response[i].monitorUrl2
             })
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
@@ -263,6 +271,8 @@ export default {
               this.common.name = response[i].warehouseName
               this.warehouseId =  response[i].id
               this.warehouseNo =  response[i].commonWarehouseNo
+              this.monitorUrl1 =  response[i].monitorUrl1
+              this.monitorUrl2 =  response[i].monitorUrl2
               this.purchasePriceList =  response[i].purchasePriceList
             }
           }
@@ -273,6 +283,8 @@ export default {
             this.purchasePriceList =  this.warehouseList[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
             this.common.name  =  this.warehouseList[0].value
+            this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
+            this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
           }
            sessionStorage.setItem('ck',this.common.name)
          this.getList()

src/views/houseSelfCollect/weightCheck.vue

@@ -20,19 +20,27 @@
         </div>
         <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
-          <div class="video1">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
-            <div v-if="!video1Src">监控视频未连接</div>
-            <video v-if="video1Src" controls="controls" :src="video1Src"  autoplay="autoplay" class="video-content"
-              mediatype="video"></video> -->
-              <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
+          <div v-if="!monitorUrl1" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
           </div>
-          <div class="vide2">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img2" v-if="!video2Src">
-            <div v-if="!video2Src">监控视频未连接</div>
-            <video src="" v-if="video2Src" class="video-content"></video> -->
-            <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
-          
+          <div v-else class="video1">
+           <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen ="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+           allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
+          </div>
+          <div v-else class="video2">
+           <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+            allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
         </div>
       </div>
@@ -168,8 +176,6 @@
         pList: [],
         mList: [],
         index: 0,
-        video1Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001',
-        video2Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002',
         currentPage: 1,
         pageSize: 10,
         carList: [],
@@ -195,7 +201,9 @@
         isShowPrint: false,
         tableData: {},
         reader: null,
-        param: 9600
+        param: 9600,
+        monitorUrl1: '',
+        monitorUrl2: '',
       }
     },
     activated() {
@@ -210,6 +218,8 @@
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
       this.relationId = this.$route.query.relationId
+      this.monitorUrl1 = this.$route.query.monitorUrl1
+      this.monitorUrl2 = this.$route.query.monitorUrl2
       this.warehouseId = this.$route.query.warehouseId
       if (!this.$route.query.grossWeight) {
         this.$route.query.grossWeight = 0

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

@@ -96,7 +96,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockPurchaseReceiptReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsProcurementInReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -111,7 +111,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockSaleOutReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsSaleOutReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -26,31 +26,31 @@
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handleAudit()"
             >通过</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handlereject()"
             >驳回</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.payment`"
+            v-hasPermission="`report.goodsProcurementInReport.payment`"
             @click="handlepayment"
             >付款</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.edit`"
+            v-hasPermission="`report.goodsProcurementInReport.edit`"
             @click="addRemarks()"
             >备注</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.carry`"
+            v-hasPermission="`report.goodsProcurementInReport.carry`"
             @click="dis()"
             >定金</ws-button
           >
@@ -358,8 +358,11 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <span v-if="roleFlag == 1 ">
         <el-button @click="dialogFormVisible11 = false">取 消</el-button>
         <el-button type="primary" @click="remarksSubmit()">保存</el-button>
+        </span>
+        <span v-else><el-button @click="dialogFormVisible11 = false">关 闭</el-button></span>
       </div>
     </el-dialog>
     <!--定金-->

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -4,11 +4,11 @@
 		<el-scrollbar style="height: 100%">
 			<el-row>
 				<el-col style="padding-left: 15px" :span="16">
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="adopt()">备注
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="adopt()">备注
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="depositbutton()">定金
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="depositbutton()">定金
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.payment`" @click="handlecollect()">收款
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.payment`" @click="handlecollect()">收款
 					</ws-button>
 				</el-col>
 				<el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
@@ -606,16 +606,17 @@
 							this.uncollectedAmount += response.records[i].amountNotReceivable
 							this.outboundVolume += response.records[i].settlementWeight
 							// this.addressUrlArray1.push(response.records[i].collectionScreenshot.split('$'))
-							num = response.records[i].collectionScreenshot.split('$')
-							for (let j = 0; j < num.length; j++) {
-								if (num[j] != '') {
-									if (this.addressUrlArray1.indexOf(num[j]) == -1) {
-										this.addressUrlArray1.push(num[j])
-									}
+							if(response.records[i].collectionScreenshot!=null){
+							    num = response.records[i].collectionScreenshot.split('$')
+								for (let j = 0; j < num.length; j++) {
+									if (num[j] != '') {
+										if (this.addressUrlArray1.indexOf(num[j]) == -1) {
+											this.addressUrlArray1.push(num[j])
+										}
 
+									}
 								}
 							}
-
 						}
 						this.deptBudgetTotal = response.total
 						this.saleList = response

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -173,12 +173,12 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                    deptBudgetList.tranCarInfoList.length>0 && deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >1</span>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                     deptBudgetList.tranCarInfoList.length>0 && !deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >未上传</span>
               </template>
@@ -589,28 +589,27 @@ export default {
     },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.freightspace[i].driver) {
+          //   this.$message({
+          //     message: '司机姓名不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].driverPhone) {
+          //   this.$message({
+          //     message: '司机电话不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].carNo) {
+          //   this.$message({
+          //     message: '车牌号不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
               message: '装车净重不能为空！',
@@ -635,7 +634,7 @@ export default {
             })
             return
           }
-        }
+        
       }
       if (sessionStorage.getItem('sh-msg')) {
         this.validateFunc()
@@ -665,14 +664,12 @@ export default {
         .then(response => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList[0].driver){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          }
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.$set(
-            this.deptBudgetList,
-            'sendDateStart',
-            response.tranCarInfoList[0].sendDateStart
-          )
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -132,6 +132,7 @@
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
+              v-hasPermission="`transportationTask.transportation.transportationInfo.exe`" 
               size="small"
               @click="examine()"
               >审核中</el-button

src/views/warehouse/warehouseManagementEdit.vue

@@ -321,7 +321,7 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.baseId })
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:'' })
       .toPromise()
       .then((response) => {
         this.options = response

src/views/warehouse/warehouseManagementPut.vue

@@ -496,6 +496,7 @@ export default {
       deptBudgetList: {
         type:'干粮',
         freight:0,
+        cost:'',
         warehouseInOutDetail: {}
       },
       historyList: [],

src/views/warehouse/warehouseManagementRecord.vue

@@ -1,992 +1,959 @@
 <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 adjustment"
-          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>
-        <span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
-        <span v-show="warehouseType==2">(临)</span>
-      </h2>
-      <p
-        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 adjustment" 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>
+				<span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
+				<span v-show="warehouseType==2">(临)</span>
+			</h2>
+			<p 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-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
-          <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-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="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="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="扣款（元/吨）"> </el-table-column>
-          <el-table-column prop="grade" label="品级">
-            <template slot-scope="scope">
-              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+        ">
+				备注：{{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-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
+					<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="goodsName" label="货名" width="60px"> </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="扣款（元/吨）"> </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="出入库日期">
-            <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="buyer" 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="操作人" width="120px">
+					</el-table-column>
+					<el-table-column prop="addressUrl" label="附件" width="50px">
+						<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>
-        <el-table :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">{{
+							<!-- <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>
+				<el-table :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-size="deptCircularPage.pageSize"
-            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>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </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-size="deptCircularPage.pageSize"
+						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>
+			<ws-upload ref="upload" table-name="maintain_work_order" oss-key="mainPlan" :comp-id="compId"
+				:appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
+				@uploadSuccess="uploadSuccess" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
+	</div>
+
 </template>
 
 
 <script>
-import { addselectinfoList,recordss } 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,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      appendixIdsAdd: '',
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      radiostatus: 1,
-      capacity: '',
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      remark: '',
-      binNumber: '',
-      status: 1,
-      // 提交类型
-      submitType: true,
-      selectpackingMethod: {},
-      size: 10,
-      warehouseType:'1',
-     deptBudgetList1: {},
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      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,
-    }
-  },
- 
-  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.showType = this.isShow
-  },
-  methods: {
-  
-    //返回按钮
-    returnWarehouse() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-    //
-    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
-    },
-    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.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() {
-      if(this.warehouseType==1){
-        addselectinfoList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        baseId: this.deptBudgetList.baseId,
-        positionId: this.deptBudgetList.positionId,
-        warehouseName: this.deptBudgetList.warehouseName,
-        searchType: this.searchType,
-        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: sessionStorage.getItem('ws-pf_compId'),
-        baseId: this.deptBudgetList.baseId,
-        positionId: this.deptBudgetList.positionId,
-        warehouseName: this.deptBudgetList.warehouseName,
-        searchType: this.searchType,
-        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.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
-    // deletecontract(){},
-    //删除
-
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-  },
-}
+	import {
+		addselectinfoList,
+		recordss
+	} 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,
+				dialogApproveFormVisible: false,
+				// 船舶类型
+				monetaryKey: null,
+				// 表格显示数据
+				tableDate: [],
+				appendixIdsAdd: '',
+				// 是否显示
+				showType: true,
+				// 年
+				year: '',
+				deptBudgetTotal: 0,
+				currentPage: 1,
+				pageSize: 10,
+				radiostatus: 1,
+				capacity: '',
+				searchKeyWord: '',
+				contractType: 2,
+				startDate: null,
+				endDate: null,
+				remark: '',
+				binNumber: '',
+				status: 1,
+				// 提交类型
+				submitType: true,
+				selectpackingMethod: {},
+				size: 10,
+				warehouseType: '1',
+				deptBudgetList1: {},
+				compId: sessionStorage.getItem('ws-pf_compId'),
+				deptCircularPage: {},
+				packtypeList: {},
+				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,
+			}
+		},
+
+		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.showType = this.isShow
+		},
+		methods: {
+
+			//返回按钮
+			returnWarehouse() {
+				this.$router.push({
+					path: 'warehouseManagementList'
+				})
+			},
+			//
+			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
+			},
+			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.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() {
+				if (this.warehouseType == 1) {
+					addselectinfoList({
+							compId: sessionStorage.getItem('ws-pf_compId'),
+							baseId: this.deptBudgetList.baseId,
+							positionId: this.deptBudgetList.positionId,
+							warehouseName: this.deptBudgetList.warehouseName,
+							searchType: this.searchType,
+							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: sessionStorage.getItem('ws-pf_compId'),
+							baseId: this.deptBudgetList.baseId,
+							positionId: this.deptBudgetList.positionId,
+							warehouseName: this.deptBudgetList.warehouseName,
+							searchType: this.searchType,
+							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.receiveAttachmentPath === null ||
+					row.receiveAttachmentPath === ''
+				) {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.accessoryTFs = true
+				}
+				this.appendixIdss = row.receiveAttachmentPath
+			},
+			handleExamine(row) {
+				this.$router.push({
+					name: 'salesContractExamine',
+					query: {
+						id: row.id
+					},
+				})
+			},
+
+			// 关闭 dialog时 处理文件url 初始化upload组件
+			handleCloe() {
+				this.dialogViewSpareMoney = false
+			},
+			history(row) {
+				console.log(row)
+				billoperatehis({
+						id: row.id
+					})
+					.toPromise()
+					.then((response) => {
+						this.historyList = response
+					})
+			},
+			find() {
+				this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+				this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+				this.currentPage = 1
+				this.getList()
+			},
+			// async exportlist() {
+			//   const { data } = await export1(
+			//     {
+			//       compId: sessionStorage.getItem('ws-pf_compId'),
+			//       contractType: this.contractType,
+			//       currentPage: this.currentPage,
+			//       pageSize: this.pageSize,
+			//       searchType: this.searchType,
+			//       searchKeyWord: this.searchKeyWord,
+			//       startDate: this.startDate,
+			//       endDate: this.endDate,
+			//     },
+			//     {},
+			//     { 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);
-  background: rgb(175, 181, 203);
-  padding: 3px;
-  position: relative;
-  top: -1px;
-  border-radius: 3px;
-  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%;
-}
-/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/.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);
+		background: rgb(175, 181, 203);
+		padding: 3px;
+		position: relative;
+		top: -1px;
+		border-radius: 3px;
+		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%;
+	}
+
+	/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;
+	}
 </style>

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',