Kaynağa Gözat

refactor(purchaseNeedManage): 更新打印模板字段以匹配新数据结构

liujt 7 ay önce
ebeveyn
işleme
a7d5b0085b

+ 29 - 34
src/views/purchasingManage/purchaseNeedManage/components/print-template-tr.vue

@@ -34,13 +34,13 @@
         "
       >
         <span style="flex: 1; white-space: nowrap; padding-right: 10px"
-          >申请部门:{{ formData.departmentName || '' }}</span
+          >申请部门:{{ formData.requireDeptName || '' }}</span
         >
         <span style="flex: 1; white-space: nowrap; padding: 0 10px"
-          >申请序号:{{ formData.applyNo || '' }}</span
+          >申请序号:{{ formData.requirementCode || '' }}</span
         >
         <span style="flex: 1; white-space: nowrap; padding-left: 10px"
-          >申请日期:{{ formData.applyYear || '' }}</span
+          >申请日期:{{ formData.createTime || '' }}</span
         >
       </div>
       <div
@@ -54,18 +54,15 @@
         "
       >
         <div style="flex: 1; margin-right: 20px; padding: 10px; border-right: 1px solid #000;">
-          <span>采购方式:</span>
-          <span v-if="formData.purchaseMethod === 'self'">□自行采购</span>
-          <span v-else>□自行采购</span>
-          <span v-if="formData.purchaseMethod === 'department'">□采购部门采购</span>
-          <span v-else>□采购部门采购</span>
+          <span style="margin-right: 10px;">采购方式:</span>
+     
+          <span style="margin-right: 10px;">□ 自行采购</span>
+          <span>□ 采购部门采购</span>
         </div>
         <div style="flex: 1; margin-right: 20px; padding: 10px;">
-          <span>采购类别:</span>
-          <span v-if="formData.purchaseCategory === 'administrative'">□行政用品采购</span>
-          <span v-else>□行政用品采购</span>
-          <span v-if="formData.purchaseCategory === 'nonAdministrative'">□非行政用品采购</span>
-          <span v-else>□非行政用品采购</span>
+          <span style="margin-right: 10px;">采购类别:</span>
+          <span style="margin-right: 10px;">□ 行政用品采购</span>
+          <span>□ 非行政用品采购</span>
         </div>
       </div>
       <div
@@ -81,10 +78,8 @@
       >
         <div style="flex: 1;">
           <span>价格区间:</span>
-          <span v-if="formData.priceRange === 'below3000'">□总金额3000元以下</span>
-          <span v-else>□总金额3000元以下</span>
-          <span v-if="formData.priceRange === 'above3000'">□总金额3000及元以上</span>
-          <span v-else>□总金额3000及元以上</span>
+          <span>□总金额3000元以下</span>
+          <span>□总金额3000及元以上</span>
         </div>
       </div>
       <table
@@ -114,22 +109,22 @@
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(item, index) in formData?.materialList || []">
-              <td style="padding: 8px; border: 1px solid #000; text-align: center;">{{ index + 1 }}</td>
-              <td style="padding: 8px; border: 1px solid #000;">{{ item.materialCode || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000;">{{ item.materialName || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000;">{{ item.specificationModel || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000; text-align: center;">{{ item.unit || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000; text-align: center;">{{ item.quantity || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000;">{{ item.purpose || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000; text-align: center;">{{ item.expectedDeliveryDate || '' }}</td>
-              <td style="padding: 8px; border: 1px solid #000;">{{ item.remark || '' }}</td>
+            <tr v-for="(item, index) in formData?.detailList || []">
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ index + 1 }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.productCode || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.productName || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.specification || '' }}/{{ item.modelType || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.purchaseUnit || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.purchaseCount || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;"></td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.expectReceiveDate || '' }}</td>
+              <td style="padding: 5px; border: 1px solid #000; text-align: center;">{{ item.remark || '' }}</td>
             </tr>
           </tbody>
         </table>
       <div style="display: flex; justify-content: space-between; width: 100%; font-size: 13px; margin-top: 10px;">
           <div style="flex: 1;">
-            <div style="margin-bottom: 40px;">编制/日期:{{formData.creatorName || ''}}/{{ formData.createDate || '' }}</div>
+            <div style="margin-bottom: 40px;">编制/日期:{{formData.createUserName || ''}}/{{ formData.createTime || '' }}</div>
           </div>
           <div style="flex: 1;">
             <div style="margin-bottom: 40px;">审核/日期:{{formData.auditorName || ''}}/{{ formData.auditDate || '' }}</div>
@@ -186,12 +181,12 @@ export default {
         this.formData = response;
         
         // 处理申请日期
-        if (this.formData.applyDate) {
-          const dateObj = this.formatDate(this.formData.applyDate);
-          this.formData.applyYear = dateObj.year;
-          this.formData.applyMonth = dateObj.month;
-          this.formData.applyDay = dateObj.day;
-        }
+        // if (this.formData.applyDate) {
+        //   const dateObj = this.formatDate(this.formData.applyDate);
+        //   this.formData.applyYear = dateObj.year;
+        //   this.formData.applyMonth = dateObj.month;
+        //   this.formData.applyDay = dateObj.day;
+        // }
         
         this.QRvisible = true;
       } catch (error) {