Browse Source

docs: 更新应用名称及相关文案为检测管理系统

yusheng 5 months ago
parent
commit
b2cffcf21a
61 changed files with 210 additions and 209 deletions
  1. 1 1
      .env
  2. 1 1
      src/api/inspectionProject/index.js
  3. 2 2
      src/views/certificateManagement/components/add.vue
  4. 1 1
      src/views/inspectionClassify/components/qualityItem.vue
  5. 2 2
      src/views/inspectionClassify/components/user-edit.vue
  6. 1 1
      src/views/inspectionClassify/components/user-list.vue
  7. 3 3
      src/views/inspectionPlan/components/edit.vue
  8. 1 1
      src/views/inspectionPlan/components/new-edit.vue
  9. 2 2
      src/views/inspectionPlan/components/stokledger.vue
  10. 2 2
      src/views/inspectionPlan/index.vue
  11. 2 2
      src/views/inspectionPoint/components/EquipmentDialog.vue
  12. 2 2
      src/views/inspectionPoint/components/inspectionProjectList.vue
  13. 1 1
      src/views/inspectionPoint/components/newEdit.vue
  14. 1 1
      src/views/inspectionPoint/components/newEquipmentDialog.vue
  15. 2 1
      src/views/inspectionProject/components/user-edit.vue
  16. 1 1
      src/views/inspectionProject/index.vue
  17. 1 1
      src/views/inspectionProjectEntrusted/index.vue
  18. 1 1
      src/views/inspectionProjectRequest/components/search.vue
  19. 1 1
      src/views/inspectionProjectRequest/index.vue
  20. 2 2
      src/views/inspectionProjectTask/components/inspectionProjectTaskList.vue
  21. 2 2
      src/views/inspectionProjectTask/components/inspectionProjectTaskSend.vue
  22. 1 1
      src/views/inspectionProjectTask/components/search.vue
  23. 1 1
      src/views/inspectionProjectTask/index.vue
  24. 1 1
      src/views/inspectionReport/components/detailDialog.vue
  25. 1 1
      src/views/inspectionReport/index.vue
  26. 1 1
      src/views/inspectionReport/template/inspection_report1.vue
  27. 1 1
      src/views/inspectionReport/template/inspection_report2.vue
  28. 1 1
      src/views/inspectionStandard/components/edit.vue
  29. 1 1
      src/views/inspectionStandard/components/standardDialog.vue
  30. 1 1
      src/views/inspectionStandard/index.vue
  31. 2 2
      src/views/inspectionTemplate/AddorUpdate.vue
  32. 2 2
      src/views/inspectionTemplate/components/inspectionTemplateDialog.vue
  33. 3 3
      src/views/inspectionTemplate/components/search.vue
  34. 2 2
      src/views/inspectionTemplate/index.vue
  35. 1 1
      src/views/inspectionTemplate/inspectionClassify/components/user-search.vue
  36. 2 2
      src/views/inspectionTemplate/inspectionClassify/index.vue
  37. 13 13
      src/views/inspectionWork/components/QualityContentTabs.vue
  38. 14 14
      src/views/inspectionWork/components/baseInfo.vue
  39. 4 4
      src/views/inspectionWork/components/experimentReport.vue
  40. 19 19
      src/views/inspectionWork/components/inspectionProjectReport.vue
  41. 4 4
      src/views/inspectionWork/components/inspectionWorkDialog.vue
  42. 16 16
      src/views/inspectionWork/components/newQualityContentTabs.vue
  43. 12 12
      src/views/inspectionWork/components/sampleListDialog.vue
  44. 9 9
      src/views/inspectionWork/components/sampleReport.vue
  45. 4 4
      src/views/inspectionWork/components/term.vue
  46. 1 1
      src/views/inspectionWork/components/toolList.vue
  47. 6 6
      src/views/inspectionWork/details.vue
  48. 18 18
      src/views/inspectionWork/edit.vue
  49. 1 1
      src/views/inspectionWork/index.vue
  50. 14 14
      src/views/inspectionWork/mixins/detailMixins.js
  51. 1 1
      src/views/sample/consume/components/search.vue
  52. 2 2
      src/views/sample/consume/index.vue
  53. 1 1
      src/views/sample/keepSample/components/search.vue
  54. 2 2
      src/views/sample/keepSample/index.vue
  55. 5 5
      src/views/sample/sampleRecord/components/addSample.vue
  56. 4 4
      src/views/sample/sampleRecord/index.vue
  57. 1 1
      src/views/sample/samplemanagement/detailList.vue
  58. 2 2
      src/views/sample/small/index.vue
  59. 1 1
      src/views/sample/whole/components/search.vue
  60. 2 2
      src/views/sample/whole/index.vue
  61. 1 1
      src/views/unqualifiedProduct/unqualifiedList/index.vue

+ 1 - 1
.env

@@ -1,2 +1,2 @@
-VUE_APP_NAME=检管理系统
+VUE_APP_NAME=检管理系统
 VUE_APP_API_BASE_URL=/api

+ 1 - 1
src/api/inspectionProject/index.js

@@ -77,5 +77,5 @@ export async function downImportTemplate() {
     }
   );
   console.log(res.data, '***********');
-  download(res.data, '检项导入模板.xlsx');
+  download(res.data, '检项导入模板.xlsx');
 }

+ 2 - 2
src/views/certificateManagement/components/add.vue

@@ -88,7 +88,7 @@
           },
           {
             prop: 'code',
-            label: '检工单编码',
+            label: '检工单编码',
             slot: 'code',
             align: 'center',
             width: 180,
@@ -99,7 +99,7 @@
             prop: 'name',
             slot: 'name',
             width: 120,
-            label: '检工单名称',
+            label: '检工单名称',
             align: 'center',
             showOverflowTooltip: true
           },

+ 1 - 1
src/views/inspectionClassify/components/qualityItem.vue

