From 7c3f94fc2568b38e7f85d68db9c38f4f93cef7c3 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 21 Jan 2025 11:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=B7=BB=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=81=E4=B8=8B=E6=8B=89=E9=80=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/accessory/accessory_store_form.css | 1 + css/aq_basic/framework_contract_detail.css | 1 + css/aq_basic/framework_contract_form.css | 1 + css/aq_demand_plan/apply_plan_detail.css | 1 + css/aq_demand_plan/apply_plan_form.css | 1 + css/aq_demand_plan/send_out_detail.css | 1 + css/aq_demand_plan/send_out_form.css | 1 + css/demandPlan/add_jj_data.css | 1 + css/demandPlan/apply_plan_detail.css | 1 + css/demandPlan/delivery_batch_list.css | 1 + css/demandPlan/excess_inventory_source.css | 1 + js/aq_back_material/child/add_back_material.js | 2 +- js/aq_back_material/child/choose_type_list.js | 8 ++++---- js/aq_basic/child/framework_contract_edit_form.js | 2 +- js/aq_basic/child/framework_contract_form.js | 2 +- js/aq_basic/framework_contract_list.js | 2 +- js/aq_demand_plan/child/apply_plan_edit_form.js | 2 +- js/aq_demand_plan/child/apply_plan_form.js | 2 +- js/aq_demand_plan/child/send_out_edit_form_table.js | 2 +- js/aq_demand_plan/child/send_out_form_table.js | 2 +- js/aq_inventory/child/choose_type_list.js | 10 +++++----- js/aq_inventory/child/inventory_add_take_stock.js | 2 +- js/aq_inventory/inventory_take_stock.js | 2 +- js/system/child/bid_pro_form.js | 10 +++++----- page/aq_basic/framework_contract_list.html | 2 +- page/aq_basic/type_list.html | 6 +++--- page/aq_demand_plan/child/send_out_form.html | 2 +- page/aq_demand_plan/child/send_out_pro_detail.html | 2 +- page/aq_demand_plan/send_out_list.html | 2 +- page/system/bid_pro_list.html | 4 ++-- 30 files changed, 44 insertions(+), 33 deletions(-) diff --git a/css/accessory/accessory_store_form.css b/css/accessory/accessory_store_form.css index c7c701b..86994d1 100644 --- a/css/accessory/accessory_store_form.css +++ b/css/accessory/accessory_store_form.css @@ -125,6 +125,7 @@ blockquote { border: 1px solid #ddd; padding: 10px 20px; text-align: left; + word-break: break-word; } .classTable tr th { diff --git a/css/aq_basic/framework_contract_detail.css b/css/aq_basic/framework_contract_detail.css index 19dd3df..c4465ba 100644 --- a/css/aq_basic/framework_contract_detail.css +++ b/css/aq_basic/framework_contract_detail.css @@ -52,6 +52,7 @@ body { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } diff --git a/css/aq_basic/framework_contract_form.css b/css/aq_basic/framework_contract_form.css index 389c3ef..f29b6ff 100644 --- a/css/aq_basic/framework_contract_form.css +++ b/css/aq_basic/framework_contract_form.css @@ -125,6 +125,7 @@ blockquote { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } .classTable tr th { diff --git a/css/aq_demand_plan/apply_plan_detail.css b/css/aq_demand_plan/apply_plan_detail.css index ab87864..cc301d8 100644 --- a/css/aq_demand_plan/apply_plan_detail.css +++ b/css/aq_demand_plan/apply_plan_detail.css @@ -67,6 +67,7 @@ body { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } .classTable tr td, diff --git a/css/aq_demand_plan/apply_plan_form.css b/css/aq_demand_plan/apply_plan_form.css index 87f7b56..d21a0cc 100644 --- a/css/aq_demand_plan/apply_plan_form.css +++ b/css/aq_demand_plan/apply_plan_form.css @@ -125,6 +125,7 @@ blockquote { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } .classTable tr th { diff --git a/css/aq_demand_plan/send_out_detail.css b/css/aq_demand_plan/send_out_detail.css index 9beea2d..ef4bac3 100644 --- a/css/aq_demand_plan/send_out_detail.css +++ b/css/aq_demand_plan/send_out_detail.css @@ -68,6 +68,7 @@ body { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } .classTable tr td, diff --git a/css/aq_demand_plan/send_out_form.css b/css/aq_demand_plan/send_out_form.css index a2109ce..8d77ec0 100644 --- a/css/aq_demand_plan/send_out_form.css +++ b/css/aq_demand_plan/send_out_form.css @@ -110,6 +110,7 @@ blockquote { border: 1px solid #ddd; padding: 10px; text-align: left; + word-break: break-word; } .classTable tr th { diff --git a/css/demandPlan/add_jj_data.css b/css/demandPlan/add_jj_data.css index 453320d..b42287c 100644 --- a/css/demandPlan/add_jj_data.css +++ b/css/demandPlan/add_jj_data.css @@ -18,6 +18,7 @@ padding: 10px 20px; text-align: left; text-align: center; + word-break: break-word; } .classTable tr td, diff --git a/css/demandPlan/apply_plan_detail.css b/css/demandPlan/apply_plan_detail.css index ad53314..35d379e 100644 --- a/css/demandPlan/apply_plan_detail.css +++ b/css/demandPlan/apply_plan_detail.css @@ -68,6 +68,7 @@ body { border: 1px solid #ddd; padding: 10px 20px; text-align: left; + word-break: break-word; } .classTable tr td, diff --git a/css/demandPlan/delivery_batch_list.css b/css/demandPlan/delivery_batch_list.css index ecd8f22..18aee4a 100644 --- a/css/demandPlan/delivery_batch_list.css +++ b/css/demandPlan/delivery_batch_list.css @@ -52,6 +52,7 @@ body { border: 1px solid #ddd; padding: 10px 20px; text-align: left; + word-break: break-word; } diff --git a/css/demandPlan/excess_inventory_source.css b/css/demandPlan/excess_inventory_source.css index 306353f..833676c 100644 --- a/css/demandPlan/excess_inventory_source.css +++ b/css/demandPlan/excess_inventory_source.css @@ -52,6 +52,7 @@ body { border: 1px solid #ddd; padding: 10px 20px; text-align: left; + word-break: break-word; } diff --git a/js/aq_back_material/child/add_back_material.js b/js/aq_back_material/child/add_back_material.js index 6641f6b..74a8d04 100644 --- a/js/aq_back_material/child/add_back_material.js +++ b/js/aq_back_material/child/add_back_material.js @@ -73,7 +73,7 @@ function getProList() { // 工程下拉选赋值 function setSelectData(proList) { - let html = ''; + let html = ''; $.each(proList, function (index, item) { html += '' }) diff --git a/js/aq_back_material/child/choose_type_list.js b/js/aq_back_material/child/choose_type_list.js index 5c4f9ce..16eafe9 100644 --- a/js/aq_back_material/child/choose_type_list.js +++ b/js/aq_back_material/child/choose_type_list.js @@ -124,7 +124,7 @@ function initTable() { }, { field: "type", - width: '19%', + width: '15%', title: "类型", unresize: true, align: "center", @@ -132,7 +132,7 @@ function initTable() { }, { field: "name", - width: '19%', + width: '15%', title: "名称", unresize: true, align: "center", @@ -140,7 +140,7 @@ function initTable() { }, { field: "model", - width: '19%', + width: '15%', title: "规格型号", unresize: true, align: "center", @@ -165,7 +165,7 @@ function initTable() { }, { field: "remark", - width: '13%', + width: '24%', title: "备注", unresize: true, align: "center", diff --git a/js/aq_basic/child/framework_contract_edit_form.js b/js/aq_basic/child/framework_contract_edit_form.js index f789081..ccd347c 100644 --- a/js/aq_basic/child/framework_contract_edit_form.js +++ b/js/aq_basic/child/framework_contract_edit_form.js @@ -666,7 +666,7 @@ function setTableData(results) { } function setSelectData(list) { - let html = ''; + let html = ''; $.each(list, function (index, item) { html += '' diff --git a/js/aq_basic/child/framework_contract_form.js b/js/aq_basic/child/framework_contract_form.js index eb441e1..999981e 100644 --- a/js/aq_basic/child/framework_contract_form.js +++ b/js/aq_basic/child/framework_contract_form.js @@ -516,7 +516,7 @@ function setTableData(results) { } function setSelectData(list) { - let html = ''; + let html = ''; $.each(list, function (index, item) { html += '' diff --git a/js/aq_basic/framework_contract_list.js b/js/aq_basic/framework_contract_list.js index f13f9ef..1c80658 100644 --- a/js/aq_basic/framework_contract_list.js +++ b/js/aq_basic/framework_contract_list.js @@ -134,7 +134,7 @@ function initTable() { }, { field: "money", - width: '8%', + width: '10%', title: "合同金额（元）", unresize: true, align: "center", diff --git a/js/aq_demand_plan/child/apply_plan_edit_form.js b/js/aq_demand_plan/child/apply_plan_edit_form.js index 1b0534a..1d09ded 100644 --- a/js/aq_demand_plan/child/apply_plan_edit_form.js +++ b/js/aq_demand_plan/child/apply_plan_edit_form.js @@ -43,7 +43,7 @@ function getProList() { // 工程下拉选赋值 function setSelectData(proList) { - let html = ''; + let html = ''; $.each(proList, function (index, item) { html += '' }) diff --git a/js/aq_demand_plan/child/apply_plan_form.js b/js/aq_demand_plan/child/apply_plan_form.js index a55f4ff..2c9f3b5 100644 --- a/js/aq_demand_plan/child/apply_plan_form.js +++ b/js/aq_demand_plan/child/apply_plan_form.js @@ -40,7 +40,7 @@ function getProList() { // 工程下拉选赋值 function setSelectData(proList) { - let html = ''; + let html = ''; $.each(proList, function (index, item) { html += '' }) diff --git a/js/aq_demand_plan/child/send_out_edit_form_table.js b/js/aq_demand_plan/child/send_out_edit_form_table.js index f4c9460..ea2e336 100644 --- a/js/aq_demand_plan/child/send_out_edit_form_table.js +++ b/js/aq_demand_plan/child/send_out_edit_form_table.js @@ -71,7 +71,7 @@ function setFormInput(value, type, id) { } function setSelectData(modelId, value) { - let html = ""; + let html = ""; $.each(supplierList, function (index, item) { if (value === (item.supId + '')) { html += ""; diff --git a/js/aq_demand_plan/child/send_out_form_table.js b/js/aq_demand_plan/child/send_out_form_table.js index 7f82797..77d03cd 100644 --- a/js/aq_demand_plan/child/send_out_form_table.js +++ b/js/aq_demand_plan/child/send_out_form_table.js @@ -57,7 +57,7 @@ function setFormInput(value, type, id) { } function setSelectData(modelId) { - let html = ""; + let html = ""; $.each(supplierList, function (index, item) { html += ""; }) diff --git a/js/aq_inventory/child/choose_type_list.js b/js/aq_inventory/child/choose_type_list.js index 642b982..9324db5 100644 --- a/js/aq_inventory/child/choose_type_list.js +++ b/js/aq_inventory/child/choose_type_list.js @@ -126,7 +126,7 @@ function initTable() { }, { field: "type", - width: '8%', + width: '10%', title: "类型", unresize: true, align: "center", @@ -142,7 +142,7 @@ function initTable() { }, { field: "model", - width: '8%', + width: '12%', title: "规格型号", unresize: true, align: "center", @@ -158,7 +158,7 @@ function initTable() { { field: "unitName", title: "单位", - width: '8%', + width: '8.1%', unresize: true, align: "center", sort:true, @@ -166,7 +166,7 @@ function initTable() { { field: "storageNum", title: "库存量", - width: '8%', + width: '9%', unresize: true, align: "center", sort:true, @@ -203,7 +203,7 @@ function initTable() { }, { field: "remark", - width: '10%', + width: '12%', title: "备注", unresize: true, align: "center", diff --git a/js/aq_inventory/child/inventory_add_take_stock.js b/js/aq_inventory/child/inventory_add_take_stock.js index 5bc822b..56de076 100644 --- a/js/aq_inventory/child/inventory_add_take_stock.js +++ b/js/aq_inventory/child/inventory_add_take_stock.js @@ -211,7 +211,7 @@ function getBaseTableData() { // 选择入库配件类型 function chooseFitType() { let params = {}; - openIframeByParamObj("choose_fit_type_inventory_count", '选择盘点类型', "./choose_type_list.html", '99%', '99%', params); + openIframeByParamObj("choose_fit_type_inventory_count", '选择盘点类型', "./choose_type_list.html", '92%', '95%', params); } // 查询 diff --git a/js/aq_inventory/inventory_take_stock.js b/js/aq_inventory/inventory_take_stock.js index 4d461c4..7d94f34 100644 --- a/js/aq_inventory/inventory_take_stock.js +++ b/js/aq_inventory/inventory_take_stock.js @@ -195,7 +195,7 @@ function showProcess() { } // 申请 function applyPlan(obj) { - openIframeByParamObj("apply_plan", "库存盘点", "./child/inventory_add_take_stock.html", "99%", "99%", obj); + openIframeByParamObj("apply_plan", "库存盘点", "./child/inventory_add_take_stock.html", "92%", "95%", obj); } // 申请修改 diff --git a/js/system/child/bid_pro_form.js b/js/system/child/bid_pro_form.js index 05d9266..d680a95 100644 --- a/js/system/child/bid_pro_form.js +++ b/js/system/child/bid_pro_form.js @@ -51,7 +51,7 @@ function setParams(obj) { // setSelectData(projectcategoryList, 'projectcategory'); // setSelectData(voltagelevelList, 'voltagelevel'); - setSelectData(xmZtList, 'xmZt'); + setSelectData(xmZtList, 'xmZt','工程状态'); form.render(); }); } @@ -62,7 +62,7 @@ function getLevelSelect() { ajaxRequest(url, "POST", null, false, function () { }, function (result) { if (result.code === 200) { - setSelectData(result.data,'voltagelevel'); + setSelectData(result.data,'voltagelevel','电压等级'); } }, function (xhr, status, error) { errorFn(xhr, status, error) @@ -75,7 +75,7 @@ function getProTypeSelect() { ajaxRequest(url, "POST", null, false, function () { }, function (result) { if (result.code === 200) { - setSelectData(result.data,'projectcategory'); + setSelectData(result.data,'projectcategory','工程类别'); } }, function (xhr, status, error) { errorFn(xhr, status, error) @@ -165,8 +165,8 @@ function submitApply(data) { } // 下拉选赋值 -function setSelectData(list, idName) { - let html = ''; +function setSelectData(list, idName,title) { + let html = ''; $.each(list, function (index, item) { html += '' }) diff --git a/page/aq_basic/framework_contract_list.html b/page/aq_basic/framework_contract_list.html index d627c16..26efc6d 100644 --- a/page/aq_basic/framework_contract_list.html +++ b/page/aq_basic/framework_contract_list.html @@ -55,7 +55,7 @@
diff --git a/page/aq_basic/type_list.html b/page/aq_basic/type_list.html index bd2d8a2..bb63bd0 100644 --- a/page/aq_basic/type_list.html +++ b/page/aq_basic/type_list.html @@ -33,7 +33,7 @@ + class="layui-icon layui-icon-refresh">刷新