Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched

jikimo_purchase_request/views/purchase_request_view.xml

@@ -55,6 +55,7 @@
         <field name="inherit_id" ref="purchase_request.purchase_request_line_search" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_id']" position="after">
+                <field name="supply_method"/>
                 <field name="related_product"/>
                 <field name="part_number"/>
                 <field name="part_name"/>

sf_manufacturing/wizard/sale_order_cancel.py

@@ -489,7 +489,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
                     'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}',
                     'quantity': purchase_request_line.product_qty,
                     'doc_state': purchase_request_map_dict.get(purchase_request_line.request_state, purchase_request_line.request_state),
-                    'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel'] else ''
+                    'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel', 'approved'] else ''
                 }
                 lines.append(self.create(vals)) 
 

sf_quality/data/insepection_report_template.xml

@@ -4,23 +4,23 @@
 <!-- 定义页眉模板 -->
         <template id="report_quality_header">
     <div class="header">
-        <div class="pdf-viewer-toolbar" style="display:flex;justify-content:space-between;">
+        <div class="pdf-viewer-toolbar" style="display:flex;justify-content:space-between;align-items:center;">
-            <img src="/sf_quality/static/img/logo.png" style="max-height: 70px;" alt="Logo"/>
+            <img t-if="o.company_id.favicon" t-att-src="image_data_uri(o.company_id.favicon)" style="max-height: 70px;" alt="Logo"/>
 
-            <div class="text-center" >
+            <div class="text-center">
-                <h2 style="line-height: 133px;">出厂检验报告</h2>
+                <h2>出厂检验报告</h2>
             </div>
-            <div style="padding-top: 20px;">
+            <div class="float-right" style="text-align: right;">
             <!-- 使用公开访问URL的二维码 -->
-                <img t-att-src="'/report/barcode/QR/%s?width=100&amp;height=100' % o.get_report_url()" style="width:80px;height:80px"/>
+            <img t-att-src="'/report/barcode/QR/%s' % o.get_report_url()" style="width:80px;height:80px"/>
-                <div style="font-size: 14px;">
+            <div style="font-size: 20px;">
-                    <strong>报告编号: </strong><span t-if="o.report_number_id" t-field="o.report_number_id"/> <span t-else="">ceshi</span>
+                <strong>报告编号: </strong><span t-if="o.report_number_id" t-field="o.report_number_id"/> <span t-else="">ceshi</span>
-                </div>
-                <!-- 添加扫码提示 -->
-                <div style="font-size: 12px;">
-                    <strong>扫描二维码查看PDF报告</strong>
-                </div>
             </div>
+            <!-- 添加扫码提示 -->
+            <div style="font-size: 12px; margin-top: 5px;">
+                <strong>扫描二维码查看PDF报告</strong>
+            </div>
+        </div>
         </div>
     </div>
 </template>
@@ -29,15 +29,19 @@
         <template id="report_quality_footer">
             <div class="footer">
                 <div class="row">
-                    <p style="float: left;width: 50%;margin-bottom: 10px;">售后服务: <span t-field="o.company_id.phone"/></p>
+                    <div class="col-6">
-                    <p style="float: left;width: 50%;margin-bottom: 10px;">公司名称: <span t-field="o.company_id.name"/></p>
+                        <p>售后服务: <span t-field="o.company_id.phone"/></p>
-                    <p style="float: left;width: 50%;margin-bottom: 10px;">公司网址: <span t-field="o.company_id.website"/></p>
+                        <p>公司名称: <span t-field="o.company_id.name"/></p>
-                    <p style="float: left;width: 50%;margin-bottom: 10px;">公司邮箱: <span t-field="o.company_id.email"/></p>
+                        <p>公司网址: <span t-field="o.company_id.website"/></p>
-                    <p style="float: left;width: 50%;margin-bottom: 10px;">加工工厂: <span t-field="o.company_id.factory_name"/></p>
+                        <p>公司邮箱: <span t-field="o.company_id.email"/></p>
+                    </div>
+                    <div class="col-6">
+                        <p>加工工厂: <span t-field="o.company_id.factory_name"/></p>
+                    </div>
                 </div>
-                <!-- <div class="text-center">
+                <div class="text-center">
                     <span>第<span class="page"/> 页/共 <span class="topage"/>页</span>
-                </div> -->
+                </div>
             </div>
         </template>
     <template id="report_quality_inspection">
@@ -111,7 +115,7 @@
                                 </tr>
                             </tbody>
                         </table>
-                        <img src="/sf_quality/static/img/pass.png" style="width: 150px; height: 150px;position: absolute; bottom: 20px; right: 23%;"/>
+                        <img src="/sf_quality/static/img/pass.png" style="width: 200px; height: 200px;position: absolute; bottom: 20px; right: 20%;"/>
 
                         </div>
                         <div class="row mt-4">
@@ -138,7 +142,7 @@
 
                         <div class="row mt-5">
                             <div class="col-12 text-center">
-                                <p></p>
+                                <p>(以下空白)</p>
                             </div>
                         </div>