bugfix:质检状态传值错误

src/views/modules/quality/onlinecheck-add-or-update.vue

@@ -1,32 +1,13 @@
 <template>
   <div>
     <div class="my-title">{{ !id ? "新增" : display ? "详情" : "修改" }}</div>
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      label-width="auto"
-    >
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
       <el-row class="my-row">
         <el-col :span="8">
           <el-form-item label="任务号" prop="orderCode">
-            <el-select
-              v-model="dataForm.orderCode"
-              :disabled="display"
-              filterable
-              remote
-              reserve-keyword
-              placeholder="请输入关键词"
-              :remote-method="debouncedSearch"
-              :loading="loading"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in orderOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="dataForm.orderCode" :disabled="display" filterable remote reserve-keyword
+              placeholder="请输入关键词" :remote-method="debouncedSearch" :loading="loading" style="width: 100%">
+              <el-option v-for="item in orderOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -35,22 +16,9 @@
       <el-row class="my-row">
         <el-col :span="8">
           <el-form-item label="产品" prop="productId">
-            <el-select
-              v-model="dataForm.productId"
-              filterable
-              remote
-              reserve-keyword
-              placeholder="请输入关键词"
-              :remote-method="debouncedSearch2"
-              :loading="loading2"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in productOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="dataForm.productId" filterable remote reserve-keyword placeholder="请输入关键词"
+              :remote-method="debouncedSearch2" :loading="loading2" style="width: 100%">
+              <el-option v-for="item in productOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -73,19 +41,12 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="onChose">取消</el-button>
-      <el-button
-        v-if="!display"
-        type="primary"
-        @click="dataFormSubmit()"
-        v-reClick
-        >确定</el-button
-      >
+      <el-button v-if="!display" type="primary" @click="dataFormSubmit()" v-reClick>确定</el-button>
     </span>
   </div>
 </template>
 
 <script>
-import { save, update } from "@/api/filemanage";
 import { getOrderByCode } from "@/api/sale";
 import _ from "lodash";
 export default {
@@ -170,17 +131,17 @@ export default {
             data: this.$http.adornData(data),
           }).then(({ data }) => {
             if (data && data.code === '200') {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
           });
         }
       });
@@ -205,7 +166,7 @@ export default {
       this.getProduct(query);
     },
     getProduct(input) {
-      if (input == null || input == '') {
+      if (input === null || input === '') {
         return;
       }
 

src/views/modules/quality/onlinecheck-detail.vue

@@ -16,67 +16,26 @@
           dataForm.inspectionDate
         }}</e-desc-item>
       </e-desc>
-      <el-table
-        :data="dataForm.purOnlineDetectionProjectList"
-        border
-        style="width: 100%"
-      >
+      <el-table :data="dataForm.purOnlineDetectionProjectList" border style="width: 100%">
         <el-table-column label="序号" type="index" width="100" align="center">
         </el-table-column>
-        <el-table-column
-          prop="projectName"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="项目名称"
-        >
+        <el-table-column prop="projectName" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="项目名称">
         </el-table-column>
-        <el-table-column
-          prop="measuredValue"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="实测值"
-        >
+        <el-table-column prop="measuredValue" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="实测值">
         </el-table-column>
-        <el-table-column
-          prop="nominalValue"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="名义值"
-        >
+        <el-table-column prop="nominalValue" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="名义值">
         </el-table-column>
-        <el-table-column
-          prop="upperDeviation"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="上偏差"
-        >
+        <el-table-column prop="upperDeviation" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="上偏差">
         </el-table-column>
-        <el-table-column
-          prop="lowerDeviation"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="下偏差"
-        >
+        <el-table-column prop="lowerDeviation" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="下偏差">
         </el-table-column>
-        <el-table-column
-          prop="isQualified"
-          :formatter="formatIsQualified"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="评定"
-        >
+        <el-table-column prop="isQualified" :formatter="formatIsQualified" header-align="center" align="center"
+          min-width="160" :show-tooltip-when-overflow="true" label="评定">
         </el-table-column>
       </el-table>
     </div>
@@ -91,7 +50,6 @@ import EDesc from "../common/e-desc";
 import EDescItem from "../common/e-desc-item";
 import ApproveComponent from "../common/approve-component";
 import UploadComponent from "../common/upload-component-v2";
-import { approveStateOption, measureStateOption } from "@/utils/enums";
 export default {
   name: "disqualification-detail",
   components: { EDesc, EDescItem, ApproveComponent, UploadComponent },
@@ -107,7 +65,7 @@ export default {
       ],
     };
   },
