Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -37,7 +37,8 @@
         <td class="col col-bgc">热损伤（%）</td>
         <td class="col">{{ printData.jiaorenli }}</td>
         <td class="col col-bgc">单价（元/公斤）</td>
-        <td class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-else class="col">{{ printData.dryGrainPrice }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/inspectInfo.vue

@@ -255,7 +255,11 @@
             })
             this.dialogTableVisible = true;
           }
-        });
+        })
+        this.types = ""
+        // this.inspect = [] 
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
       },
       typeChange(){
         if(this.inspect.type == "干粮" && this.inspect.goodsName){

src/views/houseSelfCollect/inspectionManagement.vue

@@ -72,7 +72,12 @@
         prop="tidalGrainPrice"
         label="单价（元/公斤）"
         width="120px"
-      ></el-table-column>
+      >
+      <template scope="scope">
+          <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
+          <span v-else>{{ scope.row.dryGrainPrice }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -88,12 +88,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
         <template scope="scope">
-          <el-button
-            type="danger"
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
-            @click="del(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
-          >删除</el-button>
+          
           <el-button
             v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
@@ -109,6 +104,12 @@
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
+          <el-button
+            type="danger"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            @click="del(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/houseSelfCollect/settlement.vue

@@ -459,9 +459,12 @@ export default {
               .then((response) => {})
           })
           this.dialogTableVisible = true
+          
         }
       })
-
+      this.paymentList = [] 
+      this.isShowPrint = false
+      this.$router.push({path:'paymentManagement'})
     },
     printSmall() {
       window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
@@ -481,8 +484,8 @@ export default {
          this.paymentList.base = this.paymentList.base.toFixed(2)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
-          if(!this.paymentList.solidGrainPrice){
-            this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
+          if(!this.paymentList.dryGrainPrice){
+            this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
           if(this.paymentList.type =='潮粮'){
             this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
@@ -492,7 +495,7 @@ export default {
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
-            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.dryGrainPrice*this.paymentList.weighingManagement.netWeight
              this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
               this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
                 this.paymentList.actualPayment = this.paymentList.calculationPayable

src/views/houseSelfCollect/weighingManagement.vue

@@ -200,6 +200,7 @@ export default {
           this.allowEdit = this.warehouseList[i].allowEdit
             this.WAREHOUSE[2].payname = this.warehouseList[i].value
              this.common.name  =  this.warehouseList[0].value
+            sessionStorage.setItem('ck',this.common.name)
         }
       }
       this.getList()
@@ -264,6 +265,7 @@ export default {
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
            this.common.name  =  this.warehouseList[0].value
+           sessionStorage.setItem('ck',this.common.name)
          this.getList()
         })
     },

src/views/houseSelfCollect/weightCheck.vue

@@ -249,7 +249,7 @@
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: '',
-            warehouseName: this.common.name,
+            warehouseName: sessionStorage.getItem('ck'),
             managementType: 1
           })
           .toPromise()
@@ -276,41 +276,61 @@
       makeData() {
         this.mList = [];
         this.pList = [];
+        let that = this
         console.log(this.common.commonWeighingList, "commonWeighingList")
         let _list = this.common.commonWeighingList
         for (let i = 0; i < _list.length; i++) {
+          if(_list[i].allow == 2){
+            continue
+          }
           if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
             this.mList.push(_list[i])
-          } else if (_list[i].status == '已称皮重' || _list[i].status == '已称毛重') {
+          }
+          
+          if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
             this.pList.push(_list[i])
           }
-        }
+        }debugger
         if (this.information == "毛重") {
           this.index = 0
           this.carList = this.mList
           if (this.mList.length != 0) {
-            this.setCurrent(this.mList[0])
+      let _item = this.mList.filter(function(val){
+        console.log(that.$route.query.id)
+                if(val.id==that.$route.query.id){
+                  return val
+                }
+            })
+
+            this.setCurrent(_item[0])
 
             this.carWeightInfo = {
-              carNumber: this.mList[0].carNumber,
+              carNumber: _item[0].carNumber,
               type: this.information,
               weight: this.weighingList.grossWeight
             }
+            this.deptBudgetTotal =  this.mList.length
           }
-          this.weighingList = this.mList[0]
+          this.weighingList = _item[0]
         } else {
           this.index = 1
           this.carList = this.pList
           if (this.pList.length != 0) {
-            this.setCurrent(this.pList[0])
+            let _item = this.pList.filter(function(val1){
+                if(val1.id==that.$route.query.id){
+                  return val1
+                }
+            })
+            this.setCurrent(_item[0])
 
             this.carWeightInfo = {
-              carNumber: this.pList[0].carNumber,
+              carNumber: _item[0].carNumber,
               type: this.information,
               weight: this.weighingList.tare
             }
+             this.deptBudgetTotal =  this.pList.length
           }
-          this.weighingList = this.pList[0]
+          this.weighingList = _item[0]
         }
       },
       tabClick(val) {
@@ -428,6 +448,10 @@
             this.dialogTableVisible = true
           }
         })
