Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index.vue

 <template>
   <div class="instructions-issued">
     <div class="instructions-issued-top">
-      <el-form :inline="true" :model="searchFormData" class="instructions-issued-search" label-width="50px">
-        <el-col :span="12">
+      <el-form :inline="true" :model="searchFormData" class="instructions-issued-search">
+        <el-col :span="5">
           <el-form-item label="站位:">
             <el-select v-model="searchFormData.postion" placeholder="站位" @change="changePostion">
               <el-option
@@ -14,7 +14,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="5">
           <el-form-item label="架次:">
             <el-select v-model="searchFormData.sorties" placeholder="架次" @change="changeSorties">
               <el-option
@@ -26,6 +26,26 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="计划结束:">
+            <el-date-picker
+              v-model="searchFormData.actualEnd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd 00:00:00"
+              @change="getTableData"
+              @clear="getTableData"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="AO(号/名称):">
+            <el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
+          </el-form-item>
+        </el-col>
       </el-form>
       <span class="start-working">
         <img :src="wordImgUrl" alt="" :title="title" @click="startWorking">
@@ -120,7 +140,9 @@ export default {
       postionList: [],
       searchFormData: {
         sorties: '',
-        postion: ''
+        postion: '',
+        actualEnd: '',
+        aoName: ''
       },
       group: '',
       groupType: '',
@@ -436,6 +458,8 @@ export default {
       })
     },
     tabClick(tab) {
+      this.searchFormData.aoName = ''
+      this.searchFormData.actualEnd = ''
       this.activeName = tab.index
       if (this.activeName === '1') {
         this.defaultPercent = 100
@@ -482,6 +506,21 @@ export default {
                 }
               ],
               'operator': 'AND'
+            },
+            {
+              'items': [
+                {
+                  'fieldName': 'extProcessPlan.serialNumber',
+                  'operator': 'LIKE',
+                  'value': this.searchFormData.aoName
+                },
+                {
+                  'fieldName': 'extProcessPlan.name',
+                  'operator': 'LIKE',
+                  'value': this.searchFormData.aoName
+                }
+              ],
+              'operator': 'OR'
             }
           ],
           'items': [],
@@ -504,6 +543,14 @@ export default {
           }
         ]
       }
+      if (this.searchFormData.actualEnd && this.searchFormData.actualEnd.length > 0) {
+        params.searchItems.children[0].items.push({
+          'fieldName': 'scheduledEnd',
+          'operator': 'BTWN',
+          'value': this.searchFormData.actualEnd[0],
+          'value1': this.searchFormData.actualEnd[1]
+        })
+      }
       post('/JoExecutePlan/getProductionPrepare', params).then(res => {
         if (res.items && res.items.content) {
           this.tableData = res.items.content
@@ -748,7 +795,7 @@ export default {
     .instructions-issued-search {
       padding: 10px 8px;
       height: 40px;
-      width: 40%;
+      width: 90%;
     }
     .start-working{
       height: 30px;