-  mounted() {},
+  mounted() { },
   methods: {
     onChose() {
       this.$emit("onChose");
@@ -129,7 +87,7 @@ export default {
     formatIsQualified(row) {
       if (!row.isQualified) return "";
 
-      return this.getIsQualifiedStr(row.state);
+      return this.getIsQualifiedStr(row.isQualified);
     },
     getIsQualifiedStr(state) {
       let option = this.isQualifiedOption.find((t) => t.value === state);
@@ -142,5 +100,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/modules/quality/onlinecheck.vue

@@ -2,11 +2,7 @@
 <template>
   <div class="work-type">
     <template v-if="!addOrUpdateVisible && !detailVisible">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="queryData()"
-      >
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
         <el-form-item label="任务号">
           <el-input v-model="dataForm.orderCode" placeholder="" clearable />
         </el-form-item>
@@ -21,189 +17,77 @@
           <el-button type="primary" @click="add()">新增</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        :data="dataList"
-        border
-        v-loading="dataListLoading"
-        style="width: 100%"
-      >
+      <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%">
         <el-table-column label="序号" type="index" width="100" align="center">
         </el-table-column>
-        <el-table-column
-          prop="orderCode"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="任务号"
-        >
+        <el-table-column prop="orderCode" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="任务号">
         </el-table-column>
-        <el-table-column
-          prop="mapNumber"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="图号"
-        >
+        <el-table-column prop="mapNumber" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="图号">
         </el-table-column>
-        <el-table-column
-          prop="productName"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="产品名称"
-        >
+        <el-table-column prop="productName" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="产品名称">
         </el-table-column>
-        <el-table-column
-          prop="productNumber"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="编号"
-        >
+        <el-table-column prop="productNumber" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="编号">
         </el-table-column>
-        <el-table-column
-          prop="temperature"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="温度"
-        >
+        <el-table-column prop="temperature" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="温度">
         </el-table-column>
-        <el-table-column
-          prop="humidity"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="湿度"
-        >
+        <el-table-column prop="humidity" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="湿度">
         </el-table-column>
-        <el-table-column
-          prop="deliveryDate"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="备注"
-        >
+        <el-table-column prop="deliveryDate" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="备注">
         </el-table-column>
-        <el-table-column
-          prop="inspectorName"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="检验员"
-        >
+        <el-table-column prop="inspectorName" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="检验员">
         </el-table-column>
-        <el-table-column
-          prop="state"
-          :formatter="formatState"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="状态"
-        >
+        <el-table-column prop="state" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="状态">
+          <template slot-scope="scope">
+            <span>{{ formatState(scope.row) }}</span>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="isQualified"
-          :formatter="formatIsQualified"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="是否合格"
-        >
+        <el-table-column prop="isQualified" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="是否合格">
+          <template slot-scope="scope">
+            <span>{{ formatIsQualified(scope.row) }}</span>
+          </template>
         </el-table-column>
-        <el-table-column
-          prop="inspectionDate"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="校验日期"
-        >
+        <el-table-column prop="inspectionDate" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="校验日期">
         </el-table-column>
-        <el-table-column
-          prop="creatName"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="申请人"
-        >
+        <el-table-column prop="creatName" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="申请人">
         </el-table-column>
-        <el-table-column
-          prop="createTime"
-          header-align="center"
-          align="center"
-          min-width="160"
-          :show-tooltip-when-overflow="true"
-          label="申请日期"
-        >
+        <el-table-column prop="createTime" header-align="center" align="center" min-width="160"
+          :show-tooltip-when-overflow="true" label="申请日期">
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="220"
-          label="操作"
-        >
+        <el-table-column fixed="right" header-align="center" align="center" width="220" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="detailHandle(scope.row)"
-              >查看</el-button
-            >
-            <el-button v-if="scope.row.state == 1" type="text" size="small" @click="importHandle(scope.row)"
-              >导入报告</el-button
-            >
+            <el-button type="text" size="small" @click="detailHandle(scope.row)">查看</el-button>
+            <el-button v-if="scope.row.state == 1" type="text" size="small"
+              @click="importHandle(scope.row)">导入报告</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @size-change="sizeChangeHandle"
-        @current-change="currentChangeHandle"
-        :current-page="pageIndex"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="pageSize"
-        :total="totalPage"
-        layout="total, sizes, prev, pager, next, jumper"
-      >
+      <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+        :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
       </el-pagination>
     </template>
     <!-- 弹窗 -->
-    <onlinecheck-add-or-update
-      v-if="addOrUpdateVisible"
-      ref="addOrUpdate"
-      @onChose="onChose"
-    />
+    <onlinecheck-add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @onChose="onChose" />
 
     <onlinecheck-detail v-if="detailVisible" ref="detail" @onChose="onChose" />
 
     <el-dialog title="导入" :visible.sync="importVisible">
-      <el-upload
-        class="upload-demo"
-        ref="upload"
-        :on-remove="handleRemove"
-        action="#"
-        accept=""
-        :limit="1"
-        :file-list="fileList"
-        :auto-upload="false"
-        :http-request="handleUpload"
-        v-loading="importLoading"
-      >
-        <el-button slot="trigger" size="small" type="primary"
-          >选取文件</el-button
-        >
-        <el-button size="small" type="success" @click="submitUpload"
-          >开始上传</el-button
-        >
+      <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove" action="#" accept="" :limit="1"
+        :file-list="fileList" :auto-upload="false" :http-request="handleUpload" v-loading="importLoading">
+        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+        <el-button size="small" type="success" @click="submitUpload">开始上传</el-button>
       </el-upload>
     </el-dialog>
   </div>
@@ -327,7 +211,7 @@ export default {
     formatIsQualified(row) {
       if (!row.isQualified) return "";
 
-      return this.getIsQualifiedStr(row.state);
+      return this.getIsQualifiedStr(row.isQualified);
     },
     getIsQualifiedStr(state) {
       let option = this.isQualifiedOption.find((t) => t.value === state);
@@ -385,5 +269,4 @@ export default {
 };
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>