From a8bedaf7eeb57e23af0961510c90a3df22aff15e Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 04 十月 2021 12:10:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 28 +++++++-------
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/index.html | 16 ++++----
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 4 +
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 30 +++++++++------
5 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 780c91d..132e1b9 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,7 +2,7 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9a30c97..dcf81d1 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -451,9 +451,9 @@
</dd>
</dl>
</li>
- <!-- 妯℃不鍏风鐞� -->
+ <!-- 鍣ㄥ叿绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>妯℃不鍏风鐞�</cite></a>
+ <a><i class="layui-icon layui-icon-set"></i><cite>鍣ㄥ叿绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鍩虹寤烘ā</a>
@@ -519,8 +519,8 @@
<dl class="layui-nav-child">
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">鏁呴殰鐧昏</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">鏁呴殰鐧昏鍗曠淮鎶�</a></dd>
- <dd><a lay-href="">妯℃不鍏风淮淇淳宸ュ崟n</a></dd>
- <dd><a lay-href="">妯℃不鍏风淮淇淳宸ュ崟缁存姢n</a></dd>
+ <dd><a lay-href="">鍣ㄥ叿缁翠慨娲惧伐鍗昻</a></dd>
+ <dd><a lay-href="">鍣ㄥ叿缁翠慨娲惧伐鍗曠淮鎶</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗曠淮鎶�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗�</a></dd>
@@ -528,10 +528,10 @@
</dl>
</dd>
<dd>
- <a>妯℃不鍏锋姤琛�</a>
+ <a>鍣ㄥ叿鎶ヨ〃</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">妯℃不鍏峰簱瀛樻煡璇</a></dd>
- <dd><a lay-href="">妯℃不鍏峰饱鍘嗚〃n</a></dd>
+ <dd><a lay-href="">鍣ㄥ叿搴撳瓨鏌ヨn</a></dd>
+ <dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
</dl>
</dd>
</dl>
@@ -706,7 +706,7 @@
</dd>
<dd>
<a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>妯℃不鍏风姸鎬佺湅鏉�
+ <i class="layui-icon layui-icon-layer"></i>鍣ㄥ叿鐘舵�佺湅鏉�
</a>
</dd>
</dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
index f1044c2..11ae3ab 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -193,8 +193,10 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: '500'
+ , height: 'full-50'
, page: true
+ , limits: [50, 200, 500, 1000, 5000, 10000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index a3379b1..c2250f3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>妯″叿妗ｆ璁剧疆</title>
+ <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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -61,19 +61,19 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿缂栧彿</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" style="background-color:#efefef4d;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName" style="background-color:#efefef4d;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿瑙勬牸</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HModel" id="HModel" style="background-color:#efefef4d;">
</div>
@@ -81,7 +81,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿鍨嬪彿</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HModel2" id="HModel2" style="background-color:#efefef4d;">
</div>
@@ -131,7 +131,7 @@
</div>
</div>-->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妯″叿鍒嗙被</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
@@ -187,7 +187,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯″叿鐘舵��</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" style="background-color:#efefef4d;">
</div>
@@ -437,7 +437,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '妯″叿鍒嗙被鍒楄〃',
+ title: '鍣ㄥ叿鍒嗙被鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -818,10 +818,10 @@
$("#HInterID").val(d.data[0].hmainid);
$("#HBillNo").val(d.data[0].鍗曟嵁鍙�);
$("#HDate").val(formatDate(d.data[0].鏃ユ湡));
- $("#HMouldNo").val(d.data[0].妯″叿缂栧彿);
- $("#HName").val(d.data[0].妯″叿鍚嶇О);
- $("#HModel").val(d.data[0].褰撳墠妯″叿瑙勬牸);
- $("#HModel2").val(d.data[0].妯″叿鍨嬪彿);
+ $("#HMouldNo").val(d.data[0].鍣ㄥ叿缂栧彿);
+ $("#HName").val(d.data[0].鍣ㄥ叿鍚嶇О);
+ $("#HModel").val(d.data[0].褰撳墠鍣ㄥ叿瑙勬牸);
+ $("#HModel2").val(d.data[0].鍣ㄥ叿鍨嬪彿);
$("#HDiameter").val(d.data[0].鐩村緞);
$("#HSubjoin").val(d.data[0].杈呭姪灞炴��);
$("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
@@ -830,7 +830,7 @@
//$("#HMaterID").val(d.data[0].HMaterID);
//$("#HMaterNumber").val(d.data[0].HMaterNumber);
$("#HMouleTypeID").val(d.data[0].HMouldTypeID);
- $("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
+ $("#HMouleTypeName").val(d.data[0].鍣ㄥ叿鍝佺被);
$("#HUnitID").val(d.data[0].HUnitID);
$("#HUnitName").val(d.data[0].璁￠噺鍗曚綅);
$("#HOutComDate").val(formatDate(d.data[0].鍑哄巶鏃ユ湡));
@@ -839,7 +839,7 @@
$("#HDeptName").val(d.data[0].浣跨敤閮ㄩ棬);
$("#HSupID").val(d.data[0].HSupID);
$("#HSupName").val(d.data[0].渚涘簲鍟�);
- $("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+ $("#HMouldStatus").val(d.data[0].鍣ㄥ叿鐘舵��);
$("#HWHID").val(d.data[0].HWhID);
$("#HWHName").val(d.data[0].榛樿浠撳簱);
//$("#HRoutingID").val(d.data[0].HRoutingID);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index aaf90de..d20c4ab 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -34,13 +34,13 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="btn-DeAudit" style="padding:0 5px">鍙嶅鏍�</button>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妯″叿缂栧彿</label>
+ <label class="layui-form-label">鍣ㄥ叿缂栧彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妯″叿鍚嶇О</label>
+ <label class="layui-form-label">鍣ㄥ叿鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -156,21 +156,27 @@
//, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , limits: [50,200,500,1000,5000,10000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 200
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
- , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
- , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
- , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
- , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
- , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
- , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
+ , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被' }
+ , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��' }
+ , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱' }
+ , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅' }
+ , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�' }
+ , { field: '铏氭嫙浠�', title: '铏氭嫙浠�' }
+ , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
+ , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
+ , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+ , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸' }
+ , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸' }
, { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
- , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
+ , { field: '妯″叿ERP鐗╂枡', title: '鍣ㄥ叿ERP鐗╂枡' }
, { field: '鐩村緞', title: '鐩村緞' }
, { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��' }
, { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2' }
@@ -258,7 +264,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妯″叿妗ｆ鍒楄〃',
+ title: '鏂板鍣ㄥ叿妗ｆ鍒楄〃',
closeBtn: false,
shift: 2,
area: ['100%', '100%'],
@@ -285,7 +291,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫妯″叿妗ｆ鍒楄〃'
+ , title: '缂栬緫鍣ㄥ叿妗ｆ鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
--
Gitblit v1.9.1