From 8d543b23aa16cc8496498fea8be437fdd063c13b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 四月 2023 10:27:33 +0800
Subject: [PATCH] 乔一项目优化
---
WebTM/views/home/console_QiaoYi.html | 199 -----
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 18
WebTM/views/user/login.html | 5
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 31
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 15
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 247 +++---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 60
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillEdit.html | 184 +++-
WebTM/views/index_QiaoYi.html | 4
WebTM/views/userfiles/images/wy.jpg | 0
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 50
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html | 184 +++-
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 8
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 34
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html | 3
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 136 ++-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 9
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 6
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 23
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 365 +++++----
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 30
/dev/null | 0
WebTM/views/userfiles/images/pda.jpg | 0
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 380 +++++----
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 99 -
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 29
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 55
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 10
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillList.html | 2
WebTM/WebTM.csproj | 3
30 files changed, 1,097 insertions(+), 1,092 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 32e4f36..d8b2cfd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,8 +184,9 @@
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
- <Content Include="views\userfiles\images\IMG_5566.jpg" />
<Content Include="views\userfiles\images\loginBackground-New.jpg" />
+ <Content Include="views\userfiles\images\pda.jpg" />
+ <Content Include="views\userfiles\images\wy.jpg" />
<Content Include="views\user\login_anrui.html" />
<Content Include="views\user\login2.html" />
<Content Include="views\video\1.wav" />
diff --git a/WebTM/views/home/console_QiaoYi.html b/WebTM/views/home/console_QiaoYi.html
index 4c08b9f..7009c49 100644
--- a/WebTM/views/home/console_QiaoYi.html
+++ b/WebTM/views/home/console_QiaoYi.html
@@ -20,7 +20,7 @@
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header"><!--蹇嵎鏂瑰紡--></div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
<div carousel-item="">
@@ -85,7 +85,7 @@
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header"><!--蹇嵎鏂瑰紡--></div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
<div carousel-item="">
@@ -147,136 +147,7 @@
</div>
</div>
</div>
- <div class="layui-col-md6">
- <!-- 蹇嵎鏂瑰紡 -->
- <div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
- <div class="layui-card-body">
- <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
- <div carousel-item="">
- <ul class="layui-row layui-col-space10 layui-this">
- <li class="layui-col-xs3">
- <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <i class="layui-icon layui-icon-add-circle"></i>
- <cite>鐗╂枡鍒楄〃</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
- <i class="layui-icon layui-icon-mike"></i>
- <cite>鐢熶骇璁㈠崟</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <i class="layui-icon layui-icon-android"></i>
- <cite>鐢熶骇璁㈠崟缁存姢</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <i class="layui-icon layui-icon-chart"></i>
- <cite>宸ュ簭娴佽浆鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <i class="layui-icon layui-icon-app"></i>
- <cite>宸ュ簭娴佽浆鍗＄淮鎶�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">
- <i class="layui-icon layui-icon-theme"></i>
- <cite>宸ュ簭杩斿伐璁板綍鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ュ簭杩斿伐鐢宠鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ヨ壓璺嚎鍒楄〃</cite>
- </a>
- </li>
- </ul>
- </div>
- <div class="layui-carousel-ind"></div>
- <button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button>
- <button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-md6">
- <!-- 蹇嵎鏂瑰紡 -->
- <div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
- <div class="layui-card-body">
- <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
- <div carousel-item="">
- <ul class="layui-row layui-col-space10 layui-this">
- <li class="layui-col-xs3">
- <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <i class="layui-icon layui-icon-add-circle"></i>
- <cite>鐗╂枡鍒楄〃</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
- <i class="layui-icon layui-icon-mike"></i>
- <cite>鐢熶骇璁㈠崟</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <i class="layui-icon layui-icon-android"></i>
- <cite>鐢熶骇璁㈠崟缁存姢</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <i class="layui-icon layui-icon-chart"></i>
- <cite>宸ュ簭娴佽浆鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <i class="layui-icon layui-icon-app"></i>
- <cite>宸ュ簭娴佽浆鍗＄淮鎶�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">
- <i class="layui-icon layui-icon-theme"></i>
- <cite>宸ュ簭杩斿伐璁板綍鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ュ簭杩斿伐鐢宠鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ヨ壓璺嚎鍒楄〃</cite>
- </a>
- </li>
- </ul>
- </div>
- <div class="layui-carousel-ind"></div>
- <button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button>
- <button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
- </div>
- </div>
- </div>
- </div>
+
</div>
</div>
<div class="layui-col-md4">
@@ -326,70 +197,6 @@
</ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
- </div>
- </div>
- </div>
-
- <!-- 蹇嵎鏂瑰紡 -->
- <div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
- <div class="layui-card-body">
- <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
- <div carousel-item="">
- <ul class="layui-row layui-col-space10 layui-this">
- <li class="layui-col-xs3">
- <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <i class="layui-icon layui-icon-add-circle"></i>
- <cite>鐗╂枡鍒楄〃</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
- <i class="layui-icon layui-icon-mike"></i>
- <cite>鐢熶骇璁㈠崟</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <i class="layui-icon layui-icon-android"></i>
- <cite>鐢熶骇璁㈠崟缁存姢</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <i class="layui-icon layui-icon-chart"></i>
- <cite>宸ュ簭娴佽浆鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <i class="layui-icon layui-icon-app"></i>
- <cite>宸ュ簭娴佽浆鍗＄淮鎶�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">
- <i class="layui-icon layui-icon-theme"></i>
- <cite>宸ュ簭杩斿伐璁板綍鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ュ簭杩斿伐鐢宠鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>宸ヨ壓璺嚎鍒楄〃</cite>
- </a>
- </li>
- </ul>
- </div>
- <div class="layui-carousel-ind"></div>
- <button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button>
- <button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
</div>
</div>
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index f8800aa..3080969 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -457,10 +457,10 @@
<!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
<!-- <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd> -->
- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill_QiaoYi.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
<!-- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd> -->
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曠淮鎶�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
<!-- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd> -->
<!-- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲忥紙鐟炰笌绁猴級</a></dd> -->
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</a></dd>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index ff448ae..817d15a 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -136,6 +136,11 @@
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
var judgeMorPCflag = judgeMorPC();
+ if (!judgeMorPCflag) {//绉诲姩绔�
+
+ $("#LAY-user-login").css("background", "url('../userfiles/images/pda.jpg')");
+ }
+
//鎻愪氦
form.on("submit(LAY-user-login-submit)", function (obj) {
loging();
diff --git a/WebTM/views/userfiles/images/IMG_5566.jpg b/WebTM/views/userfiles/images/IMG_5566.jpg
deleted file mode 100644
index 6331af3..0000000
--- a/WebTM/views/userfiles/images/IMG_5566.jpg
+++ /dev/null
Binary files differ
diff --git a/WebTM/views/userfiles/images/pda.jpg b/WebTM/views/userfiles/images/pda.jpg
new file mode 100644
index 0000000..3563fa5
--- /dev/null
+++ b/WebTM/views/userfiles/images/pda.jpg
Binary files differ
diff --git a/WebTM/views/userfiles/images/wy.jpg b/WebTM/views/userfiles/images/wy.jpg
new file mode 100644
index 0000000..82ad58f
--- /dev/null
+++ b/WebTM/views/userfiles/images/wy.jpg
Binary files differ
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/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
index fcdcdc2..7a0468a 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/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
@@ -69,15 +69,6 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
- <div class="layui-input-block" style="margin-left: 152px; width: 185px;">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
-
- <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -93,29 +84,39 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 162px; width: 717px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
- <div class="layui-tab-item">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-tab-item">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏉″舰鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ </div>
</div>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
</div>
- <input id="HItemID" name="HItemID" type="hidden" />
- <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
</div>
- </div>
</div>
</div>
</form>
@@ -170,6 +171,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index 330a4a9..5733ab0 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -109,6 +109,16 @@
<input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
@@ -146,132 +156,10 @@
</div>
</div>
- <div class="layui-inline">
- <!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">榛樿浠撳簱</label>
- <div class="layui-input-inline">
- <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-row">
-
- <div class="layui-inline">
- <!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
- <div class="layui-input-inline">
- <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label"> 淇濊川鏈燂細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
-
-
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞閲忓崟浣�</label>
- <div class="layui-input-inline">
- <input type="text" readonly name="HSALEUNITName" id="HSALEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HSALEUNITID" id="HSALEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEUNITList" id="HSALEUNITList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞浠�<br />璁￠噺鍗曚綅</label>
- <div class="layui-input-inline" style="margin-top:10px">
- <input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-inline">
- <label class="layui-form-label">鍩烘湰璁￠噺鍗曚綅</label>
- <div class="layui-input-inline">
- <input type="text" readonly name="HBASEUNITName" id="HBASEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HBASEUNITID" id="HBASEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HBASEUNITList" id="HBASEUNITList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-inline">
- <label class="layui-form-label">搴撳瓨璁￠噺鍗曚綅</label>
- <div class="layui-input-inline">
- <input type="text" readonly name="HSTOREUNITName" id="HSTOREUNITName" class="layui-input" value="" style="float: left; width: 100px;">
- <input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSTOREUNITList" id="HSTOREUNITList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPERUNITSTANDHOUR" lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR" autocomplete="off" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
- <div class="layui-input-inline" style="margin-top:10px">
- <input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
- <div class="layui-input-inline" style="margin-top:10px">
- <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
- </div>
- </div>
-
</div>
+
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"> 澶囨敞锛�</label>
@@ -286,7 +174,7 @@
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
-
+
</div>
</div>
@@ -454,6 +342,115 @@
</div>
</div>
+ <div class="layui-row">
+
+ <div class="layui-inline">
+ <!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 淇濊川鏈燂細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞閲忓崟浣�</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HSALEUNITName" id="HSALEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HSALEUNITID" id="HSALEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEUNITList" id="HSALEUNITList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞浠�<br />璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍩烘湰璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HBASEUNITName" id="HBASEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HBASEUNITID" id="HBASEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBASEUNITList" id="HBASEUNITList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">搴撳瓨璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HSTOREUNITName" id="HSTOREUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSTOREUNITList" id="HSTOREUNITList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPERUNITSTANDHOUR" lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
+ </div>
+ </div>
+
+
+ </div>
</div>
</div>
</div>
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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
index b4e497a..2b5a125 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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
@@ -389,12 +389,14 @@
return;
}
var HRate = $("#HRate").val();
+
+ sMainStr += ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate;
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "SaveGy_UnitList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/SaveGy_UnitList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate },
+ data: { "msg": sMainStr},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
index 806e272..b2e754b 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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
@@ -67,14 +67,7 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
- <div class="layui-input-block" style="margin-left: 152px; width: 185px;">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱鍦板潃</label>
<div class="layui-input-inline">
@@ -89,7 +82,7 @@
</div>
</div>
<div class="layui-row">
-
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
@@ -102,6 +95,16 @@
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHSPFlag" id="checkboxHSPFlag" lay-skin="primary" lay-filter="checkboxHSPFlag" value="true" title="鏄惁鍚敤">
<input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 164px; width: 717px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -187,6 +190,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index 51f8b80..472e81e 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -75,17 +75,7 @@
</button>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱屽姟</label>
- <div class="layui-input-inline">
- <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDutyID" id="HDutyID" value="0">
- <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
+
</div>
<div class="layui-row">
@@ -449,7 +439,7 @@
</div>
</div>
<div class="layui-row">
-
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宀椾綅</label>
<div class="layui-input-inline">
@@ -461,8 +451,17 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱屽姟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDutyID" id="HDutyID" value="0">
+ <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
@@ -474,7 +473,10 @@
</button>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
+ </div>
+ <div class="layui-row">
+
+ <!--<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">璐濆＋杈鹃儴闂�</label>
<div class="layui-input-inline">
<input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
@@ -484,7 +486,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
index f740ec1..8ef5ea3 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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
@@ -70,18 +70,7 @@
<input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
- </div>
+
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
@@ -99,6 +88,21 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style=" width: 375%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" >
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<div class="layui-tab-item">
@@ -189,6 +193,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 30b4f6e..e870f2e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -71,18 +71,7 @@
<input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
- </div>
+
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -90,6 +79,20 @@
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
</div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label" >缁勭粐</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style=" width: 375%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -189,6 +192,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index cc4261a..352bc34 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -86,11 +86,11 @@
</div>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐*</label>
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
- <div class="layui-form-item">
+ <div class="layui-form-item" style=" width: 375%;">
<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
@@ -343,6 +343,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 413d081..0ad3e54 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -79,18 +79,7 @@
<input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
- </div>
+
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -103,6 +92,20 @@
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style="width: 375%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -201,7 +204,7 @@
</div>
<div class="layui-row">
</div>
- </div>
+ </div>
</div>
</div>
</div>
@@ -251,6 +254,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 4b34c15..a0e856b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -77,29 +77,11 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom:5px">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浣跨敤缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+ <div class="layui-form-item" style="margin-bottom:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
</div>
</div>
<div class="layui-inline">
@@ -109,9 +91,31 @@
</div>
</div>
<div class="layui-row">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" >鍒涘缓缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style="width: 265%;">
+ <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" >浣跨敤缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style="width: 265%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -385,13 +389,13 @@
set_AddFNew();
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
- $("#HCreateID").attr("disabled", true);
+ $("#HCreateOrgID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
- $("#HCreateID").attr("disabled", true);
+ $("#HCreateOrgID").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -399,23 +403,7 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛�
- //閫夋嫨鍒涘缓缁勭粐
- form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- var sMainStr = JSON.stringify(data.field);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缁勭粐'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
+
//缁撶畻鏂瑰紡寮圭獥
form.on('submit(btnSearchProc)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -591,8 +579,8 @@
}
$("#HUSEORGID").append(Organization);
$("#HUSEORGID").val(sessionStorage["OrganizationID"])
- $("#HCreateORGID").append(Organization);
- $("#HCreateORGID").val(sessionStorage["OrganizationID"])
+ $("#HCreateOrgID").append(Organization);
+ $("#HCreateOrgID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -600,23 +588,6 @@
})
}
- //閫夋嫨浣跨敤缁勭粐
- form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- var sMainStr = JSON.stringify(data.field);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缁勭粐'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
//閫夋嫨瀹㈡埛绫诲瀷
dropdown.render({
elem: '#HCusStatus'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 163322d..5e6cc54 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -73,23 +73,16 @@
<div class="layui-form-item" style="padding-top: 10px;">
<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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
</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: 185px;">
- <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </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="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
@@ -118,26 +111,6 @@
</div>
</div>
<div class="layui-inline">
- <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" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
- <div class="layui-input-block" style="margin-left: 75px;">
- <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 71px;">
<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -147,16 +120,27 @@
</button>
</div>
</div>
+
+ <div class="layui-inline" style="width: 51%;">
+ <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" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
</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="HQty" lay-verify="HQty" id="HQty">
</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: 71px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -166,13 +150,13 @@
</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="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
</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" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
@@ -190,7 +174,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: 71px;">
<input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -214,13 +198,11 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 95px;">BOM</label>
- <div class="layui-input-block" style="margin-left: 80px;">
- <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
+ <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -265,18 +247,6 @@
<label class="layui-form-label" style="width: 85px;">璁″垝寮�瀹屽伐鏈�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏈�杩熷紑宸ユ棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏈�杩熷畬宸ユ棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
</div>
</div>
</div>
@@ -371,6 +341,40 @@
<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="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 75px;">
+ <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 95px;">BOM</label>
+ <div class="layui-input-block" style="margin-left: 80px;">
+ <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�杩熷紑宸ユ棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�杩熷畬宸ユ棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
</div>
</div>
</div>
@@ -1202,10 +1206,26 @@
//闈炵┖楠岃瘉
function AllowLoadData(data) {
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
if ($("#HMaterNumber").val() == "") {
layer.msg("鐗╂枡缂栫爜娌℃湁閫夋嫨");
return false;
}
+
+ if ($("#HMaterName").val() == "") {
+ layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HModel").val() == "") {
+ layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
//if ($("#HSourceName").val() == "") {
// layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨");
// return false;
@@ -1220,10 +1240,10 @@
// return false;
//}
- if ($("#HMainCenterIDName").val() == "") {
- layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
- return false;
- }
+ //if ($("#HMainCenterIDName").val() == "") {
+ // layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
+ // return false;
+ //}
//if ($("#BomName").val() == "") {
// layer.msg("BOM娌℃湁閫夋嫨");
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index d4096a7..ecc43c1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -415,14 +415,14 @@
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
- , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
+ , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
, { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115, totalRow: true }
@@ -857,7 +857,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_FastQuery();
}
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 278ff82..b9f49f7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -75,7 +75,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
@@ -83,7 +83,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="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
@@ -94,16 +94,11 @@
<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍥惧彿鐗堟湰</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
- </div>
- </div>
+
</div>
<div class="layui-row">
<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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -112,28 +107,23 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О</label>
+ <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О*</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
</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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
- </div>
- </div>
+
</div>
<div class="layui-row">
<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="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -143,108 +133,92 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
- </button>
+ <div class="layui-input-block" style="margin-left: 96px;">
+ <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
+ <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
+ <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
+ <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
</div>
</div>
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <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" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎴愬搧缂栧彿</label>
- <div class="layui-input-block" style="margin-left: 115px;">
- <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
- </div>
- </div>
- <div class="layui-inline">
- <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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
- </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: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+ <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" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
+
+
+
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
- </div>
- </div>
- <div class="layui-inline">
- <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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
- <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
- <!--</div>
- </div>
- <div class="layui-inline">
- <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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
- </div>
- </div>-->
+ <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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
+ <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
+ <!--</div>
+ </div>
+ <div class="layui-inline">
+ <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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">--> <!--style="background-color:#efefef4d;"-->
- <!--</div>
- </div>
- <div class="layui-inline">
- <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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
- <!--</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍑忚祫婧愬噺閲�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
- <!--</div>
- </div>-->
+ <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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
+ <!--style="background-color:#efefef4d;"-->
+ <!--</div>
+ </div>
+ <div class="layui-inline">
+ <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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
+ <!--style="background-color:#efefef4d;"-->
+ <!--</div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍑忚祫婧愬噺閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
+ <!--style="background-color:#efefef4d;"-->
+ <!--</div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -254,21 +228,19 @@
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 96px;">
- <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
- <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
- <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
- <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 185px;">
- <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�" >
- <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo" >
- </div>
- </div>
+
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -372,6 +344,50 @@
<input type="text" class="layui-input" name="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍥惧彿鐗堟湰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎴愬搧缂栧彿</label>
+ <div class="layui-input-block" style="margin-left: 115px;">
+ <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 185px;">
+ <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+ <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -473,7 +489,7 @@
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": ""
+ , "HWHID": 0, "HWHName": "","HRemark":""
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -492,60 +508,62 @@
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
// , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
- , { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
// , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
// , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
- //, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
- , { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
- // , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
- , { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
- // , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
- , { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
- , { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
- , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
- , { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
- , { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
- , { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
- , { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
- //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
- , { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
- , { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
- , { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
- , { field: 'HReadyTime', title: '鍑嗗鏃堕棿', edit: 'text' }
- , { field: 'HQueueTime', title: '鎺掗槦鏃堕棿', edit: 'text' }
- , { field: 'HMoveTime', title: '杞Щ鏃堕棿', edit: 'text' }
- , { field: 'HChangeMould', title: '鎹㈡ā鏃堕棿', edit: 'text' }
- , { field: 'HPackStd', title: '鍛ㄨ浆绠辨爣鍑�', edit: 'text' }
- , { field: 'HPack', title: '鍛ㄨ浆绠�', edit: 'text' }
- , { field: 'HPutArea', title: '鏆傛斁鍖�', edit: 'text' }
- , { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
- , { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
- // , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text' }
- , { field: 'HNextProcFlag', title: '涓嬮亾娴佽浆宸ュ簭', templet: "#HNextProcFlag" }//chenbox
- , { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
- , { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
- , { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
- , { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
- , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
- , { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
- , { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
- , { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
- , { field: 'HBeginDayQty', title: '寮�宸ヤ綑閲忥紙澶╂暟锛�', edit: 'text' }
- , { field: 'HBeginFixQty', title: '寮�宸ヤ綑閲忥紙鍥烘暟锛�', edit: 'text' }
- , { field: 'HFixWorkDays', title: '涓婇亾鍥哄畾澶╂暟', edit: 'text' }
- , { field: 'HTrunWorkDays', title: '涓婇亾寰幆鍛ㄦ湡', edit: 'text' }
- , { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
- , { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
- , { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
- , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
- , { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
+
+ //, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
+ ////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
+ //, { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
+ //// , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
+ //, { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
+ //// , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
+ //, { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
+ //, { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
+ //, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
+ //, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
+ //, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
+ //, { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+ //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
+ //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
+ ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+ //, { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
+ //, { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
+ //, { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
+ //, { field: 'HReadyTime', title: '鍑嗗鏃堕棿', edit: 'text' }
+ //, { field: 'HQueueTime', title: '鎺掗槦鏃堕棿', edit: 'text' }
+ //, { field: 'HMoveTime', title: '杞Щ鏃堕棿', edit: 'text' }
+ //, { field: 'HChangeMould', title: '鎹㈡ā鏃堕棿', edit: 'text' }
+ //, { field: 'HPackStd', title: '鍛ㄨ浆绠辨爣鍑�', edit: 'text' }
+ //, { field: 'HPack', title: '鍛ㄨ浆绠�', edit: 'text' }
+ //, { field: 'HPutArea', title: '鏆傛斁鍖�', edit: 'text' }
+ //, { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
+ //, { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
+ //// , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text' }
+ //, { field: 'HNextProcFlag', title: '涓嬮亾娴佽浆宸ュ簭', templet: "#HNextProcFlag" }//chenbox
+ //, { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
+ //, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
+ //, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
+ //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
+ //, { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+ //, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
+ //, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
+ //, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
+ //, { field: 'HBeginDayQty', title: '寮�宸ヤ綑閲忥紙澶╂暟锛�', edit: 'text' }
+ //, { field: 'HBeginFixQty', title: '寮�宸ヤ綑閲忥紙鍥烘暟锛�', edit: 'text' }
+ //, { field: 'HFixWorkDays', title: '涓婇亾鍥哄畾澶╂暟', edit: 'text' }
+ //, { field: 'HTrunWorkDays', title: '涓婇亾寰幆鍛ㄦ湡', edit: 'text' }
+ //, { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
+ //, { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
+ //, { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
+ //, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
+ //, { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
//, done: function (res, curr, count) {
@@ -800,7 +818,7 @@
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": ""
+ , "HWHID": 0, "HWHName": "", "HRemark": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1546,7 +1564,7 @@
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": ""
+ , "HWHID": 0, "HWHName": "", "HRemark": ""
})
j++;
}
@@ -1824,7 +1842,7 @@
, "HBeginDayQty": d.data[i].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[i].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[i].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[i].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[i].鏈亾鍑嗗鏃堕棿
, "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
, "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
- , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName
+ , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞
}
)
}
@@ -1916,6 +1934,14 @@
}
if ($("#HMaterNumber").val() == "") {
layer.msg("浜у搧浠ｇ爜娌℃湁閫夋嫨!");
+ return false;
+ }
+ if ($("#HMaterName").val() == "") {
+ layer.msg("浜у搧鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HMaterModel").val() == "") {
+ layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
return false;
}
if ($("#HUnitName").val() == "") {
@@ -2051,10 +2077,8 @@
async: false,
success: function (data1) {
if (data1.data.length != 0) {
-
-
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index ca4b5ea..8ee3ac9 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -257,54 +257,54 @@
{ type: 'checkbox', fixed: 'left' }
/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
- //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: '缁勭粐', title: '缁勭粐' }
- //, { field: 'hsubid', title: 'hsubid', width: 80 }
, { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
- , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- //, { field: 'hprocid', title: 'hprocid', width: 105 }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭', title: '宸ュ簭' }
- //, { field: 'HSupID', title: 'HSupID', width: 105 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
, { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
- , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- , { field: '鑹巼', title: '鑹巼' }
- , { field: '绱鑹巼', title: '绱鑹巼' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
, { field: '淇敼浜�', title: '淇敼浜�' }
, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
+ //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
+ //, { field: '缁勭粐', title: '缁勭粐' }
+ ////, { field: 'hsubid', title: 'hsubid', width: 80 }
+ //, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+ ////, { field: 'hprocid', title: 'hprocid', width: 105 }
+ ////, { field: 'HSupID', title: 'HSupID', width: 105 }
+ //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ //, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
+ //, { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+ //, { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
+ //, { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
+ //, { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+ //, { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+ //, { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+ //, { field: '鑹巼', title: '鑹巼' }
+ //, { field: '绱鑹巼', title: '绱鑹巼' }
+ //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
+ ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
+ ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
+ ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
+ //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
+ ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
+ //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
+ //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
]]
};
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index e049e9c..234bb2b 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -158,6 +158,8 @@
var option = [];
var option2 = [];
var HModName = "Gy_RoutingBillListQuery";
+ var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "宸ヤ綔", "HMainProcID", "宸ュ簭鍚嶇О", "涓昏繍琛屾椂闂�", "杩愯鏃堕棿鍗曚綅", "涓诲姞宸ユ暟閲�", "鏉愯川", "鍥惧彿鐗堟湰", "HMainGroupID", "鐝粍", "宸ヤ环", "鏍囧噯璧勬簮鏁�", "鍔犺祫婧愬閲�", "鍑忚祫婧愬噺閲�", "HItemID", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName", "渚涘簲鍟嗕唬鐮�","渚涘簲鍟�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#endregion
@@ -400,7 +402,7 @@
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -458,7 +460,7 @@
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData2) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -498,7 +500,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- DisPlay_HideColumn_Sec();
});
@@ -766,7 +767,6 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -849,7 +849,6 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
index 861cc77..fdffcf0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
@@ -364,6 +364,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
</div>-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
@@ -1084,42 +1085,23 @@
data: { "HProcExchHinteID": HProcExchHinteID },
success: function (data1) {
if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+
+ option = {
+ elem: '#mainTable',
+ type: "GET",
+ data: data1.data,
+ //, cellMinWidth: 80
+ //toolbar: '#toolbarDemo'
+ cols: [[
+ { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺' }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
+ ]]
+ , height: 500
}
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, 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: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
+ table.render(option)
}
- option = {
- elem: '#mainTable',
- url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
- type: "GET",
- //, cellMinWidth: 80
- toolbar: '#toolbarDemo'
- , where: { HProcExchHinteID: HProcExchHinteID }
- , cols: [col]
- , height: 500
- }
- table.render(option)
}
})
break;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
index 2a71268..a5550e9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
@@ -273,7 +273,7 @@
<input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
</td>
</tr>
-
+
<tr>
<th>鎶ュ簾鏁伴噺</th>
<td class="bz_td">
@@ -384,6 +384,7 @@
</tbody>
</table>
</div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
@@ -808,21 +809,10 @@
toolbar: '#toolbarDemo'
, where: { HProcExchHinteID: HProcExchHinteID }
, cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+ { field: '娴佹按鍙�', title: '娴佹按鍙�' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
, { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
]]
, height: 500
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
index 6df0da2..160e697 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
@@ -80,30 +80,11 @@
</div>
</div>
<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐢熶骇杞﹂棿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -113,6 +94,8 @@
<input type="hidden" name="HMaterID" id="HMaterID" value="0">
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-inline">
@@ -125,8 +108,6 @@
<input type="text" class="layui-input" name="HModel" id="HModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -137,17 +118,17 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">璁㈠崟鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">杩斿伐鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
<div class="layui-row">
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">杩斿伐鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">寮�濮嬪伐搴�</label>
<div class="layui-input-inline">
@@ -168,21 +149,15 @@
<input type="text" class="layui-input" name="HProcExchBegNO" id="HProcExchBegNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">缁撴潫娴佹按鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchEndNO" id="HProcExchEndNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐢熶骇缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
- </div>
- </div>
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐢熶骇璁㈠崟</label>
<div class="layui-input-inline">
@@ -191,24 +166,21 @@
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-col-xs6 layui-inline">
<label class="layui-form-label" style="width:12.5%">澶囨敞</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color: #efefef4d; width: 610px; " readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
</div>
</div>
</div>
@@ -270,8 +242,6 @@
<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -282,6 +252,37 @@
<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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 83px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 78px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 78px;">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
</div>
</div>
</div>
@@ -632,19 +633,20 @@
, { field: 'HProcID', title: '宸ュ簭ID', hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
- , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
, { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
, { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
, { field: 'HQty', title: '杩斿伐鏁伴噺', edit: 'text' }
- , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
- , { field: 'HDeptName', title: '閮ㄩ棬' }
+ , { field: 'HWorkRemark', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: "300" }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
, { field: 'HSupName', title: '渚涘簲鍟�' }
, { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text',width:"300" }
+
+ //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ //, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
+ //, { field: 'HDeptName', title: '閮ㄩ棬' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -761,6 +763,76 @@
//闈炵┖楠岃瘉
function AllowLoadData(data) {
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HProcExchBillNo").val() == "") {
+ layer.msg("娴佽浆鍗′笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HMaterNumber").val() == "") {
+ layer.msg("鐗╂枡浠ｇ爜涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HMaterName").val() == "") {
+ layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HModel").val() == "") {
+ layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HUnitName").val() == "") {
+ layer.msg("璁￠噺鍗曚綅涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HPlanQty").val() == "0") {
+ layer.msg("璁㈠崟鏁伴噺涓嶈兘涓�0!");
+ return false;
+ }
+
+ if ($("#HQty").val() == "0") {
+ layer.msg("杩斿伐鏁伴噺涓嶈兘涓�0!");
+ return false;
+ }
+
+ if ($("#HProcBegName").val() == "") {
+ layer.msg("寮�濮嬪伐搴忎笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HProcEndName").val() == "") {
+ layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HProcExchBegNO").val() == "") {
+ layer.msg("寮�濮嬫祦姘村彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HProcExchEndNO").val() == "") {
+ layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HPRDORGName").val() == "") {
+ layer.msg("鐢熶骇缁勭粐涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HICMOBillNo").val() == "") {
+ layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
+ return false;
+ }
+
//if ($("#HEmpID").val()=="0") {
// layer.msg("璇烽�夋嫨璐熻矗浜�!");
// return false;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
index 1c36789..65dd184 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
@@ -138,7 +138,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+ var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍒跺崟浜�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
var option = [];
var HModName = "Sc_ProcExchRecordBackBillList";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
index f084003..1439a70 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
@@ -80,30 +80,11 @@
</div>
</div>
<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐢熶骇杞﹂棿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -113,6 +94,8 @@
<input type="hidden" name="HMaterID" id="HMaterID" value="0">
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-inline">
@@ -125,8 +108,6 @@
<input type="text" class="layui-input" name="HModel" id="HModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -137,17 +118,17 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">璁㈠崟鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">杩斿伐鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
<div class="layui-row">
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">杩斿伐鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">寮�濮嬪伐搴�</label>
<div class="layui-input-inline">
@@ -168,21 +149,15 @@
<input type="text" class="layui-input" name="HProcExchBegNO" id="HProcExchBegNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">缁撴潫娴佹按鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchEndNO" id="HProcExchEndNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐢熶骇缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
- </div>
- </div>
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐢熶骇璁㈠崟</label>
<div class="layui-input-inline">
@@ -191,24 +166,21 @@
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-col-xs6 layui-inline">
<label class="layui-form-label" style="width:12.5%">澶囨敞</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color: #efefef4d; width: 610px; " readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
</div>
</div>
</div>
@@ -270,8 +242,6 @@
<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -282,6 +252,37 @@
<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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 83px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 78px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 78px;">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
</div>
</div>
</div>
@@ -626,19 +627,20 @@
, { field: 'HProcID', title: '宸ュ簭ID', hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
- , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
, { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
, { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
, { field: 'HQty', title: '杩斿伐鏁伴噺', edit: 'text' }
- , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
- , { field: 'HDeptName', title: '閮ㄩ棬' }
+ , { field: 'HWorkRemark', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: "300" }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
, { field: 'HSupName', title: '渚涘簲鍟�' }
, { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text',width:"300" }
+
+ //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ //, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
+ //, { field: 'HDeptName', title: '閮ㄩ棬' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -755,6 +757,76 @@
//闈炵┖楠岃瘉
function AllowLoadData(data) {
+ if ($("#HBillNo").val()=="") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HProcExchBillNo").val() == "") {
+ layer.msg("娴佽浆鍗′笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HMaterNumber").val() == "") {
+ layer.msg("鐗╂枡浠ｇ爜涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HMaterName").val() == "") {
+ layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HModel").val() == "") {
+ layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HUnitName").val() == "") {
+ layer.msg("璁￠噺鍗曚綅涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HPlanQty").val() == "0") {
+ layer.msg("璁㈠崟鏁伴噺涓嶈兘涓�0!");
+ return false;
+ }
+
+ if ($("#HQty").val() == "0") {
+ layer.msg("杩斿伐鏁伴噺涓嶈兘涓�0!");
+ return false;
+ }
+
+ if ($("#HProcBegName").val() == "") {
+ layer.msg("寮�濮嬪伐搴忎笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HProcEndName").val() == "") {
+ layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HProcExchBegNO").val() == "") {
+ layer.msg("寮�濮嬫祦姘村彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HProcExchEndNO").val() == "") {
+ layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HPRDORGName").val() == "") {
+ layer.msg("鐢熶骇缁勭粐涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HICMOBillNo").val() == "") {
+ layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
+ return false;
+ }
+
//if ($("#HEmpID").val()=="0") {
// layer.msg("璇烽�夋嫨璐熻矗浜�!");
// return false;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
index f0ec689..b426654 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
@@ -136,7 +136,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+ var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍒跺崟浜�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
var option = [];
var HModName = "Sc_ProcExchWorkBackBillList";
@@ -260,6 +260,7 @@
}
}
}
+
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 96ea639..9481578 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -63,10 +63,10 @@
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="5" style="padding:1px;">缇婃瘺淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
<li lay-id="3" style="padding:1px;">妫�绉荤エ淇℃伅</li>
<li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</li>
- <li lay-id="5" style="padding:1px;">缇婃瘺淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -88,17 +88,17 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍥惧彿鐗堟湰</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">鍥惧彿鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -107,8 +107,8 @@
<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -124,11 +124,11 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎬昏鍥惧彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">鎬昏鍥惧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -152,42 +152,33 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏉愯川</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
- </div>
- </div>-->
+ <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
- </div>
- </div>-->
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">妯″叿璁惧</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipMent" id="btnHEquipMent" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
+ <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+ </div>
+ </div>-->
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -200,62 +191,37 @@
</button>
</div>
</div>
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎴愬搧缂栧彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
- </div>
- </div>-->
- </div>
- <div class="layui-row">
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鍘熷洜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
- </div>
- </div>-->
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鏍囪</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
- </div>
- </div>-->
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
- </div>
- </div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">骞呭</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍏嬮噸</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
- </div>
- </div>
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鎴愬搧缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
</div>
+
<div class="layui-row">
<!--<div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">杈呮暟閲�</label>
<div class="layui-input-inline">
@@ -279,7 +245,109 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">琛ユ枡鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+ </div>
+ </div>-->
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鍏嬮噸</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">澶囨敞2</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">搴曢儴澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark3" id="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--缇婃瘺淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HHeight" id="HHeight">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HInches" id="HInches">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HAl1Long" id="HAl1Long">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HDensity" id="HDensity">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HTela" id="HTela">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HUnderTela" id="HUnderTela">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HSizing" id="HSizing">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜よ揣鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HSellDate" id="HSellDate" style="padding-left: 32px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -467,12 +535,23 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">妯″叿璁惧</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px; background-color: #efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipMent" id="btnHEquipMent" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
+ </div>
+ </div>
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
<div class="layui-input-inline">
@@ -720,65 +799,6 @@
</div>
</div>
</div>
- <!--缇婃瘺淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-inline">
- <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="HHeight" id="HHeight">
- </div>
- </div>
- <div class="layui-inline">
- <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="HInches" id="HInches" >
- </div>
- </div>
- <div class="layui-inline">
- <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="HAl1Long" id="HAl1Long" >
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HDensity" id="HDensity" >
- </div>
- </div>
- <div class="layui-inline">
- <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="HTela" id="HTela" >
- </div>
- </div>
- <div class="layui-inline">
- <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="HUnderTela" id="HUnderTela" >
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HSizing" id="HSizing" >
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜よ揣鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HSellDate" id="HSellDate" style="padding-left: 32px;" >
- </div>
- </div>
- </div>
- </div>
- </div>
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
@@ -981,31 +1001,32 @@
, { field: 'HProcID', title: '宸ュ簭ID', hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
- , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
, { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
, { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
- , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
- , { field: 'HDeptName', title: '閮ㄩ棬' }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6" }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
, { field: 'HSupName', title: '渚涘簲鍟�' }
, { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
, { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
- , { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', style:"background-color: #e6e6e6" }
- , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', style: "background-color: #e6e6e6"}
- , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', style: "background-color: #e6e6e6" }
- , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', style: "background-color: #e6e6e6" }
- , { field: 'HOverRate', title: '瓒呴姣斾緥', event: "HOverRate", style: "background-color: #e6e6e6"}
- , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', style: "background-color: #e6e6e6" }
- , { field: 'HPassRate', title: '鑹巼', style: "background-color: #e6e6e6" }
- , { field: 'HSumPassRate', title: '绱鑹巼', style: "background-color: #e6e6e6" }
- , { field: 'HPicNum', title: '鍥剧焊缂栧彿', style: "background-color: #e6e6e6"}
- , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 500, style: "background-color: #e6e6e6"}
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6"}
+
+ //, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
+ //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ //, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
+ //, { field: 'HDeptName', title: '閮ㄩ棬' }
+ //, { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
+ //, { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', style:"background-color: #e6e6e6" }
+ //, { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', style: "background-color: #e6e6e6"}
+ //, { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', style: "background-color: #e6e6e6" }
+ //, { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', style: "background-color: #e6e6e6" }
+ //, { field: 'HOverRate', title: '瓒呴姣斾緥', event: "HOverRate", style: "background-color: #e6e6e6"}
+ //, { field: 'HMaxQty', title: '鏈�楂樹笂闄�', style: "background-color: #e6e6e6" }
+ //, { field: 'HPassRate', title: '鑹巼', style: "background-color: #e6e6e6" }
+ //, { field: 'HSumPassRate', title: '绱鑹巼', style: "background-color: #e6e6e6" }
+ //, { field: 'HPicNum', title: '鍥剧焊缂栧彿', style: "background-color: #e6e6e6"}
+ //, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 500, style: "background-color: #e6e6e6"}
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -1949,6 +1970,8 @@
, "HAuxUnit": data.HAuxUnit
, "HAuxUnitName": data.杈呭姪鍗曚綅
, "HSplitNo": data.鎷嗗垎鍙�
+ , "HRemark2": data.澶囨敞2
+ , "HRemark3": data.搴曢儴澶囨敞
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 7939ed5..b65a993 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -203,9 +203,9 @@
//
var HModName = "Sc_ProcessExchangeBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
- var titleData = ["HItemID", "HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID"];
+ var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
- var titleData2 = ["HEntryID", "HProcID", "HCenterID", "HDeptID", "hmainid", "hicmointerid", "HWorkShopID", "HMaterID", "HUnitID", "hsubid", "HSupID"];
+ var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮乫", "鎿嶄綔宸�", "HSourceID", "鐢熶骇璧勬簮浠ｇ爜", "鐢熶骇璧勬簮", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "鎵瑰彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
@@ -482,6 +482,17 @@
}
}
+ ////鑾峰彇涓嶉渶瑕佹樉绀虹殑瀛楁 缁欓殣钘�
+ //var str = "";
+ //for (var i = 0; i < data.length; i++) {
+ // if ($.inArray(data[i].name, ["娴佹按鍙�", "宸ュ簭鍚嶇О", "宸ヤ綔涓績", "宸ヨ壓鍙傛暟", "澶囨敞", "杩涚珯鍏宠仈鏁伴噺", "鍑虹珯鍏宠仈鏁伴噺", "鏃ユ湡", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟嗗悕绉�", "鏄惁濮斿"]) > -1) {
+
+ // } else {
+ // str += data[i].name + ",";
+ // }
+ //}
+ //console.log(str);
+
//鍔ㄦ�佹樉绀哄垪鍚�
option2 = {
elem: '#mainTable2'
--
Gitblit v1.9.1