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

src/views/profitable/cashout.vue

@@ -31,7 +31,7 @@
             </ws-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.contractNo" placeholder="选择合同" class="typeselect" @change="selectcontract">
+            <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"
                 style="color: #8890b1" />
             </el-select>
@@ -84,7 +84,7 @@
           <ws-option v-for="item in datesList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select> -->
-         <ws-select :disabled='disabled' v-model="moneys" placeholder="费用分配金额">
+         <ws-select :disabled='disabled' v-model="moneys" v-if='mode!="暂不分配"' placeholder="费用分配金额">
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
@@ -408,7 +408,7 @@
         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){
+            if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
               this.$message({
                 message: '分配金额不能为空!',
                 type: 'warning',