提交代码

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -30,7 +30,7 @@
           </el-select>
         </el-form-item>
         <!-- 创建时间 -->
-        <el-form-item>
+        <!-- <el-form-item>
           <span style="margin-left:5px;margin-right:5px;color:#606266;">{{$t('creationtime')}}</span>
           <el-date-picker
             style="width:240px;"
@@ -58,6 +58,17 @@
             clearable
             @change="searchFilter"
           ></el-date-picker>
+        </el-form-item> -->
+        <el-form-item>
+          <span style="margin-left:5px;margin-right:5px;color:#606266;">对方单位</span>
+          <el-input v-model.trim="customerOrgs" placeholder="请输入" size="small" style="width: 150px" clearable @change="searchFilter"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <span style="margin-left:5px;margin-right:5px;color:#606266;">合同状态</span>
+          <el-select v-model="finishStatuss" placeholder="请选择" style="width:120px" size="small" clearable @change="searchFilter">
+            <el-option label="履约中" :value="1"></el-option>
+            <el-option label="履约完成" :value="2"></el-option>
+          </el-select>
         </el-form-item>
         
 
@@ -288,7 +299,7 @@
                 </el-table-column>
                 <el-table-column prop="payedAmount" label="已付款金额（元）" width="160">
                   <template slot-scope="scope">
-                    <el-input-number v-model="scope.row.payedAmount" controls-position="right" @change="chgPayedAmount()" :min="0" size="small" :precision="2"></el-input-number>
+                    <el-input-number v-model="scope.row.payedAmount" controls-position="right" @change="chgPayedAmount()" :min="0" size="small" :precision="2" :controls="false"></el-input-number>
                   </template>
                 </el-table-column>
                 <el-table-column prop="payType" label="付款类型" width="140">
@@ -628,6 +639,8 @@ export default {
       typeName: '',
       status: '',
       dateArray: [],
+      customerOrgs: '',
+      finishStatuss: '',
 
       typeList: [],
       contractList: [],
@@ -899,6 +912,15 @@ export default {
         parameter.startDate = this.dateArray[0]
         parameter.endDate = this.dateArray[1]
       }
+
+      if(this.customerOrgs) {
+        parameter.customerOrg = this.customerOrgs
+      }
+
+      if(this.finishStatuss) {
+        parameter.finishStatus = this.finishStatuss
+      }
+      
       this.http.post('/contract/exportContractOneToMany',parameter,
       res => {
         if(res.code == 'ok'){
@@ -1052,7 +1074,7 @@ export default {
         if(res.code == 'ok'){
           res.data = res.data.map(item => ({
             ...item,
-            payType: item.payType ? 1 : 0
+            payType: item.payType ? 1 : 2
           }));
           console.log(res.data, '<==== 数据')
           this.contractPaymentList = res.data;
@@ -1390,6 +1412,15 @@ export default {
         parameter.paymentStartDate = this.paymentDate[0]
         parameter.paymentEndDate = this.paymentDate[1]
       }
+
+      if(this.customerOrgs) {
+        parameter.customerOrg = this.customerOrgs
+      }
+
+      if(this.finishStatuss) {
+        parameter.finishStatus = this.finishStatuss
+      }
+      
       this.listLoading = true
       this.http.post('/contract/getContractPage',parameter,
       res => {