Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev

src/views/mes/qms/inspec/content/inspec-process.vue

@@ -221,17 +221,19 @@
             </el-table-column>
             <el-table-column prop="result" label="测试结果" width="150">
               <template slot-scope="scope">
-                <el-input :disabled="state === 'view'" v-if="scope.row.inputNum" ref="inputNum"
+                <el-input :disabled="state === 'view'" v-if="scope.row.inputNum" :ref="'ipt' + scope.$index"
                   v-model="scope.row.result" @input="numInputChange($event, scope.$index, scope.row)"
-                  @keyup.enter.native="inputEnter(scope.$index)" clearable />
-                <el-select v-model="scope.row.result" v-if="scope.row.selectBox" ref="selectBox"
+                  @keyup.enter.native="(e) => inputEnter(e, scope.$index)" clearable />
+                <el-select v-model="scope.row.result" v-if="scope.row.selectBox" :ref="'ipt' + scope.$index"
+                  @visible-change="isShowSelectOptions" @keyup.enter.native="(e) => inputEnter(e, scope.$index)"
                   :disabled="state === 'view'">
                   <el-option v-for="item in scope.row.qcItemTypeTextSubDetailList" :key="item.textNo"
                     :label="item.textNoDesc" :value="item.textNo" @click.native="selectChange(item, scope.row)">
                   </el-option>
                 </el-select>
-                <el-input v-if="scope.row.inputText" :disabled="state === 'view'" ref="inputText"
-                  v-model="scope.row.result" placeholder="请输入测试结果" clearable />
+                <el-input v-if="scope.row.inputText" :disabled="state === 'view'" :ref="'ipt' + scope.$index"
+                  v-model="scope.row.result" placeholder="请输入测试结果" @keyup.enter.native="(e) => inputEnter(e,scope.$index)"
+                  clearable />
                 <span ref="showResult" v-if="scope.row.showResult">{{ scope.row.result }}</span>
               </template>
             </el-table-column>
@@ -243,8 +245,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.showNcCode" v-model="scope.row.ncCode" placeholder="请输入不良代码"
                   :disabled="state === 'view'">
-                  <i slot="suffix" class="el-input__icon el-icon-copy-document"
-                    @click.stop="showDialog(scope.row)"></i>
+                  <i slot="suffix" class="el-input__icon el-icon-copy-document" @click.stop="showDialog(scope.row)"></i>
                 </el-input>
               </template>
             </el-table-column>
@@ -329,7 +330,8 @@ export default {
 
   data() {
     return {
-      selectRow:{},
+      isShowSelect: null,
+      selectRow: {},
       qms,
       headers: {
         Authorization: 'Bearer ' + store.getters.access_token,
@@ -519,8 +521,8 @@ export default {
       for (let i = 0; i < tree.length; i++) {
         if (tree[i].inspecResultList && tree[i].inspecResultList.length) {
           if (tree[i].inspecResultList.includes(node)) {
-                return tree[i];
-              }
+            return tree[i];
+          }
           const parent = me._findParent(tree[i].inspecResultList, node);
           if (parent) {
             return parent;
@@ -572,7 +574,7 @@ export default {
       me.inspecNcList.forEach(item => {
         ncCode.push(item.ncCode)
       })
-      me.selectRow.ncCode=ncCode.join(',')
+      me.selectRow.ncCode = ncCode.join(',')
       saveNc(param).then((res) => {
         hideLoading()
         if (res.status === 200) {
@@ -634,7 +636,7 @@ export default {
       me.ncCodeDialogVisible = true
       me.ncCodeList = []
       me.inspecNcList = []
-      me.selectRow =row
+      me.selectRow = row
       me.getNcList(row)
     },
     async getNcList(row) {
@@ -651,7 +653,7 @@ export default {
         hideLoading()
       })
       let paramSelectAllNc = {
-        operationBo : me.processForm.operationBo,
+        operationBo: me.processForm.operationBo,
         item: me.processForm.item,
         resourceBo: me.processForm.resourceBo,
         lotNo: me.processForm.lotNo,
@@ -832,9 +834,9 @@ export default {
       console.log(e)
       console.log('Switch changed:', event, row);
       if (e) {
-                return 'ok-cell'
+        return 'ok-cell'
       } else {
-                return 'ng-cell'
+        return 'ng-cell'
       }
     },
     // 数字输入限制
@@ -853,7 +855,7 @@ export default {
         if (Number(row.result) < Number(row.minValue) && Number(row.result) > Number(row.maxValue)) {
           return row.qcItemJudge = false
         } else {
-          if ( !isBlank(row.maxValue) && Number(row.result) > Number(row.maxValue)) {
+          if (!isBlank(row.maxValue) && Number(row.result) > Number(row.maxValue)) {
             return row.qcItemJudge = false
           } else if (!isBlank(row.minValue) && Number(row.result) < Number(row.minValue)) {
             return row.qcItemJudge = false
@@ -865,7 +867,11 @@ export default {
         return row.qcItemJudge = false
       }
     },
-    inputEnter(index) {
+    isShowSelectOptions(isShowSelect) {
+      this.isShowSelect = isShowSelect
+    },
+    inputEnter(e, index) {
+      console.log(e);
       let me = this
       let result = [];
       for (let i = 0; i < me.qcTable.length; i++) {
@@ -878,13 +884,14 @@ export default {
           }
         }
       }
-      console.log(result);
-      // 获取当前行的下一个索引
       const nextIndex = index + 1;
-      if (nextIndex < me.qcTable.length) {
-        this.$nextTick(() => {
-          this.$refs.inputNum[nextIndex].focus();
-        });
+      let input = this.$refs['ipt' + nextIndex]
+      if (!input) {
+        input = this.$refs['ipt' + (nextIndex + 1)];
+      }
+      if (input) {
+        if (!this.isShowSelect) input.focus();
+
       }
     },
     closeForm() {