From ec82d16c11f85929e5a9ab209d09310c1bef2ea6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 七月 2023 14:30:37 +0800
Subject: [PATCH] 1
---
gmms/WebContent/orderManage/order.jsp | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/gmms/WebContent/orderManage/order.jsp b/gmms/WebContent/orderManage/order.jsp
index 1d04cfd..bffba31 100644
--- a/gmms/WebContent/orderManage/order.jsp
+++ b/gmms/WebContent/orderManage/order.jsp
@@ -24,7 +24,7 @@
</head>
<body>
<div id="app" >
- <el-container >
+ <el-container v-loading="loading" >
<el-header style="margin-top: 3%;height: 3%;">
<el-button @click="showFlagFuc" type="primary" round style="float:right;">{{showFlag==false?'杩斿洖璁㈠崟':'鏂板璁㈠崟'}}</el-button>
<el-date-picker v-show="showFlag" style="float: left;margin-bottom: 0.3%;"
@@ -43,7 +43,6 @@
</el-header>
<el-main >
<el-table v-show="showFlag"
- v-loading="loading"
:data="orderData"
max-height="600"
style="width: 100%;">
@@ -60,7 +59,9 @@
<el-button v-if="orderData[scope.$index]['11_order_status']<2"
@click.native.prevent="updateOrderState(scope.$index, orderData)"
type="text"
- size="small">
+ size="small"
+ v-preventReClick
+ >
{{orderData[scope.$index]['11_order_status']==0?'瀹℃牳':'鍙嶅'}}
</el-button>
@@ -68,13 +69,14 @@
@click.native.prevent="updateRow(scope.$index, orderData)"
type="text"
size="small">
- 淇敼
+ 淇敼
</el-button>
<el-button
+ v-if="orderData[scope.$index]['11_order_status']>1"
@click.native.prevent="open(scope.$index, orderData)"
type="text"
size="small">
- 娆＄牬
+ 娆＄牬
</el-button>
@@ -94,8 +96,8 @@
<el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
<el-form-item>
- <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">淇敼</el-button>
- <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">鎻愪氦</el-button>
+ <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick >淇敼</el-button>
+ <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick >鎻愪氦</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</el-form-item>
@@ -136,7 +138,7 @@
<el-form-item>
<el-button @click="resetForm('wornGlass');wornGlassFLAG = false">鍙� 娑�</el-button>
- <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')">鎻愪氦</el-button>
+ <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')" v-preventReClick>鎻愪氦</el-button>
</el-form-item>
</el-form>
@@ -215,7 +217,7 @@
ruleForm: {
produceid:"",
glassNum:"",
- creator:""
+ creator:'<%= request.getParameter("xingming") %>'
},
rules: {
produceid: [
@@ -258,7 +260,7 @@
return false;
}
let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
- this.connects("璁㈠崟鏂板",sql,1,1);
+ this.connects("璁㈠崟鏂板",sql,1,1);
});
},
resetForm(formName) {//娓呴櫎鏂板閲嶇疆
@@ -274,7 +276,7 @@
this.updateShowFlag=true;
let rowObj=row[index]
this.ruleForm.glassNum=rowObj["5_smallglass_no"]
- this.ruleForm.produceid=rowObj["2_recipe_no"]
+ this.ruleForm.produceid=rowObj["12_id"]
this.updateOrder.id=rowObj["0_id"]
},
@@ -318,7 +320,8 @@
if(arrFlag==0){
sql="{call AXJ_a_order_select_into()}"
}
- loadAjxs('浜у搧鏌ヨ',sql,2,"orderData")
+ this.loading=true
+ this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
},
selectTimeOrder:function(){
let arrObj={}
@@ -335,7 +338,9 @@
arrObj.endtime=''
sql="{call AXJ_a_order_select_into()}"
}
- loadAjxs('浜у搧鏌ヨ',sql,2,"orderData")
+ this.loading=true
+ this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
+ //loadAjxs('浜у搧鏌ヨ',sql,2,"orderData")
},
open(index,row) {//鎵撳紑鍒虹牬鐣岄潰
--
Gitblit v1.8.0