فهرست منبع

fix: 优化证书展示及权限控制

yusheng 2 ماه پیش
والد
کامیت
c255ecab47

+ 1 - 1
src/views/certificateManagement/components/certificate_conformity_jangnan_template.vue

@@ -50,7 +50,7 @@
           margin-bottom: 10px;
         "
       >
-        {{ form.createTime }}
+        {{ form.createTime ? form.createTime.split(' ')[0] : '' }}
       </div>
     </div>
 

+ 1 - 0
src/views/inspectionWork/components/baseInfo.vue

@@ -267,6 +267,7 @@
               style="width: 100%"
               v-model="form.qualityMode"
               placeholder="请选择"
+              disabled
             >
               <!-- :disabled="
                 parseInt(qualityType1) == 1 || parseInt(qualityType1) == 3

+ 24 - 7
src/views/inspectionWork/components/inspectionWorkList.vue

@@ -147,7 +147,10 @@
         >
 
         <el-link
-          v-if="$hasPermission('qms:quality_work_order:certificate')"
+          v-if="
+            $hasPermission('qms:quality_work_order:certificate') &&
+            row.status == 1
+          "
           type="primary"
           :underline="false"
           @click="openNumber(row)"
@@ -300,6 +303,7 @@
       :type="'0'"
     ></component>
     <mesWorkOrder ref="mesWorkOrderRef"></mesWorkOrder>
+    <certificate ref="certificateRef"></certificate>
   </div>
 </template>
 <script>
@@ -321,6 +325,8 @@
     sampleCollection,
     checkByQualityWorkOrderId
   } from '@/api/inspectionWork';
+  import { getList as getCertificate } from '@/api/certificateManagement';
+
   import { queryTodo } from '@/api/bpm/task';
   import dictMixins from '@/mixins/dictMixins';
   import { getFile } from '@/api/system/file';
@@ -332,7 +338,7 @@
   import inspection_report2 from '@/views/inspectionReport/template/inspection_report2.vue';
   import { inspectionProjectStatus } from '@/enum/dict.js';
   import { recordingMethodList } from '@/utils/util.js';
-
+  import certificate from '@/views/certificateManagement/components/certificate.vue';
   export default {
     name: 'InspectionWorkList',
     mixins: [dictMixins, tabMixins],
@@ -346,7 +352,8 @@
       inspectionProjectTaskSend,
       inspection_report1,
       inspection_report2,
-      mesWorkOrder
+      mesWorkOrder,
+      certificate
     },
     props: {
       // 是否只显示我的工单
@@ -937,10 +944,20 @@
       done() {
         this.$refs.search.search();
       },
-      openNumber(row) {
-        this.formData.certificateNumber = row.certificateNumber;
-        this.rowData = row;
-        this.addOpen = true;
+      async openNumber(row) {
+        let data = await getCertificate({
+          generateType: 1,
+          pageNum: 1,
+          size: 1,
+          inspectionWorkId: row.id
+        });
+        console.log(data, 'data');
+        if (data?.list.length) {
+          this.$refs.certificateRef.open(data?.list[0], 'print');
+        }
+        // this.formData.certificateNumber = row.certificateNumber;
+        // this.rowData = row;
+        // this.addOpen = true;
       },
       closeModel() {
         this.addOpen = false;