From 28d38f132ff7c6a1239df6c56f2da0a021bd4e96 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 13 九月 2023 16:12:08 +0800
Subject: [PATCH] 销售订单bug修复
---
src/components/view/technical.vue | 527 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 345 insertions(+), 182 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 9d0d780..424ee7e 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -1,8 +1,322 @@
+<template>
+ <div class="technical">
+ <div class="title">
+ <el-row>
+ <el-col :span="12">鎶�鏈枃浠�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="search-header">
+ <el-form v-model="searchData" :inline="true">
+ <el-form-item label="璁㈠崟鍙�:">
+ <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 label="浜у搧鍚嶇О:">
+ <el-input v-model="searchData.name" @input="query"></el-input>
+ </el-form-item>
+ <el-form-item label="缂栧埗鐘舵��:" >
+ <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 250px;">
+ <el-option label="寰呯紪鍒�" :value="0"></el-option>
+ <el-option label="宸茬紪鍒�" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button plain @click="resetBtn" style="margin-left: 12px;">閲� 缃�</el-button>
+ <el-button @click="searchTechnical">鏌� 璇�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="technical-table">
+ <div class="table-box">
+ <el-table
+ border style="width: 100%"
+ :data="technicalTable"
+ >
+ <el-table-column
+ type="selection"
+ width="78">
+ </el-table-column>
+ <el-table-column
+ prop="order_number"
+ label="璁㈠崟鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="saleman"
+ label="涓氬姟鍛�">
+ </el-table-column>
+ <el-table-column
+ prop="proname"
+ label="瀹㈡埛鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="浜у搧鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="specifications"
+ label="瑙勬牸鍨嬪彿">
+ </el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ prop="number"
+ label="鏁伴噺">
+ </el-table-column>
+ <el-table-column
+ prop="涓嬪崟鏃ユ湡"
+ label="涓嬪崟鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ prop="浜よ揣鏃ユ湡"
+ label="浜よ揣鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ label="鐘舵��"
+ width="85"
+ >
+ <template slot-scope="scope">
+ <span :style="{'color': scope.row.type==0 ? 'red':'green'}">
+ {{scope.row.type==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ width="194">
+ <template slot-scope="scope">
+ <!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
+ <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="pageParams.pageNo"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="pageParams.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :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:{
+ id:'',
+ date:'',
+ name:'',
+ condition:'',
+ },
+ compiledata:{},
+ technicalTable: [],
+ showDetail: false,
+ selectedRow: {},
+ pageParams:{
+ pageNo:1,
+ pageSize:10,
+ total:0
+ }
+ }
+ },
+ created() {
+ this.getTechnicalTableData()
+ },
+ methods: {
+ authorizedstrength(row) {
+ this.compiledata = row
+ this.compile()
+ },
+ //缂栧埗
+ compile() {
+ console.log();
+ this.$axios.post(this.$api.url.compile,{
+ id:this.compiledata.id
+ }).then( res =>{
+ this.$message.success('缂栧埗瀹屾垚')
+ })
+ this.getTechnicalTableData()
+ },
+
+ 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,
+ orderCode:this.searchData.id,
+ time:this.searchData.date,
+ name:this.searchData.name,
+ type:this.searchData.type,
+ }
+ })
+ this.technicalTable = res.data.row
+ this.pageParams.total = res.data.total
+ },
+
+
+ // 澶撮儴鏉′欢鏌ヨ-閲嶇疆
+ resetBtn() {
+ this.searchData={}
+ this.getTechnicalTableData()
+ },
+ // 澶撮儴鏉′欢鏌ヨ-鏌ヨ
+ searchTechnical() {
+ this.getTechnicalTableData()
+ },
+ handleSizeChange(value){
+ this.pageParams.pageSize = value
+ this.getTechnicalTableData()
+ },
+ handleCurrentChange(value){
+ this.pageParams.pageNo = value
+ this.getTechnicalTableData()
+ }
+ },
+}
+</script>
<style scoped>
.technical{
height: 100%;
width: 100%;
+ }
+ .el-form-item__label{
+ padding: 0 60px 0;
}
.technical .title .el-button {
height: 32px;
@@ -21,9 +335,13 @@
background: #fff;
padding: 24px 32px;
}
+
+.search-header .el-form-item__label{
+ padding: 0 30px 0 0;
+}
.search-header .el-form-item{
margin: 0px;
- font-size: 14px;
+ font-size: 20px;
}
.search-header .el-form-item:nth-child(1){
margin-right: 48px;
@@ -48,7 +366,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,185 +399,30 @@
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">
- <el-row>
- <el-col :span="12">鎶�鏈枃浠�</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
- </el-col>
- </el-row>
- </div>
- <div class="search-header">
- <el-form v-model="searchData" :inline="true">
- <el-form-item label="璁㈠崟鍙�:">
- <el-input v-model="searchData.number"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪崟鏃ユ湡:">
- <el-date-picker
- v-model="searchData.date"
- 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-form-item>
- </el-form>
- </div>
- <div class="technical-table">
- <div class="table-box">
- <el-table
- border style="width: 100%"
- :data="technicalTable"
- >
- <el-table-column
- type="selection"
- width="78">
- </el-table-column>
- <el-table-column
- prop="date"
- label="璁㈠崟鍙�"
- width="124">
- </el-table-column>
- <el-table-column
- prop="name"
- label="宸ョ▼鍚嶇О"
- width="160">
- </el-table-column>
- <el-table-column
- prop="address"
- label="浜у搧缂栫爜"
- width="168"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="浜у搧澶х被"
- width="128">
- </el-table-column>
- <el-table-column
- prop="address"
- label="瑙勬牸鍨嬪彿"
- width="170">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍗曚綅"
- width="100">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鏁伴噺"
- width="118"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="涓嬪崟浜�"
- width="114">
- </el-table-column>
- <el-table-column
- prop="address"
- label="涓嬪崟鏃ユ湡"
- width="153"
- >
- </el-table-column>
- <el-table-column
- prop="address"
- label="浜よ揣鏃ユ湡"
- width="137">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鐘舵��"
- width="85"
- >
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- width="194">
- <template>
- <el-button type="text" size="small">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" size="small">缂栬緫闄勪欢</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
-
-
- <el-pagination
- :current-page="1"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
- layout="total, sizes, prev, pager, next, jumper"
- :total="400">
- </el-pagination>
- </div>
- </div>
-</template>
-
-<script>
-export default {
- data() {
- return {
- searchData:{
- number:'',
- 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: '涓婃捣甯�'
- }
- ]
- }
- },
-}
-</script>
+<style>
+ .technical .title *{
+ font-size: 14px;
+ }
+
+ .technical .search-header *{
+ font-size: 14px;
+ }
+</style>
--
Gitblit v1.9.3