gjy 2 лет назад
Родитель
Сommit
2665c2d6ec

+ 1 - 47
src/views/profitable/cashoutedit.vue

@@ -273,34 +273,7 @@
       submit(){
         this.deptBudgetList.compId=localStorage.getItem('ws-pf_compId')
         this.deptBudgetList.agent=localStorage.getItem('ws-pf_staffName')
-        if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'){
-          for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
-            if(!this.feeDetailsDistributions[i].distributionMoney){
-              this.$message({
-                message: '分配金额不能为空!',
-                type: 'warning',
-              })
-              return
-            }
-            if(this.feeDetailsDistributions[i].distributionMoney<0){
-              this.$message({
-                message: '分配金额应大于0!',
-                type: 'warning',
-              })
-              return
-            }
-            if((String(this.feeDetailsDistributions[i].distributionMoney).indexOf('.') != -1 &&
-              String(this.feeDetailsDistributions[i].distributionMoney).length -
-              (String(this.feeDetailsDistributions[i].distributionMoney).indexOf('.') + 1) >
-              2)){
-              this.$message({
-                message: '分配金额最多保留两位小数!',
-                type: 'warning',
-              })
-              return
-            }
-          }
-        }
+
         this.deptBudgetList.totalDistribution=this.amount
         if(this.deptBudgetList.purpose=='合同费用'){
           this.deptBudgetList.expensesPurpose=1
@@ -336,25 +309,6 @@
               })
               return
         }
-       
-        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='全部分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='全部分配'){
-          if(this.amount!=this.deptBudgetList.amountMoney){
-            this.$message({
-                message: '请款金额与分配金额不相等!',
-                type: 'warning',
-          })
-          return
-          }
-        }
-        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='部分分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='部分分配'){
-          if(this.amount>this.deptBudgetList.amountMoney){
-            this.$message({
-                message: '分配金额不可超过请款金额!',
-                type: 'warning',
-          })
-          return
-          }
-        }
         if(!this.deptBudgetList.expenseName){
           this.$message({
                 message: '费用名称不能为空!',

+ 1 - 1
src/views/profitable/expensemanagementdetails.vue

@@ -150,7 +150,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="agent" label="经办人"></el-table-column>
+          <el-table-column prop="creater" label="发起人"></el-table-column>
           <el-table-column prop="createDate" label="发起日期" width="90"></el-table-column>
           <el-table-column prop="status" label="费用状态" width="100">
             <template slot-scope="scope">