From 63a5da9d6be10bbd910812c423bdfad7ae2945e5 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 09 四月 2024 11:24:16 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/silk/silk-web into zzq
---
src/views/productManage/silkInspectForm/index.vue | 83 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/src/views/productManage/silkInspectForm/index.vue b/src/views/productManage/silkInspectForm/index.vue
index 5bc971f..42c3c14 100644
--- a/src/views/productManage/silkInspectForm/index.vue
+++ b/src/views/productManage/silkInspectForm/index.vue
@@ -11,7 +11,7 @@
@searchClick="onFilterSearch"
>
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <!-- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button> -->
<el-button size="small" type="primary" @click="printClick">鎵撳嵃</el-button>
</template>
</CommonSearch>
@@ -30,8 +30,8 @@
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90" fixed="right">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" size="small">淇敼</el-button>
+ <el-button @click="delClick(scope.row.ID)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -46,7 +46,7 @@
</template>
<script>
-import { getFollowRecordList, getDeleteFollowRecord } from "@/api/productManage/silkInspectForm.js"
+import { getInspectCheckList, getInspectCheckDelete } from "@/api/productManage/silkInspectForm.js"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
export default {
@@ -61,25 +61,20 @@
tableList: {},
loading: false,
searchOptions: [],
- editConfig: {
- visible: false,
- title: "鏂板缓",
- infomation: {}
- },
- search_map: {},
+ keyword: '',
tableColumn: [
- { label: "缂栧彿", prop: "topic", min: 120, default: true }, // 涓婚
- { label: "杞﹂棿", prop: "client_name", min: 190, }, // 瀹㈡埛鍚嶇О
- { label: "杞︾粍", prop: "contact_name", min: 100, }, // 鑱旂郴浜哄鍚�
- { label: "鏃ユ湡", prop: "client_status", min: 100 }, // 瀹㈡埛鐘舵��
- { label: "骞冲潎绾ゅ害", prop: "contact_information_name", min: 100 }, // 鑱旂郴鏂瑰紡
- { label: "鍏噺绾ゅ害", prop: "follow_time", min: 130 }, // 鑱旂郴浜烘棩鏈�
- { label: "鍋忓樊", prop: "next_follow_time", min: 130 }, // 涓嬫鍥炶鏃ユ湡
- { label: "鎬诲樊", prop: "member_name", min: 110 }, // 璐熻矗浜�
- { label: "杞︾粍绛夌骇", prop: "member_name", min: 110 }, // 璐熻矗浜�
- { label: "娓呮磥", prop: "member_name", min: 110 }, // 璐熻矗浜�
- { label: "娲佸噣", prop: "member_name", min: 110 }, // 璐熻矗浜�
- { label: "瑙勬牸", prop: "member_name", min: 110 }, // 璐熻矗浜�
+ { label: "缂栧彿", prop: "number", min: 120, default: true },
+ { label: "杞﹂棿", prop: "name", min: 190, },
+ { label: "杞︾粍", prop: "workshopGroup", min: 100, },
+ { label: "鏃ユ湡", prop: "finishDate", min: 100 },
+ { label: "骞冲潎绾ゅ害", prop: "averageFineness", min: 100 },
+ { label: "鍏噺绾ゅ害", prop: "measureFineness", min: 130 },
+ { label: "鍋忓樊", prop: "deviation", min: 130 },
+ { label: "鎬诲樊", prop: "totalDeviation", min: 110 },
+ { label: "杞︾粍绛夌骇", prop: "finenessGrade", min: 110 },
+ { label: "娓呮磥", prop: "cleanliness", min: 110 },
+ { label: "娲佸噣", prop: "purity", min: 110 },
+ { label: "瑙勬牸", prop: "spec", min: 110 },
],
showCol: [
"缂栧彿",
@@ -99,7 +94,7 @@
},
created() {
this.setTable()
- this.getData(this.search_map)
+ this.getData(this.keyword)
},
computed: {
},
@@ -135,24 +130,23 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getFollowRecordList({
- search_map: this.search_map,
+ await getInspectCheckList({
+ keyword: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
.then((res) => {
console.log(res)
if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
+ if (res.data&& res.data.length > 0) {
+ const list = res.data.map((item) => {
return {
...item,
- client_name: item.client.name,
- contact_name: item.contact.name,
- client_status: item.client_status.name,
- phone: item.contact.phone,
- member_name: item.member.username,
- contact_information_name: item.contact_information.name
+ number: item.finenessRegister.number,
+ name: item.finenessRegister.name,
+ workshopGroup: item.finenessRegister.workshopGroup,
+ finishDate: item.finenessRegister.finishDate,
+ spec:item.finenessRegister.spec,
}
})
this.tableList.tableInfomation = list || []
@@ -173,7 +167,7 @@
},
// 鎼滅储
onFilterSearch(searchText) {
- this.search_map.client_name = searchText ?? ""
+ this.keyword= searchText ?? ""
this.pagerOptions.currPage = 1
this.getData()
},
@@ -189,23 +183,26 @@
},
// 缂栬緫
handleClick(row) {
- console.log(row)
- this.editConfig.title = "缂栬緫"
- let config=JSON.parse(JSON.stringify(row));
- config.client_status_id=config.client_status_id?config.client_status_id:null
- config.contact_information_id=config.contact_information_id?config.contact_information_id:null
- this.editConfig.infomation = { ...config, sale_chance_name:row.sale_chance.name, sales_leads_name: "" }
- this.editConfig.visible = true
+ this.$router.push({
+ path:"/productManage/silkRegisterForm/addPage",
+ query:{
+ activeName:'second',
+ inspectID:row.ID,
+ id:row.finenessRegisterID,
+ number:row.number,
+ }
+ });
},
// 鍒犻櫎
delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ debugger
+ this.$confirm("璇风‘璁ゆ槸鍚﹀垹闄わ紝鍒犻櫎鎿嶄綔涓嶅彲鎾ら攢??", "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
})
.then(() => {
- getDeleteFollowRecord({ ids: [id] }).then((response) => {
+ getInspectCheckDelete({ id: id }).then((response) => {
if (response.code === 200) {
this.$message.success("鍒犻櫎鎴愬姛")
this.getData()
--
Gitblit v1.8.0