+        this.isShowPrint = false
+        this.$router.push({
+          path: 'weighingManagement'
+        })
       },
       closePrint() {
         this.isShowPrint = false
@@ -809,4 +833,7 @@
     padding: 10px 0 !important;
     height: auto !important;
   }
+  .weight{
+    font-size: 68px;
+  }
 </style>

src/views/outboundManagement/collectionManagement.vue

@@ -520,7 +520,7 @@ export default {
       }).toPromise().then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
-            response.records[i].contractPrice =  response.records[i].contractPrice/1000
+            response.records[i].contractPrice =  response.records[i].contractPrice*1000
           }
            this.collectList = response.records
         })

src/views/outboundManagement/collectionment.vue

@@ -60,7 +60,7 @@
             </ws-form-item>
             <ws-form-item label="单价(元/公斤)" span="1" prop="contractPrice">
               <ws-input 
-              v-model="collectionList.weighingManagement.contractPrice" placeholder="请输入单价" maxlength="100" size="small" disabled/>
+              v-model="collectionList.weighingManagement.contractPrice*1000" placeholder="请输入单价" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNo">
               <ws-input 

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -27,7 +27,7 @@
           <ws-button
             type="primary"
             v-hasPermission="`report.procurementInReport.view`"
-            @click="handlepass()"
+            @click="handleAudit()"
             >通过</ws-button
           >
           <ws-button
@@ -100,8 +100,8 @@
         >
         <span v-else>合同重量: 0 吨</span>
 
-        <span v-if="warehouseList.settlementWeight"
-          >入库量: {{ warehouseList.settlementWeight }} 吨</span
+        <span v-if="settlementWeight1"
+          >入库量: {{ settlementWeight1 }} 吨</span
         >
         <span v-else>入库量: 0 吨</span>
 
@@ -377,6 +377,7 @@
             class="deal"
             placeholder="输入定金金额"
           ></el-input>
+          
         </el-form-item>
         <el-form-item label="上传定金截图" :label-width="formLabelWidth">
           <el-upload
@@ -406,7 +407,6 @@ import {
   addDisOrRemarks,
   stockPurchasePayMoney,
 } from '@/model/statisticalReport/index'
-import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -493,11 +493,12 @@ export default {
       payedMoney:'',
       payNotMoney:'',
       settlementWeight: '',
+      settlementWeight1: '',
       modification: [],
       contractManagementInfoList: {},
       contractManagementInfo: {
         contractManagementInfoList: [],
-        deposit: '0',
+        deposit: '',
         depositUrl: '',
         remark: '',
         id: '',
@@ -640,7 +641,8 @@ export default {
             this.contractManagementInfoList.id = this.contractNoList[i].id
           }
         }
-        this.contractManagementInfoList.deposit = this.deposit
+         this.contractManagementInfoList.deposit = this.deposit
+        // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
         this.contractManagementInfoList.depositUrl = this.depositUrl
         addDisOrRemarks(this.contractManagementInfoList)
           .toPromise()
@@ -648,7 +650,7 @@ export default {
             this.$message.success('修改成功')
             this.dialogFormVisible5 = false
             this.getList()
-            this.contractManagementInfoList = {}
+            
           })
       })
     },
@@ -806,37 +808,37 @@ export default {
         })
       }
     },
-    audit(item, index, status, status2, reason) {
-      if (index < this.modification.length) {
-        posthandle({
-          taskId: item.taskId,
-          approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
-          needReapply: status2 != undefined ? true : false,
-        })
-          .toPromise()
-          .then((response) => {
-            this.audit(
-              this.modification[index + 1],
-              index + 1,
-              status,
-              status2,
-              reason
-            )
-          })
-          .catch((req) => {
-            this.$message.warning(req.message)
-          })
-      } else {
-        if (status == true) {
-          this.$message.success('通过成功')
-          this.getList()
-        } else if (status == false) {
-          this.$message.success('驳回成功')
-          this.getList()
-        }
-      }
-    },
+    // audit(item, index, status, status2, reason) {
+    //   if (index < this.modification.length) {
+    //     posthandle({
+    //       taskId: item.taskId,
+    //       approved: status,
+    //       auditMind: reason != undefined ? '已驳回' : '34',
+    //       needReapply: status2 != undefined ? true : false,
+    //     })
+    //       .toPromise()
+    //       .then((response) => {
+    //         this.audit(
+    //           this.modification[index + 1],
+    //           index + 1,
+    //           status,
+    //           status2,
+    //           reason
+    //         )
+    //       })
+    //       .catch((req) => {
+    //         this.$message.warning(req.message)
+    //       })
+    //   } else {
+    //     if (status == true) {
+    //       this.$message.success('通过成功')
+    //       this.getList()
+    //     } else if (status == false) {
+    //       this.$message.success('驳回成功')
+    //       this.getList()
+    //     }
+    //   }
+    // },
     handlereject(status) {
       var that = this
       if (this.modification.length == 0) {
@@ -869,20 +871,6 @@ export default {
       //   this.options = this.contractNoList
       // }
     },
-    handlepass() {
-      var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
-      } else {
-        this.$confirm(`是否确定通过？`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          that.audit(this.modification[0], 0, true, 2)
-        })
-      }
-    },
     handleSelectionChange(val) {
       this.modification = val
     },
