前端

src/views/profitable/cashout.vue

@@ -30,12 +30,12 @@
                 <ws-option label="保证金" value="保证金" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.flag" placeholder="" class="typeselect" >
                 <ws-option label="否" value="否" style="color: #8890b1" />
                 <ws-option label="是" value="是" style="color: #8890b1" />
             </ws-select>
-          </el-form-item>
+          </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.contractNo" filterable clearable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo" :value="item.contractNo"

src/views/profitable/expensemanagentedit.vue

@@ -422,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=[]
@@ -530,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({

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/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: '确定',
@@ -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
           }