e

src/views/leadMatch/MatchList/matchList.vue

@@ -1,25 +1,29 @@
 <template>
   <div>
+     <Toptitle title="匹配列表">
+      <slot name="titleButton"> </slot>
+    </Toptitle>
+    <div class="match_list">
     <Row style="padding:10px 0">
-      <Col span="5">
+      <Col span="6">
         <span>项目编号：</span>
         <span>
-          <Input v-model="SearchInfo.project_number" style="width:150px" />
+          <Input v-model="SearchInfo.project_number" style="width:140px" size="small"/>
         </span>
       </Col>
-      <Col span="5">
+      <Col span="6">
         <span>项目名称：</span>
         <span>
-          <Input v-model="SearchInfo.project_name" style="width:150px" />
+          <Input v-model="SearchInfo.project_name" style="width:140px" size="small"/>
         </span>
       </Col>
-      <Col span="5">
+      <Col span="6">
         <span>项目简称：</span>
         <span>
-          <Input v-model="SearchInfo.project_short_title" style="width:150px" />
+          <Input v-model="SearchInfo.project_short_title" style="width:140px" size="small"/>
         </span>
       </Col>
-      <Col span="5">
+      <Col span="6">
         <span>匹配状态：</span>
         <span>
           <Select
@@ -27,7 +31,8 @@
             filter-by-label
             transfer
             v-model="SearchInfo.machining_state"
-            style="width: 150px"
+            style="width: 140px"
+            size="small"
           >
             <Option label="未匹配" value="0"></Option>
             <Option label="匹配中" value="1"></Option>
@@ -36,18 +41,18 @@
         </span>
       </Col>
       <Col span="2" offset="2">
-        <Button @click="initData" type="primary" style="margin-right: 10px"
+        <Button @click="initData" type="primary" style="margin-right: 10px" size='small'
           >搜索</Button
         >
       </Col>
     </Row>
-    <div>
       <Table :columns="tableColumns" border :max-height="500" :data="tableData">
         <template slot="setSlot" slot-scope="{ row, index }">
           <a @click="handleSet(row, index, 1)" style="margin: 0 5px">匹配</a>
           <a @click="handleSet(row, index, 2)">查看</a>
         </template>
       </Table>
+      </div>
       <div class="content_body_page">
         <Page
           :page-size-opts="[10, 20, 30, 40, 100]"
@@ -62,7 +67,6 @@
         />
       </div>
     </div>
-  </div>
 </template>
 
 <script>
@@ -228,4 +232,15 @@ export default {
   justify-content: center;
   padding-top: 20px;
 }
+.match_list{
+  height:620px;
+  overflow: hidden;
+}
+/deep/ .ivu-col{
+display: flex;
+margin: 5px;
+}
+/deep/ .ivu-col-span-6{
+  flex: auto;
+}
 </style>

src/views/leadMatch/roomList/list.vue

@@ -127,6 +127,7 @@ export default {
       this.axios.get('/api/cut_order_list',{params:{
         page_index:this.pageIndex,
         page_size:this.pageSize,
+        order_type:2,
         ...row
         }}).then(res=>{
         this.tableData = res.data.data;

src/views/leadMatch/weightMemo/list.vue

@@ -125,6 +125,7 @@ export default {
     initData(row) {
       this.axios.get('/api/cut_order_list',{params:{
         page_index:this.pageIndex,page_size:this.pageSize,
+        order_type:1,
         ...row}}).then(res=>{
         this.tableData = res.data.data;
         this.total = res.data.total