Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步

# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml

sf_sale/__manifest__.py

@@ -22,6 +22,11 @@
         'views/purchase_order_view.xml',
         'views/quick_easy_order_view.xml'
     ],
+    'assets': {
+        'web.assets_backend': [
+            'sf_sale/static/js/setTableWidth.js',
+        ]
+    },
     'demo': [
     ],
     'qweb': [

sf_sale/security/ir.model.access.csv

@@ -69,8 +69,11 @@ access_purchase_order_wizard_group_purchase,purchase_order_wizard_group_purchase
 access_purchase_order_wizard_group_purchase_director,purchase_order_wizard_group_purchase_director,model_purchase_order_wizard,sf_base.group_purchase_director,1,1,1,0
 access_crm_tag_group_sale_salemanager,crm_tag_group_sale_salemanager,sales_team.model_crm_tag,sf_base.group_sale_salemanager,1,0,0,0
 access_crm_tag_group_sale_director,crm_tag_group_sale_director,sales_team.model_crm_tag,sf_base.group_sale_director,1,1,1,0
+
+access_sale_order,sale.order,sale.model_sale_order,sf_base.group_plan_dispatch,1,0,0,0
 access_res_partner_group_purchase,res_partner_group_purchase,base.model_res_partner,sf_base.group_purchase,1,1,1,0
 access_res_partner_group_purchase_director,res_partner_group_purchase_director,base.model_res_partner,sf_base.group_purchase_director,1,1,1,0
 access_sale_advance_payment_inv_group_sale_salemanager,sale_advance_payment_inv_group_sale_salemanager,sale.model_sale_advance_payment_inv,sf_base.group_sale_salemanager,1,1,1,0
 access_sale_advance_payment_inv_group_sale_director,sale_advance_payment_inv_group_sale_director,sale.model_sale_advance_payment_inv,sf_base.group_sale_director,1,1,1,0
 
+

sf_sale/static/js/setTableWidth.js

@@ -0,0 +1,28 @@
+function setTableWidth() {
+    let timer = null
+    const dom =  $('.o_list_renderer ')
+    if(!dom.length) {
+        timer = setTimeout(setTableWidth, 500)
+        return
+    }
+    const widthTest = '<span id="widthTest" style="width: fit-content"></span>'
+    $('body').append(widthTest)
+    clearTimeout(timer)
+    const tbody_tr = dom.find('tbody').children('tr')
+    dom.find('thead').children('tr').children().each(function () {
+        $('#widthTest').text($(this).text())
+        const width = $('#widthTest').width()
+        const i = $(this).index()
+        console.log(111)
+        tbody_tr.each(function () {
+            if($(this).children().length > 2) {
+                $(this).children().eq(i).css('min-width', width + 'px')
+            }
+        })
+    })
+}
+
+$(function () {
+    setTableWidth()
+})
+