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

src/views/profitable/cashoutaduitNQ.vue

@@ -51,7 +51,9 @@
        />
         </el-form-item>
         </el-form>
-        <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
+        <!-- 经营性费用不分配 -->
+        <div v-if='deptBudgetList.expensesPurpose!=5'>
+          <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
         <div style='margin:10px auto;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" class="typeselect" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
@@ -63,6 +65,8 @@
         </ws-select>
         合计分配：{{amount}}元
         </div>
+        </div>
+ 
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"' :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">
@@ -162,7 +166,7 @@
       return {
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         compId:localStorage.getItem('ws-pf_compId'),
@@ -337,6 +341,8 @@
         this.$router.go(-1)
       },
        submit(status){
+        //经营性费用不进行分配
+        if(this.deptBudgetList.expensesPurpose!=5){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(!this.feeDetailsDistributions[i].distributionMoney){
               this.$message({
@@ -458,7 +464,21 @@
             this.rejectshow=true
           })
         }
-        
+        }else{
+          if(status==1){
+        editexenseinfo(this.deptBudgetList).toPromise()
+          .then(response => {
+            this.title='通过'
+            this.rejectshow=true
+          })
+        }else{
+          editexenseinfo(this.deptBudgetList).toPromise()
+          .then(response => {
+            this.title='驳回'
+            this.rejectshow=true
+          })
+        }
+        }
       },
       pass(){
          this.$confirm('确认通过请款信息？', '提示', {