@@ -63,7 +63,7 @@ export default {
   data() {
     return {
       visible: false,
-      title: '选择检项',
+      title: '选择检项',
 
       columns: [
         {

+ 2 - 2
src/views/inspectionClassify/components/user-edit.vue

@@ -6,7 +6,7 @@
     :append-to-body="true"
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
-    :title="isUpdate ? '修改检项' : '新建检项'"
+    :title="isUpdate ? '修改检项' : '新建检项'"
     @update:visible="updateVisible"
     :maxable="true"
   >
@@ -14,7 +14,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="检分类:" prop="qualityStandardId">
+          <el-form-item label="检分类:" prop="qualityStandardId">
             <el-cascader-panel
               style="width: 100%"
               v-model="form.categoryLevelId"

+ 1 - 1
src/views/inspectionClassify/components/user-list.vue

@@ -23,7 +23,7 @@
           class="ele-btn-icon"
           @click="openAdd()"
         >
-          添加检项
+          添加检
         </el-button>
       </template>
 

+ 3 - 3
src/views/inspectionPlan/components/edit.vue

@@ -28,7 +28,7 @@
       @getQualityTemplate="getQualityTemplate"
     ></base-info>
     <el-row>
-      <header-title title="检内容"></header-title>
+      <header-title title="检内容"></header-title>
 
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="来源清单" name="1">
@@ -300,12 +300,12 @@
             style="margin-top: 10px"
           ></el-pagination>
         </el-tab-pane>
-        <el-tab-pane label="检方案" name="3">
+        <el-tab-pane label="检方案" name="3">
           <el-button
             @click="addInspectionTemplate"
             type="primary"
             style="margin-top: 5px"
-            >选择检方案</el-button
+            >选择检方案</el-button
           >
           <el-table
             v-show="activeName === '3'"

+ 1 - 1
src/views/inspectionPlan/components/new-edit.vue

@@ -91,7 +91,7 @@
       </el-row>
     </el-form>
     <el-row>
-      <header-title title="检内容"></header-title>
+      <header-title title="检内容"></header-title>
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="来源清单" name="1">
           <!-- <ele-pro-table

+ 2 - 2
src/views/inspectionPlan/components/stokledger.vue

@@ -377,11 +377,11 @@ export default {
       qualityStatusOption: [
         {
           value: 1,
-          label: '已检'
+          label: '已检'
         },
         {
           value: 0,
-          label: '未检'
+          label: '未检'
         }
       ],
       visible: false,

+ 2 - 2
src/views/inspectionPlan/index.vue

@@ -151,14 +151,14 @@
           {
             prop: 'code',
             slot: 'code',
-            label: '检计划编码',
+            label: '检计划编码',
             width: 160,
             align: 'center',
             showOverflowTooltip: true,
             fixed: 'left'
           },
           {
-            label: '检计划名称',
+            label: '检计划名称',
             prop: 'name',
             width: 160,
             align: 'center',

+ 2 - 2
src/views/inspectionPoint/components/EquipmentDialog.vue

@@ -66,7 +66,7 @@ export default {
           label: '编码'
         },
         {
-          label: '检项名称',
+          label: '检项名称',
           prop: 'inspectionName'
         },
 
@@ -78,7 +78,7 @@ export default {
         //   }
         // },
         {
-          label: '检标准',
+          label: '检标准',
           prop: 'inspectionStandard',
           formatter: (row, column, cellValue) => {
             return row.symbol+' '+cellValue+' '+row.unit

+ 2 - 2
src/views/inspectionPoint/components/inspectionProjectList.vue

@@ -15,10 +15,10 @@
       </el-table-column>
       <el-table-column label="编码" align="center" prop="inspectionCode">
       </el-table-column>
-      <el-table-column label="检项名称" align="center" prop="inspectionName">
+      <el-table-column label="检项名称" align="center" prop="inspectionName">
       </el-table-column>
       <el-table-column
-        label="检标准"
+        label="检标准"
         align="center"
         prop="inspectionStandard"
         width="300px"

+ 1 - 1
src/views/inspectionPoint/components/newEdit.vue

@@ -61,7 +61,7 @@
               class="ele-btn-icon"
               @click="openAdd()"
             >
-              添加检项
+              添加检
             </el-button>
           </template>
 

+ 1 - 1
src/views/inspectionPoint/components/newEquipmentDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <ele-modal
-    title="添加检项"
+    title="添加检项"
     :visible.sync="visibleDialog"
     :before-close="handleClose"
     :close-on-click-modal="false"

+ 2 - 1
src/views/inspectionProject/components/user-edit.vue

@@ -5,7 +5,7 @@
     :append-to-body="true"
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
-    :title="isUpdate ? '修改检项' : '新建检项'"
+    :title="isUpdate ? '修改检项' : '新建检项'"
     @update:visible="updateVisible"
     :maxable="true"
   >
@@ -447,6 +447,7 @@
       textTypeChange() {
         this.form.maxValue = '';
         this.form.minValue = '';
+        this.form.symbol=''
       },
       
       defaultInput(value) {

+ 1 - 1
src/views/inspectionProject/index.vue

@@ -92,7 +92,7 @@
           <el-popconfirm
             v-if="$hasPermission('qms:inspection_item:save')"
             class="ele-action"
-            title="确定要复制当前检吗?"
+            title="确定要复制当前检吗?"
             @confirm="copy(row)"
           >
             <template v-slot:reference>

+ 1 - 1
src/views/inspectionProjectEntrusted/index.vue

@@ -10,7 +10,7 @@
             page-name="inspectionProjectEntrusted"
           />
         </el-tab-pane>
-        <el-tab-pane label="检受托单" name="entrustedList">
+        <el-tab-pane label="检受托单" name="entrustedList">
           <inspection-project-request-list
             ref="entrustedListRef"
             :my-request="false"

+ 1 - 1
src/views/inspectionProjectRequest/components/search.vue

@@ -23,7 +23,7 @@
             placeholder: '请输入'
           },
           {
-            label: '检工单编码:',
+            label: '检工单编码:',
             value: 'qualityWorkOrderCode',
             type: 'input',
             placeholder: '请输入'

+ 1 - 1
src/views/inspectionProjectRequest/index.vue

@@ -6,7 +6,7 @@
         <el-tab-pane label="我的请托单" name="myRequest">
           <inspection-project-request-list ref="myRequestRef" :my-request="true" />
         </el-tab-pane>
-        <el-tab-pane label="检请托单" name="requestList">
+        <el-tab-pane label="检请托单" name="requestList">
           <inspection-project-request-list ref="requestListRef" :my-request="false" />
         </el-tab-pane>
       </el-tabs>

+ 2 - 2
src/views/inspectionProjectTask/components/inspectionProjectTaskList.vue

@@ -69,7 +69,7 @@
           type="primary"
           :underline="false"
           @click="openReport(row)"
-          >查看检报告</el-link
+          >查看检报告</el-link
         >
 
         <el-link
@@ -81,7 +81,7 @@
           type="primary"
           :underline="false"
           @click="reportApprovalSubmit(row)"
-          >检报告审批</el-link
+          >检报告审批</el-link
         >
 
         <el-link

+ 2 - 2
src/views/inspectionProjectTask/components/inspectionProjectTaskSend.vue

@@ -4,13 +4,13 @@
     :append-to-body="true"
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
-    :title="type == 1 ? '检派单' : '检请托'"
+    :title="type == 1 ? '检派单' : '检请托'"
     :visible.sync="visible"
     :maxable="true"
     @close="cancel"
   >
     <header-title
-      :title="recordingMethod == 1 ? '检项信息' : '样品信息'"
+      :title="recordingMethod == 1 ? '检项信息' : '样品信息'"
     ></header-title>
     <ele-pro-table
       :needPage="false"

+ 1 - 1
src/views/inspectionProjectTask/components/search.vue

@@ -23,7 +23,7 @@
             placeholder: '请输入'
           },
           {
-            label: '检工单编码:',
+            label: '检工单编码:',
             value: 'qualityWorkOrderCode',
             type: 'input',
             placeholder: '请输入'

+ 1 - 1
src/views/inspectionProjectTask/index.vue

@@ -6,7 +6,7 @@
         <el-tab-pane label="我的任务单" name="myTask">
           <inspection-project-task-list ref="myTaskRef" :my-task="true" />
         </el-tab-pane>
-        <el-tab-pane label="检任务单" name="taskList">
+        <el-tab-pane label="检任务单" name="taskList">
           <inspection-project-task-list ref="taskListRef" :my-task="false" />
         </el-tab-pane>
       </el-tabs>

+ 1 - 1
src/views/inspectionReport/components/detailDialog.vue

@@ -1,7 +1,7 @@
 <template>
     <ele-modal
         :visible.sync="visible"
-        title="检报告"
+        title="检报告"
         width="70%"
         append-to-body
         :maxable="true"

+ 1 - 1
src/views/inspectionReport/index.vue

@@ -176,7 +176,7 @@
           },
           {
             prop: 'code',
-            label: '检工单编码',
+            label: '检工单编码',
             // slot: 'code',
             align: 'center',
             width: 180,

+ 1 - 1
src/views/inspectionReport/template/inspection_report1.vue

@@ -2,7 +2,7 @@
   <ele-modal
     :visible="visible"
     v-if="visible"
-    title="检报告"
+    title="检报告"
     width="70%"
     append-to-body
     :before-close="cancel"

+ 1 - 1
src/views/inspectionReport/template/inspection_report2.vue

@@ -2,7 +2,7 @@
   <ele-modal
     :visible="visible"
     v-if="visible"
-    title="检报告"
+    title="检报告"
     width="70%"
     append-to-body
     :before-close="cancel"

+ 1 - 1
src/views/inspectionStandard/components/edit.vue

@@ -175,7 +175,7 @@
                   </el-table-column>
                 </el-table-column>
                 <el-table-column :label="form.tolerance" align="center">
-                  <el-table-column label="检标准" align="center">
+                  <el-table-column label="检标准" align="center">
                     <template slot-scope="scope">
                       <el-form-item label-width="0" prop="inspectionStandard">
                         <el-input

+ 1 - 1
src/views/inspectionStandard/components/standardDialog.vue

@@ -39,7 +39,7 @@
           </ele-pro-table>
         </el-col>
         <el-col :span="12" class="table_col" v-if="equipmentdialog">
-          <div class="title">检项</div>
+          <div class="title">检项</div>
           <search ref="search" @search="search"></search>
           <ele-pro-table
             ref="equiTable1"

+ 1 - 1
src/views/inspectionStandard/index.vue

@@ -71,7 +71,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此检标准吗?"
+            title="确定要删除此检标准吗?"
             @confirm="remove(row)"
             v-if="row.isUpdate != 1 && [0, 3].includes(row.approvalStatus)"
           >

+ 2 - 2
src/views/inspectionTemplate/AddorUpdate.vue

@@ -52,7 +52,7 @@
           <el-form-item label="名称" prop="qualitySchemeTemplateName">
             <el-input
               v-model="dataForm.qualitySchemeTemplateName"
-              placeholder="检方案名称"
+              placeholder="检方案名称"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -60,7 +60,7 @@
           <el-form-item label="编码" prop="qualitySchemeTemplateCode">
             <el-input
               v-model="dataForm.qualitySchemeTemplateCode"
-              placeholder="检方案编码"
+              placeholder="检方案编码"
               disabled
             ></el-input>
           </el-form-item>

+ 2 - 2
src/views/inspectionTemplate/components/inspectionTemplateDialog.vue

@@ -67,14 +67,14 @@ export default {
         },
         {
           prop: 'qualitySchemeTemplateCode',
-          label: '检方案编码',
+          label: '检方案编码',
           showOverflowTooltip: true,
           align: 'center',
           minWidth: 110
         },
         {
           prop: 'qualitySchemeTemplateName',
-          label: '检方案名称',
+          label: '检方案名称',
           align: 'center',
           minWidth: 150
         },

+ 3 - 3
src/views/inspectionTemplate/components/search.vue

@@ -8,7 +8,7 @@
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="检方案名称:">
+        <el-form-item label="检方案名称:">
           <el-input
             clearable
             v-model="where.qualitySchemeTemplateName"
@@ -18,7 +18,7 @@
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="检方案编码:">
+        <el-form-item label="检方案编码:">
           <el-input
             clearable
             v-model="where.qualitySchemeTemplateCode"
@@ -41,7 +41,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="检方案类型:">
+        <el-form-item label="检方案类型:">
           <DictSelection
             dictName="质检计划类型"
             v-model="where.type"

+ 2 - 2
src/views/inspectionTemplate/index.vue

@@ -236,14 +236,14 @@
           {
             prop: 'qualitySchemeTemplateCode',
             slot: 'qualitySchemeTemplateCode',
-            label: '检方案编码',
+            label: '检方案编码',
             showOverflowTooltip: true,
             align: 'center',
             minWidth: 110
           },
           {
             prop: 'qualitySchemeTemplateName',
-            label: '检方案名称',
+            label: '检方案名称',
             align: 'center',
             minWidth: 150
           },

+ 1 - 1
src/views/inspectionTemplate/inspectionClassify/components/user-search.vue

@@ -8,7 +8,7 @@
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="检名称:">
+        <el-form-item label="检名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>

+ 2 - 2
src/views/inspectionTemplate/inspectionClassify/index.vue

@@ -1,6 +1,6 @@
 <template>
   <ele-modal
-    title="检"
+    title="检"
     :visible.sync="visible"
     v-if="visible"
     :before-close="handleClose"
@@ -152,7 +152,7 @@
 
           {
             prop: 'categoryLevelClassName',
-            label: '检类型',
+            label: '检类型',
             align: 'center',
             minWidth: 150
           },

+ 13 - 13
src/views/inspectionWork/components/QualityContentTabs.vue

@@ -1,12 +1,12 @@
 <template>
   <el-row>
-    <header-title title="检内容">
+    <header-title title="检内容">
       <el-button
         type="primary"
         :loading="loading"
         v-if="type != 'detail'"
         @click="$emit('batch-quality')"
-        >批量检</el-button
+        >批量检</el-button
       >
       <el-button
         type="primary"
@@ -266,7 +266,7 @@
           </el-table-column>
           <!-- *** fixed="right" -->
           <el-table-column
-            label="检状态"
+            label="检状态"
             prop="qualityStatus"
             align="center"
             :show-overflow-tooltip="true"
@@ -278,7 +278,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="检结果"
+            label="检结果"
             prop="qualityResults"
             align="center"
             fixed="right"
@@ -316,7 +316,7 @@
                 :underline="false"
                 @click="handleDetail(scope.$index, scope.row, 'report')"
               >
-                
+                检
               </el-link>
               <el-link
                 type="primary"
@@ -338,7 +338,7 @@
         />
       </el-tab-pane>
       <!--  -->
-      <el-tab-pane label="检方案" name="3">
+      <el-tab-pane label="检方案" name="3">
         <el-table
           :data="paginatedSchemeList"
           tooltip-effect="dark"
@@ -353,28 +353,28 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检方案编码"
+            label="检方案编码"
             prop="qualitySchemeTemplateCode"
             align="center"
           >
           </el-table-column>
           <el-table-column
-            label="检方案名称"
+            label="检方案名称"
             prop="qualitySchemeTemplateName"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检类型"
+            label="检类型"
             prop="categoryLevelClassName"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检项编码"
+            label="检项编码"
             prop="inspectionCode"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检项名称"
+            label="检项名称"
             prop="inspectionName"
             align="center"
           ></el-table-column>
@@ -674,7 +674,7 @@ export default {
       const end = start + pageSize;
       return this.sampleList?.slice(start, end);
     },
-    // 分页后的检方案列表
+    // 分页后的检方案列表
     paginatedSchemeList() {
       const { currentPage, pageSize } = this.schemePagination;
       const start = (currentPage - 1) * pageSize;
@@ -865,7 +865,7 @@ export default {
       this.conditionType = val;
     },
     checkSelectable(row, index) {
-      // 只有当检方式为抽检(qualityMode=2)时   类型不是生产检验  才可选
+      // 只有当检方式为抽检(qualityMode=2)时   类型不是生产检验  才可选
       return this.form.qualityType != 2 && this.form.qualityMode === 2;
     },
     handleDetail(index, row, type) {

+ 14 - 14
src/views/inspectionWork/components/baseInfo.vue

@@ -13,16 +13,16 @@
       </el-col>
 
       <!-- <el-col :span="6">
-        <el-form-item label="检类型:" prop="qualityType">
+        <el-form-item label="检类型:" prop="qualityType">
           <DictSelection
-            dictName="检计划类型"
+            dictName="检计划类型"
             v-model="form.qualityType"
             :disabled="btnType == 'detail'"
           ></DictSelection>
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="检方式:" prop="qualityMode">
+        <el-form-item label="检方式:" prop="qualityMode">
           <DictSelection
             dictName="取样类型"
             v-model="form.qualityMode"
@@ -164,7 +164,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="检时间:" prop="qualityTime">
+          <el-form-item label="检时间:" prop="qualityTime">
             <el-date-picker
               v-model="form.qualityTime"
               class="w100"
@@ -282,8 +282,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <!-- <el-form-item label="检结果:" prop="qualityResults" v-if="form.qualityMode == 2"> -->
-          <el-form-item label="检结果:" prop="qualityResults">
+          <!-- <el-form-item label="检结果:" prop="qualityResults" v-if="form.qualityMode == 2"> -->
+          <el-form-item label="检结果:" prop="qualityResults">
             <!--    :disabled="btnType == 'detail'" -->
             <el-select
               v-model="form.qualityResults"
@@ -400,7 +400,7 @@
           </el-form-item>
         </el-col>
         <!-- <el-col :span="6">
-          <el-form-item label="检类型:">
+          <el-form-item label="检类型:">
             <el-input
               v-model="form.certificateNumber"
               disabled
@@ -412,7 +412,7 @@
         <!--  总数量 减去 样品数量 *** -->
         <!--   -->
         <!-- <el-col :span="6">
-          <el-form-item label="检结果数量:" prop="resultsTotal">
+          <el-form-item label="检结果数量:" prop="resultsTotal">
             <el-input
               type="number"
               v-model="form.resultsTotal"
@@ -495,7 +495,7 @@
       //   },
       //   immediate: false
       // },
-      // 新增 *** 监听合格率更改 检结果
+      // 新增 *** 监听合格率更改 检结果
       // 'form.qualificationRate': {
       //   handler(newVal) {
       // if (newVal == '100.00%' || newVal == '100%' || newVal == '100.0%') {
@@ -524,10 +524,10 @@
           //   { required: true, message: '请输入不合格数', trigger: 'blur' }
           // ],
           qualityTime: [
-            { required: true, message: '请选择检时间', trigger: 'blur' }
+            { required: true, message: '请选择检时间', trigger: 'blur' }
           ],
           groupId: [
-            { required: true, message: '请选择检部门', trigger: 'change' }
+            { required: true, message: '请选择检部门', trigger: 'change' }
           ],
           executeJobId: [
             { required: true, message: '请选择执行班组', trigger: 'change' }
@@ -537,13 +537,13 @@
           ],
 
           // qualityId: [
-          //   { required: true, message: '请选择检人', trigger: 'change' }
+          //   { required: true, message: '请选择检人', trigger: 'change' }
           // ],
           // qualityIdList: [
-          //   { required: true, message: '请选择检人', trigger: 'blur' }
+          //   { required: true, message: '请选择检人', trigger: 'blur' }
           // ],
           qualityResults: [
-            { required: true, message: '请选择检结果', trigger: 'change' }
+            { required: true, message: '请选择检结果', trigger: 'change' }
           ],
           inspectionStandards: [
             { required: true, message: '请选择检验标准', trigger: 'change' }

+ 4 - 4
src/views/inspectionWork/components/experimentReport.vue

@@ -19,7 +19,7 @@
     >
       <el-row>
         <el-col :span="8">
-          <el-form-item label="检项:" prop="inspectionName">
+          <el-form-item label="检项:" prop="inspectionName">
             {{ tableData[0]?.inspectionName }}</el-form-item
           >
         </el-col>
@@ -41,7 +41,7 @@
         :datasource="tableData"
       >
         <template v-slot:toolbar v-if="type != 'detail'">
-          当前检剩余样品数:{{ getSampleQuantityCount1 }}
+          当前检剩余样品数:{{ getSampleQuantityCount1 }}
         </template>
         <template v-slot:sampleQuantity="{ row, $index }">
           <el-input
@@ -747,7 +747,7 @@
         if (type == 'lossNumber' || type == 'lossNumberUnqualified') {
           this.setNumber(item, index, type, '损耗', 'lossNumber');
           if (this.numTotal > this.getSampleQuantityCount) {
-            this.$message.error('不能大于当前检剩余样品数');
+            this.$message.error('不能大于当前检剩余样品数');
             this.$set(this.tableData[index], type, 0);
           }
         }
@@ -758,7 +758,7 @@
         ) {
           this.setNumber(item, index, type, '留样', 'retainedSampleQuantity');
           if (this.numTotal > this.getSampleQuantityCount) {
-            this.$message.error('不能大于当前检剩余样品数');
+            this.$message.error('不能大于当前检剩余样品数');
             this.$set(this.tableData[index], type, 0);
           }
         }

+ 19 - 19
src/views/inspectionWork/components/inspectionProjectReport.vue

@@ -84,7 +84,7 @@
           "
         >
           <span>
-            当前检剩余样品数:{{ getSampleQuantityCount
+            当前检剩余样品数:{{ getSampleQuantityCount
             }}{{ form.measureUnit }}</span
           >
           <el-button
@@ -298,7 +298,7 @@
       return {
         handleInput,
         type: 'report',
-        title: '检项工单',
+        title: '检项工单',
         visible: false,
         form: {},
         tableData: [],
@@ -310,21 +310,21 @@
             minWidth: 150,
             prop: 'code',
             align: 'center',
-            label: '检项工单号',
+            label: '检项工单号',
             showOverflowTooltip: true
           },
           {
             minWidth: 150,
             prop: 'qualityWorkOrderCode',
             align: 'center',
-            label: '检工单编码',
+            label: '检工单编码',
             showOverflowTooltip: true
           },
           {
             minWidth: 150,
             prop: 'qualityWorkOrderName',
             align: 'center',
-            label: '检工单名称',
+            label: '检工单名称',
             showOverflowTooltip: true
           },
           {
@@ -347,7 +347,7 @@
             slot: 'qualityMode',
             prop: 'qualityMode',
             align: 'center',
-            label: '检方式',
+            label: '检方式',
             showOverflowTooltip: true
           },
           {
@@ -517,7 +517,7 @@
             prop: 'qualityNames',
             slot: 'qualityNames',
             align: 'center',
-            label: '检人',
+            label: '检人',
             showOverflowTooltip: true
           },
           {
@@ -525,7 +525,7 @@
             prop: 'qualityTimeEnd',
             slot: 'qualityTimeEnd',
             align: 'center',
-            label: '检时间',
+            label: '检时间',
             showOverflowTooltip: true
           },
           {
@@ -571,35 +571,35 @@
             minWidth: 150,
             prop: 'qualitySchemeTemplateCode',
             align: 'center',
-            label: '检方案编码',
+            label: '检方案编码',
             showOverflowTooltip: true
           },
           {
             minWidth: 120,
             prop: 'qualitySchemeTemplateName',
             align: 'center',
-            label: '检方案名称',
+            label: '检方案名称',
             showOverflowTooltip: true
           },
           {
             minWidth: 100,
             prop: 'categoryLevelClassName',
             align: 'center',
-            label: '检类型',
+            label: '检类型',
             showOverflowTooltip: true
           },
           {
             minWidth: 130,
             prop: 'inspectionCode',
             align: 'center',
-            label: '检项编码',
+            label: '检项编码',
             showOverflowTooltip: true
           },
           {
             minWidth: 120,
             prop: 'inspectionName',
             align: 'center',
-            label: '检项名称',
+            label: '检项名称',
             showOverflowTooltip: true
           },
           {
@@ -631,7 +631,7 @@
             prop: 'useTools',
             slot: 'useTools',
             align: 'center',
-            label: '检工具',
+            label: '检工具',
             showOverflowTooltip: true
           },
           {
@@ -640,7 +640,7 @@
             align: 'center',
             slot: 'qualityResultContent',
             headerSlot: this.qms_qualityResultContent == 1 ? 'isRequired' : '',
-            label: '检内容',
+            label: '检内容',
             showOverflowTooltip: true
           },
           {
@@ -705,7 +705,7 @@
             prop: 'qualityResults',
             slot: 'qualityResults',
             align: 'center',
-            label: '检结果',
+            label: '检结果',
             showOverflowTooltip: true,
             fixed: 'right'
           },
@@ -813,10 +813,10 @@
         this.pageName = pageName;
         this.type = type;
         if (pageName == 'inspectionProjectTask') {
-          this.title = '检项任务单';
+          this.title = '检项任务单';
         }
         if (pageName == 'inspectionProjectRequest') {
-          this.title = '检项受托单';
+          this.title = '检项受托单';
         }
         if (type == 'report') {
           let data = {  ...row,...workData };
@@ -930,7 +930,7 @@
           this.visible = false;
         } else {
           if (isHandleConfirm && this.qms_qualityResultContent == 1) {
-            return this.$message.error('检内容不能为空!');
+            return this.$message.error('检内容不能为空!');
           }
           let api =
             this.pageName == 'inspectionProjectTask'

+ 4 - 4
src/views/inspectionWork/components/inspectionWorkDialog.vue

@@ -88,7 +88,7 @@
 
           {
             prop: 'code',
-            label: '检工单编码',
+            label: '检工单编码',
             slot: 'code',
             align: 'center',
             width: 180,
@@ -99,7 +99,7 @@
             prop: 'name',
             slot: 'name',
             width: 120,
-            label: '检工单名称',
+            label: '检工单名称',
             align: 'center',
             showOverflowTooltip: true
           },
@@ -129,7 +129,7 @@
           },
           {
             prop: 'qualityName',
-            label: '检人',
+            label: '检人',
             align: 'center',
             width: 120,
             showOverflowTooltip: true,
@@ -142,7 +142,7 @@
           },
           {
             prop: 'qualityTime',
-            label: '检时间',
+            label: '检时间',
             align: 'center',
             width: 120,
             showOverflowTooltip: true

+ 16 - 16
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -6,13 +6,13 @@
       ref="inspectionTemplateRef"
       @choose="inspectionTemplateSuccess"
     ></inspectionTemplateDialog>
-    <header-title title="检内容">
+    <header-title title="检内容">
       <el-button
         type="primary"
         :loading="loading"
         v-if="type != 'detail'"
         @click="$emit('batch-quality')"
-        >批量检</el-button
+        >批量检</el-button
       >
       <!-- <el-button
         type="primary"
@@ -303,7 +303,7 @@
             </template>
           </el-table-column> -->
           <el-table-column
-            label="检结果"
+            label="检结果"
             prop="qualityResults"
             align="center"
             width="180"
@@ -403,7 +403,7 @@
                 v-if="!scope.row.correlationId"
                 @click="handleDetail(scope.$index, scope.row, 'report')"
               >
-                
+                检
               </el-link>
               <!-- <el-link
                 type="primary"
@@ -425,13 +425,13 @@
         /> -->
       </el-tab-pane>
       <!--  -->
-      <el-tab-pane label="检方案" name="3">
+      <el-tab-pane label="检方案" name="3">
         <el-button
           v-if="type !== 'detail'"
           @click="addInspectionTemplate"
           type="primary"
           style="margin-top: 5px"
-          >选择检方案</el-button
+          >选择检方案</el-button
         >
 
         <el-table
@@ -448,28 +448,28 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检方案编码"
+            label="检方案编码"
             prop="qualitySchemeTemplateCode"
             align="center"
           >
           </el-table-column>
           <el-table-column
-            label="检方案名称"
+            label="检方案名称"
             prop="qualitySchemeTemplateName"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检类型"
+            label="检类型"
             prop="categoryLevelClassName"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检项编码"
+            label="检项编码"
             prop="inspectionCode"
             align="center"
           ></el-table-column>
           <el-table-column
-            label="检项名称"
+            label="检项名称"
             prop="inspectionName"
             align="center"
           ></el-table-column>
@@ -512,7 +512,7 @@
             </template></el-table-column
           >
           <el-table-column
-            label="检状态"
+            label="检状态"
             prop="status"
             align="center"
             :show-overflow-tooltip="true"
@@ -527,7 +527,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="检结果"
+            label="检结果"
             prop="qualityResults"
             align="center"
             width="180"
@@ -594,7 +594,7 @@
           :total="schemeList.length"
         /> -->
       </el-tab-pane>
-      <el-tab-pane label="检任务单" name="4">
+      <el-tab-pane label="检任务单" name="4">
         <ele-pro-table
           ref="table"
           :columns="taskColumns"
@@ -603,7 +603,7 @@
         >
         </ele-pro-table>
       </el-tab-pane>
-      <el-tab-pane label="检请托单" name="5">
+      <el-tab-pane label="检请托单" name="5">
         <ele-pro-table
           ref="table"
           :columns="entrustColumns"
@@ -986,7 +986,7 @@
           },
           {
             prop: 'code',
-            label: '检任务单号',
+            label: '检任务单号',
             showOverflowTooltip: true,
             align: 'center',
             minWidth: 130

+ 12 - 12
src/views/inspectionWork/components/sampleListDialog.vue

@@ -16,7 +16,7 @@
           <div style="padding: 10px">
             <el-table :data="props.row.qualitySampleTemplateList" border>
               <el-table-column
-                label="检方案编码"
+                label="检方案编码"
                 prop="qualitySchemeTemplateCode"
                 align="center"
                 show-overflow-tooltip
@@ -28,7 +28,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="检方案名称"
+                label="检方案名称"
                 prop="qualitySchemeTemplateName"
                 align="center"
                 show-overflow-tooltip
@@ -40,7 +40,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="检类型"
+                label="检类型"
                 prop="categoryLevelClassName"
                 align="center"
                 show-overflow-tooltip
@@ -52,7 +52,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="检项编码"
+                label="检项编码"
                 prop="inspectionCode"
                 align="center"
                 show-overflow-tooltip
@@ -64,7 +64,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="检项名称"
+                label="检项名称"
                 prop="inspectionName"
                 align="center"
                 show-overflow-tooltip
@@ -102,7 +102,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="检工具" prop="" align="center">
+              <el-table-column label="检工具" prop="" align="center">
                 <template slot-scope="scope">
                   <toolButtom
                     v-model="scope.row.useTools"
@@ -116,7 +116,7 @@
 
               <!-- @blur="(e) => inputResultContent(e, scope.row)" -->
               <el-table-column
-                label="检内容"
+                label="检内容"
                 prop="qualityResultContent"
                 align="center"
                 fixed="right"
@@ -145,7 +145,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="检结果"
+                label="检结果"
                 prop="qualityResults"
                 align="center"
                 fixed="right"
@@ -285,7 +285,7 @@
           { label: '重量单位', prop: 'weightUnit', align: 'center' },
           { label: '仓库', prop: 'warehouseName', align: 'center' },
           {
-            label: '检结果',
+            label: '检结果',
             prop: 'qualityResults',
             align: 'center',
             slot: 'qualityResults',
@@ -321,7 +321,7 @@
             label: '让步接收'
           }
         ],
-        sList: [] //检工具筛选
+        sList: [] //检工具筛选
       };
     },
     computed: {},
@@ -334,7 +334,7 @@
         this.type = type;
         this.pageName = pageName;
         // console.log(list, 'lklllllllllllllllllkkkkkkkkkkkkkkkkkkkkk', list[0].qualityResults);
-        //如果检项qualitySampleTemplateList只有一条数据且检结果是让步接收
+        //如果检项qualitySampleTemplateList只有一条数据且检结果是让步接收
         if (list[0].qualitySampleTemplateList.length == 1) {
           for (let i = 0; i < list[0].qualitySampleTemplateList.length; i++) {
             list[0].qualitySampleTemplateList[i].qualityResults = list[0]
@@ -373,7 +373,7 @@
         this.$emit('handleDispose', index, row, type);
       },
 
-      //选择检工具
+      //选择检工具
       openToolList(index, row) {
         this.$emit('openToolList', index, row);
       }

+ 9 - 9
src/views/inspectionWork/components/sampleReport.vue

@@ -207,7 +207,7 @@
       </el-table-column> -->
 
       <el-table-column
-        label="检结果"
+        label="检结果"
         prop="qualityResults"
         align="center"
         width="180"
@@ -303,7 +303,7 @@
             :underline="false"
             @click="handleDetail(scope.$index, scope.row, 'report')"
           >
-            
+            检
           </el-link>
         </template>
       </el-table-column>
@@ -345,21 +345,21 @@
             minWidth: 150,
             prop: 'code',
             align: 'center',
-            label: '检项工单号',
+            label: '检项工单号',
             showOverflowTooltip: true
           },
           {
             minWidth: 150,
             prop: 'qualityWorkOrderCode',
             align: 'center',
-            label: '检工单编码',
+            label: '检工单编码',
             showOverflowTooltip: true
           },
           {
             minWidth: 150,
             prop: 'qualityWorkOrderName',
             align: 'center',
-            label: '检工单名称',
+            label: '检工单名称',
             showOverflowTooltip: true
           },
           {
@@ -382,7 +382,7 @@
             slot: 'qualityMode',
             prop: 'qualityMode',
             align: 'center',
-            label: '检方式',
+            label: '检方式',
             showOverflowTooltip: true
           },
           {
@@ -514,7 +514,7 @@
 
         inspectionProjectStatus,
         type: 'report',
-        title: '检任务单',
+        title: '检任务单',
         visible: false,
         form: {},
         disposeTypeList: {
@@ -801,10 +801,10 @@
         this.pageName = pageName;
         this.type = type;
         if (pageName == 'inspectionProjectTask') {
-          this.title = '检任务单';
+          this.title = '检任务单';
         }
         if (pageName == 'inspectionProjectRequest') {
-          this.title = '检受托单';
+          this.title = '检受托单';
         }
         this.form = JSON.parse(JSON.stringify(row));
         console.log(this.form, 'this.form');

+ 4 - 4
src/views/inspectionWork/components/term.vue

@@ -135,14 +135,14 @@
         columns: [
           {
             prop: 'categoryLevelName',
-            label: '检类型',
+            label: '检类型',
             align: 'center',
             minWidth: 110
           },
 
           {
             prop: 'inspectionName',
-            label: '检名称',
+            label: '检名称',
             showOverflowTooltip: true,
             align: 'center',
             minWidth: 110
@@ -168,7 +168,7 @@
           {
             prop: 'qualityResultValue',
             slot: 'qualityResultValue',
-            label: '检结果参数',
+            label: '检结果参数',
             align: 'center',
             minWidth: 160
           },
@@ -176,7 +176,7 @@
           {
             prop: 'qualityResult',
             slot: 'qualityResult',
-            label: '检结果',
+            label: '检结果',
             align: 'center',
             minWidth: 100
           },

+ 1 - 1
src/views/inspectionWork/components/toolList.vue

@@ -42,7 +42,7 @@
     >
       <template v-slot:toolbar v-if="type != 'detail'">
         <el-button type="primary" @click="fileShow = true"
-          >选择检工具</el-button
+          >选择检工具</el-button
         >
       </template>
       <template v-slot:action="{ row }">

+ 6 - 6
src/views/inspectionWork/details.vue

@@ -83,7 +83,7 @@
               </el-col>
 
               <el-col :span="6">
-                <el-form-item label="检时间">
+                <el-form-item label="检时间">
                   <el-input :value="qualityTime" disabled />
                 </el-form-item>
               </el-col>
@@ -110,7 +110,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="检结果">
+                <el-form-item label="检结果">
                   <el-input :value="form.qualityResultsName" disabled />
                 </el-form-item>
               </el-col>
@@ -292,7 +292,7 @@
             </el-row>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="检内容" name="3">
+        <el-tab-pane label="检内容" name="3">
           <el-tabs v-model="inspectionName">
             <el-tab-pane label="来源清单" name="1">
               <ele-pro-table
@@ -334,7 +334,7 @@
                 </template> -->
               </ele-pro-table></el-tab-pane
             >
-            <el-tab-pane label="检方案" name="3">
+            <el-tab-pane label="检方案" name="3">
               <ele-pro-table
                 :columns="tableColumns3"
                 :datasource="sourceData3"
@@ -353,7 +353,7 @@
                 </template>
               </ele-pro-table></el-tab-pane
             >
-            <el-tab-pane label="检任务单" name="4">
+            <el-tab-pane label="检任务单" name="4">
               <ele-pro-table
                 ref="table"
                 :columns="taskColumns"
@@ -362,7 +362,7 @@
               >
               </ele-pro-table>
             </el-tab-pane>
-            <el-tab-pane label="检请托单" name="5">
+            <el-tab-pane label="检请托单" name="5">
               <ele-pro-table
                 ref="table"
                 :columns="entrustColumns"

+ 18 - 18
src/views/inspectionWork/edit.vue

@@ -502,7 +502,7 @@
         // activeName: '2',
 
         packingList: [],
-        // 样品清单,处置,批量处置,批量检,检的操作
+        // 样品清单,处置,批量处置,批量检,检的操作
         sampleList: [],
         schemeList: [],
         inventoryList: [],
@@ -535,7 +535,7 @@
             return;
           }
           console.log(newVal, 'newVal 12');
-          // 默认赋值检结果
+          // 默认赋值检结果
           this.setInspectionResults(newVal);
         },
         deep: true,
@@ -610,7 +610,7 @@
             this.$set(this.form, 'qualityResults', 1);
             // this.$set(this.form, 'status', 1);
             console.log(list, 'list');
-            console.log(this.form.qualityResults, '检结果');
+            console.log(this.form.qualityResults, '检结果');
           }
         });
       },
@@ -708,7 +708,7 @@
             this.$set(this.form, 'qualificationRate', '100%');
             this.$set(this.form, 'noQualificationRate', '0');
             this.$set(this.form, 'qualityResults', 1);
-            //样品数量和样品合格数相等 默认合格率100% 不合格率0% 检结果合格
+            //样品数量和样品合格数相等 默认合格率100% 不合格率0% 检结果合格
             this.$set(this.form, 'qualifiedNumber', this.form.total);
             this.$set(this.form, 'noQualifiedNumber', 0);
           } else {
@@ -973,7 +973,7 @@
         this.calculate(this.sampleList);
         this.sampleNumber = this.sampleList.length;
       },
-      //检项报工
+      //检项报工
       inspectionProjectReport({ index, list }) {
         this.$nextTick(() => {
           if (this.form.taskMonadInfo) {
@@ -1009,7 +1009,7 @@
           );
         });
       },
-      //检项报工回调
+      //检项报工回调
       inspectionProjectReportSuccess({ data, tableData }) {
         this.schemeList = [
           ...tableData,
@@ -1221,7 +1221,7 @@
         });
 
         // await this.queryQualityInventory()
-        // 检方案
+        // 检方案
         await this.queryQualityTempleContent();
         // 样品清单
         await this.queryQualitySamplContent();
@@ -1575,7 +1575,7 @@
         // ***
 
         if (this.form.qualityIdList.length == 0) {
-          this.$message.error('请选择检人');
+          this.$message.error('请选择检人');
           return;
         }
 
@@ -1726,13 +1726,13 @@
       // 报工
       handleReporting(index, row) {
         if (this.form.qualityIdList.length == 0) {
-          this.$message.error('请选择检人');
+          this.$message.error('请选择检人');
           return;
         }
 
         if (this.form.qualityMode == 2 && !this.form.qualityResults) {
           this.$refs.baseInfoRefs.toggleExpand2();
-          this.$message.error('请选择检结果');
+          this.$message.error('请选择检结果');
           return;
         }
 
@@ -1760,7 +1760,7 @@
               if (status != '1') {
                 this.loading = false;
                 this.$refs.tabsRef.tabsChange('2');
-                this.$message.error('请完成以下样品检!');
+                this.$message.error('请完成以下样品检!');
                 return;
               }
             }
@@ -1772,11 +1772,11 @@
               }
             });
             if (is) {
-              this.$message.error('有未完成检项检,请检查!');
+              this.$message.error('有未完成检项检,请检查!');
               return;
             }
             if (!this.schemeList.length) {
-              this.$message.error('检方案不能为空,请检查!');
+              this.$message.error('检方案不能为空,请检查!');
               return;
             }
           }
@@ -1846,7 +1846,7 @@
           this.$set(this.sampleList, index, data);
         }
       },
-      //确认
+      //确认检
       handleConfirm(list, index) {
         // 检查有效性
         // for (const item of list) {
@@ -1869,7 +1869,7 @@
                 (child) => child.qualityResults === 3
               )
             ) {
-              // 如果检项只有一条而且结果为让步接收那么整个就是让步接收
+              // 如果检项只有一条而且结果为让步接收那么整个就是让步接收
               item.isValid = false;
               item.qualityResults = 3;
             } else if (
@@ -1917,15 +1917,15 @@
           console.log(this.sampleList, 'this.sampleList');
         }
         this.activeName = '2';
-        // *** 选完批量检调用
+        // *** 选完批量检调用
         // this.countQualityResults();
         // this.$refs.baseInfoRefs.quantityCalculation(
         //   'noQualifiedNumber',
         //   'noSetSampleList'
         // );
-        console.log('检没有 2');
+        console.log('检没有 2');
       },
-      // 批量
+      // 批量检
       batchQuality(index, row, type) {
         if (this.sampleList.length == 0) {
           this.$message.error('样品清单不能为空');

+ 1 - 1
src/views/inspectionWork/index.vue

@@ -6,7 +6,7 @@
         <el-tab-pane label="我的工单" name="myWork">
           <inspection-work-list ref="myWorkRef" :my-work="true" />
         </el-tab-pane>
-        <el-tab-pane label="检工单" name="workList">
+        <el-tab-pane label="检工单" name="workList">
           <inspection-work-list ref="workListRef" :my-work="false" />
         </el-tab-pane>
       </el-tabs>

+ 14 - 14
src/views/inspectionWork/mixins/detailMixins.js

@@ -60,7 +60,7 @@ export default {
         },
 
         {
-          label: '检时间',
+          label: '检时间',
           prop: 'qualityTime',
           span: 6
         },
@@ -86,7 +86,7 @@ export default {
         },
 
         {
-          label: '检结果',
+          label: '检结果',
           prop: 'qualityResultsName',
           span: 6
         },
@@ -409,7 +409,7 @@ export default {
         },
         {
           prop: 'qualityResults',
-          label: '检结果',
+          label: '检结果',
           align: 'center',
           width: '120',
           showOverflowTooltip: true,
@@ -704,7 +704,7 @@ export default {
         },
         {
           prop: 'code',
-          label: '检任务单号',
+          label: '检任务单号',
           showOverflowTooltip: true,
           align: 'center',
           minWidth: 130
@@ -1037,31 +1037,31 @@ export default {
           fixed: 'left'
         },
         {
-          label: '检方案编码',
+          label: '检方案编码',
           prop: 'qualitySchemeTemplateCode',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          label: '检方案名称',
+          label: '检方案名称',
           prop: 'qualitySchemeTemplateName',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          label: '检类型',
+          label: '检类型',
           prop: 'categoryLevelClassName',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          label: '检项编码',
+          label: '检项编码',
           prop: 'inspectionCode',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          label: '检项名称',
+          label: '检项名称',
           prop: 'inspectionName',
           align: 'center',
           showOverflowTooltip: true
@@ -1089,7 +1089,7 @@ export default {
           prop: 'qualityResultContent',
           align: 'center',
           headerSlot: 'isRequired',
-          label: '检内容',
+          label: '检内容',
           showOverflowTooltip: true
         },
         {
@@ -1200,7 +1200,7 @@ export default {
           showOverflowTooltip: true
         },
         {
-          label: '检状态',
+          label: '检状态',
           prop: 'status',
           align: 'center',
           showOverflowTooltip: true,
@@ -1212,7 +1212,7 @@ export default {
           }
         },
         {
-          label: '检结果',
+          label: '检结果',
           prop: 'qualityResults',
           align: 'center',
           show: this.form.recordingMethod == 1,
@@ -1229,7 +1229,7 @@ export default {
     isSampleQuantity(item, index) {
       // this.resetData(item, index, ['qualifiedQuantity', 'noQualifiedQuantity']);
       if (Number(item.sampleQuantity) > this.getSampleQuantityCount) {
-        this.$message.error('样品数量不能大于当前检剩余样品数');
+        this.$message.error('样品数量不能大于当前检剩余样品数');
         this.$set(
           this.tableData[index],
           'sampleQuantity',
@@ -1297,7 +1297,7 @@ export default {
       }
       if (item[key] - (this.curretNum || 0) > this.getSampleQuantityCount) {
         this.$message.error(
-          title + keyObj.title + '不能大于当前检剩余样品数'
+          title + keyObj.title + '不能大于当前检剩余样品数'
         );
         this.$set(this.tableData[index], key, 0);
       }

+ 1 - 1
src/views/sample/consume/components/search.vue

@@ -20,7 +20,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
-        <el-form-item label="检状态:">
+        <el-form-item label="检状态:">
           <el-select
             v-model="where.qualityResults"
             placeholder="请选择"

+ 2 - 2
src/views/sample/consume/index.vue

@@ -255,7 +255,7 @@ export default {
           }
         },
         {
-          label: '检状态',
+          label: '检状态',
           prop: 'qualityStatus',
           align: 'center',
           formatter: (row, column, cellValue) => {
@@ -269,7 +269,7 @@ export default {
           }
         },
         {
-          label: '检结果',
+          label: '检结果',
           prop: 'qualityResults',
           align: 'center',
           fixed: 'right',

+ 1 - 1
src/views/sample/keepSample/components/search.vue

@@ -20,7 +20,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
-        <el-form-item label="检状态:">
+        <el-form-item label="检状态:">
           <el-select
             v-model="where.qualityResults"
             placeholder="请选择"

+ 2 - 2
src/views/sample/keepSample/index.vue

@@ -78,12 +78,12 @@ export default {
                   }
                 },
                 {
-                    label: '检状态', prop: 'qualityStatus', align: 'center', formatter: (row, column, cellValue) => {
+                    label: '检状态', prop: 'qualityStatus', align: 'center', formatter: (row, column, cellValue) => {
                         return cellValue == 0 ? '未检' : cellValue == 1 ? '已检' : cellValue == 2 ? '待检' : '';
                     }
                 },
                 {
-                    label: '检结果', prop: 'qualityResults', align: 'center',  fixed: 'right', formatter: (row, column, cellValue) => {
+                    label: '检结果', prop: 'qualityResults', align: 'center',  fixed: 'right', formatter: (row, column, cellValue) => {
                         return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
                     }
                 },

+ 5 - 5
src/views/sample/sampleRecord/components/addSample.vue

@@ -33,7 +33,7 @@
       <header-title title="基本信息"></header-title>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="检工单编码:" prop="qualityWorkOrderCode">
+          <el-form-item label="检工单编码:" prop="qualityWorkOrderCode">
             <el-input
               :disabled="!isSampleRecord || (isSampleRecord && type != 'add')"
               readonly
@@ -44,7 +44,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="检工单名称:" prop="qualityWorkOrderName">
+          <el-form-item label="检工单名称:" prop="qualityWorkOrderName">
             <el-input
               disabled
               v-model="form.qualityWorkOrderName"
@@ -147,7 +147,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="检方式:" prop="qualityMode">
+          <el-form-item label="检方式:" prop="qualityMode">
             <DictSelection
               dictName="取样类型"
               v-model="form.qualityMode"
@@ -381,10 +381,10 @@
         loading: false,
         rules: {
           qualityWorkOrderCode: [
-            { required: true, message: '请选择检工单', trigger: 'change' }
+            { required: true, message: '请选择检工单', trigger: 'change' }
           ],
           qualityMode: [
-            { required: true, message: '请选择检方式', trigger: 'change' }
+            { required: true, message: '请选择检方式', trigger: 'change' }
           ],
           recordingMethod: [
             { required: true, message: '请选择记录方法', trigger: 'change' }

+ 4 - 4
src/views/sample/sampleRecord/index.vue

@@ -123,14 +123,14 @@
           },
           {
             prop: 'qualityWorkOrderCode',
-            label: '检工单编码',
+            label: '检工单编码',
             align: 'center',
             minWidth: 150,
             showOverflowTooltip: true
           },
           {
             prop: 'qualityWorkOrderName',
-            label: '检工单名称',
+            label: '检工单名称',
             align: 'center',
             minWidth: 120,
             showOverflowTooltip: true
@@ -156,7 +156,7 @@
           },
           {
             prop: 'qualityMode',
-            label: '检方式',
+            label: '检方式',
             align: 'center',
             minWidth: 100,
             formatter: (row) => {
@@ -346,7 +346,7 @@
       seekList() {
         return [
           {
-            label: '检工单编码:',
+            label: '检工单编码:',
             value: 'qualityWorkOrderCode',
             type: 'input',
             placeholder: '请输入'

+ 1 - 1
src/views/sample/samplemanagement/detailList.vue

@@ -455,7 +455,7 @@ export default {
         },
         {
           prop: 'qualityResults',
-          label: '检结果',
+          label: '检结果',
           align: 'center',
           width: '120',
           showOverflowTooltip: true,

+ 2 - 2
src/views/sample/small/index.vue

@@ -207,7 +207,7 @@ export default {
           fixed: 'right'
         },
         {
-          label: '检状态',
+          label: '检状态',
           prop: 'qualityStatus',
           align: 'center',
           showOverflowTooltip: true,
@@ -223,7 +223,7 @@ export default {
           }
         },
         {
-          label: '检结果',
+          label: '检结果',
           prop: 'qualityResults',
           align: 'center',
           showOverflowTooltip: true,

+ 1 - 1
src/views/sample/whole/components/search.vue

@@ -20,7 +20,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
-        <el-form-item label="检状态:">
+        <el-form-item label="检状态:">
           <el-select
             v-model="where.qualityResults"
             placeholder="请选择"

+ 2 - 2
src/views/sample/whole/index.vue

@@ -215,7 +215,7 @@ export default {
           fixed: 'right'
         },
         {
-          label: '检状态',
+          label: '检状态',
           prop: 'qualityStatus',
           align: 'center',
           showOverflowTooltip: true,
@@ -231,7 +231,7 @@ export default {
           }
         },
         {
-          label: '检结果',
+          label: '检结果',
           prop: 'qualityResults',
           align: 'center',
           showOverflowTooltip: true,

+ 1 - 1
src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -202,7 +202,7 @@ export default {
         {
           prop: 'qualityType',
           slot: 'qualityType',
-          label: '检类型',
+          label: '检类型',
           align: 'center',
           width: 120,
           showOverflowTooltip: true