Accept Merge Request #504: (feature/制造-计划优化 -> develop)

Merge Request: 本地已处理完序号导致的label变形问题，线上测试

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/504?initial=true

jikimo_frontend/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['web'],
+    'depends': ['web', 'purchase'],
     'data': [
 
     ],
@@ -24,12 +24,16 @@
             'jikimo_frontend/static/src/fields/custom_many2many_checkboxes/*',
             'jikimo_frontend/static/src/scss/custom_style.scss',
             # 'jikimo_frontend/static/src/views/list_nums/list_nbCols.js',
-            # 'jikimo_frontend/static/src/views/list_nums/list_nums.xml',
-            # 'jikimo_frontend/static/src/views/list_nums/list_nums2.xml',
-            # 'jikimo_frontend/static/src/views/list_nums/list_nums3.xml',
+            'jikimo_frontend/static/src/views/list_nums/list_nums.xml',
+            'jikimo_frontend/static/src/views/list_nums/list_nums2.xml',
+            'jikimo_frontend/static/src/views/list_nums/list_nums3.xml',
             'jikimo_frontend/static/src/js/custom_form_status_indicator.js',
             'jikimo_frontend/static/src/scss/rowno_in_tree.scss',
-            'jikimo_frontend/static/src/views/list_nums/list_render.xml',
+            # 'jikimo_frontend/static/src/views/list_nums/list_render.xml',
+            'jikimo_frontend/static/src/list/list_up_down_button.xml',
+            'jikimo_frontend/static/src/list/custom_import.js',
+            'jikimo_frontend/static/src/list/custom_width.js',
+            'jikimo_frontend/static/src/views/list_nums/extent_purchase.xml',
 
         ],
 

jikimo_frontend/static/src/list/custom_width.js

@@ -0,0 +1,84 @@
+/** @odoo-module */
+
+import {patch} from '@web/core/utils/patch';
+import {ListRenderer} from "@web/views/list/list_renderer"
+
+// var {patch} = require("web.utils") 这句话也行
+
+patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
+    // 你可以重写或者添加一些方法和属性
+    // The following code manipulates the DOM directly to avoid having to wait for a
+    // render + patch which would occur on the next frame and cause flickering.
+    freezeColumnWidths() {
+        console.log('ccccccccccccccccccccccccccc')
+        if (!this.keepColumnWidths) {
+            this.columnWidths = null;
+        }
+
+        const table = this.tableRef.el;
+        const headers = [...table.querySelectorAll("thead th:not(.o_list_actions_header)")];
+        const column_num = headers.length
+
+        if (!this.columnWidths || !this.columnWidths.length) {
+            // no column widths to restore
+            // Set table layout auto and remove inline style to make sure that css
+            // rules apply (e.g. fixed width of record selector)
+            table.style.tableLayout = "auto";
+            headers.forEach((th) => {
+                th.style.width = null;
+                th.style.maxWidth = null;
+            });
+
+            this.setDefaultColumnWidths(column_num);
+
+            // Squeeze the table by applying a max-width on largest columns to
+            // ensure that it doesn't overflow
+            this.columnWidths = this.computeColumnWidthsFromContent();
+            table.style.tableLayout = "fixed";
+        }
+        headers.forEach((th, index) => {
+            if (!th.style.width) {
+                th.style.width = `${Math.floor(this.columnWidths[index])}px`;
+            }
+        });
+    },
+
+    setDefaultColumnWidths(column_num) {
+        const bbb = this.state.columns[0].name
+        const widths = this.state.columns.map((col) => this.calculateColumnWidth(col));
+        const sumOfRelativeWidths = (widths
+            .filter(({ type }) => type === "relative")
+            .reduce((sum, { value }) => sum + value, 0));
+
+        // 获取数组的最后一项
+        const lastItem = widths[widths.length - 1];
+
+        // 复制最后一项
+        const newItem = { ...lastItem };
+
+        // 将新的对象添加到数组的末尾
+        widths.push(newItem);
+
+        // 判断销售的sequence
+        if (this.state.columns[0].name === "sequence") {
+            widths[1] = { type: "relative", value: 0.1 };
+        }
+
+        // 1 because nth-child selectors are 1-indexed, 2 when the first column contains
+        // the checkboxes to select records.
+        const columnOffset = this.hasSelectors ? 2 : 1;
+        widths.forEach(({ type, value }, i) => {
+            const headerEl = this.tableRef.el.querySelector(`th:nth-child(${i + columnOffset})`);
+            if (type === "absolute") {
+                if (this.isEmpty) {
+                    headerEl.style.width = value;
+                } else {
+                    headerEl.style.minWidth = value;
+                }
+            } else if (type === "relative" && this.isEmpty) {
+                headerEl.style.width = `${((value / column_num) * 100).toFixed(2)}%`;
+            }
+        });
+    },
+}
+);

