11-19

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -20,9 +20,13 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
+      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
+        <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
+      </el-input>
       <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
+        <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
+      </el-input>
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>
@@ -242,7 +246,12 @@
 
 <script>
 import { initProject, intPartState, searchTable, searchmachine, searchgroup, editData } from '@/api/ManufacturingCenter/StatusQuery'
+import elInput from 'element-ui/packages/input'
+
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       loading0: false,
@@ -401,6 +410,12 @@ export default {
             if (response.data.result[i].机床结束时间 !== '') {
               response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
             }
+            if (response.data.result[i].工位属性 === '请选择') {
+              response.data.result[i].工位属性 = ''
+            }
+            if (response.data.result[i].机床主管 === '请选择') {
+              response.data.result[i].机床主管 = ''
+            }
           }
           this.tableData6 = response.data.result
           this.total1 = parseInt(response.data.output[0].ItemCount)