1.维修反馈：新增功能：人员选择时班次下拉内容根据BU查询

2.***任务：检验单：填写实测值后，自动判定检验项目结论
6 months ago · 9155f5ad08
6 changed files with 154 additions and 7 deletions
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@ -1217,7 +1217,6 @@
        // 获取数据列表
        this.getDataList()
      }
-      this.getClassesList()
      // 获取用户角色
      this.getUserRoleList()
    },
@ -1563,7 +1562,12 @@
        this.saveFeedMatterFlag = true
      },
      getClassesList() {
-        getClassesList().then(({data}) => {
+        let split = this.saveModalData.bu.split('_')
+        let params = {
+          site: split[0],
+          buNo: split[1]
+        }
+        getClassesList(params).then(({data}) => {
          if (data.code === 0) {
            this.classesList = data.rows
          } else {
@ -1852,6 +1856,8 @@
        } else {
          this.operatorData.roleId = ''
        }
+        //根据bu查询班次信息
+        this.getClassesList()
        // 查询人员
        getOperatorListByOrder(this.operatorData).then(({data}) => {
          if (data && data.code === 0) {
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@ -450,7 +450,7 @@
          min-width="80"
          label="实测值">
          <template slot-scope="scope">
-            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
            <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
          </template>
        </el-table-column>
@ -3825,6 +3825,34 @@
          this.$refs[aaa].focus()
        })
      },
+      updateItemResult(row){
+        if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+          return;
+        }
+        if (row.maxValue == null && row.minValue == null) {
+          if (row.numberValue!=row.defaultValue){
+            row.itemResult = 'N'
+          }
+        }else if (row.maxValue != null && row.minValue != null){
+          if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.maxValue != null){
+          if ( row.numberValue>row.maxValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.minValue != null){
+          if ( row.numberValue<row.minValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }
+      },

      //删除
      handleDeleteBtn (td) {
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@ -434,7 +434,7 @@
          min-width="80"
          label="实测值">
          <template slot-scope="scope">
-            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
            <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
          </template>
        </el-table-column>
@ -3799,6 +3799,35 @@
          this.$refs[aaa].focus()
        })
      },
+      updateItemResult(row){
+        if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+          this.$message.success("tuichu")
+          return;
+        }
+        if (row.maxValue == null && row.minValue == null) {
+          if (row.numberValue!=row.defaultValue){
+            row.itemResult = 'N'
+          }
+        }else if (row.maxValue != null && row.minValue != null){
+          if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.maxValue != null){
+          if ( row.numberValue>row.maxValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.minValue != null){
+          if ( row.numberValue<row.minValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }
+      },

      //删除
      handleDeleteBtn (td) {
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -448,7 +448,7 @@
          min-width="80"
          label="实测值">
          <template slot-scope="scope">
-            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+            <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
            <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
          </template>
        </el-table-column>
@ -3879,6 +3879,34 @@
          this.$refs[aaa].focus()
        })
      },
+      updateItemResult(row){
+        if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+          return;
+        }
+        if (row.maxValue == null && row.minValue == null) {
+          if (row.numberValue!=row.defaultValue){
+            row.itemResult = 'N'
+          }
+        }else if (row.maxValue != null && row.minValue != null){
+          if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.maxValue != null){
+          if ( row.numberValue>row.maxValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.minValue != null){
+          if ( row.numberValue<row.minValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }
+      },

      //删除
      handleDeleteBtn (td) {
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@ -359,7 +359,7 @@
            min-width="80"
            label="实测值">
            <template slot-scope="scope">
-              <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+              <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
              <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
            </template>
          </el-table-column>
@ -2867,6 +2867,34 @@
          this.$refs[aaa].focus()
        })
      },
+      updateItemResult(row){
+        if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+          return;
+        }
+        if (row.maxValue == null && row.minValue == null) {
+          if (row.numberValue!=row.defaultValue){
+            row.itemResult = 'N'
+          }
+        }else if (row.maxValue != null && row.minValue != null){
+          if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.maxValue != null){
+          if ( row.numberValue>row.maxValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }else if(row.minValue != null){
+          if ( row.numberValue<row.minValue) {
+            row.itemResult = 'N'
+          }else {
+            row.itemResult = 'Y'
+          }
+        }
+      },

      //删除
      handleDeleteBtn (td) {
--- a/src/views/modules/qc/PQCResultEntry.vue
+++ b/src/views/modules/qc/PQCResultEntry.vue
@ -542,7 +542,7 @@
            min-width="80"
            label="实测值">
            <template slot-scope="scope">
-              <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px; width: 98%"></el-input>
+              <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" @change="updateItemResult(scope.row)" style="height: 11px; width: 98%"></el-input>
              <el-input :ref="`textValue${scope.$index}`" v-else v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px; width: 98%"></el-input>
            </template>
          </el-table-column>
@ -4140,6 +4140,34 @@ export default {
        this.$refs[aaa].focus()
      })
    },
+    updateItemResult(row){
+      if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+        return;
+      }
+      if (row.maxValue == null && row.minValue == null) {
+        if (row.numberValue!=row.defaultValue){
+          row.itemResult = 'N'
+        }
+      }else if (row.maxValue != null && row.minValue != null){
+        if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
+          row.itemResult = 'N'
+        }else {
+          row.itemResult = 'Y'
+        }
+      }else if(row.maxValue != null){
+        if ( row.numberValue>row.maxValue) {
+          row.itemResult = 'N'
+        }else {
+          row.itemResult = 'Y'
+        }
+      }else if(row.minValue != null){
+        if ( row.numberValue<row.minValue) {
+          row.itemResult = 'N'
+        }else {
+          row.itemResult = 'Y'
+        }
+      }
+    },

    //删除
    handleDeleteBtn (td) {