From edb59164b6742793776aafe42b6559d1a0c4c654 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 十二月 2023 09:23:30 +0800
Subject: [PATCH] 海尔项目12.25
---
gmms/WebContent/qiegeguanli/qiegerenwu.jsp | 130 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 116 insertions(+), 14 deletions(-)
diff --git a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
index ce9c01d..11e803d 100644
--- a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
+++ b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
@@ -47,7 +47,7 @@
<div id='app'>
<!-- <div style='height:20px;width:300px;background-color:#3C8DBC;float:right;'><span style = 'color:#fff;' >鏁呴殰鎯呭喌:</span><span id='infos'></span></div> -->
<section class="content-header" style="padding: 0px 15px 0 15px;">
- <h1>璁㈠崟浠诲姟 <small></small></h1>
+ <h1 @dblclick="dangqianpeifang()">璁㈠崟浠诲姟 </h1>
<ol class="breadcrumb">
@@ -86,7 +86,7 @@
</tr>
</thead>
<tbody>
- <tr v-for="item in shuzu">
+ <tr v-for="item in shuzu" style="height: 51px;">
<td>{{item['1_order_id']}}</td>
<td>{{item['2_original_width']}}</td>
<td>{{item['3_original_height']}}</td>
@@ -121,7 +121,7 @@
</td>
<td v-else-if="item['11_order_status']==2">
- <button @click="dainjishijian('缁撴潫浠诲姟',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >缁撴潫浠诲姟</button>
+ <button @click="dainjishijian('缁撴潫浠诲姟',item['0_id'])" style='background-color: red' class='btn btn-large btn-success' >缁撴潫浠诲姟</button>
<button @click="dainjishijian('鍙栨秷浠诲姟',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >鍙栨秷浠诲姟</button>
</td>
@@ -148,7 +148,7 @@
<h3 class="modal-title" id="myModalLabel">鎻愮ず淇℃伅</h3>
</div>
<div class="modal-body" style="text-align: left;">
- <h3>鎮ㄧ‘瀹氳鎵ц褰撳墠鎿嶄綔鍚楋紵</h3>
+ <h1>璇疯繘琛屼汉鑴歌瘑鍒紝鏈夋晥鏈熶袱鍒嗛挓</h1>
</div>
<div class="modal-footer">
@@ -156,11 +156,56 @@
data-dismiss="modal">鍙栨秷</button>
<button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"
- id="surefinish">纭</button>
+ id="surefinish">鎴戝凡璇嗗埆锛岀‘璁�</button>
</div>
</div>
</div>
</form>
+ </div>
+
+
+ <div class="modal fade" id="modify-infos" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true" style="height: 800px;">
+
+ <div class="modal-dialog" style="width: 800px;" >
+ <div class="modal-content" >
+ <table class="table table-striped table-hover"
+ style="overflow-x: auto;font-size: 12px;">
+ <thead>
+ <tr>
+ <th>鏈哄櫒缂栧彿</th>
+ <th>鏈哄櫒鍚嶇О</th>
+ <th>閰嶆柟绫诲瀷</th>
+ <th>褰撳墠閰嶆柟鍊�</th>
+ <th>鍙戦�侀厤鏂瑰��</th>
+
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="item in shuzu2">
+ <td>{{item['0_id']}}</td>
+ <td>{{item['1_machine_name']}}</td>
+ <td>{{item['2_class_html']}}</td>
+ <td>{{item['3_content_value']}}</td>
+ <td>{{item['4_content_value1']}}</td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default btn-lg"
+ data-dismiss="modal">鍏抽棴</button>
+ <button v-if="peifanhao[0]['0_recipe_no']!=null" id="tiebiaoji" @click="peifangxiafa(1)" type="button" class="btn btn-primary btn-lg"
+ id="tiebiaoji">璐存爣鏈烘暟鎹笅鍙�</button>
+ <button v-if="peifanhao[0]['0_recipe_no']!=null" id="peifangxiafa" @click="peifangxiafa(2)" type="button" class="btn btn-primary btn-lg"
+ id="peifangxiafa">閰嶆柟涓嬪彂</button>
+
+
+
+ </div>
+ </div>
+
+ </div>
+
</div>
</section>
@@ -180,16 +225,27 @@
data:{
shuzu:[],
shuzu1:[],
+ shuzu2:[],
lines:<%= request.getParameter("id") %>,
- peifanhao:[],
+ peifanhao:[{}],
subval:{
id:'',
type:''
}
},
methods:{
- dainjishijian:function(type,id){
- console.log(type,id);
+ dangqianpeifang(){
+
+ this.shuzu2="";
+ let sql="{call AXJ_a_get_machine_recipe_select()}";
+ let flag=2;
+ this.loadAjxss('浠诲姟鏌ヨ鎴愬姛',sql,flag,"shuzu2");
+ let sql1="{call AXJ_qiegeguanli_peifanghao_cahxun1()}";
+ this.loadAjxss('閰嶆柟鍙锋煡璇�',sql1,2,"peifanhao")
+
+ $("#modify-infos").modal('show');
+ },
+ dainjishijian(type,id){
$("#modify-info").modal('show');
if(type=="棰嗗彇浠诲姟"){
this.subval.type=2;
@@ -201,9 +257,15 @@
this.subval.type=1;
}
this.subval.id=id
+ let para={
+ ids:id
+ }
+ let sql="{call AXJ_qiegeguanli_peifanghao_cahxun(?,?)}~"+JSON.stringify(para);
+ this.loadAjxss('閰嶆柟鍙锋煡璇�',sql,2,"peifanhao")
},
getMSg(){
//this.getMSgs();
+
this.renwuguanli();
},
getMSgs(){
@@ -216,8 +278,8 @@
param.append("flag",1);
param.append("anquanma",json["anquanma"]);
- this.$http.post('../mysqlInsert/mysql.jsp',param).then(({ data }) => {
- let result=$(data).text();
+ this.$http.post('../mysqlInsert/mysql.jsp',param).then(( datas ) => {
+ let result=datas.data;
index = result.indexOf("[[");
if(index>-1){
if(result.indexOf("[[anquanmaerr]]")>-1){
@@ -226,11 +288,12 @@
}else{
result=result.substring(index).trim()
alert(result);
- resolve();
+ reject();
window.location.reload();
}
}else{
alert("浠诲姟淇敼鎴愬姛锛�")
+ resolve();
window.location.reload();
}
@@ -244,6 +307,11 @@
let param = new URLSearchParams();
param.append("zt",this.subval.type);
param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
+ param.append("changpinghao",this.peifanhao[0]['1_changpinghao']);
+ param.append("way_of_working",this.peifanhao[0]['2_way_of_working']);
+ param.append("thickness",this.peifanhao[0]['3_thickness']);
+ param.append("glass_type",this.peifanhao[0]['4_glass_type']);
+ param.append("production_type",this.peifanhao[0]['5_production_type']);
this.$http.post( '../mysqlInsert/toPlc.jsp',param)
.then(function (response) {
console.log(response);
@@ -253,6 +321,40 @@
alert('Error: ' + "鏈嶅姟鍣ㄦ満鍣ㄨ繛鎺ュ彂鐢熼敊璇紒");
});
})
+ },
+ peifangxiafa(leixing){
+ if(leixing==1){
+ let param = new URLSearchParams();
+ param.append("zt",98);
+ param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
+ this.$http.post( '../mysqlInsert/toPlc.jsp',param)
+ .then(function (response) {
+ console.log(response);
+ })
+
+ .catch(function (error) {
+ alert('Error: ' + "鏈嶅姟鍣ㄦ満鍣ㄨ繛鎺ュ彂鐢熼敊璇紒");
+ });
+ }else if(leixing==2){
+ let param = new URLSearchParams();
+ param.append("zt",99);
+ param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);
+ param.append("changpinghao",this.peifanhao[0]['1_changpinghao']);
+ param.append("way_of_working",this.peifanhao[0]['2_way_of_working']);
+ param.append("thickness",this.peifanhao[0]['3_thickness']);
+ param.append("glass_type",this.peifanhao[0]['4_glass_type']);
+ param.append("production_type",this.peifanhao[0]['5_production_type']);
+ this.$http.post( '../mysqlInsert/toPlc.jsp',param)
+ .then(function (response) {
+ console.log(response);
+ })
+
+ .catch(function (error) {
+ alert('Error: ' + "鏈嶅姟鍣ㄦ満鍣ㄨ繛鎺ュ彂鐢熼敊璇紒");
+ });
+ }
+
+
},
renwuguanliquxiao:function(){
this.subval='';
@@ -266,9 +368,9 @@
this.shuzu="";
let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
let flag=2;
- loadAjxs('浠诲姟鏌ヨ鎴愬姛',sql,flag,"shuzu");
- sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
- loadAjxs('閰嶆柟鍙锋煡璇�',sql,flag,"peifanhao");
+ this.loadAjxss('浠诲姟鏌ヨ鎴愬姛',sql,flag,"shuzu");
+ /* sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
+ loadAjxs('閰嶆柟鍙锋煡璇�',sql,flag,"peifanhao"); */
}
})
--
Gitblit v1.8.0