From 352ad5d8f7957bc7f84baf4ce4d8518619864b6e Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 18 八月 2023 11:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/technical.vue | 211 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 189 insertions(+), 22 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 9d0d780..66ed8ff 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -48,7 +48,7 @@
color: #fff;
}
/* 杈撳叆妗嗙殑鏍峰紡 */
->>> .search-header .el-form-item .el-input .el-input__inner{
+.search-header .el-form-item .el-input >>>.el-input__inner{
width: 224px;
height: 32px ;
box-sizing: border-box;
@@ -81,6 +81,22 @@
display: flex;
justify-content: end;
}
+.formtitle{
+ display: block;
+ margin-bottom: 24px;
+ font-size: 16px;
+}
+.detail-model >>>.el-form-item__label{
+ color: rgb(51, 51, 51);
+}
+.detail-model >>>.el-input__inner{
+width: 224px;
+height: 32px;
+box-sizing: border-box;
+background: rgb(238, 238, 238);
+border: 1px solid rgb(221, 221, 221);
+border-radius:4px;
+}
</style>
@@ -97,18 +113,19 @@
<div class="search-header">
<el-form v-model="searchData" :inline="true">
<el-form-item label="璁㈠崟鍙�:">
- <el-input v-model="searchData.number"></el-input>
+ <el-input v-model="searchData.id"></el-input>
</el-form-item>
<el-form-item label="涓嬪崟鏃ユ湡:">
<el-date-picker
v-model="searchData.date"
+ value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button plain @click="resetBtn">閲� 缃�</el-button>
- <el-button @click="filteredTableData">鏌� 璇�</el-button>
+ <el-button @click="searchTechnical">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
@@ -123,70 +140,72 @@
width="78">
</el-table-column>
<el-table-column
- prop="date"
+ prop="id"
label="璁㈠崟鍙�"
width="124">
</el-table-column>
<el-table-column
- prop="name"
+ prop="proname"
label="宸ョ▼鍚嶇О"
width="160">
</el-table-column>
<el-table-column
- prop="address"
+ prop="code"
label="浜у搧缂栫爜"
width="168"
>
</el-table-column>
<el-table-column
- prop="name"
+ prop="type"
label="浜у搧澶х被"
width="128">
</el-table-column>
<el-table-column
- prop="address"
+ prop="specifications"
label="瑙勬牸鍨嬪彿"
width="170">
</el-table-column>
<el-table-column
- prop="name"
+ prop="unit"
label="鍗曚綅"
width="100">
</el-table-column>
<el-table-column
- prop="address"
+ prop="number"
label="鏁伴噺"
width="118"
>
</el-table-column>
<el-table-column
- prop="name"
+ prop="username"
label="涓嬪崟浜�"
width="114">
</el-table-column>
<el-table-column
- prop="address"
+ prop="createTime"
label="涓嬪崟鏃ユ湡"
width="153"
>
</el-table-column>
<el-table-column
- prop="address"
+ prop="deliveryTime"
label="浜よ揣鏃ユ湡"
width="137">
</el-table-column>
<el-table-column
- prop="address"
+ prop="state"
label="鐘舵��"
width="85"
>
+ <template slot-scope="scope">
+ {{scope.state==1?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ </template>
</el-table-column>
<el-table-column
- fixed="right"
label="鎿嶄綔"
width="194">
- <template>
- <el-button type="text" size="small">鏌ョ湅璇︽儏</el-button>
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
<el-button type="text" size="small">缂栬緫闄勪欢</el-button>
</template>
</el-table-column>
@@ -195,22 +214,131 @@
<el-pagination
- :current-page="1"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="pageParams.pageNo"
:page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-size="pageParams.pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="pageParams.total">
</el-pagination>
+ <!-- 鏌ョ湅璇︽儏妯℃�佹 -->
+ <el-dialog title="鏂囦欢璇︽儏" class="detail-model" :visible.sync="showDetail" width="687px" @close="showDetail = false">
+ <el-form label-position="right" label-width="70px" :model="selectedRow">
+ <span class="formtitle">鍩烘湰淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="璁㈠崟鍙�">
+ <el-input :value="selectedRow.id" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ョ▼鍚嶇О">
+ <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="浜у搧缂栫爜">
+ <el-input :value="selectedRow.code" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜у搧澶х被">
+ <el-input :value="selectedRow.type" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-input :value="selectedRow.specifications" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅">
+ <el-input :value="selectedRow.unit" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="鏁伴噺">
+ <el-input :value="selectedRow.number" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓嬪崟浜�">
+ <el-input :value="selectedRow.custname" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="涓嬪崟鏃ユ湡">
+ <el-input :value="selectedRow.createTime" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜よ揣鏃ユ湡">
+ <el-input :value="selectedRow.deliveryTime" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="鐘舵��">
+ <el-input :value="selectedRow.state==1?'寰呯紪鍒�':'宸茬紪鍒�'" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <span class="formtitle">瀹㈡埛淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍚嶇О">
+ <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐪佷唤">
+ <el-input :value="selectedRow.province" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="浜嬩笟閮�">
+ <el-input :value="selectedRow.department" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓氬姟鍛�">
+ <el-input :value="selectedRow.salesman" :readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <span class="formtitle">闄勪欢淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <span style="height: 32px; width: 224px; color:rgb(0, 78, 162);">xxx椤圭洰涔�.docx</span>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
</div>
</div>
</template>
<script>
export default {
+ filters:{
+
+ },
data() {
return {
searchData:{
- number:'',
+ id:'',
date:''
},
technicalTable: [{
@@ -258,8 +386,47 @@
name: '鐜嬪皬铏�',
address: '涓婃捣甯�'
}
- ]
+ ],
+ showDetail: false,
+ selectedRow: {},
+ pageParams:{
+ pageNo:1,
+ pageSize:10,
+ total:0
+ }
}
},
+ created() {
+ this.getTechnicalTableData()
+ },
+ methods: {
+ async showDetails(row){
+ this.showDetail = true
+ const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}})
+ this.selectedRow = res.data
+ console.log(this.selectedRow)
+ },
+ async getTechnicalTableData() {
+ const res = await this.$axios.get(this.$api.url.selectAllOrder,{params:{pageSize:(this.pageParams.pageNo-1),countSize:this.pageParams.pageSize,...this.searchData}})
+ this.technicalTable = res.data.row
+ this.pageParams.total = res.data.total
+ },
+ // 澶撮儴鏉′欢鏌ヨ-閲嶇疆
+ resetBtn() {
+ this.searchData={}
+ },
+ // 澶撮儴鏉′欢鏌ヨ-鏌ヨ
+ searchTechnical() {
+ this.getTechnicalTableData()
+ },
+ handleSizeChange(value){
+ this.pageParams.pageSize = value
+ this.getTechnicalTableData()
+ },
+ handleCurrentChange(value){
+ this.pageParams.pageNo = value
+ this.getTechnicalTableData()
+ }
+ },
}
</script>
--
Gitblit v1.9.3