From 600422b0312cab54f6a84f63e1e5ac1e1fc36d1b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 13:16:46 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/rawInsDetail.vue modified: src/components/view/sale.vue modified: src/components/view/technical.vue modified: src/main.js
---
src/main.js | 2
src/components/view/technical.vue | 4
src/components/view/rawInsDetail.vue | 30 +-
src/assets/api/controller.js | 1
src/components/view/sale.vue | 821 ++++++++++++++++++++++++++++--------------------------
5 files changed, 447 insertions(+), 411 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index ffe7844..a1ad291 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -185,6 +185,7 @@
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
addSale: "sale/addSale", //鏂板閿�鍞崟
saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+ synchronization: "sale/synchronization",//鍚屾
updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 4b41eba..c2b201f 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -429,21 +429,21 @@
},
methods: {
assertTest(row){
- let fuArr=['>', '<', '=']
- if(!fuArr.includes(row.required[0])){
- this.$message({
- message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
- if(!fuArr.includes(row.internal[0])){
- this.$message({
- message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let fuArr=['>', '<', '=']
+ // if(!fuArr.includes(row.required[0])){
+ // this.$message({
+ // message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
+ // if(!fuArr.includes(row.internal[0])){
+ // this.$message({
+ // message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
},
// 璁惧鏍戣繃婊ゆ悳绱�
filterNode(value, data) {
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 697f19f..2e10f82 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -1,112 +1,112 @@
<style scoped>
- .sale .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;
- }
+.sale .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;
+}
- .sale .title {
- margin-bottom: 10px;
- padding: 0 20px;
- }
+.sale .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+}
- .sale .title * {
- font-size: 16px;
- }
+.sale .title * {
+ font-size: 16px;
+}
- .choose {
- padding: 21px 24px;
- display: flex;
- align-items: center;
- background-color: #fff;
- border-bottom: 3px solid rgb(245, 247, 251);
- }
+.choose {
+ padding: 21px 24px;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-bottom: 3px solid rgb(245, 247, 251);
+}
- .choose * {
- font-size: 14px;
- }
+.choose * {
+ font-size: 14px;
+}
- .choose .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;
- }
+.choose .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;
+}
- .thing {
- width: calc(100% - 44px);
- height: calc(100% - 42px - 82px - 66px);
- background-color: #fff;
- overflow: auto;
- padding: 33px 22px;
- }
+.thing {
+ width: calc(100% - 44px);
+ height: calc(100% - 42px - 82px - 66px);
+ background-color: #fff;
+ overflow: auto;
+ padding: 33px 22px;
+}
- .table_do {
- color: #004ea0;
- cursor: pointer;
- }
+.table_do {
+ color: #004ea0;
+ cursor: pointer;
+}
- .select-model .body {
- padding: 0 20px;
- color: #333;
- max-height: 72vh;
- overflow-y: auto;
- }
+.select-model .body {
+ padding: 0 20px;
+ color: #333;
+ max-height: 72vh;
+ overflow-y: auto;
+}
- .select-model .head {
- font-size: 16px;
- color: #333;
- line-height: 40px;
- }
+.select-model .head {
+ font-size: 16px;
+ color: #333;
+ line-height: 40px;
+}
- .select-model .content * {
- font-size: 14px;
- }
+.select-model .content * {
+ font-size: 14px;
+}
- .select-model .content .value {
- font-size: 14px;
- padding: 0 15px;
- background-color: rgba(0, 0, 0, 0.05);
- border: 1px solid rgba(0, 0, 0, 0.1);
- border-radius: 4px;
- }
+.select-model .content .value {
+ font-size: 14px;
+ padding: 0 15px;
+ background-color: rgba(0, 0, 0, 0.05);
+ border: 1px solid rgba(0, 0, 0, 0.1);
+ border-radius: 4px;
+}
</style>
<style>
- .sale .title .el-button * {
- font-size: 14px;
- }
+.sale .title .el-button * {
+ font-size: 14px;
+}
- .sale .title .el-button--default {
- color: #004EA2;
- }
+.sale .title .el-button--default {
+ color: #004EA2;
+}
- .sale .thing * {
- font-size: 14px;
- }
+.sale .thing * {
+ font-size: 14px;
+}
- .sale .has-gutter .el-table__cell {
- background-color: #F0F1F5 !important;
- color: #333;
- }
+.sale .has-gutter .el-table__cell {
+ background-color: #F0F1F5 !important;
+ color: #333;
+}
- .sale .has-gutter .el-table__cell .cell {
- font-size: 16px;
- font-weight: 500;
- }
+.sale .has-gutter .el-table__cell .cell {
+ font-size: 16px;
+ font-weight: 500;
+}
- .sale .cell {
- color: #333;
- padding-left: 17px !important;
- }
+.sale .cell {
+ color: #333;
+ padding-left: 17px !important;
+}
- .sale .el-table__body-wrapper {
- height: 100%;
- }
+.sale .el-table__body-wrapper {
+ height: 100%;
+}
- .sale .el-table__body {
- height: 100%;
- }
+.sale .el-table__body {
+ height: 100%;
+}
</style>
<template>
@@ -115,6 +115,8 @@
<el-row>
<el-col :span="12" style="line-height: 32px;">閿�鍞鐞�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button type="success" @click="syncOrder"
+ :icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">鍚屾</el-button>
<el-button type="primary" icon="el-icon-plus" @click="openAddDia">鏂板</el-button>
<!-- <el-button icon="el-icon-edit-outline">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="delSales">鍒犻櫎</el-button>
@@ -162,50 +164,53 @@
</el-table-column>
<el-table-column prop="浜よ揣鏃ユ湡" label="浜よ揣鏃ユ湡" width="150">
</el-table-column>
+ <el-table-column prop="note" label="澶囨敞" width="150">
+ </el-table-column>
<el-table-column prop="type" label="鐘舵��" width="100">
<template slot-scope="scope">
- <span style="color: #34BD66;" v-if="scope.row.type==1">閫氳繃</span>
- <span style="color: #E84738;" v-else-if="scope.row.type==0">涓嶉�氳繃</span>
+ <span style="color: #34BD66;" v-if="scope.row.type == 1">閫氳繃</span>
+ <span style="color: #E84738;" v-else-if="scope.row.type == 0">涓嶉�氳繃</span>
<span v-else>鏈鏍�</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="220">
<template slot-scope="scope">
<span class="table_do" @click="changeShowDetail(scope.row)"> 鏌ョ湅璇︽儏 </span>
- <span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)"> 瀹℃牳 </span>
+ <span class="table_do" v-if="scope.row.type == null" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" v-if="scope.row.type == null"
+ @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
<span class="table_do" v-else> </span>
<span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
</template>
</el-table-column>
</el-table>
<el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
- :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
- :total="countSize">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="countSize">
</el-pagination>
</el-col>
</div>
<div class="select-model">
<el-dialog title="閿�鍞鎯�" :visible.sync="selectDia" width="750px">
- <div class="body" v-if="oneData!=null">
+ <div class="body" v-if="oneData != null">
<div class="head">鍩烘湰淇℃伅</div>
<div class="content">
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">璁㈠崟缂栧彿</el-col>
<el-col :span="8">
- <div class="value">{{oneData.orderNumber}}</div>
+ <div class="value">{{ oneData.orderNumber }}</div>
</el-col>
<el-col :span="3" :offset="2">鍚堝悓缂栧彿</el-col>
<el-col :span="8">
- <div class="value">{{oneData.code}}</div>
+ <div class="value">{{ oneData.code }}</div>
</el-col>
</el-row>
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">宸ョ▼鍚嶇О</el-col>
<el-col :span="8">
- <div class="value">{{oneData.name}}</div>
+ <div class="value">{{ oneData.name }}</div>
</el-col>
<el-col :span="3" :offset="2">鐘舵��</el-col>
<el-col :span="8">
@@ -214,53 +219,43 @@
<div class="value" v-else> </div>
</el-col>
</el-row>
+ <el-row style="line-height: 30px;margin: 15px 0;">
+ <el-col :span="3">澶囨敞</el-col>
+ <el-col :span="21">
+ <div style="width: 95%;word-wrap: break-word;" class="value">{{ oneData.note }}</div>
+ </el-col>
+ </el-row>
</div>
<div class="head">瀹㈡埛淇℃伅</div>
<div class="content">
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">瀹㈡埛鍚嶇О</el-col>
<el-col :span="8">
- <div class="value">{{oneData.proname}}</div>
+ <div class="value">{{ oneData.proname }}</div>
</el-col>
- <el-col :span="3" :offset="2">鏀惰揣鍦板潃</el-col>
+ <el-col :span="3" :offset="2">涓氬姟鍛�</el-col>
<el-col :span="8">
- <div class="value">{{oneData.adress}}</div>
+ <div class="value">{{ oneData.saleman }}</div>
</el-col>
</el-row>
<el-row style="line-height: 30px;margin: 15px 0;">
- <el-col :span="3">鑱旂郴浜�</el-col>
+ <el-col :span="3">涓嬪崟浜�</el-col>
<el-col :span="8">
- <div class="value">{{oneData.username}}</div>
+ <div class="value">{{ oneData.orderName }}</div>
</el-col>
- <el-col :span="3" :offset="2">鑱旂郴鐢佃瘽</el-col>
+ <el-col :span="3" :offset="2">浜よ揣鏃ユ湡</el-col>
<el-col :span="8">
- <div class="value">{{oneData.phone}}</div>
- </el-col>
- </el-row>
- <el-row style="line-height: 30px;margin: 15px 0;">
- <el-col :span="3">涓氬姟鍛�</el-col>
- <el-col :span="8">
- <div class="value">{{oneData.saleman}}</div>
- </el-col>
- <el-col :span="3" :offset="2">涓嬪崟浜�</el-col>
- <el-col :span="8">
- <div class="value">{{oneData.orderName}}</div>
- </el-col>
- </el-row>
- <el-row style="line-height: 30px;margin: 15px 0;">
- <el-col :span="3">浜よ揣鏃ユ湡</el-col>
- <el-col :span="8">
- <div class="value">{{oneData.delTime}}</div>
- </el-col>
- <el-col :span="3" :offset="2">瀹℃牳浜�</el-col>
- <el-col :span="8">
- <div class="value">{{oneData.checkname==null?' ': oneData.checkname}}</div>
+ <div class="value">{{ oneData.delTime }}</div>
</el-col>
</el-row>
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">瀹℃牳鏃ユ湡</el-col>
<el-col :span="8">
- <div class="value">{{oneData.checkTime==null?' ': oneData.checkTime}}</div>
+ <div class="value">{{ oneData.checkTime == null ? ' ' : oneData.checkTime }}</div>
+ </el-col>
+ <el-col :span="3" :offset="2">瀹℃牳浜�</el-col>
+ <el-col :span="8">
+ <div class="value">{{ oneData.checkname == null ? ' ' : oneData.checkname }}</div>
</el-col>
</el-row>
</div>
@@ -277,21 +272,28 @@
</el-table-column>
<el-table-column prop="price" label="鍗曚环">
</el-table-column>
+ <el-table-column prop="username" label="鑱旂郴浜�">
+ </el-table-column>
+ <el-table-column prop="phone" label="鑱旂郴鐢佃瘽">
+ </el-table-column>
+ <el-table-column prop="address" label="鍦板潃">
+ </el-table-column>
</el-table>
</div>
</div>
</el-dialog>
</div>
<div class="select-model">
- <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="850px"
- @close="closeDialog">
+ <el-dialog :title="`閿�鍞�${upDia == true ? '淇敼' : '鏂板'}`" :visible.sync="addDia" width="850px"
+ @close="closeDialog">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
<div class="content">
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">璁㈠崟缂栧彿</el-col>
<el-col :span="8">
- <el-input v-model="addData.orderNumber" size="small" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable></el-input>
+ <el-input v-model="addData.orderNumber" size="small" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
+ clearable></el-input>
</el-col>
<el-col :span="3" :offset="2">鍚堝悓缂栧彿</el-col>
<el-col :span="8">
@@ -312,37 +314,25 @@
<el-col :span="8">
<el-input v-model="addData.proname" size="small" placeholder="璇疯緭鍏ュ鎴峰悕绉�" clearable></el-input>
</el-col>
- <el-col :span="3" :offset="2">鏀惰揣鍦板潃</el-col>
- <el-col :span="8">
- <el-input v-model="addData.adress" size="small" placeholder="璇疯緭鍏ユ敹璐у湴鍧�" clearable></el-input>
- </el-col>
- </el-row>
- <el-row style="line-height: 30px;margin: 15px 0;">
- <el-col :span="3">鑱旂郴浜�</el-col>
- <el-col :span="8">
- <el-input v-model="addData.username" size="small" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable></el-input>
- </el-col>
- <el-col :span="3" :offset="2">鑱旂郴鐢佃瘽</el-col>
- <el-col :span="8">
- <el-input v-model="addData.phone" size="small" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable></el-input>
- </el-col>
- </el-row>
- <el-row style="line-height: 30px;margin: 15px 0;">
- <el-col :span="3">涓嬪崟浜�</el-col>
- <el-col :span="8">
- <el-input v-model="addData.orderName" size="small" placeholder="璇疯緭鍏ヤ笅鍗曚汉" clearable></el-input>
- </el-col>
<el-col :span="3" :offset="2">浜よ揣鏃ユ湡</el-col>
<el-col :span="8">
<el-date-picker v-model="addData.delTime" size="small" placeholder="璇疯緭鍏ヤ氦璐ф棩鏈�" clearable
value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-row>
+ <el-row style="line-height: 30px;margin: 15px 0;">
+ <el-col :span="3">涓嬪崟浜�</el-col>
+ <el-col :span="8">
+ <el-input v-model="addData.orderName" size="small" placeholder="璇疯緭鍏ヤ笅鍗曚汉"
+ clearable></el-input>
+ </el-col>
+ </el-row>
</div>
<div class="head" style="line-height: 50px;">
<el-col :span="12">浜у搧淇℃伅</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="mini" @click="addSaleMaterial"><span style="font-size: 12px;">娣诲姞琛�</span></el-button>
+ <el-button size="mini" @click="addSaleMaterial"><span
+ style="font-size: 12px;">娣诲姞琛�</span></el-button>
</el-col>
</div>
<div class="content">
@@ -355,7 +345,8 @@
</el-table-column>
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="180">
<template slot-scope="scope">
- <el-input v-model="scope.row.specifications" size="small" clearable placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input>
+ <el-input v-model="scope.row.specifications" size="small" clearable
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
@@ -366,7 +357,7 @@
<el-table-column prop="number" label="鏁伴噺">
<template slot-scope="scope">
<el-input v-model.number="scope.row.number" size="small"
- @change="(val)=>scope.row.number = isNaN(val)?null:val" clearable
+ @change="(val) => scope.row.number = isNaN(val) ? null : val" clearable
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
@@ -375,17 +366,35 @@
<el-input v-model="scope.row.price" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
+ <el-table-column prop="username" label="鑱旂郴浜�">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.username" size="small" clearable
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="phone" label="鐢佃瘽">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.phone" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="address" label="鍦板潃">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.address" size="small" clearable
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
<el-table-column prop="price" label="鎿嶄綔" width="65px">
<template slot-scope="scope">
- <el-button type="text" @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">鍒犻櫎</el-button>
+ <el-button type="text"
+ @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button v-if="upDia==false" type="primary" @click="addSale">纭� 瀹�</el-button>
- <el-button v-else-if="upDia==true" type="primary" @click="upSale">纭� 瀹�</el-button>
+ <el-button v-if="upDia == false" type="primary" @click="addSale">纭� 瀹�</el-button>
+ <el-button v-else-if="upDia == true" type="primary" @click="upSale">纭� 瀹�</el-button>
<el-button @click="addDia = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -394,259 +403,281 @@
</template>
<script>
- export default {
- data() {
- return {
- search: {
- code: null,
- name: null,
- type: null,
- delTime: null
- },
- tableData: [],
- selects: '',
- currentPage: 1,
- countSize: 0,
- pageSize: 10,
- selectDia: false,
- oneData: null,
- addDia: false,
- addData: {
- orderNumber: null,
- code: null,
- name: null,
- proname: null,
- adress: null,
- username: null,
- delTime: null,
- orderName: null,
- phone: null,
- saleMaterialList: []
- },
- repeList: [],
- upDia: false
+export default {
+ data() {
+ return {
+ search: {
+ code: null,
+ name: null,
+ type: null,
+ delTime: null
+ },
+ tableData: [],
+ selects: '',
+ currentPage: 1,
+ countSize: 0,
+ pageSize: 10,
+ selectDia: false,
+ oneData: null,
+ addDia: false,
+ addData: {
+ orderNumber: null,
+ code: null,
+ name: null,
+ proname: null,
+ adress: null,
+ username: null,
+ delTime: null,
+ orderName: null,
+ phone: null,
+ saleMaterialList: []
+ },
+ repeList: [],
+ isSync: false,
+ upDia: false
+ }
+ },
+ mounted() {
+ this.selectRawInspectsList()
+ },
+ methods: {
+ closeDialog() {
+ this.addData = {
+ orderNumber: null,
+ code: null,
+ name: null,
+ proname: null,
+ adress: null,
+ username: null,
+ delTime: null,
+ orderName: null,
+ phone: null,
+ saleMaterialList: []
}
},
- mounted() {
+ handleSelectionChange(val) {
+ this.selects = ''
+ val.forEach((a, ai) => {
+ this.selects += a.id
+ if (ai != val.length - 1) {
+ this.selects += ','
+ }
+ })
+ },
+ handleSizeChange(val) {
+ this.pageSize = val
this.selectRawInspectsList()
},
- methods: {
- closeDialog(){
- this.addData = {
- orderNumber: null,
- code: null,
- name: null,
- proname: null,
- adress: null,
- username: null,
- delTime: null,
- orderName: null,
- phone: null,
- saleMaterialList: []
+ syncOrder() {
+ this.isSync = true
+ setTimeout(() => {
+ this.$message({
+ message: '鍚屾鍋囨垚鍔�(鈼曖礂鈼�)锛�',
+ type: 'success'
+ });
+ this.isSync=false
+ }, 2000);
+ return
+ //璋冪敤鍚屾鎺ュ彛
+ this.axios.post(this.$api.url.synchronization).then(res => {
+ if (res.code === '200') {
+ this.isSync = false
+ this.$message({
+ message: '鍚屾鎴愬姛锛�',
+ type: 'success'
+ });
}
- },
- handleSelectionChange(val) {
- this.selects = ''
- val.forEach((a, ai)=>{
- this.selects += a.id
- if(ai!=val.length-1){
- this.selects += ','
- }
- })
- },
- handleSizeChange(val) {
- this.pageSize = val
- this.selectRawInspectsList()
- },
- handleCurrentChange(val) {
- this.currentPage = val
- this.selectRawInspectsList()
- },
- selectRawInspectsList() {
- this.axios.get(this.$api.url.selectSaleList, {
- params: {
- pageSize: this.currentPage,
- countSize: this.pageSize,
- delTime: this.search.delTime,
- name: this.search.name,
- type: this.search.type,
- orderNumber: this.search.code
- }
- }).then(res => {
- this.tableData = res.data.row
- this.countSize = res.data.total
- })
- },
- clean() {
- this.selects = ''
- this.currentPage = 1
- this.countSize = 0
- this.pageSize = 10
- this.search = {
- formTime: null,
- createTime: null,
- insState: 2,
- judgeState: 2,
- type: null
+ })
+ },
+ handleCurrentChange(val) {
+ this.currentPage = val
+ this.selectRawInspectsList()
+ },
+ selectRawInspectsList() {
+ this.axios.get(this.$api.url.selectSaleList, {
+ params: {
+ pageSize: this.currentPage,
+ countSize: this.pageSize,
+ delTime: this.search.delTime,
+ name: this.search.name,
+ type: this.search.type,
+ orderNumber: this.search.code
}
- this.selectRawInspectsList()
- },
- changeShowDetail(ob) {
- this.selectDia = true
- this.axios.get(this.$api.url.selectSaleDatilById, {
- params: {
- id: ob.id
- }
- }).then(res => {
- this.oneData = res.data
- })
- },
- addSaleMaterial() {
- this.addData.saleMaterialList.push({})
- },
- addSale() {
- for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
- if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
- this.addData.saleMaterialList.splice(b, 1)
- b--
- } else {
- for (var c in this.addData.saleMaterialList[b]) {
- if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
- .keys(this.addData.saleMaterialList[b]).length != 5) {
- this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
- return
- }
- }
- }
+ }).then(res => {
+ this.tableData = res.data.row
+ this.countSize = res.data.total
+ })
+ },
+ clean() {
+ this.selects = ''
+ this.currentPage = 1
+ this.countSize = 0
+ this.pageSize = 10
+ this.search = {
+ formTime: null,
+ createTime: null,
+ insState: 2,
+ judgeState: 2,
+ type: null
+ }
+ this.selectRawInspectsList()
+ },
+ changeShowDetail(ob) {
+ this.selectDia = true
+ this.axios.get(this.$api.url.selectSaleDatilById, {
+ params: {
+ id: ob.id
}
- for (var a in this.addData) {
- if (this.addData[a] == null || this.addData[a] == '') {
- if (a == 'saleMaterialList') {
- this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
- } else {
- this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
- }
- return
- }
- }
- this.axios.post(this.$api.url.addSale, this.addData, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- this.$message.success('娣诲姞鎴愬姛')
- this.addDia = false
- this.selectRawInspectsList()
- })
- },
- openAddDia() {
- this.addDia = !(this.addDia)
- this.upDia = false
- },
- upRepe(index, i) {
- var data = this.repeList[index]
- if (data == undefined) {
- this.addData.saleMaterialList[i] = {}
+ }).then(res => {
+ this.oneData = res.data
+ })
+ },
+ addSaleMaterial() {
+ this.addData.saleMaterialList.push({})
+ },
+ addSale() {
+ for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
+ if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
+ this.addData.saleMaterialList.splice(b, 1)
+ b--
} else {
- this.addData.saleMaterialList[i].unit = data.unit
- this.addData.saleMaterialList[i].specifications = data.specifications
+ for (var c in this.addData.saleMaterialList[b]) {
+ if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
+ .keys(this.addData.saleMaterialList[b]).length != 5) {
+ this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
+ return
+ }
+ }
}
- },
- saleCheck(ob) {
- this.$confirm(`璁㈠崟${ob.row.code}鐨勪俊鎭槸鍚﹂�氳繃`, '閿�鍞鍗曞鏍�', {
- distinguishCancelAndClose: true,
- confirmButtonText: '閫氳繃',
- cancelButtonText: '涓嶉�氳繃'
- }).then(res => {
- this.$axios.post(this.$api.url.saleCheck, {
- id: ob.row.id,
- type: 1
- }).then(res => {
- this.selectRawInspectsList()
- this.$parent.removeAllTab()
- })
- }).catch(e => {
- if (e == 'cancel') {
- this.$axios.post(this.$api.url.saleCheck, {
- id: ob.row.id,
- type: 0
- }).then(res => {
- this.selectRawInspectsList()
- })
- }
- })
- },
- openUpDia(index) {
- this.addDia = true
- this.upDia = true
- this.axios.get(this.$api.url.selectSaleDatilById, {
- params: {
- id: index
- }
- }).then(res => {
- this.addData = res.data
- this.addData.id = index
- })
- },
- upSale() {
- for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
- if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
- this.addData.saleMaterialList.splice(b, 1)
- b--
+ }
+ for (var a in this.addData) {
+ if (this.addData[a] == null || this.addData[a] == '') {
+ if (a == 'saleMaterialList') {
+ this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
} else {
- for (var c in this.addData.saleMaterialList[b]) {
- if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
- .keys(this.addData.saleMaterialList[b]).length != 6) {
- this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
- return
- }
- }
+ this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
}
- }
- for (var a in this.addData) {
- console.log(a);
- if ((this.addData[a] == null || this.addData[a] == '') && a!='checkname' && a!='checkTime' && a != 'type') {
- if (a == 'saleMaterialList') {
- this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
- } else {
- this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
- }
- return
- }
- }
- this.axios.post(this.$api.url.updateSaleById, {
- id: this.addData.id,
- str: JSON.stringify(this.addData)
- }).then(res => {
- this.$message.success('缂栬緫鎴愬姛')
- this.addDia = false
- this.upDia = false
- this.selectRawInspectsList()
- })
- },
- deleteRow(index, rows) {
- rows.splice(index, 1);
- },
- delSale(index){
- this.axios.post(this.$api.url.delSale, {
- id: this.tableData[index].id,
- }).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.tableData.splice(index, 1)
- })
- },
- delSales(){
- if(this.selects=='') {
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹垹闄�')
return
}
- this.axios.post(this.$api.url.delAllSale,{
- ids: this.selects
- }).then(res=>{
- this.$message.success('鍒犻櫎鎴愬姛')
- this.selectRawInspectsList()
- })
}
+ this.axios.post(this.$api.url.addSale, this.addData, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.$message.success('娣诲姞鎴愬姛')
+ this.addDia = false
+ this.selectRawInspectsList()
+ })
+ },
+ openAddDia() {
+ this.addDia = !(this.addDia)
+ this.upDia = false
+ },
+ upRepe(index, i) {
+ var data = this.repeList[index]
+ if (data == undefined) {
+ this.addData.saleMaterialList[i] = {}
+ } else {
+ this.addData.saleMaterialList[i].unit = data.unit
+ this.addData.saleMaterialList[i].specifications = data.specifications
+ }
+ },
+ saleCheck(ob) {
+ this.$confirm(`璁㈠崟${ob.row.code}鐨勪俊鎭槸鍚﹂�氳繃`, '閿�鍞鍗曞鏍�', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '閫氳繃',
+ cancelButtonText: '涓嶉�氳繃'
+ }).then(res => {
+ this.$axios.post(this.$api.url.saleCheck, {
+ id: ob.row.id,
+ type: 1
+ }).then(res => {
+ this.selectRawInspectsList()
+ this.$parent.removeAllTab()
+ })
+ }).catch(e => {
+ if (e == 'cancel') {
+ this.$axios.post(this.$api.url.saleCheck, {
+ id: ob.row.id,
+ type: 0
+ }).then(res => {
+ this.selectRawInspectsList()
+ })
+ }
+ })
+ },
+ openUpDia(index) {
+ this.addDia = true
+ this.upDia = true
+ this.axios.get(this.$api.url.selectSaleDatilById, {
+ params: {
+ id: index
+ }
+ }).then(res => {
+ this.addData = res.data
+ this.addData.id = index
+ })
+ },
+ upSale() {
+ for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
+ if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
+ this.addData.saleMaterialList.splice(b, 1)
+ b--
+ } else {
+ for (var c in this.addData.saleMaterialList[b]) {
+ if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
+ .keys(this.addData.saleMaterialList[b]).length != 6) {
+ this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
+ return
+ }
+ }
+ }
+ }
+ for (var a in this.addData) {
+ console.log(a);
+ if ((this.addData[a] == null || this.addData[a] == '') && a != 'checkname' && a != 'checkTime' && a != 'type') {
+ if (a == 'saleMaterialList') {
+ this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
+ } else {
+ this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
+ }
+ return
+ }
+ }
+ this.axios.post(this.$api.url.updateSaleById, {
+ id: this.addData.id,
+ str: JSON.stringify(this.addData)
+ }).then(res => {
+ this.$message.success('缂栬緫鎴愬姛')
+ this.addDia = false
+ this.upDia = false
+ this.selectRawInspectsList()
+ })
+ },
+ deleteRow(index, rows) {
+ rows.splice(index, 1);
+ },
+ delSale(index) {
+ this.axios.post(this.$api.url.delSale, {
+ id: this.tableData[index].id,
+ }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.tableData.splice(index, 1)
+ })
+ },
+ delSales() {
+ if (this.selects == '') {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹垹闄�')
+ return
+ }
+ this.axios.post(this.$api.url.delAllSale, {
+ ids: this.selects
+ }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectRawInspectsList()
+ })
}
}
+}
</script>
\ No newline at end of file
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 9f1f9d9..501871f 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -85,6 +85,10 @@
label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
+ prop="note"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
label="鐘舵��"
width="85"
>
diff --git a/src/main.js b/src/main.js
index 2c27d35..db24cf8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://10.20.102.112:8001'
+const javaApi = 'http://127.0.0.1:8001'
// localhost 127.0.0.1
// const javaApi = 'http://127.0.0.1:8001/'
--
Gitblit v1.9.3