jikimo_frontend/static/src/list/list_up_down_button.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="list_up_down_button" t-inherit="web.ListView.Buttons" t-inherit-mode="extension" owl="1">
+        <xpath expr="//t[@t-if='nbTotal and !nbSelected and activeActions.exportXlsx and isExportEnable and !env.isSmall']" position="before">
+            <!-- 新增的导入文件按钮 -->
+<!--             <button type="button" class="btn btn-secondary fa fa-upload o_list_import_file" data-tooltip="导入文件" aria-label="Import File" title="" t-on-click="onDirectImportData"/> -->
+<!--             <button type="button" class="btn btn-secondary fa fa-upload o_list_import_file" data-tooltip="导入文件" aria-label="Import File" title="" t-on-click="onDirectImportData"/> -->
+<!--             <button type="button" class="btn btn-secondary fa fa-download o_list_export_xlsx" data-tooltip="导出全部" aria-label="导出全部" t-on-click="onDirectExportData"/> -->
+                    <button type="button" class="btn btn-secondary o_list_export_xlsx" data-tooltip="导出全部" aria-label="导出全部" t-on-click="onDirectExportData">导出全部</button>
+<!--                     <button type="button" t-component="base_import.ImportRecords" class="btn btn-secondary o_list_export_xlsx" data-tooltip="导入数据" aria-label="导入数据" t-on-click="importRecords">导入数据</button> -->
+<!--                     <button type="button" class="btn btn-secondary o_list_export_xlsx" data-tooltip="导入数据" aria-label="导入数据" t-on-click="importRecords">导入数据</button> -->
+<!--                     <t t-component="base_import.ImportRecords"> -->
+<!--                       <button t-on-click="importRecords" type="button" class="btn btn-secondary o_list_export_xlsx" data-tooltip="导入数据" aria-label="导入数据">导入数据</button> -->
+<!--                     </t> -->
+
+        </xpath>
+        <xpath expr="//t[@t-if='nbTotal and !nbSelected and activeActions.exportXlsx and isExportEnable and !env.isSmall']" position="replace">
+        </xpath>
+    </t>
+</templates>

jikimo_frontend/static/src/scss/rowno_in_tree.scss

@@ -1,3 +1,4 @@
 .row_no {
-  width:4% !important;
+  width: 3.2% !important;
+  vertical-align: middle;
 }

jikimo_frontend/static/src/views/list_nums/extent_purchase.xml

@@ -0,0 +1,7 @@
+<templates>
+    <t t-name="purchase.PurchaseListView" t-inherit="web.ListRenderer" t-inherit-mode="primary" owl="1">
+        <xpath expr="//div[hasclass('o_list_renderer')]" position="before">
+            <PurchaseDashBoard />
+        </xpath>
+    </t>
+</templates>

jikimo_frontend/static/src/views/list_nums/list_nums.xml

@@ -5,7 +5,7 @@
 
 <t t-name="og.web.ListRenderer" t-inherit="web.ListRenderer" t-inherit-mode="extension">
     <xpath expr="//table/thead/tr/th[@t-if='hasSelectors']" position="before">
-        <th><i class="fa fa-list-ol"/></th>
+        <th class="row_no"><i class="fa fa-list-ol"/></th>
     </xpath>
 </t>
 

sf_plan/models/custom_plan.py

@@ -63,6 +63,14 @@ class sf_production_plan(models.Model):
     # picking_type_id = fields.Many2one('stock.picking.type', 'Operation Type', compute='_compute_orderpoint_id')
     # move_dest_ids = fields.One2many('stock.move', 'created_production_id', compute='_compute_orderpoint_id')
 
+    @api.model
+    def get_import_templates(self):
+        """returns the xlsx import template file"""
+        return [{
+            'label': _('导入计划数据'),
+            'template': '/sf_plan/static/src/xlsx/sf_production_plan.xlsx'
+        }]
+
     @api.model
     def _compute_orderpoint_id(self):
         pass