style(inspectionReport): 调整报告弹窗及表单宽度

fix(inspectionWork): 支持报告审批驳回后重新审批并新增检测工具列

src/views/inspectionReport/components/reportTemplateWrapper.vue

@@ -1,7 +1,7 @@
 <template>
   <ele-modal
     :visible="visible"
-    width="70%"
+    width="80%"
     append-to-body
     title="检测报告"
     @close="cancel"
@@ -440,6 +440,7 @@
             this.currentRow.noQualifiedNumber
           );
 
+
           this.$set(this.basicInfoData, 'qualityWorkerId', this.currentRow.id);
           this.$set(
             this.basicInfoData,

src/views/inspectionReport/template/inspection_report1.vue

@@ -247,14 +247,14 @@
                 <el-input
                   v-model="basicInfoData.inspector"
                   placeholder="请输入检验员"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.inspectionTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -274,14 +274,14 @@
                 <el-input
                   v-model="basicInfoData.reviewer"
                   placeholder="请输入复核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.reviewTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -301,14 +301,14 @@
                 <el-input
                   v-model="basicInfoData.checker"
                   placeholder="请输入审核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.approvedDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionReport/template/inspection_report2.vue

@@ -269,14 +269,14 @@
                 <el-input
                   v-model="basicInfoData.inspector"
                   placeholder="请输入检验员"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.inspectionTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -296,14 +296,14 @@
                 <el-input
                   v-model="basicInfoData.reviewer"
                   placeholder="请输入复核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.reviewTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -323,14 +323,14 @@
                 <el-input
                   v-model="basicInfoData.checker"
                   placeholder="请输入审核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.approvedDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionReport/template/inspection_report3.vue

@@ -1039,14 +1039,14 @@
                 <el-input
                   v-model="basicInfoData.executorSign"
                   placeholder="请输入执行人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.executorDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -1060,14 +1060,14 @@
                 <el-input
                   v-model="basicInfoData.departmentSign"
                   placeholder="请输入部门负责人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.departmentDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -1081,14 +1081,14 @@
                 <el-input
                   v-model="basicInfoData.supervisorSign"
                   placeholder="请输入监督人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.supervisorDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionReport/template/inspection_report4.vue

@@ -241,14 +241,14 @@
                 <el-input
                   v-model="basicInfoData.inspector"
                   placeholder="请输入检验员"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.inspectionTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -268,14 +268,14 @@
                 <el-input
                   v-model="basicInfoData.reviewer"
                   placeholder="请输入复核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.reviewTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -295,14 +295,14 @@
                 <el-input
                   v-model="basicInfoData.checker"
                   placeholder="请输入审核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.approvedDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionReport/template/inspection_report5.vue

@@ -295,14 +295,14 @@
                 <el-input
                   v-model="basicInfoData.inspector"
                   placeholder="请输入检验人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.inspectionTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -322,14 +322,14 @@
                 <el-input
                   v-model="basicInfoData.reviewer"
                   placeholder="请输入复核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.reviewTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -349,14 +349,14 @@
                 <el-input
                   v-model="basicInfoData.checker"
                   placeholder="请输入批准人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.approvedDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionReport/template/inspection_report6.vue

@@ -288,14 +288,14 @@
                 <el-input
                   v-model="basicInfoData.inspector"
                   placeholder="请输入检验人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.inspectionTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -315,14 +315,14 @@
                 <el-input
                   v-model="basicInfoData.reviewer"
                   placeholder="请输入复核人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.reviewTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else
@@ -342,14 +342,14 @@
                 <el-input
                   v-model="basicInfoData.checker"
                   placeholder="请输入批准人"
-                  style="width: 140px"
+                  style="width: 120px"
                 ></el-input>
                 <el-date-picker
                   v-model="basicInfoData.approvedDate"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
-                  style="width: 160px"
+                  style="width: 140px"
                 />
               </div>
               <div v-else

src/views/inspectionWork/components/inspectionWorkList.vue

@@ -216,7 +216,7 @@
           v-if="
             row.status == 1 &&
             isReportApproval == 1 &&
-            !row.reportApprovalStatus &&
+            (!row.reportApprovalStatus || row.reportApprovalStatus == 3) &&
             !isEmptyObject(row.reportTemplateJson) &&
             $hasPermission('qms:quality_work_order:qualityReportApproval')
           "

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -565,6 +565,19 @@
               {{ scope.row.executionMethod == 1 ? '常规' : '实验' }}
             </template></el-table-column
           >
+          <el-table-column
+            label="检查工具"
+            prop="useTools"
+            align="center"
+            v-if="form.recordingMethod == 1"
+          >
+            <template slot-scope="scope">
+              <toolButtom
+                v-model="scope.row.useTools"
+                :type="type"
+                :sList="scope.row.toolList" /></template
+          ></el-table-column>
+
           <el-table-column
             label="检测状态"
             prop="status"
@@ -680,6 +693,7 @@
   import inspectionTemplateDialog from '@/views/inspectionTemplate/components/inspectionTemplateDialog.vue';
   import wokePopupList from '@/components/workList/wokePopupList.vue';
   import { parameterGetByCode } from '@/api/main/index';
+  import toolButtom from './toolButtom.vue';
 
   import {
     getDetails,
@@ -706,7 +720,8 @@
 
     components: {
       inspectionTemplateDialog,
-      wokePopupList
+      wokePopupList,
+      toolButtom
     },
     watch: {
       schemeList: {

src/views/inspectionWork/details.vue

@@ -383,6 +383,13 @@
                     >{{ scope.row.experimentCode }}
                   </el-link>
                 </template>
+                <template v-slot:useTools="{ row }">
+                  <toolButtom
+                    v-model="row.useTools"
+                    :type="'detail'"
+                    :sList="row.toolList"
+                  />
+                </template>
                 <template v-slot:defaultValue="{ row }">
                   <div style="display: flex; justify-content: center">
                     <span v-if="row.textType != 8">{{ row.symbol }}</span>
@@ -505,6 +512,7 @@
   import { getById as getByIdProjectTask } from '@/api/inspectionProjectTask';
   import { getById as getByIdProjectRequest } from '@/api/inspectionProjectRequest';
   import RuleCycle from '@/components/rule-cycle.vue';
+  import toolButtom from './components/toolButtom.vue';
 
   export default {
     mixins: [detailMixins],
@@ -513,8 +521,10 @@
       experimentReport,
       inspectionProjectReport,
       inspectionProjectReportView,
-      sampleReport,sampleListView,
-      RuleCycle
+      sampleReport,
+      sampleListView,
+      RuleCycle,
+      toolButtom
     },
     data() {
       return {

src/views/inspectionWork/mixins/detailMixins.js

@@ -1096,7 +1096,14 @@ export default {
           minWidth: 300,
           slot: 'defaultValue'
         },
-
+        {
+          minWidth: 100,
+          prop: 'useTools',
+          slot: 'useTools',
+          align: 'center',
+          label: '检测工具',
+          showOverflowTooltip: true
+        },
         {
           label: '执行方法',
           prop: 'executionMethod',