Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/views/workOrder/basicEngineeringData/index.vue

@@ -444,6 +444,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -488,6 +489,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -532,6 +534,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -632,6 +635,7 @@ export default {
                                     rules={required}
                                   >
                                     <el-select
+                                      filterable={true}
                                       value={row[column.columnAttributes.prop]}
                                       onInput={val => {
                                         row[column.columnAttributes.prop] = val
@@ -924,6 +928,7 @@ export default {
     },
     // 打开弹窗
     openForm() {
+      this.isEditIndex = -1
       // 获取辅材下拉数据
       materialNormList({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] }).then(res => {
         this.fucaiSel = res.data.records