From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 135 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 19 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 9a40c74..755a9c9 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -78,7 +78,7 @@
}
.standard .has-gutter .el-table__cell .cell {
- line-height: 38px;
+ line-height: 34px;
background-color: #f8f8f8;
}
@@ -114,9 +114,9 @@
style="height:calc(100% - 30px);overflow-y: scroll;scrollbar-width: none;">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
- <el-col :span="21" :class="{sort:node.level>3}">
+ <el-col :span="21" :class="{sort:node.level>3}" :title="data.label">
<span><i
- :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
{{ data.code }} {{ data.label }}</span>
</el-col>
<el-col :span="2" style="text-align: right;" v-if="delStandardTree">
@@ -142,9 +142,9 @@
<!-- </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;overflow-y: auto;"
- tooltip-effect="dark" highlight-current-row @row-click="rowClick" ref="standard">
- <el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="180">
+ <el-table class="el-table" :data="standardList" style="width: 100%;" height="220" tooltip-effect="dark"
+ highlight-current-row @row-click="rowClick" ref="standard">
+ <el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="200">
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
</template>
@@ -166,6 +166,7 @@
@select="upProductSelect" @select-all="handleAll">
<el-table-column type="selection" width="65">
</el-table-column>
+ <el-table-column prop="model" label="鍨嬪彿" min-width="120" 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"
@@ -198,8 +199,22 @@
</template>
</el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="price" label="鍗曚环(鍏�)" width="90" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHour" label="宸ユ椂(H)" width="90" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="price" label="鍗曚环(鍏�)" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.price" size="small" placeholder="鍗曚环(鍏�)"
+ @change="(value)=>upStandardProductListOfPrice(value,scope.row.id)" v-if="upStandardProduct">
+ </el-input>
+ <span v-else>{{scope.row.price}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.manHour" size="small" placeholder="鍗曚环(鍏�)"
+ @change="(value)=>upStandardProductListOfManHour(value,scope.row.id)" v-if="upStandardProduct">
+ </el-input>
+ <span v-else>{{scope.row.manHour}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="manHourGroup" label="宸ユ椂鍒嗙粍" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="section" label="鎿嶄綔" width="120">
@@ -277,19 +292,41 @@
<el-button type="primary" @click="addStandardProductDo" :loading="addLoad3">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鍖洪棿璁剧疆" :visible.sync="sectionUpDia" width="500px">
+ <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">
<el-table-column type="index" label="搴忓彿" width="70" align="center">
</el-table-column>
<el-table-column label="鍖洪棿" align="center">
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.thing" clearable></el-input>
+ <el-input size="small" v-model="scope.row.thing" clearable placeholder="鍖洪棿"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑕佹眰鍊�" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.ask" clearable placeholder="瑕佹眰鍊�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑕佹眰鎻忚堪" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 2}"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚环" align="center" width="120">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.price" clearable placeholder="鍗曚环"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="宸ユ椂绯绘暟" align="center" width="120">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.manHour" clearable placeholder="宸ユ椂绯绘暟"></el-input>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="70" align="center">
<template slot-scope="scope">
- <el-button size="mini" type="danger" icon="el-icon-minus" circle @click="sectionList.splice(scope.$index, 1)"></el-button>
+ <el-button size="mini" type="danger" icon="el-icon-minus" circle
+ @click="sectionList.splice(scope.$index, 1)"></el-button>
</template>
</el-table-column>
</el-table>
@@ -738,7 +775,39 @@
this.$message.error('鏈繚瀛�')
return
}
- this.$message.success('宸蹭繚瀛�')
+ // this.$message.success('宸蹭繚瀛�')
+ })
+ },
+ upStandardProductListOfPrice(value, index) {
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: index,
+ price: value
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ // this.$message.success('宸蹭繚瀛�')
+ })
+ },
+ upStandardProductListOfManHour(value, index) {
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: index,
+ manHour: value
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ // this.$message.success('宸蹭繚瀛�')
})
},
delStandardMethodByFLSSM(id) {
@@ -875,26 +944,54 @@
this.sectionRow = row
this.sectionUpDia = true
this.sectionList = []
- if(this.sectionRow.section!==null){
- JSON.parse(this.sectionRow.section).forEach(a=>{
+ if (this.sectionRow.section != null && this.sectionRow.section != '') {
+ JSON.parse(this.sectionRow.section).forEach((a, ai) => {
this.sectionList.push({
- thing: a
+ thing: a,
+ ask: JSON.parse(this.sectionRow.ask)[ai],
+ tell: JSON.parse(this.sectionRow.tell)[ai],
+ price: JSON.parse(this.sectionRow.price)[ai],
+ manHour: JSON.parse(this.sectionRow.manHour)[ai]
})
})
}
},
sectionLoadAdd() {
let sectionList = []
- this.sectionList.forEach(a=>{
- if(a.thing!==''){
+ let askList = []
+ let tellList = []
+ let priceList = []
+ let manHourList = []
+ this.sectionList.forEach(a => {
+ if (a.thing !== '') {
sectionList.push(a.thing)
+ askList.push(a.ask)
+ tellList.push(a.tell)
+ priceList.push(a.price)
+ manHourList.push(a.manHour)
}
})
- this.sectionRow.section = JSON.stringify(sectionList)
+ if (sectionList.length === 0) {
+ this.sectionRow.section = null
+ this.sectionRow.ask = null
+ this.sectionRow.tell = null
+ this.sectionRow.price = null
+ this.sectionRow.manHour = null
+ } else {
+ this.sectionRow.section = JSON.stringify(sectionList)
+ this.sectionRow.ask = JSON.stringify(askList)
+ this.sectionRow.tell = JSON.stringify(tellList)
+ this.sectionRow.price = JSON.stringify(priceList)
+ this.sectionRow.manHour = JSON.stringify(manHourList)
+ }
this.sectionLoad = true
this.$axios.post(this.$api.standardTree.upStandardProductList, {
id: this.sectionRow.id,
- section: this.sectionRow.section
+ section: this.sectionRow.section,
+ ask: this.sectionRow.ask,
+ tell: this.sectionRow.tell,
+ price: this.sectionRow.price,
+ manHour: this.sectionRow.manHour
}, {
headers: {
'Content-Type': 'application/json'
--
Gitblit v1.9.3