Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms into dengfei

src/api/inspectionPlan/index.js

@@ -206,7 +206,7 @@ export async function retractPlan(data) {
 
 // 查询计划详情
 export async function planDetails(id) {
-  const res = await request.get(`/qms/quality_plan/getDetailByld/${id}`);
+  const res = await request.get(`/qms/quality_plan/getDetailById/${id}`);
   if (res.data.code == 0) {
     return res.data;
   }

src/views/inspectionPlan/index.vue

@@ -24,11 +24,7 @@
           </el-button>
         </template>
         <template v-slot:code="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            @click="openEdit('detail', row)"
-          >
+          <el-link type="primary" :underline="false" @click="openDetails(row)">
             {{ row.code }}
           </el-link>
         </template>
@@ -83,7 +79,7 @@
             class="ele-action"
             title="确定要关闭吗？"
             @confirm="close(row)"
-            v-if="row.status != 3 "
+            v-if="row.status != 3 && row.status != 4"
           >
             <template v-slot:reference>
               <el-link type="warning" :underline="false"> 关闭 </el-link>
@@ -94,7 +90,7 @@
             class="ele-action"
             title="确定要删除吗？"
             @confirm="remove(row)"
-            v-if="row.status == 0 || row.status == 2 "
+            v-if="row.status == 0 || row.status == 2"
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -438,7 +434,7 @@
           this.qualityMode = list;
         }
       },
-            // 打开详情
+      // 打开详情
       openDetails(row) {
         console.log(row, 'row 000');
         let id = row.id;

src/views/inspectionWork/details.vue

@@ -4,8 +4,7 @@
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="基本信息" name="1">
           <el-form ref="form1" :model="form" label-width="94px">
-            <el-row>
-              <el-col
+            <!-- <el-col
                 :span="item.span"
                 v-for="(item, index) in infoList"
                 :key="index"
@@ -13,6 +12,100 @@
                 <el-form-item :label="`${item.label}:`">
                   <el-input :value="form[item.prop]" disabled />
                 </el-form-item>
+              </el-col> -->
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="编码">
+                  <el-input :value="form.code" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="产品名称">
+                  <el-input :value="form.productName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="产品编码">
+                  <el-input :value="form.productCode" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="批次号">
+                  <el-input :value="form.batchNo" disabled />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="型号">
+                  <el-input :value="form.modelType" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="牌号">
+                  <el-input :value="form.brandNo" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="计量类型">
+                  <el-input :value="form.inspectionStandardsName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="质检部门">
+                  <el-input :value="form.groupName" disabled />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="质检人">
+                  <el-input :value="form.qualityName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="质检时间">
+                  <el-input :value="form.qualityTime" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="工时(h)">
+                  <el-input :value="form.hours" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="合格率">
+                  <el-input :value="form.noQualificationRate" disabled />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="不合格率">
+                  <el-input :value="form.noQualificationRate" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="检验方式">
+                  <el-input :value="form.qualityModeName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="质检结果">
+                  <el-input :value="form.qualityResultsName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="总重量">
+                  <el-input :value="form.totalWeight" disabled />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="总数量">
+                  <el-input :value="form.sampleQuantity" disabled />
+                </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="样品数">
@@ -29,6 +122,13 @@
                   <el-input :value="form.noQualifiedNumber" disabled />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="规格">
+                  <el-input :value="form.specification" disabled />
+                </el-form-item>
+              </el-col>
               <el-col :span="6" v-for="el in disposeTypeList">
                 <el-form-item :label="disposalName(el.disposeType)">
                   <el-input :value="el.measureQuantity" disabled />
@@ -131,7 +231,11 @@
             ></el-tab-pane>
           </el-tabs>
         </el-tab-pane>
-        <el-tab-pane label="样品处置" name="4">
+        <el-tab-pane
+          label="样品处置"
+          name="4"
+          v-show="form.status == 1 && activeName == '4'"
+        >
           <ele-pro-table
             :columns="tableColumns4"
             :datasource="sourceData4"
@@ -254,6 +358,7 @@
             obj[item.prop] = res[item.prop];
           });
           this.form = obj;
+          this.form.status = res.status;
           this.fieldAssign(res, obj);
           this.sampleInfo(res);
         } catch (err) {
@@ -261,6 +366,11 @@
         }
       },
       sampleInfo(res) {
+        this.$set(
+          this.form,
+          'sampleQualifiedNumber',
+          res.sampleQualifiedNumber
+        );
         this.$set(
           this.form,
           'sampleNoQualifiedNumber',
@@ -282,12 +392,24 @@
         this.$set(this.form, 'qualifiedNumber', res.qualifiedNumber);
         this.$set(this.form, 'noQualifiedNumber', res.noQualifiedNumber);
         this.$set(this.form, 'remark', res.remark);
-        this.sourceData5 = res.unqualifiedDetail || [];
-        this.sourceData4 = res.qualitySampleList || [];
-        this.sourceData2 = res.qualitySampleList || [];
         this.sourceData3 = res.templateList || [];
         this.sourceData1 = res.qualityInventoryList || [];
-        this.disposeTypeList = res.disposeTypeList || [];
+        let name = this.$route.query.name;
+        // const result = name == '计划' ? res.qualityWorkOrderDetailVO : res;
+        let result = {};
+        if (name == '计划') {
+          this.sourceData4 = res.sampleList || [];
+          this.sourceData2 = res.sampleList || [];
+          result = res.qualityWorkOrderDetailVO
+            ? res.qualityWorkOrderDetailVO
+            : {};
+        } else {
+          result = res;
+          this.sourceData4 = res.qualitySampleList || [];
+          this.sourceData2 = res.qualitySampleList || [];
+        }
+        this.sourceData5 = result.unqualifiedDetail || [];
+        this.disposeTypeList = result.disposeTypeList || [];
       },
       async fieldAssign(res, obj) {
         if (res.qualityMode == 1) {
@@ -298,9 +420,9 @@
           obj.qualityModeName = '';
         }
         if (res.qualityResults == 1) {
-          obj.qualityResultsName = '全检';
+          obj.qualityResultsName = '合格';
         } else if (res.qualityResults == 2) {
-          obj.qualityResultsName = '抽检';
+          obj.qualityResultsName = '不合格';
         } else {
           obj.qualityResultsName = '';
         }
@@ -315,10 +437,10 @@
         return '';
       },
       goBack() {
-        console.log(this.$route.query, '000000000000');
         let path = this.$route.query.path || '';
+        console.log(path, 'path');
         if (path) {
-          this.$router.push({ path: '/inspectionWork' });
+          this.$router.push({ path: path });
         } else {
           this.$router.go(-1);
         }