From 08c005b51ba04092beef0399b06d512100fc3d5a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 25 十二月 2023 14:59:17 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产报表/ProductionAnalysisReport.html | 694 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/IpadIndex.html | 2
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 4
WebTM/views/index.html | 6
WebTM/WebTM.csproj | 1
5 files changed, 704 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b19321a..007e054 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -308,6 +308,7 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\ProductionAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_InventoryAgeReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProdOrderPickingStatusReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 9c2bfd7..8eff9a3 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -180,7 +180,7 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
+ html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName+']</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
switch (LoadData1[i].HICMOStatus) {
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index c88803f..ba29d8a 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -476,6 +476,12 @@
<dd><a lay-href="鐢熶骇绠＄悊/璁㈠崟鐘舵�佸垎甯�/Sc_OrderStateDistribution.html">璁惧鐘舵�佸垎甯�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>鐢熶骇鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶ヨ〃/ProductionAnalysisReport.html">鐢熶骇鍒嗘瀽鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
</dl>
</li>-->
<!-- 杞﹂棿绠＄悊 -->
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html"
new file mode 100644
index 0000000..44615f8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html"
@@ -0,0 +1,694 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇鍒嗘瀽鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞翠唤锛�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒嗘瀽缁村害锛�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HType" id="HType" lay-verify="HType">
+ <option style="color:blue;" value="杞﹂棿">杞﹂棿</option>
+ <option style="color:blue;" value="鐗╂枡">鐗╂枡</option>
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div style="width:99.5%;height:calc(50vh);margin-top:10px;">
+ <div id="histogram" style="width: 60%; height: calc(50vh); float: left">
+
+ </div>
+ <div id="PieChart" style="width: 39%; height: calc(50vh); float: left; margin-left: 5px;">
+
+ </div>
+ </div>
+ <div style="width:99%;height:calc(42vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "ProductionAnalysisReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愬浘褰€��
+ function set_Graphics() {
+ //#region 銆愭煴鐘跺浘銆�
+ var app = {};
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+ //#region [鏌辩姸鍥惧竷灞�鏍峰紡]
+ const posList = [
+ 'left',
+ 'right',
+ 'top',
+ 'bottom',
+ 'inside',
+ 'insideTop',
+ 'insideLeft',
+ 'insideRight',
+ 'insideBottom',
+ 'insideTopLeft',
+ 'insideTopRight',
+ 'insideBottomLeft',
+ 'insideBottomRight'
+ ];
+ app.configParameters = {
+ rotate: {
+ min: -90,
+ max: 90
+ },
+ align: {
+ options: {
+ left: 'left',
+ center: 'center',
+ right: 'right'
+ }
+ },
+ verticalAlign: {
+ options: {
+ top: 'top',
+ middle: 'middle',
+ bottom: 'bottom'
+ }
+ },
+ position: {
+ options: posList.reduce(function (map, pos) {
+ map[pos] = pos;
+ return map;
+ }, {})
+ },
+ distance: {
+ min: 0,
+ max: 100
+ }
+ };
+ app.config = {
+ rotate: 90,
+ align: 'left',
+ verticalAlign: 'middle',
+ position: 'insideBottom',
+ distance: 15,
+ onChange: function () {
+ const labelOption = {
+ rotate: app.config.rotate,
+ align: app.config.align,
+ verticalAlign: app.config.verticalAlign,
+ position: app.config.position,
+ distance: app.config.distance
+ };
+ myChart.setOption({
+ series: [
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ },
+ {
+ label: labelOption
+ }
+ ]
+ });
+ }
+ };
+ const labelOption = {
+ show: true,
+ position: 'top'
+ };
+ //#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
+ var HXTitle = [];//X杞存爣棰樺悕绉�
+ var HJanuary = []; //涓�鏈堜唤鏁版嵁
+ var HFebruary = []; //浜屾湀浠芥暟鎹�
+ var HMarch = []; //涓夋湀浠芥暟鎹�
+ var HApril = []; //鍥涙湀浠芥暟鎹�
+ var HMay = []; //浜旀湀浠芥暟鎹�
+ var HJune = []; //鍏湀浠芥暟鎹�
+ var HJuly = []; //涓冩湀浠芥暟鎹�
+ var HAugust = []; //鍏湀浠芥暟鎹�
+ var HSeptember = []; //涔濇湀浠芥暟鎹�
+ var HOctober = []; //鍗佹湀浠芥暟鎹�
+ var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+ var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+ switch ($("#HType").val()) {
+ case '鐗╂枡':
+ HXTitle.push(option.data[i].鐗╂枡);
+ break;
+ case '杞﹂棿':
+ HXTitle.push(option.data[i].杞﹂棿);
+ break;
+ }
+
+ HJanuary.push(option.data[i]['1鏈�']);
+ HFebruary.push(option.data[i]['2鏈�']);
+ HMarch.push(option.data[i]['3鏈�']);
+ HApril.push(option.data[i]['4鏈�']);
+ HMay.push(option.data[i]['5鏈�']);
+ HJune.push(option.data[i]['6鏈�']);
+ HJuly.push(option.data[i]['7鏈�']);
+ HAugust.push(option.data[i]['8鏈�']);
+ HSeptember.push(option.data[i]['9鏈�']);
+ HOctober.push(option.data[i]['10鏈�']);
+ HNovember.push(option.data[i]['11鏈�']);
+ HDecember.push(option.data[i]['12鏈�']);
+ }
+ option_ZZT = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+ },
+ toolbox: {
+ show: true,
+ orient: 'vertical',
+ left: 'right',
+ top: 'center',
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ['line', 'bar', 'stack'] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: true },
+ data: HXTitle
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '1鏈�',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJanuary
+ },
+ {
+ name: '2鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HFebruary
+ },
+ {
+ name: '3鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMarch
+ },
+ {
+ name: '4鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HApril
+ },
+ {
+ name: '5鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HMay
+ },
+ {
+ name: '6鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJune
+ },
+ {
+ name: '7鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HJuly
+ },
+ {
+ name: '8鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HAugust
+ },
+ {
+ name: '9鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSeptember
+ },
+ {
+ name: '10鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HOctober
+ },
+ {
+ name: '11鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HNovember
+ },
+ {
+ name: '12鏈�',
+ type: 'bar',
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HDecember
+ }
+ ]
+ };
+ option_ZZT && myChart.setOption(option_ZZT);
+ //#endregion
+
+ //#region 銆愰ゼ鍥俱��
+ var chartDom = document.getElementById('PieChart');
+ var myChart = echarts.init(chartDom);
+ var option_BT;
+
+ var option_BT_XData = [];
+ for (let i = 0; i < option.data.length; i++) {
+ switch ($("#HType").val()) {
+ case '杞﹂棿':
+ option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].杞﹂棿 });
+ break;
+ case '鐗╂枡':
+ option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].鐗╂枡 });
+ break;
+ }
+
+ }
+
+ option_BT = {
+ title: {
+ text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈�' + $("#HType").val() + '鍒嗗竷鍥�',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ top: 'bottom'
+ },
+ series: [
+ {
+ name: '鐢熶骇鏁伴噺',
+ type: 'pie',
+ radius: '50%',
+ data: option_BT_XData,
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+
+ option_BT && myChart.setOption(option_BT);
+ //#endregion
+ }
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ set_Graphics();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cellMinWidth: 120
+ // , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ // , height: 'full-70'
+ //};
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 350
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ }
+ }
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(DateYear) {
+ DateYear = $("#HYear").val();
+ var HType = $("#HType").val();
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/ProductionAnalysisReportList',
+ type: "GET",
+ async: false,
+ data: { "DateYear": DateYear, "HType": HType, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ set_Graphics();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index ef287e0..4d955b7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -392,8 +392,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HManagerID: checkStatus.data[0].HItemID,
- HManagerCode: checkStatus.data[0].HNumber,
- HManagerName: checkStatus.data[0].HName,
+ HManagerCode: checkStatus.data[0].鑱屽憳浠ｇ爜,
+ HManagerName: checkStatus.data[0].鑱屽憳鍚嶇О,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
--
Gitblit v1.9.1