From 9e802d159301367ac49b297f1a0618e366d27dfb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 17 三月 2023 09:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 108 ++++++++
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 107 +++++---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 107 +++++---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html | 21 -
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 116 ++++++---
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 110 ++++++++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 2
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 9
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 109 +++++++-
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 14
13 files changed, 518 insertions(+), 193 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f0d2214..06468a2 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 6693e5b..34f8f54 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,10 +1,10 @@
锘�
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
+ //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
- //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost/WEBAPI/"; //棰滃鍙板紡鏈烘湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
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 917373d..1a44151 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"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璋冩嫧鍗�</title>
+ <title>鐩存帴璋冩嫧鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -21,7 +21,7 @@
<div class="layui-card-body" style="padding: 5px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
- <span style="color: white;"><i class="layui-icon layui-icon-form"></i>璋冩嫧鍗�</span>
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩存帴璋冩嫧鍗�</span>
</div>
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
@@ -33,6 +33,16 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
</div>
</div>
</div>
@@ -54,14 +64,12 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <select name=" HBillType" id="HBillType">
- <option value="-1">鎵嬪伐褰曞叆</option>
- <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
- <option value="1243">璋冩嫧鐢宠鍗�</option>
- <option value="1201">濮斿璁㈠崟-鎶曟枡</option>
+ <select name="HBillType" id="HBillType">
<option value="1402">鍙戣揣閫氱煡鍗�</option>
- <!--<option value="1234">涓嬫灦閫氱煡鍗�</option>
- <option value="1243">璋冩嫧鐢宠鍗�</option>-->
+ <option value="1243">璋冩嫧鐢宠鍗�</option>
+ <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="1604">濮斿鐢ㄦ枡娓呭崟</option>
+ <option value="-1">鎵嬪伐褰曞叆</option>
</select>
<!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
</div>
@@ -329,16 +337,6 @@
</div>
<!--鏄庣粏淇℃伅-->
<div class="layui-tab-item">
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
<!--涓嬫灦淇℃伅-->
@@ -474,7 +472,53 @@
// 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 ? "1402" : d.data[0].HSourceBillType);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (d.data[0].HSourceBillType == "1402") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1402");
+ 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 == "1243") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1243");
+ 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 == "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 == "1604") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1604");
+ 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");
//$("#HSourceBillNo").append.readonly = true;
@@ -1633,26 +1677,26 @@
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
//}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HDeptName").val() == '') {
+ // layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HSecManager").val() == '') {
+ // layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HKeeper").val() == '') {
+ // layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//if ($("#HSupName").val() == '') {
// layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return false;
//}
- if ($("#HWHNAME").val() == '') {
- layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
// layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// 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\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index a073f22..82c5e27 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -747,49 +747,54 @@
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
- var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- get_DisplayTech(data.HInterID);
- form.val("formData", { //HGroupName
- "HInterID": data.HInterID,
- "HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
- "HProcNo": data.HProcNo,
- "HQty": data.HQty,
- "HWasterQty": data.HWasterQty,
- "HWorkTimes": data.HWorkTimes,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
- "HSourceID": data.HSourceID,
- "HSourceName": data.HSourceName,
- "HQCCheckID": data.HQCCheckID,
- "HQCCheckName": data.HQCCheckName,
- "HEmpID": data.HEmpID,
- "HEmpName": data.HEmpName,
- "HEmpID2": data.HEmpID2,
- "HEmpName2": data.HEmpName2,
- "HEmpID3": data.HEmpID3,
- "HEmpName3": data.HEmpName3,
- "HEmpID4": data.HEmpID4,
- "HEmpName4": data.HEmpName4,
- "HEmpID5": data.HEmpID5,
- "HEmpName5": data.HEmpName5,
- "HRemark": data.HRemark
- });
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
- } else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ if (result.code == 1) {
+ var data = result.data[0];
+ txtHBarCode_KeyDown(data.HBarCode);
+ txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+ get_DisplayTech(data.HInterID);
+ form.val("formData", { //HGroupName
+ "HInterID": data.HInterID,
+ "HBillNo": data.HBillNo,
+ "HBarCode": data.HBarCode,
+ "HProcNo": data.HProcNo,
+ "HQty": data.HQty,
+ "HWasterQty": data.HWasterQty,
+ "HWorkTimes": data.HWorkTimes,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.HSourceName,
+ "HQCCheckID": data.HQCCheckID,
+ "HQCCheckName": data.HQCCheckName,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.HEmpName,
+ "HEmpID2": data.HEmpID2,
+ "HEmpName2": data.HEmpName2,
+ "HEmpID3": data.HEmpID3,
+ "HEmpName3": data.HEmpName3,
+ "HEmpID4": data.HEmpID4,
+ "HEmpName4": data.HEmpName4,
+ "HEmpID5": data.HEmpID5,
+ "HEmpName5": data.HEmpName5,
+ "HRemark": data.HRemark
+ });
+ if (data.鏄惁瀹℃牳 == "true") {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ } else {
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ }
+ if (OperationType == 3) {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ }
+ PicUpload();
+ layer.close(index);
}
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ else {
+ layer.close(index);
}
- PicUpload();
- layer.close(index);
}
, error: function () {
layer.close(index);
@@ -864,7 +869,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -913,7 +918,11 @@
case "PRO":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -941,8 +950,8 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrgID": data.缁勭粐
});
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -951,7 +960,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -1298,6 +1307,10 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#lngBillSubKey").val() == 0) {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var tableData = data.field;
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
@@ -1326,7 +1339,7 @@
}
}
}
- if (result.Verify == "Y") {
+ if (data.Verify == "Y") {
location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
}
else {
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.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.html"
index 1978428..468d42e 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.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.html"
@@ -897,7 +897,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In"},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -944,9 +944,13 @@
layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" +"浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
break;
case "PRO":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -987,7 +991,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "In" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -1172,7 +1176,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
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.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.html"
index 6917316..eaf73ff 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.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.html"
@@ -583,49 +583,53 @@
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
- var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- get_DisplayTech(data.HInterID);
- form.val("formData", { //HGroupName
- "HInterID": data.HInterID,
- "HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
- "HProcNo": data.HProcNo,
- "HQty": data.HQty,
- "HWasterQty": data.HWasterQty,
- "HWorkTimes": data.HWorkTimes,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
- "HSourceID": data.HSourceID,
- "HSourceName": data.HSourceName,
- "HQCCheckID": data.HQCCheckID,
- "HQCCheckName": data.HQCCheckName,
- "HEmpID": data.HEmpID,
- "HEmpName": data.HEmpName,
- "HEmpID2": data.HEmpID2,
- "HEmpName2": data.HEmpName2,
- "HEmpID3": data.HEmpID3,
- "HEmpName3": data.HEmpName3,
- "HEmpID4": data.HEmpID4,
- "HEmpName4": data.HEmpName4,
- "HEmpID5": data.HEmpID5,
- "HEmpName5": data.HEmpName5,
- "HRemark": data.HRemark
- });
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ if (result.code == 1) {
+ var data = result.data[0];
+ txtHBarCode_KeyDown(data.HBarCode);
+ txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+ get_DisplayTech(data.HInterID);
+ form.val("formData", { //HGroupName
+ "HInterID": data.HInterID,
+ "HBillNo": data.HBillNo,
+ "HBarCode": data.HBarCode,
+ "HProcNo": data.HProcNo,
+ "HQty": data.HQty,
+ "HWasterQty": data.HWasterQty,
+ "HWorkTimes": data.HWorkTimes,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.HSourceName,
+ "HQCCheckID": data.HQCCheckID,
+ "HQCCheckName": data.HQCCheckName,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.HEmpName,
+ "HEmpID2": data.HEmpID2,
+ "HEmpName2": data.HEmpName2,
+ "HEmpID3": data.HEmpID3,
+ "HEmpName3": data.HEmpName3,
+ "HEmpID4": data.HEmpID4,
+ "HEmpName4": data.HEmpName4,
+ "HEmpID5": data.HEmpID5,
+ "HEmpName5": data.HEmpName5,
+ "HRemark": data.HRemark
+ });
+ if (data.鏄惁瀹℃牳 == "true") {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ } else {
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ }
+ if (OperationType == 3) {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ }
+ PicUpload();
+ layer.close(index);
} else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ layer.close(index);
}
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- }
- PicUpload();
- layer.close(index);
}
, error: function () {
layer.close(index);
@@ -700,7 +704,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -749,7 +753,11 @@
case "PRO":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -777,8 +785,8 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrgID": data.缁勭粐
});
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -787,7 +795,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -923,7 +931,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -1287,6 +1295,11 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#lngBillSubKey").val() == 0) {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
var tableData = data.field;
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
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_Detail.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_Detail.html"
index b8b9ab4..d1298c4 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_Detail.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_Detail.html"
@@ -64,19 +64,20 @@
<tr>
<th>娴佹按鍙�</th>
<td class="bz_td">
- <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙�" style="border-radius:50px;">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="娴佹按鍙�" style="border-radius:50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>宸ュ簭</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+ <input type="text" name="HWorkProcName" class="layui-input" id="HWorkProcName" placeholder="宸ュ簭" style="border-radius:50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HWorkProcID" id="HWorkProcID" autocomplete="off" value="0" class="layui-input">
</td>
</tr>
<tr>
<th>鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+ <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" placeholder="鏁伴噺" style="border-radius:50px;background-color:#efefef4d;" readonly>
</td>
</tr>
</tbody>
@@ -176,11 +177,8 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
- "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
- "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
- "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
- "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
+ "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
};
switch (obj.event) {
@@ -292,11 +290,8 @@
}
};
option.data = [{
- "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
- "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
- "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
- "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
- "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
+ "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
}];
table.render(option);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index a3bb2c1..bdb7237 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -904,7 +904,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -954,7 +954,10 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
"HProcName": data.宸ュ簭鍚嶇О,
- "HProcNo": data.娴佹按鍙�
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -995,7 +998,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType":"In" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index a9f1ecc..70c56b9 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -129,6 +129,16 @@
</div>
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
<!--琛ㄥご淇℃伅-->
<div class="layui-tab-item">
@@ -299,6 +309,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
var HStockOrgID = sessionStorage["OrganizationID"]
var HSourceFlag = sessionStorage["SourceFlag"];
@@ -323,11 +334,23 @@
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
$("#HBillSubType").val(sessionStorage["HBillSubType"]);
-
-
-
+ $("#HDate").val(formatDate(sessionStorage["HDate"]));
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
//鑾峰彇鍙傛暟
@@ -345,6 +368,17 @@
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
@@ -355,8 +389,29 @@
// 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 ? "1242" : d.data[0].HSourceBillType);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ 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 {
+ $("#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");
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
HSourceFlag = true;
//$("#HWHID").val(d.data[0].HWhID);
//$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -434,6 +489,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
}
});
//鑾峰彇鍗曟嵁瀛愮被鍨�
@@ -1113,16 +1169,46 @@
element.tabChange('tab-Kf_OtherOutBill', '3');
}
else {
- if (HSourceFlag == "false") {
- $("#HBillType").find("option:contains('鎵嬪伐褰曞叆')").attr("selected", true);
- $("#HSourceBillNo").val("");
+ //if (HSourceFlag == "false") {
+ // $("#HBillType").find("option:contains('鎵嬪伐褰曞叆')").attr("selected", true);
+ // $("#HSourceBillNo").val("");
- $("#HSourceBillNo").attr("readonly", "readonly");
- $("#HBillType").attr("disabled", "disabled");
- form.render('select');
+ // $("#HSourceBillNo").attr("readonly", "readonly");
+ // $("#HBillType").attr("disabled", "disabled");
+ // form.render('select');
+ //}
+ //HSourceFlag = true;
+ //element.tabChange('tab-Kf_OtherOutBill', '3');
+
+ if (HSourceFlag == true) {
+ element.tabChange('tab-Kf_OtherOutBill', '3');
}
- HSourceFlag = true;
- element.tabChange('tab-Kf_OtherOutBill', '3');
+ else {
+ HSourceFlag = true;
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1242" : result.data.hSourceBillTypeField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1242") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1242");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#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");
+ element.tabChange('tab-Kf_OtherOutBill', '3');
+ }
}
layer.load(3)
$.ajax({
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index 39a2eac..45f4e1a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -333,7 +333,7 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
$("#HWHID").val(sessionStorage["HWHID"]);
$("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HSupID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
@@ -348,6 +348,7 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
@@ -412,7 +413,7 @@
$("#HSupName").val(result.data[0].HSupName);
$("#HDeptID").val(result.data[0].HDeptID);
$("#HDeptName").val(result.data[0].HDeptName);
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
element.tabChange('tab-EntrustOutBill', '2');
layer.load(3);
}
@@ -485,8 +486,7 @@
- //閫夋嫨浠撳簱
- form.on('submit(HWHID-BT)', function () {
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
type: 2
, area: ['100%', '100%']
@@ -494,13 +494,28 @@
, 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 () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
}
})
});
+ ////閫夋嫨浠撳簱
+ //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(HSpID-BT)', function () {
@@ -637,7 +652,7 @@
//閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
- sessionStorage["SourceFlag"] = false;
+ HSourceFlag = false;
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
});
@@ -721,7 +736,7 @@
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
$.ajax({
- url: GetWEBURL() + "/Web/GetSpName_Json",
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
@@ -729,6 +744,7 @@
$("#HStockPlaceName").val(result.data[0].HName);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
element.tabChange('tab-POStockInBill', '2');
}
else {
@@ -826,10 +842,10 @@
var sBillNo = $("#HBillNo").val()
var sQty = $("#HQty").val()
var sWHID = $("#HWHID").val()
- var sSPID = $("#HSupID").val()
+ var sSPID = $("#HStockPlaceID").val()
var sHBillType = $("#HBillType").val()
var sSourceBillNo = $("#HSourceBillNo").val()
- var Flag = sessionStorage["SourceFlag"];
+ var Flag = HSourceFlag;
var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
var sQty = $("#HQty").val();
@@ -849,14 +865,79 @@
$('#HQty').val("");
}
$.ajax({
- url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": '1211', "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sWHID, "HSPID": sSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": Flag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ //type: "GET",
+ //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.HSupName);
+ $("#HSupID").val(result.data.HSupID);
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ HSourceFlag = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1604" : result.data.hSourceBillTypeField);
+ if (result.data.hSourceBillTypeField == "1604") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1604");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '濮斿璁㈠崟-鎶曟枡' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#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-EntrustOutBill', '3');
+ }
+ else {
+ if (HSourceFlag == true) {
+ element.tabChange('tab-EntrustOutBill', '3');
+ }
+ else {
+ HSourceFlag = true;
+ $("#HNote").val(";鐗╂枡鏉＄爜");
+ element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
+ }
+ }
playSound1();
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
- element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
+ //element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
layer.load(3)
table.render({
elem: '#wl-table'
@@ -943,7 +1024,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屾垚鍔焅n");
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
layer.load(3)
table.render({
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 912985c..5011133 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -120,7 +120,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
</div>
<div class="layui-col-xs8">
- <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
</div>
</div>
</div>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 493269b..1583f34 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -108,7 +108,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
</div>
<div class="layui-col-xs8">
- <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
</div>
</div>
</div>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index bc52985..09ea7e1 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -61,7 +61,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <select name=" HBillType" id="HBillType">
+ <select name="HBillType" id="HBillType">
<option value="1241">鍏ュ簱鐢宠鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
@@ -90,6 +90,16 @@
<select name=" HBillSubType" id="HBillSubType">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -245,6 +255,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -268,7 +279,23 @@
$("#HOrgID").val(sessionStorage["OrganizationID"]);
$("#HOrgID").hide();
$("#HBillSubType").val(sessionStorage["HBillSubType"]);
+ $("#HDate").val(formatDate(sessionStorage["HDate"]));
+ var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
//鑾峰彇鍙傛暟
@@ -286,6 +313,17 @@
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
@@ -296,14 +334,36 @@
// 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 ? "1241" : d.data[0].HSourceBillType);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (d.data[0].HSourceBillType == "1241") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1241");
+ 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");
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
//$("#HWHID").val(d.data[0].HWhID);
//$("#HKeeperID").val(d.data[0].HKeeperID);
//$("#HSecManagerID").val(d.data[0].HSecManagerID);
//$("#HDeptID").val(d.data[0].HDeptID);
//$("#HBarCode").val(d.data[0].HBarCode);
//$("#HQty").val(d.data[0].HQty);
+ HSourceFlag = true;
}
})
//鑾峰彇鍗曟嵁瀛愮被鍨�
@@ -375,6 +435,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
}
});
//鑾峰彇鍗曟嵁瀛愮被鍨�
@@ -1015,7 +1076,7 @@
//url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
- data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "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": "" },
success: function (result) {
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
@@ -1045,7 +1106,7 @@
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
$("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.HSourceBillType == "1241") {
$("#HBillType").val("1241");
@@ -1058,7 +1119,7 @@
element.tabChange('tab-Kf_OtherInBill', '3');
}
else {
- if (sessionStorage["SourceFlag"] == "true") {
+ if (HSourceFlag == true) {
element.tabChange('tab-Kf_OtherInBill', '3');
}
else {
@@ -1067,15 +1128,40 @@
//$("#HDeptName").val(result.data.HDeptName);
//$("#HDeptID").val(result.data.HDeptID);
//$("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ //sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1241") {
- $("#HBillType").val("1241");
+ //if (result.data.HSourceBillType == "1241") {
+ // $("#HBillType").val("1241");
+ //}
+ //else if (result.data.HSourceBillType == "1601") {
+ // $("#HBillType").val("1601");
+ //}
+
+
+ HSourceFlag = true;
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1241") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1241");
+ 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");
+ else {
+ //$("#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_OtherInBill', '3');
}
@@ -1236,7 +1322,7 @@
element.tabChange('tab-Kf_OtherInBill', '2');
playSound1();
HSourceFlag = true;
- sessionStorage["SourceFlag"] = true;
+ //sessionStorage["SourceFlag"] = true;
layer.load(3)
//table.render({
// elem: '#wl-table'
--
Gitblit v1.9.1