From abb175b29054b9708af27136c035b1b7351dcd20 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 14 十一月 2023 13:18:48 +0800
Subject: [PATCH] 优化
---
guns-vip-main/src/main/webapp/assets/modular/bs/productBomInfo/productBomInfo_add.js | 43 ++---
guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js | 5
guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_edit.js | 50 ++---
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html | 6
guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js | 76 +++++++++
guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder_add.js | 54 ++----
guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_add.html | 17 +
guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_edit.html | 17 +
guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html | 35 ++++
guns-vip-main/src/main/resources/opcua.properties | 6
guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder_add.js | 2
guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo.js | 26 ++
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/mapper/mapping/SalesOrderMapper.xml | 1
guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js | 46 ++--
guns-base-support/guns-sys/src/main/webapp/pages/login.html | 2
guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_add.js | 41 +---
16 files changed, 255 insertions(+), 172 deletions(-)
diff --git a/guns-base-support/guns-sys/src/main/webapp/pages/login.html b/guns-base-support/guns-sys/src/main/webapp/pages/login.html
index a325021..d4d2258 100644
--- a/guns-base-support/guns-sys/src/main/webapp/pages/login.html
+++ b/guns-base-support/guns-sys/src/main/webapp/pages/login.html
@@ -201,7 +201,7 @@
</div>-->
</div>
</div>
-<div class="login-copyright">copyright 漏 2020 stylefeng.cn all rights reserved.</div>
+<!--<div class="login-copyright">copyright 漏 2020 stylefeng.cn all rights reserved.</div>-->
@/* 鍔犲叆contextPath灞炴�у拰session瓒呮椂鐨勯厤缃� */
<script type="text/javascript">
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/mapper/mapping/SalesOrderMapper.xml b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/mapper/mapping/SalesOrderMapper.xml
index 142faa9..7b11677 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/mapper/mapping/SalesOrderMapper.xml
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/mapper/mapping/SalesOrderMapper.xml
@@ -125,6 +125,7 @@
<if test="paramCondition.state != null and paramCondition.state != ''">
and state like CONCAT('%',#{paramCondition.state},'%')
</if>
+ order by create_time desc
</select>
<select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.zsx.pm.salesOrder.model.params.SalesOrderParam">
diff --git a/guns-vip-main/src/main/resources/opcua.properties b/guns-vip-main/src/main/resources/opcua.properties
index 1956bbc..82440d1 100644
--- a/guns-vip-main/src/main/resources/opcua.properties
+++ b/guns-vip-main/src/main/resources/opcua.properties
@@ -1,12 +1,12 @@
#opcua server
opcua.server.endpoint.url=opc.tcp://127.0.0.1:49320
-opcua.server.idp.username=administrator
-opcua.server.idp.password=yyt@8888888888
+opcua.server.idp.username=""
+opcua.server.idp.password=""
#opcua client
opcua.client.app.name=plc
opcua.client.app.uri=urn:Yyt_PC:UnifiedAutomation:UaExpert
-opcua.client.cert.path=C:/Users/30672/Desktop
+opcua.client.cert.path=C:/mes/
opcua.client.cert.file=Yyt_PC-client.pfx
opcua.client.cert.alias=jlclient-ai
opcua.client.cert.common.name=UaClient@Jellyleo
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo.js b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo.js
index 90e93ad..8894338 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo.js
@@ -21,17 +21,33 @@
{field: 'id', hide: true, title: '涓婚敭id'},
{field: 'materialCode', sort: true, title: '鐗╂枡缂栧彿',width:130},
{field: 'materialName', sort: true, title: '鐗╂枡鍚嶇О',width:180},
- {field: 'materialView', sort: true, title: '瑙嗗浘'},
- {field: 'typeZ', sort: true, title: '绉嶇被'},
- {field: 'typeL', sort: true, title: '绫诲瀷'},
+ // {field: 'materialView', sort: true, title: '瑙嗗浘'},
+ // {field: 'typeZ', sort: true, title: '绉嶇被'},
+ {
+ field: 'typeL', align: "center", title: '绫诲瀷', templet: function (d) {
+ console.log(d.typeL)
+ switch(d.typeL){
+ case "PRODUCE" :
+ return "浜у搧";
+ break;
+ case "SEMIFINISHEDPRODUCTS" :
+ return "鍗婃垚鍝�";
+ break;
+ case "COMPONENTSANDPARTS" :
+ return "闆堕儴浠�";
+ break;
+ default :
+ }
+ }
+ },
{field: 'unit', sort: true, title: '鍗曚綅'},
- {field: 'matterVersion', sort: true, title: '鐗堟湰'},
+ // {field: 'matterVersion', sort: true, title: '鐗堟湰'},
{field: 'remarks', sort: true, title: '澶囨敞'},
{field: 'createUser', sort: true, title: '鍒涘缓鐢ㄦ埛',width:120},
{field: 'createTime', sort: true, title: '鍒涘缓鏃堕棿',width:160},
{field: 'updateUser', sort: true, title: '鏇存敼鐢ㄦ埛',width:120},
{field: 'updateTime', sort: true, title: '鏇存敼鏃堕棿',width:160},
- {field: 'erpSpec', sort: true, title: ''},
+ // {field: 'erpSpec', sort: true, title: ''},
{fixed: 'right',width: 125, minWidth: 125, align: 'center', toolbar: '#tableBar', title: '鎿嶄綔'}
]];
};
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_add.js b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_add.js
index d5417b8..4fb206c 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_add.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_add.js
@@ -26,33 +26,20 @@
var form = layui.form;
var admin = layui.admin;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ getDictType();
+ function getDictType(){
+ $.ajax({
+ type: "POST",
+ contentType: "application/json;charset=UTF-8",
+ url: Feng.ctxPath + '/dict/list?dictTypeId=1724238087352172546',
+ success: function (result) {
+ $.each(result.data, function (index, value) {
+ $('#typeL').append(new Option(value.name,value.code));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
+ });
+ layui.form.render("select");//閲嶆柊娓叉煋 鍥哄畾鍐欐硶
+ },
+ });
+ }
//琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(btnSubmit)', function (data) {
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_edit.js b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_edit.js
index 8295ae7..fb8a3a4 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_edit.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/materialInfo/materialInfo_edit.js
@@ -26,38 +26,28 @@
var form = layui.form;
var admin = layui.admin;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
//鑾峰彇璇︽儏淇℃伅锛屽～鍏呰〃鍗�
var ajax = new $ax(Feng.ctxPath + "/materialInfo/detail?id=" + Feng.getUrlParam("id"));
- var result = ajax.start();
- form.val('materialInfoForm', result.data);
+ var result1 = ajax.start();
+ form.val('materialInfoForm', result1.data);
+
+ getDictType();
+ function getDictType(){
+ $.ajax({
+ type: "POST",
+ contentType: "application/json;charset=UTF-8",
+ url: Feng.ctxPath + '/dict/list?dictTypeId=1724238087352172546',
+ success: function (result) {
+ $.each(result.data, function (index, value) {
+ $('#typeL').append(new Option(value.name,value.code));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
+ });
+ $('#typeL').val(result1.data.typeL)
+ layui.form.render("select");//閲嶆柊娓叉煋 鍥哄畾鍐欐硶
+ },
+ });
+ }
+
+
//琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(btnSubmit)', function (data) {
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/productBomInfo/productBomInfo_add.js b/guns-vip-main/src/main/webapp/assets/modular/bs/productBomInfo/productBomInfo_add.js
index d54fca8..30e7a01 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/productBomInfo/productBomInfo_add.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/productBomInfo/productBomInfo_add.js
@@ -26,33 +26,22 @@
var form = layui.form;
var admin = layui.admin;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $('#productCode').click(function () {
+ layer.open({
+ type: 2,
+ area: ['1000px', '600px'],
+ title: '鐗╂枡淇℃伅',
+ content: Feng.ctxPath + '/workOrder/productListing',
+ success: function (layero, index) {
+ window.materialType = 'PRODUCE';
+ },
+ end: function () {
+ let msg = JSON.parse(window.localStorage.getItem('message'));
+ $('#productCode').val(msg.materialCode);
+ $('#productName').val(msg.materialName);
+ }
+ });
+ });
//琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(btnSubmit)', function (data) {
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js
new file mode 100644
index 0000000..19695d5
--- /dev/null
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js
@@ -0,0 +1,76 @@
+
+layui.use(['table'], function () {
+ var $ = layui.jquery;
+ var table = layui.table;
+
+ /**
+ * 鐗╂枡淇℃伅绠＄悊
+ */
+ var MaterialInfo = {
+ tableId: "materialInfoTable"
+ };
+
+ var materialType = parent.materialType;
+
+ $('#serch').click(function(){
+ var queryData = {};
+ queryData['typeZ'] = materialType;
+ queryData['materialName'] = $("#materialName").val();
+ queryData['materialCode'] = $("#materialCode").val();
+ table.reload(MaterialInfo.tableId, {
+ where: queryData, page: {curr: 1}
+ });
+ });
+ /**
+ * 缂烘枡鎶ヨ鍒濆鍖栬〃鏍肩殑鍒�
+ */
+ MaterialInfo.initColumn = function () {
+ return [[
+ {type: 'radio'},
+ {field: 'id', hide: true, title: '涓婚敭id'},
+ {field: 'materialCode', sort: true, title: '浜у搧缂栧彿'},
+ {field: 'materialName', sort: true, title: '浜у搧鍚嶇О'},
+ {field: 'typeL', sort: true, title: '绫诲瀷'},
+ ]];
+ };
+
+ table = $.extend(table, {config: {checkName: 'checked'}});
+
+ var queryData = {};
+ queryData['typeL'] = materialType;
+ var tableResult = table.render({
+ elem: '#' + MaterialInfo.tableId,
+ url: Feng.ctxPath + '/materialInfo/list',
+ page: true,
+ where:queryData,
+ cellMinWidth: 80,
+ cols: MaterialInfo.initColumn()
+ });
+ let Msg='';
+ table.on('row(materialInfoTable)',function (data) {
+ Msg = data.data;
+ })
+ $('#btnSubmit').click(function(){
+ clearType();
+ if (Msg !=='' ){
+ // 鍒ゆ柇鏄惁鐐瑰嚮鐨勬槸纭畾
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ window.localStorage.setItem('message',JSON.stringify(Msg));
+ parent.layer.close(index);
+ }
+ else {
+ Feng.error("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ }
+ });
+
+ $('#reset').click(function(){
+ clearType();
+ Msg = "";
+ window.localStorage.clear();
+ });
+
+ function clearType(){
+ parent.materialType="";
+ }
+
+});
\ No newline at end of file
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
index cbbe037..aa93dd7 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
@@ -99,10 +99,25 @@
$('#split').click(function (){
var checkRows = table.checkStatus(SalesOrder.tableId);
+ console.log(checkRows.data);
+ console.log(checkRows);
+ console.log(checkRows.data.state);
+
if (checkRows.data.length !== 1) {
Feng.error("璇烽�夋嫨涓�鏉¤鎷嗗垎鐨勮鍗�");
+ return;
}
- window.location.href = Feng.ctxPath + '/salesOrder/split?id=' + checkRows.data[0].id
+ if (checkRows.data[0].state === "1") {
+ window.location.href = Feng.ctxPath + '/salesOrder/split?id=' + checkRows.data[0].id
+ }else {
+ Feng.error("宸叉媶鍒嗕笅鍙戣鍗曠姝㈤噸澶嶆媶鍒�");
+ return;
+ }
+ // if (checkRows.data.state !== "1") {
+ // Feng.error("宸叉媶鍒嗕笅鍙戣鍗曠姝㈤噸澶嶆媶鍒�");
+ // return;
+ // }
+ // window.location.href = Feng.ctxPath + '/salesOrder/split?id=' + checkRows.data[0].id
});
@@ -193,9 +208,13 @@
// 缁戝畾涓嬪彂
$('#distribute').click(function () {
var checkRows = table.checkStatus(SalesOrder.tableId);
- if(checkRows.data[0].state === "3"){
- Feng.error("璇ュ伐鍗曞凡涓嬪彂瀹屾瘯锛�");
- return;
+ console.log(checkRows);
+ console.log("checkRows.length=========="+checkRows.data.length)
+ if(checkRows.data.length === 1){
+ if(checkRows.data[0].state === "3"){
+ Feng.error("璇ュ伐鍗曞凡涓嬪彂瀹屾瘯锛�");
+ return;
+ }
}
if (checkRows.data.length !== 1) {
Feng.error("璇烽�夋嫨涓�鏉¤涓嬪彂鐨勮鍗�");
@@ -204,25 +223,6 @@
var checkRows = table.checkStatus(SalesOrder.tableId);
console.log(checkRows.data);
window.location.href = Feng.ctxPath + '/salesOrder/bindParam?id=' + checkRows.data[0].id
- // layer.open({
- // type: 2,
- // area: ['1000px', '600px'],
- // title: '涓嬪彂璁㈠崟',
- // content: Feng.ctxPath + '/salesOrder/bindParam',
- // success: function (layero, index) {
- // // let body = layer.getChildFrame('body', index);
- // // body.find('form').find('#salesOrderList').val(checkRows.data);
- // // 鑾峰彇瀛愰〉闈㈢殑iframe
- // var iframe = window['layui-layer-iframe'+index];
- // // 鍚戝瓙椤甸潰鐨勫叏灞�鍑芥暟child浼犲弬
- // iframe.child(checkRows.data);
- // },
- // end: function () {
- // table.reload(SalesOrder.tableId, {
- // where: null, page: {curr: 1}
- // });
- // }
- // });
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder_add.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder_add.js
index 9f3a104..38b97c8 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder_add.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder_add.js
@@ -38,30 +38,19 @@
//鍒濆鍖栨椂闂撮�夋嫨鍣�
laydate.render({
elem: '#planStartTime',
- type: 'datetime'
+ // type: 'datetime'
});
//鍒濆鍖栨椂闂撮�夋嫨鍣�
laydate.render({
elem: '#planEndTime',
- type: 'datetime'
+ // type: 'datetime'
});
//鍒濆鍖栨椂闂撮�夋嫨鍣�
laydate.render({
elem: '#deliveryTime',
- type: 'datetime'
+ // type: 'datetime'
});
$(document).ready(function () {
- // $.ajax({
- // type: "POST",
- // contentType: "application/json;charset=UTF-8",
- // url: Feng.ctxPath + '/workshopInfo/list',
- // success: function (result) {
- // $.each(result.data, function (index, value) {
- // $('#workshopCode').append(new Option(value.workshopCode));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
- // });
- // layui.form.render("select");//閲嶆柊娓叉煋 鍥哄畾鍐欐硶
- // },
- // });
$.ajax({
type: "POST",
contentType: "application/json;charset=UTF-8",
@@ -75,27 +64,22 @@
});
});
- // form.on("select", function (data) {
- // switch(data.elem.id){
- // case 'workshopCode':
- // $.ajax({
- // type: "POST",
- // contentType: "application/json;charset=UTF-8",
- // url: Feng.ctxPath + '/lineInfo/list?workshopCode='+data.value,
- // success: function (result) {
- // $('#productionLineCode').empty();
- // $.each(result.data, function (index, value) {
- // $('#lineCode').append(new Option(value.lineCode));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
- // });
- // if($('#workshopCode').val() === ""||$('#workshopCode').val() === null){
- // layui.$('#lineCode').empty(); // 鑾峰彇select鍏冪礌
- // }
- // layui.form.render("select");//閲嶆柊娓叉煋 鍥哄畾鍐欐硶
- // },
- // });
- // break;
- // }
- // });
+ $('#productCode').click(function () {
+ layer.open({
+ type: 2,
+ area: ['1000px', '600px'],
+ title: '鐗╂枡淇℃伅',
+ content: Feng.ctxPath + '/workOrder/productListing',
+ success: function (layero, index) {
+ window.materialType = 'PRODUCE';
+ },
+ end: function () {
+ let msg = JSON.parse(window.localStorage.getItem('message'));
+ $('#productCode').val(msg.materialCode);
+ $('#productName').val(msg.materialName);
+ }
+ });
+ });
//琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(btnSubmit)', function (data) {
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
index 164c744..19695d5 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
@@ -11,7 +11,6 @@
};
var materialType = parent.materialType;
- console.log(materialType)
$('#serch').click(function(){
var queryData = {};
@@ -31,14 +30,14 @@
{field: 'id', hide: true, title: '涓婚敭id'},
{field: 'materialCode', sort: true, title: '浜у搧缂栧彿'},
{field: 'materialName', sort: true, title: '浜у搧鍚嶇О'},
- {field: 'typeZ', sort: true, title: '绉嶇被'},
+ {field: 'typeL', sort: true, title: '绫诲瀷'},
]];
};
table = $.extend(table, {config: {checkName: 'checked'}});
var queryData = {};
- queryData['typeZ'] = materialType;
+ queryData['typeL'] = materialType;
var tableResult = table.render({
elem: '#' + MaterialInfo.tableId,
url: Feng.ctxPath + '/materialInfo/list',
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder_add.js b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder_add.js
index dd994af..44b1b9e 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder_add.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder_add.js
@@ -107,7 +107,7 @@
title: '鐗╂枡淇℃伅',
content: Feng.ctxPath + '/workOrder/productListing',
success: function (layero, index) {
- window.materialType = '浜у搧';
+ window.materialType = 'PRODUCE';
},
end: function () {
let msg = JSON.parse(window.localStorage.getItem('message'));
diff --git a/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_add.html b/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_add.html
index a0e3015..d3b1bcd 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_add.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_add.html
@@ -26,16 +26,19 @@
<input id="materialView" name="materialView" placeholder="璇疯緭鍏ヨ鍥�" type="text" class="layui-input"/>
</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="typeZ" name="typeZ" 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">-->
+<!-- <input id="typeZ" name="typeZ" 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">
- <input id="typeL" name="typeL" placeholder="璇疯緭鍏ョ被鍨�" type="text" class="layui-input" lay-verify="required" required/>
+ <select id="typeL" name="typeL" lay-filter="opType" lay-verify="required" required>
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ </select>
+<!-- <input id="typeL" name="typeL" placeholder="璇疯緭鍏ョ被鍨�" type="text" class="layui-input" lay-verify="required" required/>-->
</div>
</div>
<div class="layui-inline layui-col-md12">
diff --git a/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_edit.html b/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_edit.html
index 2410950..fd4244b 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_edit.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/bs/materialInfo/materialInfo_edit.html
@@ -26,16 +26,19 @@
<input id="materialView" name="materialView" placeholder="璇疯緭鍏ヨ鍥�" type="text" class="layui-input"/>
</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="typeZ" name="typeZ" 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">-->
+<!-- <input id="typeZ" name="typeZ" 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">
- <input id="typeL" name="typeL" placeholder="璇疯緭鍏ョ被鍨�" type="text" class="layui-input" lay-verify="required" required/>
+ <select id="typeL" name="typeL" lay-filter="opType" lay-verify="required" required>
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ </select>
+<!-- <input id="typeL" name="typeL" placeholder="璇疯緭鍏ョ被鍨�" type="text" class="layui-input" lay-verify="required" required/>-->
</div>
</div>
<div class="layui-inline layui-col-md12">
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 18b2c8a..b701efb 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
@@ -74,13 +74,13 @@
<input type="radio" id="sex1" name="sex1" value="nan1" title="鐢�">
<span>宸ヤ欢鍒颁綅</span>
<input style="margin-left: 150px" type="radio" name="sex" value="nan" title="鐢�">
- <span>宸ヤ欢鍏ョ珯</span>
+ <span>鍏佽鍚姩</span>
</div>
<div class="container">
<input type="radio" name="sex" value="nan" title="鐢�">
- <span>宸ヤ欢鍑虹珯</span>
+ <span>鍏佽鏀捐</span>
<input style="margin-left: 150px" type="radio" name="test" value="test1" title="鐢�">
- <span>宸ヤ欢瀹屾垚</span>
+ <span>宸ヤ綔瀹屾垚</span>
</div>
</div>
</div>
diff --git a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html
new file mode 100644
index 0000000..5bb1c8f
--- /dev/null
+++ b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html
@@ -0,0 +1,35 @@
+@layout("/common/_form.html",{js:["/assets/modular/pm/workOrder/bulletBox/productListing.js"]}){
+ <div class="layui-fluid" style="padding-bottom: 75px;">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form-item layui-row">
+ <input id= "id" name="id" type="hidden"/>
+ <input id= "materialType" name="materialType" type="hidden"/>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鐗╂枡缂栧彿<span style="color: red;">*</span></label>
+ <div class="layui-input-block">
+ <input id="materialCode" name="materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" type="text" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鐗╂枡鍚嶇О<span style="color: red;">*</span></label>
+ <div class="layui-input-block">
+ <input id="materialName" name="materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" type="text" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md-offset3">
+ <button class="layui-btn" id="serch">鎼滅储</button>
+ </div>
+ </div>
+ <table class="layui-table" id="materialInfoTable" lay-filter="materialInfoTable"></table>
+ </div>
+ </div>
+ </div>
+
+<div class="form-group-bottom text-center">
+ <button class="layui-btn" id="btnSubmit"> 鎻愪氦 </button>
+ <button type="reset" id="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog"> 鍏抽棴 </button>
+</div>
+
+
+@}
\ No newline at end of file
--
Gitblit v1.9.3