@@ -968,11 +956,13 @@ export default {
           this.payingMoney = 0
           this.payedMoney = 0
           this.payNotMoney = 0
+          this.settlementWeight1 = 0
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
             this.payingMoney += response.records[i].amountIngPayable
             this.payedMoney += response.records[i].amountEdPayable
             this.payNotMoney += response.records[i].amountNotPayable
+            this.settlementWeight1 += response.records[i].settlementWeight
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -36,11 +36,17 @@
 				<span v-else>合同单价: 0 元/吨</span>
 				<span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
 				<span v-else>应收: 0 元</span>
-				<span v-if="amountReceived">已收: {{ amountReceived }} 元</span>
+				<span v-if="amountReceived">已收: {{ amountReceived }} 元
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian1()" alt="" />
+				</span>
 				<span v-else>已收: 0 元</span>
 				<span v-if="uncollectedAmount">未收: {{ uncollectedAmount }} 元</span>
 				<span v-else>未收: 0 元</span>
-				<span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元</span>
+				<span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian()" alt="" />
+				</span>
 				<span v-else>定金: 0 元</span>
 			</div>
 
@@ -49,17 +55,30 @@
 				<el-table-column type="index" label="序号" width="50"></el-table-column>
 				<el-table-column class="table_td" prop="warehouseName" label="仓库"></el-table-column>
 				<el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-				<el-table-column class="table_td" prop="deliveryDate" label="出库日期"></el-table-column>
+				<el-table-column class="table_td" prop="deliveryDate" label="出库日期">
+					<template slot-scope="scope">
+						<span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.returnDate}}</span>
+						<span v-if="scope.row.returnFlag == null">{{scope.row.deliveryDate }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column class="table_td" prop="grossWeight" label="毛重(吨)"></el-table-column>
 				<el-table-column class="table_td" prop="tare" label="皮重(吨)"></el-table-column>
-				<el-table-column class="table_td" prop="netWeight" label="净重(吨)"></el-table-column>
+				<el-table-column class="table_td" prop="netWeight" label="净重(吨)">
+					<template slot-scope="scope">
+						<span style="color: #ce4545;"
+							v-if="scope.row.returnFlag == 1">-{{scope.row.netWeight}}(退)</span>
+						<span v-if="scope.row.returnFlag == null">{{scope.row.netWeight }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)">
 					<template slot-scope="scope">
 						<div class="inputChenge">
 							<el-input v-model="scope.row.settlementWeight" v-if="scope.row.identification == 'true'">
 							</el-input>
 							<div v-if="scope.row.identification == 'false'" class="inputs">
-								{{ scope.row.settlementWeight }}
+								<span style="color: #ce4545;"
+									v-if="scope.row.returnFlag == 1">{{scope.row.settlementWeight}}</span>
+								<span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
 							</div>
 						</div>
 						<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
@@ -69,14 +88,36 @@
 							v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
 					</template>
 				</el-table-column>
-				<el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)"></el-table-column>
+				<el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
+					<template slot-scope="scope">
+						<span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable }}</span>
+					</template>
+				</el-table-column>
 			</el-table>
 
+
 			<!-- 页数 -->
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
 				:total="deptBudgetTotal"></el-pagination>
-			</el-scrollbar>
+		</el-scrollbar>
+		<!-- 定金弹窗 -->
+		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose">
+			<div v-for="(item,index) in addressUrlArray" :key="index">
+				<img width="100" height="100" :src="item" alt="">
+			</div>
+		</WinseaContentModal>
+		<!-- 已收弹窗 -->
+		<WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose1">
+			<div style="display: flex;">
+				<div v-for="(item,index) in addressUrlArray1" :key="index" style="display:flex;">
+					<img width="100" height="100" :src="item" alt="">
+					<!-- <img src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/f43f512136a544d3bbcef0fa4259d274.png" alt=""> -->
+				</div>
+			</div>
+		</WinseaContentModal>
 		<!-- 收款 -->
 		<el-dialog width="25%" title="收款" :visible.sync="dialogFormVisible1" :append-to-body="true">
 			<el-form :model="form">
