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

src/components/balanceAlert.vue

@@ -158,6 +158,7 @@ export default {
               this.deptBudgetList.warehouseName == '肇东金信库' ||
               this.deptBudgetList.warehouseName == '呼兰大金仓'||
               this.deptBudgetList.warehouseName == '克东润津库'||
+              this.deptBudgetList.warehouseName == '洮南新友谊兴旺库'||
               this.deptBudgetList.warehouseName == '克东瑞信达')
           ) {
             for (var i = 0; i < value.length; i++) {

src/views/home/index.vue

@@ -194,7 +194,7 @@ export default {
   methods: {
     //中国地图
     china_map() {
-      debugger
+      
       let mapChart = this.$echarts.init(document.getElementById('china-map')); //图表初始化，china-map是绑定的元素
       window.onresize = mapChart.resize; //如果容器变大小，自适应从新构图
       let series = []; //存放循环配置项
@@ -253,7 +253,7 @@ export default {
         }
       
       }
-      debugger
+      
       for(let k = 0; k < lineData.length; k++) {
         // province.push(lineData[i].bcitysim); //存进去每个省的名字
         // province.push(lineData[i].ecitysim); //存进去每个省的名字

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -7,11 +7,11 @@
         <el-button @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
       </template>
       <template slot="right">
-        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
+        <el-select v-model="warehouseName"  filterable placeholder="" @change="warehouseNameChange" :value="searchType"
           style="margin: 0 10px">
-          <ws-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
+          <el-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
-        </ws-select>
+        </el-select>
         <!-- <el-checkbox @change='checkchange' v-model="checked">默认</el-checkbox> -->
       </template>
     </BaseHeaderLayout>
@@ -268,7 +268,9 @@
                 <ws-form-item
                   v-if='serviceManagementType == 1 || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
                   label="车队" span="1" prop="fleetName">
-                  <el-select :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
+                  <el-select @change="fleetNameChange" :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
+                    <el-option  key="0" label="非车队"
+                      value="非车队" />
                     <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
                       :value="item.fleetName" />
                   </el-select>
@@ -745,6 +747,19 @@ export default {
     }
   },
   methods: {
+    fleetNameChange(e){
+        console.log(e,this.fleetNameList)
+        if(e=='非车队'){
+          this.weighingList.freight=''
+        }else{
+          for (let i = 0; i < this.fleetNameList.length; i++) {
+            if (this.fleetNameList[i].carNo == this.weighingList.fleetName) {
+              this.weighingList.freight = this.fleetNameList[i].tranPrice
+            }
+          }
+        }
+        
+      },
     getNowTime() {
       var now = new Date();
       var year = now.getFullYear(); //得到年份
@@ -2739,6 +2754,7 @@ export default {
                   .then((response) => {
                     this.deptBudgetList.warehouseInOutId = response
                     if(!this.deptBudgetList.id){
+                      this.$delete(this.deptBudgetList,'statusFlag')
                       inspectAdd(this.deptBudgetList)
                       .toPromise()
                       .then((response1) => {
@@ -2844,9 +2860,10 @@ export default {
                       })
                     }else{
                       this.deptBudgetList.id=zjid
-                      if (this.serviceManagementType==3) {
-                        this.deptBudgetList.statusFlag = this.qyJurisdiction&&!this.zjJurisdiction ? 7 : 1
-                      }
+                      // if (this.serviceManagementType==3) {
+                      //   this.deptBudgetList.statusFlag = this.qyJurisdiction&&!this.zjJurisdiction ? 7 : 1
+                      // }
+                      this.$delete(this.deptBudgetList,'statusFlag')
                       getinspectEdit(this.deptBudgetList)
                       .toPromise()
                       .then((response) => {
@@ -2981,9 +2998,7 @@ export default {
                       .catch((response) => { })
                   })
               } else if (this.statusTypetext == '确认') {
-                if (this.serviceManagementType==3) {
-                  this.deptBudgetList.statusFlag = 2
-                }
+                this.$delete(this.deptBudgetList,'statusFlag')
                 this.deptBudgetList.flag = 2
                 getinspectEdit(this.deptBudgetList)
                   .toPromise()

src/views/outboundManagement/weighingManagementNew.vue

@@ -502,6 +502,9 @@
         checked:false,
         dialogDataList:[],
         ewCustomerOptions: [ {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         },{

src/views/outboundManagement/weighingManagementrecord.vue

@@ -247,6 +247,9 @@
         warehouseList1:[],
         
         ewCustomerOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         },{

src/views/profitable/cashout.vue

@@ -43,7 +43,7 @@
             </el-select>
           </el-form-item>
            <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓库名称" span="1" prop="contractNo" class="readonly">
-            <el-select v-model="deptBudgetList.warehouseName" placeholder="选择仓库" class="typeselect" @change="selectwarehouse">
+            <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="选择仓库" class="typeselect" @change="selectwarehouse">
               <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                 style="color: #8890b1" />
             </el-select>
@@ -102,7 +102,7 @@
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"&&deptBudgetList.flag!="是"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
+              <el-select v-model="scope.row.warehouseName" filterable placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
                 <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                   style="color: #8890b1" />
               </el-select>
@@ -110,10 +110,10 @@
           </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
             <template slot-scope="scope">
-               <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
-                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
+               <el-select v-model="scope.row.receiptDocDate" filterable placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
+                <el-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
                   style="color: #8890b1" />
-              </ws-select>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">

src/views/profitable/expenseallot.vue

@@ -67,7 +67,7 @@
         合计分配：{{amount}}元
         </div>
         <el-table ref="tableref" v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==3&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
-          <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
+          <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
                 <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -75,7 +75,15 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
+            <template slot-scope="scope">
+              <el-select  @change="((value)=>{receiptDocDatechange1(value, scope.$index)})" v-model="scope.row.warehouseName" placeholder="选择仓库">
+                <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
+                  style="color: #8890b1" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="日期">
             <template slot-scope="scope">
                <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
                 <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+item.goodsSource" :value="item.time"
@@ -83,15 +91,19 @@
               </ws-select>
             </template>
           </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="date" label="日期">
+            <template slot-scope="scope">
+                <el-date-picker @change="((value)=>{receiptDocDatechange1(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
+              value-format="yyyy-MM-dd"   ></el-date-picker>
+            </template>
+          </el-table-column>
           <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="日期">
             <template slot-scope="scope">
                 <el-date-picker @change="((value)=>{receiptDocDatechange(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
-            </el-table-column>
-          <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
+          <el-table-column v-if='deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
                 <el-select v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
@@ -299,6 +311,22 @@
              this.$set(this.goodsourcelist,index,JSON.parse(JSON.stringify(arr)))
           })
       },
+      receiptDocDatechange1(e,index){
+        var arr=[]
+        this.goodsourcelist[index]=[]
+        if(this.feeDetailsDistributions[index].warehouseName&&this.feeDetailsDistributions[index].receiptDocDate){
+          getwarehousingorder({warehouseName:this.feeDetailsDistributions[index].warehouseName,receiptDocDate:this.feeDetailsDistributions[index].receiptDocDate}).toPromise()
+          .then(response => {
+            for (let i = 0; i < response.length; i++) {
+              arr.push({goodsSource:response[i].goodsSource,id:response[i].id,weight:response[i].inWarehouseWeight,goodsName:response[i].goodsName,goodsNameKey:response[i].goodsNameKey})
+            }
+            this.feeDetailsDistributions[index].goodsSource=''
+            this.feeDetailsDistributions[index].weight=''
+             this.$set(this.goodsourcelist,index,JSON.parse(JSON.stringify(arr)))
+          })
+        }
+        
+      },
       returnsales(){
         this.$router.go(-1)
       },

src/views/profitable/expensemanagementdetails.vue

@@ -124,11 +124,11 @@
                 <el-button v-if='scope.row.status=="待确认"&&scope.row.expensesType==1' @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
-              <el-button v-if='scope.row.expensesPurpose==1&&scope.row.status=="已收款"&&!scope.row.approveStatus||scope.row.expensesPurpose==1&&scope.row.status=="已付款"&&!scope.row.approveStatus' @click="accomplish(scope.row)" type="primary">完成</el-button>
+              <el-button v-if='scope.row.expensesPurpose==1&&scope.row.status=="已收款"&&!scope.row.approveStatus||scope.row.expensesPurpose==1&&scope.row.status=="已付款"&&!scope.row.approveStatus||scope.row.expensesPurpose==2&&scope.row.status=="已付款"&&!scope.row.approveStatus' @click="accomplish(scope.row)" type="primary">完成</el-button>
               <el-button  v-if='scope.row.status=="已驳回"' @click="edit(scope.row)" type="primary">编辑</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
               <el-button v-if='!scope.row.distributionStatus&&scope.row.expensesPurpose==1&&scope.row.costType==3&&!scope.row.approveStatus&&scope.row.status=="已付款"
-              ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"&&scope.row.storageFeeFlag!=1||scope.row.expensesPurpose==2&&scope.row.status=="已付款"' @click="allot(scope.row)" type="primary">分配</el-button>
+              ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"&&scope.row.storageFeeFlag!=1||scope.row.expensesPurpose==2&&scope.row.status=="已付款"&&!scope.row.distributionStatus' @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
               <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
               <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
@@ -138,7 +138,7 @@
           <el-table-column prop="expenseRemarks" label="分配状态">
             <template slot-scope="scope">
               <span>{{scope.row.distributionStatus}}</span>
-              <el-tooltip v-if='scope.row.rejectionReason' class="item" effect="dark" :content="scope.row.rejectionReason" placement="top-start">
+              <el-tooltip v-if='scope.row.rejectionReason&&scope.row.distributionStatus' class="item" effect="dark" :content="scope.row.rejectionReason" placement="top-start">
                 <i class="el-icon-question"></i>
               </el-tooltip>
             </template>
@@ -191,7 +191,7 @@
     },
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         tableData1:[],
         deptBudgetTotal: 0,
@@ -203,10 +203,10 @@
         compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
         deptCircularPage: {},
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
         title:'附件',
         title1:'',
         outtotal:0,

src/views/profitable/expensemanagentedit.vue

@@ -95,7 +95,7 @@
         <span v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
                 <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -103,7 +103,15 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
+            <template slot-scope="scope">
+              <el-select  @change="((value)=>{receiptDocDatechange1(value, scope.$index)})" v-model="scope.row.warehouseName" placeholder="选择仓库">
+                <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
+                  style="color: #8890b1" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
             <template slot-scope="scope">
                <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
                 <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+'/'+item.goodsSource" :value="item.time"
@@ -117,9 +125,13 @@
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
-            </el-table-column>
-          <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货源">
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="date" label="日期">
+            <template slot-scope="scope">
+                <el-date-picker @change="((value)=>{receiptDocDatechange1(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
+              value-format="yyyy-MM-dd"   ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column v-if='deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
                 <el-select v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
@@ -330,6 +342,22 @@ weight: 4000}]],
              this.$set(this.goodsourcelist,index,JSON.parse(JSON.stringify(arr)))
           })
       },
+      receiptDocDatechange1(e,index){
+        var arr=[]
+        this.goodsourcelist[index]=[]
+        if(this.feeDetailsDistributions[index].warehouseName&&this.feeDetailsDistributions[index].receiptDocDate){
+          getwarehousingorder({warehouseName:this.feeDetailsDistributions[index].warehouseName,receiptDocDate:this.feeDetailsDistributions[index].receiptDocDate}).toPromise()
+          .then(response => {
+            for (let i = 0; i < response.length; i++) {
+              arr.push({goodsSource:response[i].goodsSource,id:response[i].id,weight:response[i].inWarehouseWeight,goodsName:response[i].goodsName,goodsNameKey:response[i].goodsNameKey})
+            }
+            this.feeDetailsDistributions[index].goodsSource=''
+            this.feeDetailsDistributions[index].weight=''
+             this.$set(this.goodsourcelist,index,JSON.parse(JSON.stringify(arr)))
+          })
+        }
+        
+      },
       selectcontent(e){
 
       },
@@ -394,6 +422,9 @@ weight: 4000}]],
             this.deptBudgetList.costType=5
             this.deptBudgetList.expenseAllocationInfoList=[]
           }
