From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 110 +++++++++------------------
src/components/tool/value-table.vue | 2
src/components/view/role-manage.vue | 1
src/components/view/b1-inspect-order-plan.vue | 5 +
src/components/view/a6-personnel-detail.vue | 41 ++++++++++
src/components/view/person-manage.vue | 61 +++++++++++++++
src/view/index.vue | 4
7 files changed, 148 insertions(+), 76 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index de2c1b3..20b9a47 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -99,7 +99,7 @@
text-align: left;
width: 100%;
display: inline-block;
- margin-left: 20px;
+ margin-left: 200px;
}
</style>
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index d4ffde8..3778dec 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -177,6 +177,46 @@
},
data() {
return {
+ datathirdParty:[{
+ id: 1,
+ label: '涓�绾� 1',
+ children: [{
+ id: 4,
+ label: '浜岀骇 1-1',
+ children: [{
+ id: 9,
+ label: '涓夌骇 1-1-1'
+ }, {
+ id: 10,
+ label: '涓夌骇 1-1-2'
+ }]
+ }]
+ }, {
+ id: 2,
+ label: '涓�绾� 2',
+ children: [{
+ id: 5,
+ label: '浜岀骇 2-1'
+ }, {
+ id: 6,
+ label: '浜岀骇 2-2'
+ }]
+ }, {
+ id: 3,
+ label: '涓�绾� 3',
+ children: [{
+ id: 7,
+ label: '浜岀骇 3-1'
+ }, {
+ id: 8,
+ label: '浜岀骇 3-2'
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ },
+ addthirdParty:false,
search: null,
list: [],
selectTree: '',
@@ -218,6 +258,7 @@
this.selectTreeList()
},
methods: {
+
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 54a6f86..6ae4714 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -102,6 +102,11 @@
.ins-order-plan-main .el-form-item__label{
color: #000;
}
+
+ .ins-order-plan-main .el-table th.el-table__cell>.cell{
+ height: 46px;
+ line-height: 30px;
+ }
</style>
<template>
<div class="ins-order-plan-main">
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 87e822c..986d535 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -1,6 +1,6 @@
<style scoped>
.standard {
- padding: 20px 0;
+ padding: 10px 0;
display: flex;
}
@@ -38,8 +38,8 @@
}
.right .title {
- height: 30px;
- line-height: 30px;
+ height: 34px;
+ line-height: 34px;
padding: 0 10px;
background-color: white;
}
@@ -72,12 +72,12 @@
height: 40px !important;
}
>>>.header-class th.el-table__cell>.cell{
- line-height: 14px !important;
+ line-height: 20px !important;
padding-top: 0 !important;
padding-bottom: 0 !important;
}
>>>.el-table__row{
- height: 30px !important;
+ height: 35px !important;
}
</style>
<style>
@@ -145,15 +145,6 @@
<div class="right">
<el-row class="title">
<el-col :span="24" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
- <!-- <el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''"> -->
- <!-- <el-button size="small" type="primary" @click="addStandardDia = true"
- v-if="addStandardMethod">鏂板鏍囧噯</el-button>
- <el-button size="small" type="primary" @click="addProductDia = true" v-if="addStandardProduct">鏂板椤圭洰</el-button>
- <el-button size="small" @click="delStandardProductByIds" v-if="delStandardProduct">
- <i class="el-icon-delete" style="color: #3A7BFA;"></i>
- <span style="color: #3A7BFA;">鍒犻櫎</span>
- </el-button> -->
- <!-- </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
<el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;" height="220" tooltip-effect="dark"
@@ -175,17 +166,16 @@
</el-table>
</el-row>
<el-row class="product_table" v-loading="tableLoad2">
- <el-table :data="pagedData" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe
+ <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe
:fit="true" border
@selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
@select="upProductSelect"
@select-all="handleAll"
class="productTable"
- @filter-change="filterChange"
header-row-class-name="header-class">
- <el-table-column type="selection" width="65" >
+ <el-table-column type="selection" width="50" >
</el-table-column>
- <el-table-column prop="model" label="鍨嬪彿" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
@@ -300,7 +290,7 @@
<el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鏂板鏍囧噯" :visible.sync="addStandardDia" width="400px">
+ <!-- <el-dialog title="鏂板鏍囧噯" :visible.sync="addStandardDia" width="400px">
<div class="body">
<el-row style="line-height: 50px;">
<el-col :span="6" style="text-align: right;">
@@ -317,8 +307,8 @@
<el-button @click="addStandardDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addStandardMethodList" :loading="addLoad2">纭� 瀹�</el-button>
</span>
- </el-dialog>
- <el-dialog title="鏂板椤圭洰" :visible.sync="addProductDia" width="70%">
+ </el-dialog> -->
+ <!-- <el-dialog title="鏂板椤圭洰" :visible.sync="addProductDia" width="70%">
<div class="body" style="height: 60vh;" v-if="addProductDia">
<ValueTable ref="ValueTable" :url="$api.capacityScope.selectItemParameterList" :componentData="componentData" />
</div>
@@ -326,7 +316,7 @@
<el-button @click="addProductDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addStandardProductDo" :loading="addLoad3">纭� 瀹�</el-button>
</span>
- </el-dialog>
+ </el-dialog> -->
<el-dialog title="鍖洪棿璁剧疆" :visible.sync="sectionUpDia" width="70%">
<div class="body" style="padding: 5px 0;">
<el-table :data="sectionList" border style="width: 100%" height="350px">
@@ -459,27 +449,7 @@
total:0,
pageSize:100,
currentPage:1,
- productLists:[],
- }
- },
- computed: {
- pagedData() {
- const start = (this.currentPage - 1) * this.pageSize;
- const end = start + this.pageSize;
- this.total = this.productList.length;
- return this.productList.slice(start, end);
- },
- },
- watch:{
- pagedData:{
- deep:true,
- handler(val){
- setTimeout(() => {
- val.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- }, 300)
- }
+ standardId: 0
}
},
mounted() {
@@ -958,17 +928,19 @@
},
rowClick(row, column, event) {
this.tableLoad2 = true
+ this.standardId = row.id
this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
id: row.id,
- tree: this.selectTree
+ tree: this.selectTree,
+ page: this.currentPage
}).then(res => {
- this.productLists = this.HaveJson(res.data)
- this.productList = res.data
- // setTimeout(() => {
- // this.productList.forEach(a => {
- // if (a.state == 1) this.toggleSelection(a)
- // })
- // }, 300)
+ this.productList = res.data.productList
+ this.total = res.data.total
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
this.tableLoad2 = false
})
},
@@ -1000,16 +972,9 @@
}
// this.$message.success('宸蹭繚瀛�')
})
- this.productLists.map(item => {
- if(row.id == item.id){
- item.state = row.state;
- }
- return item
- })
},
filterHandler(value, row, column) {
const property = column['property'];
- // console.log(222222222222,row[property],value)
return row[property] === value;
},
handleAll(e) {
@@ -1100,22 +1065,21 @@
},
handleCurrentChange(val) {
this.currentPage = val;
+ this.tableLoad2 = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
+ id: this.standardId,
+ tree: this.selectTree,
+ page: val
+ }).then(res => {
+ this.productList = res.data.productList
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ this.tableLoad2 = false
+ })
},
- filterChange(e){
- let arr =[];
- for (let key in e){
- arr = e[key]
- }
- if(arr.length>0){
- let arr0 = this.HaveJson(this.productLists).filter(item=>{
- return arr.find(value=>item.sonLaboratory==value)!==undefined
- })
- this.productList = this.HaveJson(arr0)
- }else{
- this.productList = this.HaveJson(this.productLists)
- }
- // productLists
- }
}
}
</script>
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index e3d8ba1..9003944 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -89,6 +89,7 @@
<!-- <el-row class="title">
<el-col :span="12" style="padding-left: 20px;">鐢ㄦ埛绠＄悊</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="openthirdParty">鑾峰彇涓夋柟浜哄憳</el-button>
<el-button size="medium" type="primary" @click="opeaAdd" v-if="addPower">鏂板鐢ㄦ埛</el-button>
</el-col>
</el-row> -->
@@ -171,6 +172,22 @@
<el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog title="娣诲姞涓夋柟浜哄憳" :visible.sync="addthirdParty" width="400px">
+ <div class="body">
+ <el-tree
+ :data="datathirdParty"
+ show-checkbox
+ node-key="id"
+ :default-expanded-keys="[2, 3]"
+ :default-checked-keys="[5]"
+ :props="defaultProps">
+ </el-tree>
+ <span slot="footer" style="padding-left: 200px">
+ <el-button @click="addthirdParty = false" size="mini">鍙� 娑�</el-button>
+ <el-button type="primary" @click="" :loading="addLoad" size="mini">纭� 瀹�</el-button>
+ </span>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -182,6 +199,46 @@
},
data() {
return {
+ datathirdParty:[{
+ id: 1,
+ label: '涓�绾� 1',
+ children: [{
+ id: 4,
+ label: '浜岀骇 1-1',
+ children: [{
+ id: 9,
+ label: '涓夌骇 1-1-1'
+ }, {
+ id: 10,
+ label: '涓夌骇 1-1-2'
+ }]
+ }]
+ }, {
+ id: 2,
+ label: '涓�绾� 2',
+ children: [{
+ id: 5,
+ label: '浜岀骇 2-1'
+ }, {
+ id: 6,
+ label: '浜岀骇 2-2'
+ }]
+ }, {
+ id: 3,
+ label: '涓�绾� 3',
+ children: [{
+ id: 7,
+ label: '浜岀骇 3-1'
+ }, {
+ id: 8,
+ label: '浜岀骇 3-2'
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ },
+ addthirdParty:false,
componentData: {
entity: {
name: null,
@@ -276,6 +333,10 @@
this.getPower()
},
methods: {
+ openthirdParty(){
+ this.addthirdParty=true;
+
+ },
refreshTable() {
this.$refs['ValueTable'].selectList()
},
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 28c4b8d..6b41247 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -96,6 +96,7 @@
<el-button type="primary" @click="saveAddData" :loading="addLoad" v-if="type!='鏌ョ湅'">纭� 瀹�</el-button>
</span>
</el-dialog>
+
</div>
</template>
diff --git a/src/view/index.vue b/src/view/index.vue
index 7a4697f..b9ff928 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -225,8 +225,8 @@
.component_view {
height: calc(100vh - 84px);
- width: calc(100% - 52px);
- padding: 0 26px;
+ width: calc(100% - 40px);
+ padding: 0 20px;
background: rgb(245, 247, 251);
}
--
Gitblit v1.9.3