Преглед на файлове

feat(inspectionReport): 调整报告模板字段布局并初始化样品来源

在报告模板中调整“样品来源”和“样品数量”字段的行列布局,移除独立的“来源”行。同时在模板包装组件中为基本信息数据初始化“source”字段,其值取自当前工单编码。
yusheng преди 2 дни
родител
ревизия
dcb97d6f12
променени са 2 файла, в които са добавени 26 реда и са изтрити 20 реда
  1. 7 0
      src/views/inspectionReport/components/reportTemplateWrapper.vue
  2. 19 20
      src/views/inspectionReport/template/inspection_report4.vue

+ 7 - 0
src/views/inspectionReport/components/reportTemplateWrapper.vue

@@ -448,6 +448,13 @@
             this.currentRow.workOrderId
           );
           this.$set(this.basicInfoData, 'type', this.type || 0);
+          this.$set(
+            this.basicInfoData,
+            'source',
+            this.currentRow.workOrderCode
+          );
+          console.log( this.currentRow)
+
           this.$set(
             this.basicInfoData,
             'qualityType',

+ 19 - 20
src/views/inspectionReport/template/inspection_report4.vue

@@ -62,19 +62,31 @@
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
             >规格型号</td
           >
-          <td style="border: 1px solid #ccc; padding: 8px" colspan="3"
+          <td style="border: 1px solid #ccc; padding: 8px"
             >{{ basicInfoData.specification }}/{{ basicInfoData.modelType }}</td
           >
-        </tr>
-        <tr>
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
-            >数量</td
+            >产品数量</td
           >
           <td style="border: 1px solid #ccc; padding: 8px"
             >{{ basicInfoData.total }}{{ basicInfoData.sampleMeasureUnit }}</td
           >
+        </tr>
+        <tr>
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
-            >检品数量</td
+            >样品来源</td
+          >
+          <td style="border: 1px solid #ccc; padding: 8px">
+            <div v-if="!isView">
+              <el-input
+                v-model="basicInfoData.source"
+                placeholder="请输入来源"
+              ></el-input>
+            </div>
+            <div v-else>{{ basicInfoData.source }}</div>
+          </td>
+          <td style="width: 150px; border: 1px solid #ccc; padding: 8px">
+            样品数量</td
           >
           <td style="border: 1px solid #ccc; padding: 8px"
             >{{ basicInfoData.sampleQuantity
@@ -99,7 +111,7 @@
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
             >报告日期</td
           >
-          <td style="border: 1px solid #ccc; padding: 8px" colspan="3">
+          <td style="border: 1px solid #ccc; padding: 8px" >
             <div v-if="!isView">
               <el-date-picker
                 v-model="basicInfoData.reportDate"
@@ -110,20 +122,6 @@
             </div>
             <div v-else>{{ basicInfoData.reportDate }}</div>
           </td>
-        </tr>
-        <tr>
-          <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
-            >来源</td
-          >
-          <td style="border: 1px solid #ccc; padding: 8px">
-            <div v-if="!isView">
-              <el-input
-                v-model="basicInfoData.source"
-                placeholder="请输入来源"
-              ></el-input>
-            </div>
-            <div v-else>{{ basicInfoData.source }}</div>
-          </td>
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
             >储存条件</td
           >
@@ -137,6 +135,7 @@
             <div v-else>{{ basicInfoData.storageCondition }}</div>
           </td>
         </tr>
+
         <tr>
           <td style="width: 150px; border: 1px solid #ccc; padding: 8px"
             >检验依据</td