+        }
+        if(this.deptBudgetList.expensesPurpose==2){
+          this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
         }
          if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
         var data=[]
@@ -502,6 +533,7 @@ weight: 4000}]],
         }
         this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.deptBudgetList.flag=3
+        console.log(this.deptBudgetList)
         editexenseinfo(this.deptBudgetList).toPromise()
           .then(response => {
             this.$message({
@@ -626,7 +658,7 @@ weight: 4000}]],
                     id:data[q].id,weight:data[q].inWarehouseWeight,goodsName:data[q].goodsName,goodsNameKey:data[q].goodsNameKey})
                 }
                 this.$set(this.goodsourcelist,i,JSON.parse(JSON.stringify(arr)))
-              }else if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
+              }else if(this.deptBudgetList.expensesPurpose==1){
                 const data  = await getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:this.feeDetailsDistributions[i].warehouseName}).toPromise()
                 this.datelist[i]=[]
                 for (let q = 0; q < data.length; q++) {
@@ -634,6 +666,15 @@ weight: 4000}]],
                   arr.push({time:data[i].issuingDate,id:data[i].id,weight:data[i].inWarehouseWeight,goodsSource:data[i].goodsSource})
                 }
                 this.$set(this.datelist,i,JSON.parse(JSON.stringify(arr)))
