From cd500a4dab1bf530072ff6da83b907eebb48108a Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 10 十月 2023 16:53:41 +0800
Subject: [PATCH] 配方修改
---
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js | 2
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html | 22 ++----
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html | 23 ++++++-
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js | 1
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js | 1
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html | 22 ++----
guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js | 54 ++++++++++++++++++
7 files changed, 92 insertions(+), 33 deletions(-)
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js
index 077c887..7463f2f 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js
@@ -27,6 +27,7 @@
}
},
{field: 'formulaName', sort: true, title: '閰嶆柟鍚嶇О'},
+ {field: 'productCode', sort: true, title: '浜у搧缂栧彿'},
{field: 'status', sort: true, title: '鐘舵��(瀛楀吀)'},
{field: 'remark', sort: true, title: '澶囨敞'},
{field: 'createUser', sort: true, title: '鍒涘缓鐢ㄦ埛'},
@@ -45,6 +46,7 @@
queryData['formulaCode'] = $('#formulaCode').val();
queryData['formulaName'] = $('#formulaName').val();
+ queryData['productCode'] = $('#productCode').val();
table.reload(FormulaInfo.tableId, {
where: queryData, page: {curr: 1}
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js
index 36c79c6..a97a89c 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js
@@ -8,6 +8,7 @@
formulaName: "",
status: "",
spareField1: "",
+ productCode: "",
spareField2: "",
remark: "",
createUser: "",
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js
index 0575ddf..2e7edf2 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js
@@ -9,6 +9,7 @@
status: "",
spareField1: "",
spareField2: "",
+ productCode: "",
remark: "",
createUser: "",
createTime: "",
diff --git a/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js b/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
index 9813ae3..7f6c962 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
@@ -7,6 +7,29 @@
var form = layui.form;
var element = layui.element;
+ /**
+ * 閰嶆柟閰嶇疆瀛愪俊鎭鐞�
+ */
+ var FormulaChildInfo = {
+ tableId: "formulaChildInfoTable"
+ };
+
+ $('#imgs').attr("src", "http://localhost:8081/img/9f2f070828381f30fdf1be0da9014c086f06f0ad.jpg");
+
+ /**
+ * 鍒濆鍖栬〃鏍肩殑鍒�
+ */
+ FormulaChildInfo.initColumn = function () {
+ return [[
+ {field: 'id', hide: true, title: 'id'},
+ {type:"numbers" ,title:'宸ユ',width:40},
+ {field: 'operationSteps', sort: true, title: '鎿嶄綔鍐呭'},
+ {field: 'techRequirement', sort: true, title: '鎶�鏈姹�'},
+ {field: 'operationType', sort: true, title: '绫诲瀷'},
+ ]];
+ };
+
+
initLineInfo();
var ajax = new $ax(Feng.ctxPath + "/workOrder/list?state=3");
@@ -22,6 +45,37 @@
$('#recipeCode').text(msg.recipeCode);
var radioElement = $('#sex1');
+ var queryData = {};
+ queryData['formulaCode'] = msg.recipeCode;
+ // 娓叉煋琛ㄦ牸
+ table.render({
+ elem: '#' + FormulaChildInfo.tableId,
+ url: Feng.ctxPath + '/formulaChildInfo/list',
+ page: false,
+ // height: "full-158",
+ height: 460,
+ cellMinWidth: 100,
+ where: queryData,
+ cols: FormulaChildInfo.initColumn(),
+ done: function (res, curr, count) {
+ console.log(res);
+ //寰楀埌褰撳墠椤电爜
+ console.log(curr);
+ //寰楀埌鏁版嵁鎬婚噺
+ console.log(count);
+ // 鏍规嵁鏉′欢鍒ゆ柇鍔犺儗鏅壊
+ $.each(res.data, function (index, item) {
+ console.log(item)
+ console.log(item.spareField1)
+ if (item.spareField1 === "3") {
+ // 娉�1
+ $("#formulaChildInfoTable").next().find('tbody tr[data-index="' + index +
+ '"]').css("background-color", "#00ff66");
+ }
+ });
+ }
+ });
+
function initLineInfo(){
$.ajax({
type: "POST",
diff --git a/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html b/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html
index e669fc0..609321a 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html
@@ -21,23 +21,17 @@
</div>
</div>
<div class="layui-inline layui-col-md12">
- <label class="layui-form-label">鐘舵��(瀛楀吀)<span style="color: red;">*</span></label>
+ <label class="layui-form-label">浜у搧缂栧彿<span style="color: red;">*</span></label>
<div class="layui-input-block">
- <input id="status" name="status" placeholder="璇疯緭鍏ョ姸鎬�(瀛楀吀)" type="text" class="layui-input" lay-verify="required" required/>
+ <input id="productCode" name="productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
- <div class="layui-inline layui-col-md12">
- <label class="layui-form-label">棰勭暀瀛楁1<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="spareField1" name="spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" type="text" class="layui-input" lay-verify="required" required/>
- </div>
- </div>
- <div class="layui-inline layui-col-md12">
- <label class="layui-form-label">棰勭暀瀛楁2<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="spareField2" name="spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" type="text" class="layui-input" lay-verify="required" required/>
- </div>
- </div>
+<!-- <div class="layui-inline layui-col-md12">-->
+<!-- <label class="layui-form-label">鐘舵��(瀛楀吀)<span style="color: red;">*</span></label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="status" name="status" placeholder="璇疯緭鍏ョ姸鎬�(瀛楀吀)" type="text" class="layui-input" lay-verify="required" required/>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">澶囨敞<span style="color: red;">*</span></label>
<div class="layui-input-block">
diff --git a/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html b/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html
index fe6395e..4568cfa 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html
@@ -21,23 +21,17 @@
</div>
</div>
<div class="layui-inline layui-col-md12">
- <label class="layui-form-label">鐘舵��(瀛楀吀)<span style="color: red;">*</span></label>
+ <label class="layui-form-label">浜у搧缂栧彿<span style="color: red;">*</span></label>
<div class="layui-input-block">
- <input id="status" name="status" placeholder="璇疯緭鍏ョ姸鎬�(瀛楀吀)" type="text" class="layui-input" lay-verify="required" required/>
+ <input id="productCode" name="productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
- <div class="layui-inline layui-col-md12">
- <label class="layui-form-label">棰勭暀瀛楁1<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="spareField1" name="spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" type="text" class="layui-input" lay-verify="required" required/>
- </div>
- </div>
- <div class="layui-inline layui-col-md12">
- <label class="layui-form-label">棰勭暀瀛楁2<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="spareField2" name="spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" type="text" class="layui-input" lay-verify="required" required/>
- </div>
- </div>
+<!-- <div class="layui-inline layui-col-md12">-->
+<!-- <label class="layui-form-label">鐘舵��(瀛楀吀)<span style="color: red;">*</span></label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="status" name="status" placeholder="璇疯緭鍏ョ姸鎬�(瀛楀吀)" type="text" class="layui-input" lay-verify="required" required/>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">澶囨敞<span style="color: red;">*</span></label>
<div class="layui-input-block">
diff --git a/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html b/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
index d099137..71b78c5 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
@@ -101,7 +101,7 @@
</div>
</div>
</div>
- <div class="layui-col-sm9 layui-col-md9 layui-col-lg9">
+ <div class="layui-col-sm6 layui-col-md6 layui-col-lg6">
<div class="layui-card" style="height: 605px">
<div class="layui-card-header" style="font-weight: bold">
<i class="layui-icon layui-icon-rate-solid"></i>鎿嶄綔鏍�
@@ -117,9 +117,11 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- 鐐瑰嚮璇ab鐨勪换涓�鏍囬锛岃瀵熷湴鍧�鏍忓彉鍖栵紝鍐嶅埛鏂伴〉闈€�傞�夐」鍗″皢浼氳嚜鍔ㄥ畾浣嶅埌涓婁竴娆″垏鎹㈢殑椤�
+ <table class="layui-table" id="formulaChildInfoTable" lay-filter="formulaChildInfoTable"></table>
</div>
- <div class="layui-tab-item">鍐呭2</div>
+ <div class="layui-tab-item">
+ 鍐呭3
+ </div>
<div class="layui-tab-item">鍐呭3</div>
<div class="layui-tab-item">鍐呭4</div>
<div class="layui-tab-item">鍐呭5</div>
@@ -128,9 +130,20 @@
</div>
</div>
</div>
- </div>
+ <div class="layui-col-sm3 layui-col-md3 layui-col-lg3">
+ <div class="layui-card" style="height: 605px">
+ <div class="layui-card-header" style="font-weight: bold">
+ <i class="layui-icon layui-icon-rate-solid"></i>鍥剧墖
+ </div>
+ <div class="layui-card-body">
+ <img id="imgs" width="320px" height="270px">
+ </div>
+ </div>
+
+ </div>
</div>
-<style>
+<!-- <img id="imgs" width="400px" height="380px">-->
+ <style>
.orderInfo {
margin-bottom: 5px; /* 璁剧疆鎹㈣鍚庣殑涓嬭竟璺� */
}
--
Gitblit v1.9.3