Merge branch 'dev' into test

src/views/produce/components/produceOrder.vue

@@ -257,14 +257,14 @@ export default {
       handler(val) {
         this.reload();
       },
-      immediate: true,
+      // immediate: true,
       deep: true
     },
     current: {
       handler(val) {
         this.reload();
       },
-      immediate: true,
+      // immediate: true,
       deep: true
     }
   },
@@ -301,7 +301,7 @@ export default {
     datasource({ page, where }) {
       return workorderPage2({
         pageNum: page,
-        size: 500,
+        size: 1000,
         workOrderId: this.$route.query.workOrderId
           ? this.$route.query.workOrderId
           : null,
@@ -325,7 +325,6 @@ export default {
     handleSearch(obj) {
       this.keyWord = obj.keyWord;
       this.taskName = obj.taskName;
-
       this.reload()
     },
 

src/views/produce/components/routings.vue

@@ -23,7 +23,7 @@
             @click.native="handIdx(index, item)"
           >
             <template v-slot:description>
-              <div>投:{{  item.feedExistNum || 0  }} 报:{{item.reportExistNum  || 0}}</div>
+              <!-- <div>投:{{  item.feedExistNum || 0  }} 报:{{item.reportExistNum  || 0}}</div> -->
               <div>{{ desIndex == index ? '此处' : '' }}</div>
             </template>
         </el-step>

src/views/produce/index.vue

@@ -35,7 +35,7 @@
       <div style="width: calc(100% - 220px);">
         <div class="seek-list" style="background-color: #157A2C;">
           <div>
-            <el-input style="width: 180px;margin-right: 5px;" clearable v-model="keyWord" placeholder="请输入关键字" />
+            <el-input style="width: 180px;margin-right: 5px;" clearable v-model="keyWord" placeholder="请输入关键字" @clear="handleSearch"/>
             <!-- <el-input style="width: 180px" clearable v-model="taskName" placeholder="请输入工序进度" /> -->
             <!--  -->
             <el-button size="mini" type="primary" style="margin: 0 5px" @click="handleSearch">查询</el-button>