From 94bd70ca069aa3bb8546b77a2e99fd5c7ffc4c6a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 七月 2022 08:27:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 86 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 24 deletions(-)
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 94fbe8e..27273b4 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"
@@ -62,7 +62,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曠彮宸ユ椂</label>
<div class="layui-input-inline">
- <input type="text" name="HWorkTimes" id="HWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HWorkTimes" id="HWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -83,7 +83,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍏宠仈ID</label>
<div class="layui-input-inline">
- <input type="text" name="HRelationID" id="HRelationID" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HRelationID" id="HRelationID" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -91,19 +91,19 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曠彮鏈�澶у伐鏃�</label>
<div class="layui-input-inline">
- <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈�灏忚繘闃�</label>
<div class="layui-input-inline">
- <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" value="0" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">姣忔棩鐝</label>
<div class="layui-input-inline">
- <input type="text" name="HClassCount" id="HClassCount" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HClassCount" id="HClassCount" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -111,13 +111,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍔犵彮宸ユ椂</label>
<div class="layui-input-inline">
- <input type="text" name="HOverTimes" id="HOverTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HOverTimes" id="HOverTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDepName" id="HDepName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -158,6 +158,20 @@
</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>
+ <div class="layui-row">
+ <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="鏄惁绂佺敤">
@@ -165,16 +179,16 @@
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs12 layui-inline">
- <label class="layui-form-label" style="width: 8.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 90%;">
+ <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">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
</div>
</div>
</div>
- </div>
- </form>
+</form>
</div>
</div>
</div>
@@ -204,7 +218,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ Organ();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -222,6 +236,8 @@
$("#HItemID").val(0);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -258,7 +274,7 @@
//閫夋嫨閮ㄩ棬鎸夐挳
form.on('submit(HDepart-BT)', function () {
- get_checkDepart();
+ get_checkDept();
});
//閫夋嫨宸ヤ綔涓績鎸夐挳
@@ -291,6 +307,28 @@
}
//#endregion
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid){
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -306,7 +344,7 @@
var data = result.data.h_v_Edit_IF_SourceList[0];
var IsHStopflag = data.绂佺敤鏍囪;
//绂佺敤鏍囪
- if (IsHStopflag == "true") {
+ if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -324,7 +362,7 @@
, "HCenterID": data.宸ヤ綔涓績ID
, "HGroup": data.鐝粍鍚嶇О
, "HGroupID": data.鐝粍ID
- , "HDepName": data.閮ㄩ棬鍚嶇О
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
, "HDeptID": data.閮ㄩ棬ID
, "HProcName": data.宸ュ簭
, "HProcID": data.宸ュ簭ID
@@ -332,6 +370,7 @@
, "HStopflag": data.绂佺敤鏍囪
, "HType": data.绫诲瀷
, "HRemark": data.澶囨敞
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
@@ -348,8 +387,7 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- var sMainStr = JSON.stringify(data.field);
- console.log("鐢熶骇" + sMainStr);
+ var sMainStr = JSON.stringify(data.field) + ";" +sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "SaveGy_SourceList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -388,7 +426,7 @@
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
@@ -403,7 +441,7 @@
//#endregion
//#region 閫夋嫨閮ㄩ棬鏂规硶
- function get_checkDepart() {
+ function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -418,7 +456,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDepName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].HName);
$("#HDeptID").val(checkStatus.data[0].HItemID);
$("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -440,7 +478,7 @@
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
--
Gitblit v1.9.1