条件搜索合同

src/views/contract/contractList.vue

@@ -2,39 +2,31 @@
     <div class="main">
         <div class="header">
             <el-form :inline="true" :model="contractQuery">
-                <!-- <el-form-item>
-                    <el-select v-model="type" placeholder="合同类别">
-                        <el-option
-                            v-for="item in typeList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
+                <!-- 合同名称，合同编号，合同类型，合同性质 -->
+                <el-form-item>
+                    <el-input v-model="contractQuery.contractName" placeholder="请选择合同名称" />
                 </el-form-item>
                 <el-form-item>
-                    <el-select v-model="type" placeholder="合同性质">
-                        <el-option
-                            v-for="item in typeList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
+                    <el-input v-model="contractQuery.contractNumber" placeholder="请选择合同编号" />
+                </el-form-item>
+                <el-form-item>
+                    <el-select v-model="contractQuery.typeId" placeholder="请选择合同类型">
+                        <el-option v-for="(item, index) in contractTypeList" :key="item.id" :value="item.id"
+                            :label="item.name"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-select v-model="type" placeholder="合同状态">
-                        <el-option
-                            v-for="item in typeList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                    <el-select v-model="contractQuery.contractNature" placeholder="合同状态">
+                        <el-option v-for="(item,index) in contractNatures"
+                            :key="index"
+                            :label="item"
+                            :value="index">
                         </el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item>
-                    <!-- <el-button type="primary" icon="el-icon-search" @click="qurey()">查询</el-button>
-                    <el-button type="primary" icon="el-icon-refresh-right" @click="reset()">重置</el-button> -->
+                    <el-button type="primary" icon="el-icon-search" @click="getContractList(true)">查询</el-button>
+                    <el-button type="primary" icon="el-icon-refresh-right" @click="contractQuery = {}">重置</el-button>
                     <el-button type="success" icon="el-icon-circle-plus-outline" @click="dialogTableVisible = true">添加合同</el-button>
                 </el-form-item>
             </el-form>
@@ -46,7 +38,7 @@
                 border>
                 <el-table-column  label="编号" width="50px">
                     <template slot-scope="scope">
-                        {{ (contractQuery.pageNum - 1) * contractQuery.pageSize + scope.$index + 1 }}
+                        {{ (contractPageQuery.pageNum - 1) * contractPageQuery.pageSize + scope.$index + 1 }}
                     </template>
                 </el-table-column>
                 <!-- <el-table-column prop="companyName" label="状态"/> -->
@@ -78,8 +70,8 @@
         </div>
         
         <div class="footer">
-            <el-pagination @current-change="getContractList" :current-page.sync="contractQuery.pageNum"
-                :page-size="contractQuery.pageSize" layout="total, prev, pager, next" :total="total">
+            <el-pagination @current-change="getContractList" :current-page.sync="contractPageQuery.pageNum"
+                :page-size="contractPageQuery.pageSize" layout="total, prev, pager, next" :total="total">
             </el-pagination>
         </div>
 
@@ -89,7 +81,7 @@
             </el-radio-group>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="$router.push({path: '/addContract', query: {checkedContractNature: String(checkedContractNature)}})">下一步</el-button>
-                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button @click="dialogTableVisible = false">取消</el-button>
             </span>
         </el-dialog>
         <!-- <add-conctract :drawerVisible="drawerVisible" @addConctract="addConctract" @closeDrawer="drawerVisible=false"></add-conctract> -->
@@ -112,13 +104,18 @@ export default {
     },
     data() {
         return {
-            contractQuery: {},
             contractList: [],
             contractTypeList: [],
             typeList: [],
             type: '',
             total: 0,
             contractQuery: {
+                typeId: '',
+                contractNature: '',
+                contractName: '',
+                contractNumber:''
+            },
+            contractPageQuery: {
                 pageSize: 10,
                 pageNum: 1,
             },
@@ -147,11 +144,12 @@ export default {
                 }
             })
         },
-        getContractList() {
+        getContractList(isCondition = false) {
             const params = {
-                ...this.contractQuery,
+                ...this.contractPageQuery,
                 companyId: this.companyId || this.$store.getters.companyId
             }
+            isCondition && Object.assign(params, this.contractQuery)
             selectContractList(params).then(res => {
                 if(res.success){
                     this.total = res.data.total