Merge remote-tracking branch 'origin/master'

acs/nladmin-ui/src/views/acs/task/index.vue

@@ -334,20 +334,7 @@
                 <el-table-column type="index" label="序号" min-width="50" />
                 <el-table-column label="设备编码" prop="device_code" min-width="115">
                   <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.device_code"
-                      style="width: 100%;"
-                      filterable
-                      placeholder="请选择"
-                      @change="isDisabled=false"
-                    >
-                      <el-option
-                        v-for="item in deviceList"
-                        :key="item.device_code"
-                        :label="item.device_code"
-                        :value="item.device_code"
-                      />
-                    </el-select>
+                    <el-input v-model="scope.row.device_code" style="width: 100%" />
                   </template>
                 </el-table-column>
                 <el-table-column label="物料编码" prop="material_code" min-width="115">