From 696285b1d2687ef66f7b64ba05bb6e3460a8c5d0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 23 三月 2023 09:26:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/home/console.html | 24 +-
WebTM/views/home/homepage2.html | 72 +++++-----
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 20 ++
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 184 +++++++++++++++++++-------
WebTM/views/index.html | 22 +-
WebTM/views/home/homepage1.html | 52 +++---
6 files changed, 240 insertions(+), 134 deletions(-)
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 00ae235..8014938 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -124,11 +124,11 @@
</a>
</li>
<!--<li class="layui-col-xs3">
- <a lay-href="set/user/info.html">
- <i class="layui-icon layui-icon-set"></i>
- <cite>鎴戠殑璧勬枡</cite>
- </a>
- </li>-->
+ <a lay-href="set/user/info.html">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>鎴戠殑璧勬枡</cite>
+ </a>
+ </li>-->
</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>
@@ -243,11 +243,11 @@
</a>
</li>
<!--<li class="layui-col-xs3">
- <a lay-href="set/user/info.html">
- <i class="layui-icon layui-icon-set"></i>
- <cite>鎴戠殑璧勬枡</cite>
- </a>
- </li>-->
+ <a lay-href="set/user/info.html">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>鎴戠殑璧勬枡</cite>
+ </a>
+ </li>-->
</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>
@@ -351,7 +351,7 @@
<ul class="layui-row layui-col-space10">
<li class="layui-col-xs6">
<a href="javascript:;" class="layadmin-backlog-body">
- <h3>寰呭鍙嬫儏閾炬帴</h3>
+ <h3>鏈槄淇℃伅</h3>
<p><cite style="color: #FF5722;">0</cite></p>
</a>
</li>
@@ -362,7 +362,7 @@
</div>
</div>
<div class="layui-card">
- <div class="layui-card-header">鏁堟灉鎶ュ憡</div>
+ <div class="layui-card-header">鏁堢巼鎶ュ憡</div>
<div class="layui-card-body layadmin-takerates">
<div class="layui-progress" lay-showPercent="yes">
<h3>瀹屽伐鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-top" lay-tips="澧為暱" lay-offset="-15"></span>锛�</h3>
diff --git a/WebTM/views/home/homepage1.html b/WebTM/views/home/homepage1.html
index 8152e88..1bd38c6 100644
--- a/WebTM/views/home/homepage1.html
+++ b/WebTM/views/home/homepage1.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>layuiAdmin 涓婚〉绀轰緥妯℃澘涓�</title>
+ <title>LMES</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -26,43 +26,43 @@
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-water"></i><a lay-href="https://www.layui.com/doc/modules/flow.html">flow</a></div>
- <p class="layui-text-center">淇寮�鍚� isLazyimg:true 鍚�, 鍥剧墖鎳掑姞杞戒絾鏄浘鐗囦笉瀛樺湪鐨勬姤閿欓棶棰�</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/flow.html">娴佸姞杞�</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/flow.html">娴佸姞杞�</a><span></span></p>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-upload-circle"></i><a lay-href="https://www.layui.com/doc/modules/upload.html">upload</a></div>
- <p class="layui-text-center">淇寮�鍚� size 鍙傛暟鍚庯紝鏂囦欢瓒呭嚭瑙勫畾澶у皬鏃讹紝鎻愮ず淇℃伅鏈夎鐨勯棶棰�</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/upload.html">鏂囦欢涓婁紶</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/upload.html">鏂囦欢涓婁紶</a><span></span></p>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-form"></i><a lay-href="https://www.layui.com/doc/modules/form.html#val">form</a></div>
- <p class="layui-text-center">澧炲姞 form.val(filter, fields)鏂规硶锛岀敤浜庣粰鎸囧畾琛ㄥ崟闆嗗悎鐨勫厓绱犲垵濮嬭祴鍊�</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span></span></p>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-form"></i><a lay-href="https://www.layui.com/doc/modules/form.html">form</a></div>
- <p class="layui-text-center">瀵� select 缁勪欢鏂板涓婁笅閿紙鈫� 鈫擄級鍥炶溅閿紙Enter锛夐�夋嫨鍔熻兘</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span></span></p>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-form"></i><a lay-href="https://www.layui.com/doc/modules/form.html">form</a></div>
- <p class="layui-text-center">浼樺寲 switch 寮�鍏崇粍浠讹紝璁╁叾鑳芥牴鎹枃鏈嚜鐢变几缂╁</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span></span></p>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm4">
<div class="layuiadmin-card-text">
<div class="layui-text-top"><i class="layui-icon layui-icon-form"></i><a lay-href="https://www.layui.com/doc/modules/form.html">form</a></div>
- <p class="layui-text-center">淇 checkbox 澶嶉�夋缁勪欢鍦ㄩ珮鍒嗚鲸灞忎笅鍑虹幇鐨勬牱寮忎笉闆呴棶棰�</p>
- <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span>7 澶╁墠</span></p>
+ <p class="layui-text-center"></p>
+ <p class="layui-text-bottom"><a lay-href="https://www.layui.com/doc/modules/form.html">琛ㄥ崟</a><span></span></p>
</div>
</div>
</div>
@@ -75,42 +75,42 @@
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>鑳℃瓕 鍦� <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/">layuiadmin涓撳尯</a> 鍥炵瓟闂</p>
- <span>鍑犵鍓�</span>
+ <p> <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/"></a> 鍥炵瓟闂</p>
+ <span></span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>褰簬鏅� 鍦� <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/">layuiadmin涓撳尯</a> 杩涜浜� <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">鎻愰棶</a></p>
- <span>2澶╁墠</span>
+ <p> <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/"> <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">鎻愰棶</a></p>
+ <span></span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>璐ゅ績 灏� <a lay-href="https://www.layui.com/">layui</a> 鏇存柊鑷� 2.3.0 鐗堟湰</p>
- <span>7澶╁墠</span>
+ <p><a lay-href="https://www.layui.com/">layui</a></p>
+ <span></span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>鍚村皧 鍦� <a lay-href="http://fly.layui.com/">Fly绀惧尯</a> 鍙戝竷浜� <a lay-href="http://fly.layui.com/column/suggest/">寤鸿</a></p>
- <span>7澶╁墠</span>
+ <p><a lay-href="http://fly.layui.com/"></a> <a lay-href="http://fly.layui.com/column/suggest/"></a></p>
+ <span></span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>璁镐笂杩� 鍦� <a lay-href="http://fly.layui.com/">Fly绀惧尯</a> 鍙戝竷浜� <a lay-href="http://fly.layui.com/column/suggest/">寤鸿</a></p>
- <span>8澶╁墠</span>
+ <p><a lay-href="http://fly.layui.com/"></a> <a lay-href="http://fly.layui.com/column/suggest/"></a></p>
+ <span></span>
</div>
</dd>
<dd>
<div class="layui-status-img"><a href="javascript:;"><img src="../../layuiadmin/style/res/logo.png"></a></div>
<div>
- <p>灏忚殜瀛� 鍦� <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/">layuiadmin涓撳尯</a> 杩涜浜� <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">鎻愰棶</a></p>
+ <p> <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/"> <a lay-href="http://fly.layui.com/vipclub/list/layuiadmin/column/quiz/">鎻愰棶</a></p>
<span>8澶╁墠</span>
</div>
</dd>
@@ -136,7 +136,7 @@
</div>
</div>
<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-dataview" data-anim="fade" lay-filter="LAY-index-pageone">
@@ -148,7 +148,7 @@
</div>
</div>
<div class="layui-card">
- <div class="layui-card-header">閲嶇偣缁勪欢</div>
+ <div class="layui-card-header">缁勪欢</div>
<div class="layui-card-body">
<ul class="layui-row layuiadmin-card-team">
<li class="layui-col-xs6">
diff --git a/WebTM/views/home/homepage2.html b/WebTM/views/home/homepage2.html
index b6ae2cd..691f66b 100644
--- a/WebTM/views/home/homepage2.html
+++ b/WebTM/views/home/homepage2.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>layuiAdmin 涓婚〉绀轰緥妯℃澘浜�</title>
+ <title>LMES</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -19,14 +19,14 @@
<div class="layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 璁块棶閲�
+ 娴侀噺
<span class="layui-badge layui-bg-blue layuiadmin-badge">鍛�</span>
</div>
<div class="layui-card-body layuiadmin-card-list">
- <p class="layuiadmin-big-font">9,999,666</p>
+ <p class="layuiadmin-big-font"></p>
<p>
- 鎬昏璁块棶閲�
- <span class="layuiadmin-span-color">88涓� <i class="layui-inline layui-icon layui-icon-flag"></i></span>
+ 鎬昏
+ <span class="layuiadmin-span-color"><i class="layui-inline layui-icon layui-icon-flag"></i></span>
</p>
</div>
</div>
@@ -34,13 +34,13 @@
<div class="layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 涓嬭浇
+ 涓嬭揪
<span class="layui-badge layui-bg-cyan layuiadmin-badge">鏈�</span>
</div>
<div class="layui-card-body layuiadmin-card-list">
<p class="layuiadmin-big-font">33,555</p>
<p>
- 鏂颁笅杞�
+ 鏂颁笅杈�
<span class="layuiadmin-span-color">10% <i class="layui-inline layui-icon layui-icon-face-smile-b"></i></span>
</p>
</div>
@@ -65,7 +65,7 @@
<div class="layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 娲昏穬鐢ㄦ埛
+ 鐢ㄦ埛
<span class="layui-badge layui-bg-orange layuiadmin-badge">鏈�</span>
</div>
<div class="layui-card-body layuiadmin-card-list">
@@ -129,39 +129,39 @@
<div class="layui-card-body">
<ul class="layuiadmin-card-status layuiadmin-home2-usernote">
<li>
- <h3>璐ゅ績</h3>
- <p>浣滀负 layui 瀹樻柟鎺ㄥ嚭鐨勫悗鍙版ā鏉匡紝浠庡垵鐗堢殑楗卞彈浜夎锛屽埌鍚庣画鐨勫煁澶翠赴瀵岋紝閫愭鍗犳嵁浜嗗浗鍐呭悗鍙扮郴缁熷簲鐢ㄧ殑涓昏甯傚満銆�</p>
- <span>5鏈�30鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="7" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
<li>
- <h3>璇歌憶浜�</h3>
- <p>鐨撻鍖瑰か锛佽媿楂�佽醇锛佷綘鏋夋椿涔濆崄鏈夊叚锛屼竴鐢熸湭绔嬪鍔燂紝鍙細鎽囧攪榧撹垖锛佸姪鏇逛负铏愶紒涓�鏉℃柇鑴婁箣鐘紝杩樻暍鍦ㄦ垜鍐涢樀鍓嶇嫼鐙虹媯鍚狅紝鎴戜粠鏈杩囨湁濡傛鍘氶鏃犺�讳箣浜猴紒</p>
- <span>5鏈�02鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="5" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
<li>
- <h3>鑳℃瓕</h3>
- <p>浣犱互涓哄彧瑕侀暱寰楁紓浜氨鏈夌敺鐢熷枩娆紵浣犱互涓哄彧瑕佹湁浜嗛挶婕備寒濡瑰瓙灏辫嚜宸辫创涓婃潵浜嗭紵浣犱互涓哄闇稿氨鑳芥壘鍒板ソ宸ヤ綔锛熸垜鍛婅瘔浣犲惂锛岃繖浜涢兘鏄湡鐨勶紒</p>
- <span>5鏈�11鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="6" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
<li>
- <h3>鏉滅敨</h3>
- <p>浜烘墠铏介珮锛屼笉鍔″闂紝涓嶈兘鑷村湥銆傚垬鍚戝崄鏃ョ敾涓�姘达紝浜旀棩鐢讳竴鐭炽��</p>
- <span>4鏈�11鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="2" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
<li>
- <h3>椴佽繀</h3>
- <p>璺湰鏄棤鎵�璋撴湁鍜屾棤鐨勶紝璧扮殑浜哄浜嗭紝灏辨病璺簡銆傘��</p>
- <span>4鏈�28鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="4" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
<li>
- <h3>寮犵埍鐜�</h3>
- <p>浜庡崈涓囦汉涔嬩腑閬囧埌浣犳墍瑕侀亣鍒扮殑浜猴紝浜庡崈涓囧勾涔嬩腑锛屾椂闂寸殑鏃犳动鐨勮崚閲庝腑锛屾病鏈夋棭涓�姝ワ紝涔熸病鏈夋櫄涓�姝ワ紝鍒氬阀璧朵笂浜嗭紝閭ｄ篃娌℃湁鍒殑璇濆ソ璇达紝鍞湁杞昏交鐨勯棶涓�澹帮細鈥滃櫌锛屽師鏉ヤ綘涔熷湪杩欓噷锛熲��</p>
- <span>4鏈�11鏃� 00:00</span>
+ <h3></h3>
+ <p></p>
+ <span></span>
<a href="javascript:;" layadmin-event="replyNote" data-id="1" class="layui-btn layui-btn-xs layuiadmin-reply">鍥炲</a>
</li>
</ul>
@@ -172,7 +172,7 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-sm6">
<div class="layui-card">
- <div class="layui-card-header">鏈懆娲昏穬鐢ㄦ埛鍒楄〃</div>
+ <div class="layui-card-header">鏈懆鍒楄〃</div>
<div class="layui-card-body">
<table class="layui-table layuiadmin-page-table" lay-skin="line">
<thead>
@@ -185,43 +185,43 @@
</thead>
<tbody>
<tr>
- <td><span class="first">鑳℃瓕</span></td>
+ <td><span class="first"></span></td>
<td><i class="layui-icon layui-icon-log"> 11:20</i></td>
<td><span>鍦ㄧ嚎</span></td>
<td>22 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td><span class="second">褰簬鏅�</span></td>
+ <td><span class="second"></span></td>
<td><i class="layui-icon layui-icon-log"> 10:40</i></td>
<td><span>鍦ㄧ嚎</span></td>
<td>21 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td><span class="third">闈充笢</span></td>
+ <td><span class="third"></span></td>
<td><i class="layui-icon layui-icon-log"> 01:30</i></td>
<td><i>绂荤嚎</i></td>
<td>66 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td>鍚村皧</td>
+ <td></td>
<td><i class="layui-icon layui-icon-log"> 21:18</i></td>
<td><i>绂荤嚎</i></td>
<td>45 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td>璁镐笂杩�</td>
+ <td></td>
<td><i class="layui-icon layui-icon-log"> 09:30</i></td>
<td><span>鍦ㄧ嚎</span></td>
<td>21 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td>灏忚殜瀛�</td>
+ <td></td>
<td><i class="layui-icon layui-icon-log"> 21:18</i></td>
<td><i>鍦ㄧ嚎</i></td>
<td>45 <i class="layui-icon layui-icon-praise"></i></td>
</tr>
<tr>
- <td>璐ゅ績</td>
+ <td></td>
<td><i class="layui-icon layui-icon-log"> 09:30</i></td>
<td><span>鍦ㄧ嚎</span></td>
<td>21 <i class="layui-icon layui-icon-praise"></i></td>
@@ -245,7 +245,7 @@
</div>
<div class="layui-col-sm12">
<div class="layui-card">
- <div class="layui-card-header">鐢ㄦ埛鍏ㄥ浗鍒嗗竷</div>
+ <div class="layui-card-header">鐢ㄦ埛鍒嗗竷</div>
<div class="layui-card-body">
<div class="layui-row layui-col-space15">
<div class="layui-col-sm4">
@@ -261,7 +261,7 @@
<tr>
<td>1</td>
<td>娴欐睙</td>
- <td>62310</td>
+ <td></td>
</tr>
<tr>
<td>2</td>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 2467394..b41e1b9 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -106,7 +106,7 @@
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>閲囪喘绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-cellphone"></i><cite>閲囪喘绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>閲囪喘璁㈠崟</a>
@@ -152,7 +152,7 @@
</li>
<!-- 閿�鍞鐞� -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>閿�鍞鐞�</cite></a>
+ <a><i class="layui-icon layui-icon-circle"></i><cite>閿�鍞鐞�</cite></a>
<dl class="layui-nav-child">
<dd>
<a>閿�鍞鍗�</a>
@@ -190,7 +190,7 @@
</li>
<!-- 浠撳瓨绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>浠撳瓨绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-down"></i><cite>浠撳瓨绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>楠屾敹鍏ュ簱</a>
@@ -262,7 +262,7 @@
</li>
<!-- 璁″垝绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>璁″垝绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-edit"></i><cite>璁″垝绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>宸ュ簭</a>
@@ -307,7 +307,7 @@
</li>
<!-- 鐢熶骇绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>鐢熶骇绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-email"></i><cite>鐢熶骇绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鐢熶骇璁㈠崟</a>
@@ -528,7 +528,7 @@
</li>
<!-- 璐ㄩ噺绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>璐ㄩ噺绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-search"></i><cite>璐ㄩ噺绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鍩虹寤烘ā</a>
@@ -586,7 +586,7 @@
</li>
鍣ㄥ叿绠＄悊
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>鍣ㄥ叿绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-table"></i><cite>鍣ㄥ叿绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鍩虹寤烘ā</a>
@@ -690,7 +690,7 @@
</li>
璁惧绠＄悊
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>璁惧绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-camera"></i><cite>璁惧绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鍩虹寤烘ā</a>
@@ -755,7 +755,7 @@
</li>
宸ヨ祫绠＄悊
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>宸ヨ祫绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-dollar"></i><cite>宸ヨ祫绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>宸ヨ祫缁撶畻鍗�(涓汉)</a>
@@ -924,7 +924,7 @@
</li>
<!--鍩虹寤烘ā-->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>鍩虹寤烘ā</cite></a>
+ <a><i class="layui-icon layui-icon-date"></i><cite>鍩虹寤烘ā</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鍏敤璧勬枡</a>
@@ -1034,7 +1034,7 @@
</li>
<!-- 绯荤粺绠＄悊 -->
<li data-name="set" class="layui-nav-item">
- <a><i class="layui-icon layui-icon-set"></i><cite>绯荤粺绠＄悊</cite></a>
+ <a><i class="layui-icon layui-icon-cart"></i><cite>绯荤粺绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
<a>鏃ュ父鏌ヨ</a>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 1a44151..8a0b5b2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -69,6 +69,8 @@
<option value="1243">璋冩嫧鐢宠鍗�</option>
<option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
<option value="1604">濮斿鐢ㄦ枡娓呭崟</option>
+ <option value="1242">鍑哄簱鐢宠鍗�</option>
+ <option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
<!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
@@ -510,6 +512,24 @@
layui.form.render('select');
$("#HBillType").attr("readonly", "readonly");
}
+ else if (d.data[0].HSourceBillType == "1242") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1242");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else if (d.data[0].HSourceBillType == "1214") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1214");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
else {
$("#HBillType").empty();
$("#HBillType").val("-1");
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2bfcf05..9c50061 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -63,7 +63,8 @@
</div>
<div class="layui-col-xs8">
<select name=" HBillType" id="HBillType">
- <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
+ <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -443,8 +444,37 @@
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillType").val(d.data[0].HSourceBillType);
+ $("#HBillType").val(d.data[0].HSourceBillType == null ? "3720" : d.data[0].HSourceBillType);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (d.data[0].HSourceBillType == "3720") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3720");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else if (d.data[0].HSourceBillType == "1214") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1214");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ $("#HBillType").empty();
+ $("#HBillType").val("-1");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ $("#HSourceBillNo").attr("disabled", "true");
HSourceFlag = true;
//$("#HWHID").val(d.data[0].HWhID);
@@ -518,7 +548,23 @@
}
//閫夋嫨浠撳簱锛堜簨浠讹級
- form.on('submit(HWHID-BT)', function () {
+ //form.on('submit(HWHID-BT)', function () {
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
type: 2
, area: ['100%', '100%']
@@ -526,7 +572,40 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ ////閫夋嫨浠撳簱锛堜簨浠讹級
+ //form.on('submit(HFIFOWHID-BT)', function () {
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
+ //閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+ form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -534,22 +613,6 @@
})
});
- //閫夋嫨浠撳簱锛堜簨浠讹級
- form.on('submit(HFIFOWHID-BT)', function () {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '浠撳簱鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
//閫夋嫨浠撲綅锛堜簨浠讹級
form.on('submit(HSpID-BT)', function () {
layer.open({
@@ -651,7 +714,7 @@
//閫�鍑烘寜閽紙浜嬩欢锛�
form.on('submit(Cancel)', function () {
- sessionStorage["SourceFlag"] = false;
+ HSourceFlag = false;
//parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -837,7 +900,7 @@
});
//纭畾
form.on('submit(QueDin2)', function (data) {
- GetMeesageByBarCode();
+ GetMeesageBySourceBillNo();
});
////鎵簮鍗曟祴璇曠敤
//$('#HSourceBillNo').on('keydown', function (event) { //鎵簮鍗�
@@ -959,10 +1022,13 @@
}
}
$.ajax({
- url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
- //data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ //type: "GET",
+ ////data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
+ //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
@@ -970,7 +1036,7 @@
$("#HWHID").val(result.data.HWhID);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-Kf_MateOutBill', '3'); //璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '3'); //璺宠浆椤电
}
else if (result.data.HBarType == '浠撲綅鏉＄爜') {
$("#HStockPlaceName").val(result.data.HSPName);
@@ -978,13 +1044,13 @@
$("#HWHNAME").val(result.data.HWhName);
$("#HWHID").val(result.data.HWhID);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-Kf_MateOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
}
else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-Kf_MateOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
}
else if (result.data.HBarType == '婧愬崟鏉＄爜') {
$("#HSupName").val(result.data.HSupName);
@@ -992,10 +1058,10 @@
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "3720") {
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "3720" : result.data.hSourceBillTypeField);
+ if (result.data.hSourceBillTypeField == "3720") {
$("#HBillType").empty();
$("#HBillType").val("3720");
var optionHtml = '';
@@ -1003,42 +1069,57 @@
$("#HBillType").append(optionHtml);
layui.form.render('select');
$("#HBillType").attr("readonly", "readonly");
-
+ }
+ else if (result.data.hSourceBillTypeField == "1214") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1214");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
+ //$("#HBillType").empty();
+ $("#HBillType").val("-1");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
+ $("#HSourceBillNo").attr("readonly", "readonly");
$("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
- element.tabChange('tab-Kf_MateOutBill', '3');
+ element.tabChange('tab-MateOutBill', '3');
}
else {
if (HSourceFlag == true) {
- element.tabChange('tab-Kf_MateOutBill', '3');
+ element.tabChange('tab-MateOutBill', '3');
}
else {
//$("#HSupName").val(result.data.HSupName);
//$("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDept);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
+ //$("#HDeptName").val(result.data.HDept);
+ //$("#HDeptID").val(result.data.HDeptID);
+ //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //$("#HBillType").val(result.data.hSourceBillTypeField)
HSourceFlag = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "3720") {
- ("#HBillType").empty();
- $("#HBillType").val("3720");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
+ ////鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ //if (result.data.HSourceBillType == "3720") {
+ // ("#HBillType").empty();
+ // $("#HBillType").val("3720");
+ // var optionHtml = '';
+ // optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ // $("#HBillType").append(optionHtml);
+ // layui.form.render('select');
+ // $("#HBillType").attr("readonly", "readonly");
- }
+ //}
//else if (result.data.HSourceBillType == "1601") {
// $("#HBillType").val("1601");
//}
$("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-Kf_MateOutBill', '3');
+ element.tabChange('tab-MateOutBill', '3');
}
}
@@ -1141,6 +1222,11 @@
HSourceFlag = true;
$("#HPlanMode").attr("disabled", "true");
$("#HBillType").attr("disabled", "true");
+ $("#HBillType").attr("disabled", "disabled");
+ form.render('select');
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ }
element.tabChange('tab-MateOutBill', '2');
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();//鎾斁澹伴煶
--
Gitblit v1.9.1