From 253b9c48b02d995540b84c1831e54e6baf8a1000 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 08 九月 2023 10:21:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/technical.vue | 308 ++++++++++++++++++++------------------------------
1 files changed, 124 insertions(+), 184 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 66ed8ff..8ec3eb3 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -1,105 +1,3 @@
-
-<style scoped>
- .technical{
- height: 100%;
- width: 100%;
- }
- .technical .title .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
- }
-
- .technical .title {
- margin-bottom: 10px;
- padding: 0 20px;
- }
-
-/* 鎼滅储澶撮儴鏍峰紡 */
-.search-header{
- background: #fff;
- padding: 24px 32px;
-}
-.search-header .el-form-item{
- margin: 0px;
- font-size: 14px;
-}
-.search-header .el-form-item:nth-child(1){
- margin-right: 48px;
-}
-.search-header .el-form-item:nth-child(2){
- margin-right: 24px;
-}
-/* 閲嶇疆鍜屾煡璇袱涓寜閽牱寮� */
-.search-header .el-form-item .el-button{
-width: 65px;
-height: 32px;
-box-sizing: border-box;
-background: rgb(255, 255, 255);
-border: 1px solid rgb(217, 217, 217);
-border-radius:2px;
-padding: 0;
-font-size: 14px;
-}
-.search-header .el-form-item .el-button:nth-child(2){
-/* Rectangle 77 */
-background: rgb(0, 78, 162);
-color: #fff;
-}
-/* 杈撳叆妗嗙殑鏍峰紡 */
-.search-header .el-form-item .el-input >>>.el-input__inner{
-width: 224px;
-height: 32px ;
-box-sizing: border-box;
-background: rgb(255, 255, 255);
-border: 1px solid rgb(217, 217, 217);
-border-radius:2px;
-}
-
-
-/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
-.technical-table{
- margin-top: 11px;
- height: calc(100% - 140px);
- background: #fff;
- padding: 23px 21px ;
- font-size: 14px;
- box-sizing: border-box;
- display: flex;
- flex-direction: column;
-}
-/* .technical-table .el-table{
- overflow-y:scroll;
-} */
-.technical-table .table-box {
- flex: 1;
- overflow-y: scroll;
-}
-.technical-table .el-pagination{
- margin-top: 23px;
- 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>
-
-
<template>
<div class="technical">
<div class="title">
@@ -140,65 +38,48 @@
width="78">
</el-table-column>
<el-table-column
- prop="id"
- label="璁㈠崟鍙�"
- width="124">
+ prop="order_number"
+ label="璁㈠崟鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="saleman"
+ label="涓氬姟鍛�">
</el-table-column>
<el-table-column
prop="proname"
- label="宸ョ▼鍚嶇О"
- width="160">
+ label="瀹㈡埛鍚嶇О">
</el-table-column>
<el-table-column
- prop="code"
- label="浜у搧缂栫爜"
- width="168"
- >
- </el-table-column>
- <el-table-column
- prop="type"
- label="浜у搧澶х被"
- width="128">
+ prop="name"
+ label="浜у搧鍚嶇О">
</el-table-column>
<el-table-column
prop="specifications"
- label="瑙勬牸鍨嬪彿"
- width="170">
+ label="瑙勬牸鍨嬪彿">
</el-table-column>
<el-table-column
prop="unit"
- label="鍗曚綅"
- width="100">
+ label="鍗曚綅">
</el-table-column>
<el-table-column
prop="number"
- label="鏁伴噺"
- width="118"
- >
+ label="鏁伴噺">
</el-table-column>
<el-table-column
- prop="username"
- label="涓嬪崟浜�"
- width="114">
+ prop="涓嬪崟鏃ユ湡"
+ label="涓嬪崟鏃ユ湡">
</el-table-column>
<el-table-column
- prop="createTime"
- label="涓嬪崟鏃ユ湡"
- width="153"
- >
+ prop="浜よ揣鏃ユ湡"
+ label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
- prop="deliveryTime"
- label="浜よ揣鏃ユ湡"
- width="137">
- </el-table-column>
- <el-table-column
- prop="state"
+ prop="type"
label="鐘舵��"
width="85"
>
<template slot-scope="scope">
- {{scope.state==1?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ {{scope.state==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
</template>
</el-table-column>
<el-table-column
@@ -341,52 +222,7 @@
id:'',
date:''
},
- technicalTable: [{
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }
- ],
+ technicalTable: [],
showDetail: false,
selectedRow: {},
pageParams:{
@@ -407,7 +243,10 @@
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}})
+ 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
},
@@ -430,3 +269,104 @@
},
}
</script>
+
+<style scoped>
+ .technical{
+ height: 100%;
+ width: 100%;
+ }
+ .technical .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .technical .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+
+/* 鎼滅储澶撮儴鏍峰紡 */
+.search-header{
+ background: #fff;
+ padding: 24px 32px;
+}
+.search-header .el-form-item{
+ margin: 0px;
+ font-size: 14px;
+}
+.search-header .el-form-item:nth-child(1){
+ margin-right: 48px;
+}
+.search-header .el-form-item:nth-child(2){
+ margin-right: 24px;
+}
+/* 閲嶇疆鍜屾煡璇袱涓寜閽牱寮� */
+.search-header .el-form-item .el-button{
+width: 65px;
+height: 32px;
+box-sizing: border-box;
+background: rgb(255, 255, 255);
+border: 1px solid rgb(217, 217, 217);
+border-radius:2px;
+padding: 0;
+font-size: 14px;
+}
+.search-header .el-form-item .el-button:nth-child(2){
+/* Rectangle 77 */
+background: rgb(0, 78, 162);
+color: #fff;
+}
+/* 杈撳叆妗嗙殑鏍峰紡 */
+.search-header .el-form-item .el-input >>>.el-input__inner{
+width: 224px;
+height: 32px ;
+box-sizing: border-box;
+background: rgb(255, 255, 255);
+border: 1px solid rgb(217, 217, 217);
+border-radius:2px;
+}
+
+
+/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
+.technical-table{
+ margin-top: 11px;
+ height: calc(100% - 140px);
+ background: #fff;
+ padding: 23px 21px ;
+ font-size: 14px;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+}
+/* .technical-table .el-table{
+ overflow-y:scroll;
+} */
+.technical-table .table-box {
+ flex: 1;
+ overflow-y: scroll;
+}
+.technical-table .el-pagination{
+ margin-top: 23px;
+ 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>
+
--
Gitblit v1.9.3