igds-web/src/main/resources/static/admin/inout/out-weight.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/static/admin/inout/weight.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/templates/admin/inout/out-handle.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/templates/admin/inout/out-weight.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -478,6 +478,31 @@ // delDisabled(); } //显示质检信息 function showCheck() { if (!recordData) { alertError("没有业务数据信息,执行被拒绝"); return; } // 获取化验项信息 // flushCheckItem(); layer.open({ type: 1, title: "质检详细", offset: ['120px', '100px'], area: ['1000px', '520px'], shade: 0, content: $('#checkDetail'), btnAlign: 'c', btn: ['取消'], yes: function () { layer.closeAll(); }, closeBtn: 0 }); } function flushPage() { layer.confirm('确定要刷新页面吗?', {icon: 3, title: '提示'}, function (index) { igds-web/src/main/resources/static/admin/inout/weight.js
@@ -34,9 +34,8 @@ /** * 出库-称重自动计算 * 1、净重 = 毛重 - 皮重 ; 总扣重 = 扣水杂 + 现场扣重 + 其他扣重 * 2、水分增重,整数 = 增重,负数= 扣重 * 3、结算重量 = 净重 - 总扣重 (含水杂增重); 入库重量 = 净重 - 总扣重 (不含水杂增重) * 1、净重 = 毛重 - 皮重 ; 总扣重 = 质检扣重 + 其他扣重 * 2、结算重量 = 净重 - 总扣重 + 质检扣重; 入库重量 = 净重 - 总扣重 * 注意:如果是手动修改了水分和杂质的扣重,则不按照配置规则进行增扣重计算 * @param name 触发事件的属性名称 */ @@ -52,11 +51,13 @@ return; } //其他信息 var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0, recordWeight = 0, deSum = 0; recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther); settleWeight = Number(recordWeight); deSum = Number(deOther) + Number(deHandle) var dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0, recordWeight = 0, deSum = 0, deCheck = curData.deCheck, addCheck = curData.addCheck; recordWeight = Number(netWeight) - Number(dePackage) - Number(deOther) - Number(deCheck); settleWeight = Number(recordWeight) + Number(addCheck); deSum = Number(deOther) + Number(deCheck) netWeight = netWeight.toFixed(0); recordWeight = recordWeight.toFixed(0); @@ -146,17 +147,6 @@ // }); // form.render(); // } function deAutoByHandle(name) { var curData = form.val("form-data"); var deOther = curData.deOther, deHandle = curData.deHandle; deSum = Number(deOther) + Number(deHandle); deSum = deSum.toFixed(0); form.val("form-data", { deSum: deSum, }); form.render(); } /** * 根据化验项和传递过来的参数获取当前参数的配置信息 igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -9,7 +9,7 @@ <title>出入库管理-值仓管理</title> <link rel="stylesheet" type="text/css" th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}"> th:href="@{../../static/plugins/layui/css/layui.css}"> <link rel="stylesheet" type="text/css" th:href="@{../../static/admin/inout/style.css}"> @@ -349,6 +349,23 @@ </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item kccz-data-group-md"> <label class="layui-form-label">质检增重</label> <div class="posi-r kccz-data-bfb fr"> <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()"> <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细 </button> </div> <div class="layui-input-block"> <div class="posi-r"> <input id="addCheck" type="text" name="addCheck" placeholder="请输入" autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em> </div> </div> </div> </div> <!--<div class="layui-col-xs4">--> <!-- <div class="layui-form-item kccz-data-group-md">--> <!-- <label class="layui-form-label">水分增重</label>--> @@ -381,6 +398,42 @@ <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label color-red">值仓人</label> <div class="layui-input-block"> <input type="text" name="handleUser" autocomplete="off" placeholder="手动录入" class="layui-input"> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item kccz-data-group-md"> <label class="layui-form-label">质检扣重</label> <div class="posi-r kccz-data-bfb fr"> <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()"> <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细 </button> </div> <div class="layui-input-block"> <div class="posi-r"> <input id="deCheck" type="text" name="deCheck" placeholder="请输入" autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em> </div> </div> </div> </div> <!-- <div class="layui-col-xs4">--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label">现场扣重</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="deHandle" placeholder="请输入"--> <!-- autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">其他扣重</label> <div class="layui-input-block"> <input type="text" name="deOther" autocomplete="off" placeholder="请输入" @@ -389,27 +442,16 @@ </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">现场扣重</label> <div class="layui-input-block"> <input type="text" name="deHandle" placeholder="请输入" autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">总扣重</label> <div class="layui-input-block"> <input type="text" name="deSum" placeholder="不可编辑" autocomplete="off" class="layui-input rkbk-search-input" disabled> <em class="kccz-data-dw">KG</em> </div> </div> </div> <!-- <div class="layui-col-xs4">--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label">总扣重</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="deSum" placeholder="不可编辑"--> <!-- autocomplete="off" class="layui-input rkbk-search-input"--> <!-- disabled> <em class="kccz-data-dw">KG</em>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!--<div class="layui-col-xs4">--> <!-- <div class="layui-form-item">--> @@ -444,15 +486,7 @@ <!-- </div>--> <!-- </div>--> <!--</div>--> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label color-red">值仓人</label> <div class="layui-input-block"> <input type="text" name="handleUser" autocomplete="off" placeholder="手动录入" class="layui-input"> </div> </div> </div> <div class="layui-col-xs8"> <div class="layui-form-item"> <label class="layui-form-label">其他说明</label> @@ -462,6 +496,41 @@ </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">包装物</label> <div class="layui-input-block"> <input type="radio" name="bzw" value="1" title="麻袋"> <input type="radio" name="bzw" value="2" title="编织袋"> <input type="radio" name="bzw" value="3" title="散装" checked> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">标准包重</label> <div class="layui-input-block"> <input type="text" name="dbz" autocomplete="off" placeholder="请输入" class="layui-input"> <em class="kccz-data-dw">KG</em> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">包件总数</label> <div class="layui-input-block"> <input type="text" name="bzbjs" autocomplete="off" placeholder="请输入" class="layui-input"> <em class="kccz-data-dw">件</em> </div> </div> </div> <div class="layui-col-xs12"> <div class="layui-form-item"> <label class="layui-form-label">备注说明</label> igds-web/src/main/resources/templates/admin/inout/out-weight.html
@@ -41,7 +41,7 @@ } .kccz-left-box2 { height: 560px; height: 540px; } .color-red { @@ -403,15 +403,32 @@ </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">现场扣重</label> <div class="layui-form-item kccz-data-group-md"> <label class="layui-form-label">质检增重</label> <div class="posi-r kccz-data-bfb fr"> <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()"> <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细 </button> </div> <div class="layui-input-block"> <input id="deHandle" type="text" name="deHandle" autocomplete="off" placeholder="请输入" class="layui-input weight"> <em <div class="posi-r"> <input id="addCheck" type="text" name="addCheck" placeholder="请输入" autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em> </div> </div> </div> </div> <!-- <div class="layui-col-xs4">--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label">现场扣重</label>--> <!-- <div class="layui-input-block">--> <!-- <input id="deHandle" type="text" name="deHandle" autocomplete="off"--> <!-- placeholder="请输入" class="layui-input weight"> <em--> <!-- class="kccz-data-dw">KG</em>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!--<div class="layui-col-xs4">--> <!-- <div class="layui-form-item kccz-data-group-md">--> @@ -454,6 +471,33 @@ </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item kccz-data-group-md"> <label class="layui-form-label">质检扣重</label> <div class="posi-r kccz-data-bfb fr"> <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()"> <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细 </button> </div> <div class="layui-input-block"> <div class="posi-r"> <input id="deCheck" type="text" name="deCheck" placeholder="请输入" autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em> </div> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">粮食产地</label> <div class="layui-input-block"> <input type="text" name="foodLocation" placeholder="请选择" autocomplete="off" class="layui-input"> <em class="kccz-data-dw cursor" onclick="showFoodLocation()">……</em> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">其他说明</label> <div class="layui-input-block"> @@ -463,16 +507,7 @@ </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">总 扣 重</label> <div class="layui-input-block"> <input type="text" name="deSum" placeholder="自动计算" autocomplete="off" class="layui-input rkbk-search-input" disabled> <em class="kccz-data-dw">KG</em> </div> </div> </div> <!--<div class="layui-col-xs4">--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label">规 格</label>--> @@ -485,16 +520,7 @@ <!-- </div>--> <!-- </div>--> <!--</div>--> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label">粮食产地</label> <div class="layui-input-block"> <input type="text" name="foodLocation" placeholder="请选择" autocomplete="off" class="layui-input"> <em class="kccz-data-dw cursor" onclick="showFoodLocation()">……</em> </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> @@ -516,7 +542,6 @@ <!-- </div>--> <!--</div>--> <div class="layui-col-xs8"> <div class="layui-form-item"> <label class="layui-form-label">备注说明</label> @@ -526,8 +551,6 @@ </div> </div> </div> <div class="layui-col-xs4"> <div class="layui-form-item"> <label class="layui-form-label color-red">出库重量</label> @@ -538,12 +561,10 @@ </div> </div> </div> <div class="layui-col-xs8"> <span style="padding-left: 93px;color: blue;"> 说明: 1、净重 = 毛重 - 皮重 ;总扣重 = 现场扣重 + 其他扣重<br> </span> <span style="padding-left: 93px;color: blue;"> 2、结算重量 = 净重 - 总扣重 ;出库重量 = 净重 - 总扣重 <div class="layui-col-xs12"> <span style="padding-left: 93px;color: blue;margin-bottom: 15px"> 说明:净重 = 毛重 - 皮重 ;总扣重 = 质检扣重 + 其他扣重;结算重量 = 净重 - 总扣重 + 质检增重 ;出库重量 = 净重 - 总扣重 </span> </div>