+              }else if(this.deptBudgetList.expensesPurpose==2){
+                const data  = await getwarehousingorder({receiptDocDate:this.feeDetailsDistributions[i].receiptDocDate,warehouseName:this.feeDetailsDistributions[i].warehouseName}).toPromise()
+                this.datelist[i]=[]
+                for (let q = 0; q < data.length; q++) {
+                  arr.push({
+                    goodsSource:data[q].goodsSource,
+                    id:data[q].id,weight:data[q].inWarehouseWeight,goodsName:data[q].goodsName,goodsNameKey:data[q].goodsNameKey})
+                }
+                this.$set(this.goodsourcelist,i,JSON.parse(JSON.stringify(arr)))
               }
             }
             console.log(this.goodsourcelist,this.datelist)

src/views/profitable/expensemanagentlook.vue

@@ -147,6 +147,10 @@
         makeWordData: {},
         srcList:[],
         expensesType:'',
+        goodsourcelist:[],
+        warehouseList:[],
+        dataList:[],
+        datelist:[],
         compId:localStorage.getItem('ws-pf_compId'),
         roleName:localStorage.getItem('ws-pf_roleName'),
         payeeinfo:{},

src/views/profitable/payment.vue

@@ -99,9 +99,10 @@
     },
     data() {
       return {
+          timer1: '',
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         size:9,
@@ -125,6 +126,20 @@
     },
     activated() {
       this.getList()
+    },
+     async created() {
+      //获取快捷路口列表
+      this.getRouteList()
+      // this.checkUserInfoDialog()
+      // {
+      this.timer1 = setInterval(this.getList, 120000);
+      // }
+    },
+    beforeDestroy() {
+      clearInterval(this.timer1);
+      if (this.timer1) {
+        clearInterval(this.timer1); // 在Vue实例销毁前，清除定时器
+      }
     },
     methods: {
       getList() {

src/views/statisticalReport/autoSettlementList.vue

@@ -44,7 +44,7 @@
       <el-row>
         <div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
       </el-row>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList" :summary-method="getSummaries" show-summary @row-click="handleRowClick"
+      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"   @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -219,7 +219,7 @@
           <el-input type='number' v-model="money" autocomplete="off" placeholder="请输入本次付款金额" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="付款日期" prop="paymentDate" :label-width="formLabelWidth" class="deal">
-          <ws-date-picker v-model="paymentDate" type="date" placeholder="请选择付款日期" value-format="yyyy-MM-dd"
+          <el-date-picker v-model="paymentDate" type="date" placeholder="请选择付款日期" value-format="yyyy-MM-dd"
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
@@ -544,6 +544,16 @@ export default {
         }
       }
     },
+    date() {
+      var date = new Date();
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      var d = date.getDate();
+
+      m = m < 10 ? "0" + m : m;
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + m + "-" + d;
+    },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
       if (row.approveStatus == null) {
@@ -588,7 +598,7 @@ export default {
       // this.money = this.money
       this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.paymentDate
+      this.paymentDate = this.date()
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
@@ -610,6 +620,7 @@ export default {
             return
         }
         this.amountNotPayable = this.amountNotPayable.toFixed(2)
+        this.money=this.amountNotPayable
         this.dialogFormVisible1 = true
       }
     },
@@ -654,6 +665,17 @@ export default {
           })
           return
         }
