From fbbe5b48c138758d335a7eb41667fe33f2ec747d Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期三, 21 四月 2021 22:13:26 +0800
Subject: [PATCH] 1.单据编辑模块（工序汇报单）： 按钮。增加关闭功能，撤销关闭功能。 2.单据编辑模块（工序汇报单）：增加审核、反审核按钮
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 11 +--
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 127 +++++++++++++++++++++++++++++++++++-------
2 files changed, 109 insertions(+), 29 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index be9dc02..80a125b 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -1188,7 +1188,7 @@
<publishTime>04/08/2021 10:57:44</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
- <publishTime>04/20/2021 21:10:48</publishTime>
+ <publishTime>04/20/2021 09:15:32</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBill.html">
<publishTime>04/13/2021 10:12:44</publishTime>
@@ -1203,16 +1203,13 @@
<publishTime>03/29/2021 19:54:57</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">
- <publishTime>04/21/2021 21:58:28</publishTime>
- </File>
- <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Detail_ProcessReportList.html">
- <publishTime>04/21/2021 19:59:24</publishTime>
+ <publishTime>04/16/2021 14:21:33</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">
<publishTime>04/09/2021 17:56:11</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
- <publishTime>04/21/2021 16:40:38</publishTime>
+ <publishTime>04/16/2021 14:21:33</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1233,7 +1230,7 @@
<publishTime>04/21/2021 18:59:55</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
- <publishTime>04/09/2021 21:12:33</publishTime>
+ <publishTime>04/16/2021 14:21:33</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
<publishTime>04/09/2021 20:12:18</publishTime>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index a9c431b..4892bf2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板娲惧伐鍗�</title>
+ <title>鏂板娲惧伐鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -82,21 +82,117 @@
</div>
</div>
-
+ <!--<div class="layui-col-xs1">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>-->
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label"> 鍐呴儴鍗曟嵁鍙凤細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+ <input id="HSupID" name="HSupID" type="hidden" />
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label"> 浜у搧浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMateriaNumber" lay-verify="HMateriaNumber" id="HMateriaNumber" readonly="readonly" autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 浜у搧锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMateriaName" lay-verify="HMateriaName" id="HMateriaName" readonly="readonly" autocomplete="off">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
+
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label"> 鍗曚綅浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDHNumber" lay-verify="HDHNumber" id="HDHNumber">
+ </div>
+ </div>
+
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鍗曚綅锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDHName" lay-verify="HDHName" id="HDHName">
+
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
+
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
+ </div>
+ </div>-->
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
+
+ </div>
+ </div>
+
</div>
</div>
<div class="layui-form-item">
<div class="layui-row">
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label">宸ュ簭锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
+ </div>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 姹囨姤鏁伴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
- <!--<input id="HSupID" name="HSupID" type="hidden" />-->
</div>
</div>
-
+ <!--<div class="layui-col-xs3">
+ <label class="layui-form-label"> 鎬诲伐鏃讹細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
+ <input id="HDeptID" name="HDeptID" type="hidden" />
+ </div>
+ </div>-->
+
</div>
</div>
@@ -306,16 +402,16 @@
}
table.render({
elem: '#mainTable'
- //, url: GetWEBURL()+'GetNewPOInStockShowBillSub'
, toolbar: '#toolbarDemo'
- //, where: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType }
- // , where: { sMsg: '28', sMsg2: '28,5;' }
+ , limit: 1000
+ , totalRow: true
, cols: [[
- { type: 'checkbox' }
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿' }
,{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty" }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty", totalRow: true }
, { field: 'HDeptID ', title: 'HDeptID', width: 105 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
@@ -327,21 +423,16 @@
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 160 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 160 }
, { field: 'HprocID ', title: 'HprocID', width: 215 }
- ////, { field: 'hunitid', title: 'hunitid' }
, { field: '宸ュ簭浠ｇ爜 ', title: '宸ュ簭浠ｇ爜 ', width: 115 }
, { field: '宸ュ簭', title: '宸ュ簭' }
- ////, { field: 'hempid', title: 'hempid' }
, { field: 'HGroupID ', title: 'HGroupID', width: 100 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
, { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
, { field: 'HSourceID', title: 'HSourceID' }
, { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
- ////, { field: 'HCenterID', title: 'HCenterID' }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
, { field: 'HWorkerID ', title: 'HWorkerID' }
- ////, { field: 'hbomid', title: 'hbomid' }
, { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜' }
- ////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
, { field: '鑱屽憳 ', title: '鑱屽憳' }
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
@@ -352,7 +443,6 @@
, { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿' }
, { field: 'HSeOrderInterID', title: 'HSeOrderInterID' }
, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
- ////, { field: 'hsubid', title: 'hsubid' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
@@ -372,12 +462,7 @@
, { field: 'HBillType', title: 'HBillType' }
, { field: 'HQtyDecimal', title: 'HQtyDecimal' }
, { field: 'HPriceDecimal', title: 'HPriceDecimal' }
-
]]
- // , data: [linterid]
- // , page: true
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
, done: function () {
layer.closeAll("loading");
}
@@ -433,7 +518,6 @@
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
data: ajaxReturnData
- , height: 'full-10'
, loading: false
, done: function (index, res) {
layer.closeAll("loading");
@@ -448,7 +532,6 @@
};
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
--
Gitblit v1.9.1