From 7dbbcd0e54b4094e9f2b620197147e69911669c6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 08 十月 2023 08:17:03 +0800
Subject: [PATCH] 海尔项目10.8最新版本
---
gmms/WebContent/orderManage/order.jsp | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/gmms/WebContent/orderManage/order.jsp b/gmms/WebContent/orderManage/order.jsp
index 798de1a..5fc2793 100644
--- a/gmms/WebContent/orderManage/order.jsp
+++ b/gmms/WebContent/orderManage/order.jsp
@@ -24,7 +24,7 @@
</head>
<body>
<div id="app" >
- <el-container v-loading="loading" >
+ <el-container v-loading="loading" style="width:100%;height:100%" >
<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%;"
@@ -32,7 +32,9 @@
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ end-placeholder="缁撴潫鏃ユ湡"
+ value-format="yyyy-MM-dd"
+ >
</el-date-picker>
<el-button @click="selectTimeOrder" v-show="showFlag" type="primary" icon="el-icon-search"
@@ -41,10 +43,10 @@
</el-button>
</el-header>
- <el-main >
+ <el-main style="width:100%;height:97%">
<el-table v-show="showFlag"
:data="orderData"
- max-height="600"
+ height="95%"
style="width: 100%;">
@@ -72,7 +74,7 @@
淇敼
</el-button>
<el-button
- v-if="orderData[scope.$index]['11_order_status']>1"
+ v-if="orderData[scope.$index]['11_order_status']==2"
@click.native.prevent="open(scope.$index, orderData)"
type="text"
size="small">
@@ -157,6 +159,7 @@
<script src="../js/jquery-3.4.1.min.js"></script>
<script src="../js/static/js/vue.js"></script>
+ <script src="../js/global.js"></script>
<script src="../js/axios.min.js"></script>
<script src="../js/mixins.js"></script>
<!-- import JavaScript -->
@@ -217,7 +220,7 @@
ruleForm: {
produceid:"",
glassNum:"",
- creator:'<%= request.getParameter("xingming") %>'
+ creator:'',
},
rules: {
produceid: [
@@ -259,6 +262,7 @@
if (!valid) {
return false;
}
+ this.ruleForm.creator='<%= request.getParameter("xingming")%>';
let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
this.connects("璁㈠崟鏂板",sql,1,1);
});
@@ -285,10 +289,12 @@
if (!valid) {
return false;
}
+ this.ruleForm.creator='<%= request.getParameter("xingming")%>';
let updateGlassObj=this.ruleForm
updateGlassObj.id=this.updateOrder.id
+
let sql="{call AXJ_a_order_update(?,?,?,?,?)}~"+JSON.stringify(updateGlassObj);
- this.connects("浜у搧淇敼",sql,1,1);
+ this.connects("璁㈠崟淇敼",sql,1,1);
});
},
@@ -299,7 +305,7 @@
let sql="{call AXJ_a_order_updateState(?,?,?)}~"+JSON.stringify(updateState);
this.connects("璁㈠崟鐘舵�佸鏍镐慨鏀�",sql,1,1);
},
- selectSub:function(){
+ async selectSub(){
let arrObj={}
let arrFlag=0
for(let i in this.slectOrder){
@@ -321,9 +327,10 @@
sql="{call AXJ_a_order_select_into()}"
}
this.loading=true
- this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
+ await this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
+ this.loading=false
},
- selectTimeOrder:function(){
+ async selectTimeOrder(){
let arrObj={}
for(let i in this.slectOrder){
arrObj[i]='n*'
@@ -339,8 +346,8 @@
sql="{call AXJ_a_order_select_into()}"
}
this.loading=true
- this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
- //loadAjxs('浜у搧鏌ヨ',sql,2,"orderData")
+ await this.loadAjxss('璁㈠崟鏌ヨ',sql,2,"orderData")
+ this.loading=false
},
open(index,row) {//鎵撳紑鍒虹牬鐣岄潰
@@ -365,18 +372,19 @@
computed:{
},
- mounted() {
+ async mounted() {
let sql="{call AXJ_a_order_select_into()}"
let flag=2;
- this.loadAjxss('璁㈠崟鍒濆鏌ヨ',sql,flag,"orderData")
+ await this.loadAjxss('璁㈠崟鍒濆鏌ヨ',sql,flag,"orderData")
/* loadAjxs('璁㈠崟鍒濆鏌ヨ',sql,flag,"orderData") */
sql="{call AXJ_a_orderHeader_select()}"
- loadAjxs('璁㈠崟琛ㄥご',sql,flag,"tableHead")
+ await this.loadAjxss('璁㈠崟琛ㄥご',sql,flag,"tableHead")
sql="{call AXJ_a_order_produce_select()}"
- loadAjxs('璁㈠崟浜у搧鏌ヨ',sql,flag,"orderProduce")
+ await this.loadAjxss('璁㈠崟浜у搧鏌ヨ',sql,flag,"orderProduce")
+ this.loading=false
},
})
--
Gitblit v1.8.0