+        if(!this.deptBudgetList.addressUrl){
+          // var arr=this.deptBudgetList.addressUrl.split(',')
+          // if(arr.length==0){
+            this.$message({
+              message: '请上传付款截图！',
+              type: 'warning',
+            })
+            return
+          // }
+        }
+        
         this.$confirm(`确定提交付款信息？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -872,7 +894,7 @@ export default {
           (String(this.deductionAmount).indexOf('.') + 1) >
           2) ||
         (this.deductionAmount && this.deductionAmount > 100000) ||
-        (this.deductionAmount && this.deductionAmount < 0)
+        (this.deductionAmount && this.deductionAmount < -100000)
       ) {
         this.$message({
           message: '扣款金额输入错误',
@@ -881,7 +903,7 @@ export default {
         return
       }
       editauto({
-        deductionAmount: Math.abs(this.deductionAmount),
+        deductionAmount: this.deductionAmount,
         id: item.id,
         flag: 1,
       })
@@ -1011,7 +1033,7 @@ export default {
         this.$message.warning('请选择要通过的条目')
       } else {
         for (let i = 0; i < this.modification.length; i++) {
-          if(this.modification[i].status=='待请款'&&this.modification[i].approveStatus||this.modification[i].status!='待请款'){
+          if(this.modification[i].status=='待请款'&&this.modification[i].approveStatus||this.modification[i].status!='待请款'&&this.modification[i].status!='已驳回'){
             this.$message.warning('请选择待请款的条目')
             return
           }

src/views/taskManagement/tranManagementLook.vue

@@ -96,7 +96,7 @@
           <ws-form-item label="发货地区" span="1" prop="waterContent">
             {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
-           <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item> 
+           <!-- <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item>  -->
           <ws-form-item label="发货人" span="1" prop="sender">
             {{ item.sender }}
           </ws-form-item>
@@ -109,13 +109,13 @@
             {{ item.receivePrivate }}/{{ item.receiveCity
             }}/{{ item.receiveArea }}
           </ws-form-item>
-          <ws-form-item
+          <!-- <ws-form-item
             label="收货地详细地址"
             span="1"
             prop="receiveDetailedAddress"
           >
             {{ item.receiveDetailedAddress }}
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="收货人" span="1" prop="receiver">
             {{ item.receiver }}
           </ws-form-item>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -178,7 +178,6 @@
           month: dayjs().format('MM')
         },
         contractList: [],
-        deptBudgetList: {},
       }
     },
     activated() {