@@ -87,8 +128,8 @@
 					<el-input v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
 				</el-form-item>
 				<el-form-item label="收款日期" prop="collectionDate" :label-width="formLabelWidth" class="deal">
-					<ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期"
-						value-format="yyyy-MM-dd" class="deal" />
+					<ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
+						class="deal" />
 				</el-form-item>
 				<el-form-item label="上传收款截图" :label-width="formLabelWidth">
 					<el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
@@ -143,12 +184,6 @@
 		disOrRemarks,
 		saleEditSettlementWeight,
 	} from '@/model/statisticalReport/index'
-	import {
-		posthandle
-	} from '@/model/purchasingManagement/index'
-	import {
-		downloadFile
-	} from '@/utils/batchDown'
 	import Pagination from '@/components/Pagination'
 	import WsUpload from '@/components/WsUpload'
 	import {
@@ -220,7 +255,7 @@
 				amountReceivable: '',
 				amountReceived: '',
 				uncollectedAmount: '',
-				outboundVolume:'',
+				outboundVolume: '',
 				collectionDate: '',
 				collectionScreenshot: '',
 				amountEdCollectionable: '',
@@ -233,6 +268,12 @@
 				searchKeyWord: '',
 				value1: '', //收款日期
 				modification: [],
+				accessoryTFs: false,
+				appendixIdss: [],
+				accessoryTFs1: false,
+				appendixIdss1: [],
+				addressUrlArray: [],
+				addressUrlArray1: [],
 			}
 		},
 		activated() {
@@ -241,15 +282,20 @@
 		},
 		methods: {
 			//表头
-			   contractchange(e) {
-        for (var i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-           this.orderList= this.contractNoList[i]
-          }
-        }
-      this.contractNo = e
-      this.getList()
-    },
+			contractchange(e) {
+				for (var i = 0; i < this.contractNoList.length; i++) {
+					if (this.contractNoList[i].contractNo == e) {
+						this.orderList = this.contractNoList[i]
+						if (this.contractNoList[i].depositUrl) {
+							this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
+						} else {
+							this.addressUrlArray = []
+						}
+					}
+				}
+				this.contractNo = e
+				this.getList()
+			},
 			//选择合同
 			dataFilter(val) {
 				this.contractNo = val
@@ -431,6 +477,35 @@
 						})
 				})
 			},
+			//定金附件
+			fujian() {
+				if (this.orderList.depositUrl === null || this.orderList.depositUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				}
+				this.appendixIdss = this.orderList.depositUrl
+				this.accessoryTFs = true
+			},
+			handleClose() {
+				this.accessoryTFs = false
+			},
+			//已收附件
+			fujian1() {
+				if (this.addressUrlArray1.length == 0) {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.appendixIdss1 = this.collectionScreenshot
+					this.accessoryTFs1 = true
+				}
+			},
+			handleClose1() {
+				this.accessoryTFs1 = false
+			},
 			//收款
 			handlecollect() {
 				this.amountEdReceivable = this.saleList.records[0].amountEdReceivable
@@ -439,7 +514,7 @@
 				this.dialogFormVisible1 = true
 			},
 			collectment() {
-				this.stockSaleReceiptReport.money = this.money			
+				this.stockSaleReceiptReport.money = this.money
 				this.stockSaleReceiptReport.collectionDate = this.collectionDate
 				if (
 					this.money < 0 ||
@@ -523,12 +598,24 @@
 						this.amountReceived = 0
 						this.uncollectedAmount = 0
 						this.outboundVolume = 0
+						let num = []
 						for (var i = 0; i < response.records.length; i++) {
 							response.records[i].identification = 'false'
 							this.amountReceivable += response.records[i].amountIngReceivable
 							this.amountReceived += response.records[i].amountEdReceivable
 							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])
+									}
+
+								}
+							}
+
 						}
 						this.deptBudgetTotal = response.total
 						this.saleList = response
@@ -854,7 +941,6 @@
 	.el-date-editor.el-input,
 	.el-date-editor.el-input__inner,
 	.el-input-number--small {
-		width: 123% !important;
 	}
 
 	/deep/.el-table td,
@@ -868,16 +954,17 @@
 		height: 220px;
 		line-height: 28px;
 		width: 146%;
-    	margin-left: 15px;
+		margin-left: 15px;
 	}
 
 	.inputs {
 		margin: 0 auto;
 		margin-right: 15%;
 	}
+
 	.inputChenge {
-  		width: 120%;
- 	    display: inline-flex;
-  		margin-left: -69%;
+		width: 120%;
+		display: inline-flex;
+		margin-left: -69%;
 	}
 </style>