From 4d2033854f0770dba993bff26ea09a0a523682fc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 09 四月 2024 11:48:54 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java | 3
web/src/views/modules/taskReliability/Task-AddOrUpdate.vue | 8 +-
web/src/views/modules/taskReliability/TaskPhaseModel.vue | 23 +++++--
modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml | 2
web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue | 39 ++++++++----
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 23 ++++---
web/src/views/modules/taskReliability/TaskPhase.vue | 21 +++++-
web/src/views/modules/basicInfo/ParamData.vue | 37 +++++++-----
web/src/views/modules/taskReliability/Task.vue | 2
web/src/views/modules/taskReliability/OperatConditModel.vue | 2
modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml | 5 -
12 files changed, 102 insertions(+), 65 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
index 4aa1038..2314a30 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
@@ -37,8 +37,7 @@
@TableField(exist = false)
private String name;
- @TableField(exist = false)
- private Double phaseDuration;
+ private Double taskDuration;
}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index 988014f..828ae0b 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -30,6 +30,8 @@
from product_model_common a
where a.is_delete = 0
and a.node_type <> 1
+ ORDER BY
+ node_type,sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
index 1b7c0cd..b2b188c 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
@@ -4,12 +4,9 @@
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskDao">
<select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
- select a.*,
- b.phaseDuration
+ select a.*
FROM
task a
- LEFT JOIN (select task_id , SUM(phase_duration_rate) as phaseDuration from task_phase
- where is_delete =0 group by task_id) b ON a.id = b.task_id
<where>
a.is_delete = 0
and a.product_id=${productId}
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 198edf7..0774e81 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -21,10 +21,12 @@
<zt-dict v-model="dataForm.repairable" dict="is_or_not" placeholder="鏄惁鍙淮淇�" clearable></zt-dict>
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.reliabDistribType" dict="ReliabDistribType" placeholder="璇烽�夋嫨鍙潬鎬у垎甯冪被鍨�" clearable></zt-dict>
+ <zt-dict v-model="dataForm.reliabDistribType" dict="ReliabDistribType" placeholder="璇烽�夋嫨鍙潬鎬у垎甯冪被鍨�"
+ clearable></zt-dict>
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.repairDistribType" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷" clearable></zt-dict>
+ <zt-dict v-model="dataForm.repairDistribType" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷"
+ clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button v-if="dataForm.srcId" type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
@@ -44,7 +46,8 @@
<span v-else v-text="scope.row.baseOperatRatio"></span>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4" prop="actualRunTime"
+ <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
+ prop="actualRunTime"
label="瀹為檯杩愯鏃堕棿">
<!-- <template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -212,7 +215,8 @@
<!-- <zt-table-column-dict v-if="dataForm.productType==='3'" :key="27" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�"
width="160"/>-->
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�" :key="27"
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" prop="reliabDistribType"
+ label="鍙潬鎬у垎甯冪被鍨�" :key="27"
width="160">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.reliabDistribType"
@@ -228,7 +232,8 @@
:hit="hit"/>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="28" prop="runTime" label="杩愯鏃堕棿" width="100">
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="28" prop="runTime"
+ label="杩愯鏃堕棿" width="100">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.runTime"></el-input>
<span v-else v-text="scope.row.runTime"></span>
@@ -278,10 +283,10 @@
name: '',
dataThreeList: null,
productType: '5',
- basicJoinCompute:'',
- repairable:'',
- repairDistribType:'',
- reliabDistribType:''
+ basicJoinCompute: '',
+ repairable: '',
+ repairDistribType: '',
+ reliabDistribType: ''
},
isOrNot: [{
value: 1,
@@ -311,13 +316,13 @@
],
// editingCell:null,
dataList: [],
- originalTableData:[],
+ originalTableData: [],
originalData: null, // 璁板綍淇敼鍓嶇殑鏁版嵁
}
},
// 鍦ㄧ粍浠朵腑瀹氫箟 beforeRouteLeave 瀵艰埅瀹堝崼
beforeRouteLeave(to, from, next) {
- console.log(this.$store.state.contentTabs,'this.$store.state.contentTabsActiveName')
+ console.log(this.$store.state.contentTabs, 'this.$store.state.contentTabsActiveName')
if (this.hasUnsavedChanges()) { // 妫�鏌ユ槸鍚︽湁鏈繚瀛樼殑鍙樻洿
this.$confirm('鎮ㄦ湁鏈繚瀛樼殑鏇存敼锛岃鍏堜繚瀛樸�傛槸鍚︾户缁寮�锛�', '鎻愮ず', {
confirmButtonText: '淇濆瓨',
@@ -363,7 +368,7 @@
this.dataForm.dataThreeList = null
this.$refs.tableObj.query()
this.originalTableData = JSON.parse(JSON.stringify(this.dataList)); // 鏇存柊鍒濆鏁版嵁涓哄綋鍓嶆暟鎹�
- console.log(this.originalTableData,'this.originalTableData 褰撳墠琛ㄦ牸json鏁版嵁')
+ console.log(this.originalTableData, 'this.originalTableData 褰撳墠琛ㄦ牸json鏁版嵁')
}
},
edit(row) {
@@ -396,9 +401,11 @@
// },
onProductSelected(data) {
this.dataForm.srcId = data.id
- this.dataForm.productType =data.productType
+ this.dataForm.productType = data.productType
console.log(data, 'onProductSelected(data)')
- this.$refs.tableObj.query()
+ this.$nextTick(() => {
+ this.$refs.tableObj.query()
+ })
},
dataLoaded(data) {
this.dataList = data
@@ -409,7 +416,7 @@
console.log(dataList, 'dataList')
}
this.originalTableData = JSON.parse(JSON.stringify(this.dataList))
- console.log(this.originalTableData,'this.originalTableData 鍒濆琛ㄦ牸json鏁版嵁')
+ console.log(this.originalTableData, 'this.originalTableData 鍒濆琛ㄦ牸json鏁版嵁')
},
hasUnsavedChanges() {
// 妫�鏌ュ綋鍓嶈〃鏍兼暟鎹笌鍒濆鏁版嵁鏄惁鐩稿悓
diff --git a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
index d4136aa..f9d2d33 100644
--- a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
@@ -70,6 +70,7 @@
},
selectDefaultProduct() {
this.dataForm.nodeType = 1
+ this.getDefaultImg(this.dataForm.nodeType)
},
// 鑾峰彇绯荤粺鍒楄〃
async getProductList() {
@@ -86,7 +87,6 @@
console.log(row, 'openAddWin(row)')
},
async getDefaultImg(selected) {
- console.log(selected, 'async getDefaultImg')
let params = {
productType: selected
}
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index 6a7cc85..e0f2b52 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -8,11 +8,11 @@
<el-input v-model="dataForm.name"></el-input>
</zt-form-item>
<zt-form-item label="鑺傜偣绫诲瀷" prop="productType" rules="required">
- <zt-dict v-model="dataForm.productType" dict="product" @input="getDefaultImg"></zt-dict>
+ <zt-dict v-model="dataForm.productType" dict="product" @input="getDefaultImg"
+ :disabled="disabled"></zt-dict>
</zt-form-item>
<zt-form-item label="杩愯鐘舵�佸浘" prop="operatImg" v-if="isShow">
- <el-input v-model="dataForm.operatImgName" @focus="selectPicture()"
- :readonly="readonly"></el-input>
+ <el-input v-model="dataForm.operatImgName" @focus="selectPicture()"></el-input>
<el-image v-if="dataForm.operatImg" :src="url+dataForm.operatImg" style="height: 50px;width: 50px"></el-image>
</zt-form-item>
<zt-form-item label="鎺掑簭" prop="sort">
@@ -31,6 +31,7 @@
export default {
data() {
return {
+ disabled: false,
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
isTree: false,
isShow: true,
@@ -61,11 +62,11 @@
this.dataForm.pid = params.pid
this.dataForm.productType = params.type
}
- if (this.dataForm.productType==='10'){
-
+ if (this.dataForm.productType === 10 && id == null) {
+ this.getDefaultImg(this.dataForm.productType)
}
+ this.disabled = !!id;
},
-
// 鑾峰彇绯荤粺鍒楄〃
async getProductList() {
let res = await this.$http.get('/basicInfo/XhProductModel/getProductList')
@@ -100,19 +101,19 @@
// 琛ㄥ崟鎻愪氦
async formSubmit() {
let flag = true
- if (this.isTree){
+ if (this.isTree) {
if (this.dataForm.productType !== '5' || this.dataForm.productType !== '4') {
this.$alert("涓嶆敮鎸佹柊澧炴鑺傜偣")
- flag =false
+ flag = false
}
- }else{
+ } else {
if (this.dataForm.productType === '5' || this.dataForm.productType === '4') {
this.$alert("涓嶆敮鎸佹柊澧炴鑺傜偣")
- flag =false
+ flag = false
}
}
- if (!flag){
+ if (!flag) {
return
}
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/basicInfo/XhProductModel/', this.dataForm)
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index 7966756..a974bad 100644
--- a/web/src/views/modules/taskReliability/OperatConditModel.vue
+++ b/web/src/views/modules/taskReliability/OperatConditModel.vue
@@ -10,7 +10,7 @@
row-key="id"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:default-expand-all="true">
- <el-table-column prop="product" label="浜у搧鑺傜偣1" width="160"/>
+ <el-table-column prop="product" label="浜у搧鑺傜偣" width="160"/>
<el-table-column prop="modelName" label="浜у搧妯″瀷"/>
<zt-table-column-handle :table="table" edit-perm="taskReliability:update"
delete-perm="taskReliability::delete" :has-view="false">
diff --git a/web/src/views/modules/taskReliability/Task-AddOrUpdate.vue b/web/src/views/modules/taskReliability/Task-AddOrUpdate.vue
index 4e58ebc..a7ead35 100644
--- a/web/src/views/modules/taskReliability/Task-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/Task-AddOrUpdate.vue
@@ -4,9 +4,9 @@
<zt-form-item label="浠诲姟鍚嶇О" prop="taskName" rules="required">
<el-input v-model="dataForm.taskName"></el-input>
</zt-form-item>
-<!-- <zt-form-item label="浠诲姟椤哄簭" prop="taskSort" rules="required">
- <el-input v-model="dataForm.taskSort"></el-input>
- </zt-form-item>-->
+ <zt-form-item label="浠诲姟鎬绘椂闀�" prop="taskDuration">
+ <el-input v-model="dataForm.taskDuration"></el-input>
+ </zt-form-item>
</el-form>
</zt-dialog>
</template>
@@ -22,7 +22,7 @@
taskName: '',
taskSort: '',
remark: '',
- status: ''
+ taskDuration: ''
}
}
},
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 74465c8..634b2ce 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -17,7 +17,7 @@
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="taskName" label="浠诲姟鍚嶇О"/>
<!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
- <el-table-column prop="phaseDuration" label="浠诲姟鏃堕暱鍒嗛厤" align="right"/>
+ <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete"/>
</el-table>
diff --git a/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue b/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
index 079ed20..3916e5b 100644
--- a/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
@@ -5,14 +5,14 @@
<el-input v-model="dataForm.phaseName"></el-input>
</zt-form-item>
<zt-form-item label="闃舵鏃堕暱姣�" prop="phaseDuration">
- <el-input v-model="dataForm.phaseDurationRate"></el-input>
+ <el-input v-model="dataForm.phaseDurationRate" @change="check"></el-input>
</zt-form-item>
<zt-form-item label="闃舵鏃堕��" prop="phaseSpeed">
<el-input v-model="dataForm.phaseSpeed"></el-input>
</zt-form-item>
-<!-- <zt-form-item label="闃舵椤哄簭" prop="phaseSort">
- <el-input v-model="dataForm.phaseSort"></el-input>
- </zt-form-item>-->
+ <!-- <zt-form-item label="闃舵椤哄簭" prop="phaseSort">
+ <el-input v-model="dataForm.phaseSort"></el-input>
+ </zt-form-item>-->
<zt-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark"></el-input>
</zt-form-item>
@@ -34,6 +34,7 @@
remark: '',
productId: ''
},
+ oldTime: null,
time: null
}
},
@@ -43,6 +44,13 @@
this.dataForm.productId = param.productId
this.time = param.time
},
+ check() {
+ let reg = /^(-?\d+)\.?(\d*)$/;
+ if (this.dataForm.phaseDurationRate.match(reg) == null && this.dataForm.phaseDurationRate !=='') {
+ this.dataForm.phaseDurationRate = '';
+ this.$alert("杈撳叆鐨勬暟鎹牸寮忔湁璇�")
+ }
+ },
// 鑾峰彇淇℃伅
async getInfo() {
let res = await this.$http.get(`/taskReliability/TaskPhase/${this.dataForm.id}`)
@@ -50,21 +58,26 @@
...this.dataForm,
...res.data
}
+ this.oldTime = this.dataForm.phaseDurationRate
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- console.log(this.time,'dataLoaded')
- if (this.time + Number(this.dataForm.phaseDurationRate )> 1) {
+ /* let flag = true
+ if (this.time + Number(this.dataForm.phaseDurationRate)-Number(this.oldTime) > 1) {
this.$alert("璇烽噸鏂拌缃綋鍓嶆椂闀挎瘮鍒嗛厤")
- }else{
- let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/taskReliability/TaskPhase/', this.dataForm)
- if (res.success) {
- await this.$tip.success()
- this.$refs.dialog.close()
- this.$emit('refreshDataList')
- }
+ flag = false
+ }
+ if (!flag) {
+ return
+ }*/
+ let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/taskReliability/TaskPhase/', this.dataForm)
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('refreshDataList')
}
}
+
}
}
</script>
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index 3886fa4..9abdaaf 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -27,8 +27,12 @@
<el-table-column prop="phaseSpeed" label="闃舵鏃堕��" align="right"/>
<!--<el-table-column prop="phaseSort" label="闃舵椤哄簭" align="center"/>-->
<el-table-column prop="operatConditDuration" label="宸ュ喌鏃堕暱鍒嗛厤" align="center"/>
- <zt-table-column-handle :table="table"
- delete-perm="taskReliability::delete"/>
+ <zt-table-column-handle :table="table" edit-perm="testReviewComment:update"
+ delete-perm="taskReliability::delete">
+ <template v-slot="{row}">
+ <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
+ </template>
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
@@ -75,17 +79,24 @@
for (let i = 0; i < this.dataList.length; i++) {
this.time = this.time + Number(this.dataList[i].phaseDurationRate)
}
- if (this.time>1){
- this.$alert("褰撳墠杩愯鏃堕暱姣斿凡瓒呭嚭锛岃閲嶆柊璁剧疆")
- }
+ console.log(this.time)
},
add() {
+ console.log(this.time)
this.$refs.AddOrUpdate.$refs.dialog.init(null, {
taskId: this.dataForm.taskId,
productId: this.dataForm.productId,
time: this.time
})
},
+ openEditWin(row){
+ console.log(row)
+ this.$refs.AddOrUpdate.$refs.dialog.init(row.id, {
+ taskId: this.dataForm.taskId,
+ productId: this.dataForm.productId,
+ time: this.time
+ })
+ },
onTaskSelected(row) {
this.dataForm.taskId = row.id
this.dataForm.productId = row.productId
diff --git a/web/src/views/modules/taskReliability/TaskPhaseModel.vue b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
index 2b9b5a8..516193a 100644
--- a/web/src/views/modules/taskReliability/TaskPhaseModel.vue
+++ b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
@@ -13,8 +13,8 @@
v-adaptive="{bottomOffset:30}" border
@cell-click="handleCellClick"
@selection-change="table.selectionChangeHandle">
- <el-table-column prop="operatConditName" label="宸ュ喌鍚嶇О" width="160"/>
- <el-table-column prop="operatConditDurationRate" label="鏃堕暱姣�" align="right" width="100">
+ <el-table-column prop="operatConditName" label="宸ュ喌鍚嶇О" width="100"/>
+ <el-table-column prop="operatConditDurationRate" label="宸ュ喌鏃堕暱姣�" align="right" width="160">
<template slot-scope="scope">
<span
v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -67,10 +67,18 @@
//鎵归噺淇濆瓨
async handleSaveRows() {
let time = null
+ let operatConditDurationRate = null
let flag = true
let list = []
+ let reg = /^(-?\d+)\.?(\d*)$/;
this.dataForm.dataThreeList = this.$refs.tableObj.dataList
for (let i = 0; i < this.dataForm.dataThreeList.length; i++) {
+ operatConditDurationRate = this.dataForm.dataThreeList[i].operatConditDurationRate
+ console.log(operatConditDurationRate)
+ if (String(operatConditDurationRate).match(reg) == null && operatConditDurationRate !== null) {
+ this.$alert("杈撳叆鐨勬暟鎹牸寮忔湁璇�")
+ flag = false
+ }
time = time + Number(this.dataForm.dataThreeList[i].operatConditDurationRate)
if (this.dataForm.dataThreeList[i].isCheck === '0' && this.dataForm.dataThreeList[i].operatConditDurationRate != null) {
this.$alert("鏈夋湭鍕鹃�夌殑宸ュ喌")
@@ -79,17 +87,16 @@
this.$alert("鏈夋湭濉啓鐨勫伐鍐垫椂闀�")
flag = false
}
-
- if (this.dataForm.dataThreeList[i].isCheck==='1'){
+ if (this.dataForm.dataThreeList[i].isCheck === '1') {
list.push(this.dataForm.dataThreeList[i])
}
}
this.dataForm.dataThreeList = list
- console.log(time, 'async handleSaveRows')
- if (time> 1) {
+ /*console.log(time, 'async handleSaveRows')
+ if (time > 1) {
this.$alert("璇烽噸鏂拌缃綋鍓嶆椂闀挎瘮鍒嗛厤")
return
- }
+ }*/
if (!flag) {
return
}
@@ -100,7 +107,7 @@
this.originalData = null
this.dataForm.dataThreeList = null
this.$refs.tableObj.query()
- this.$emit('getList')
+ this.$emit('getList')
this.originalTableData = JSON.parse(JSON.stringify(this.dataList)); // 鏇存柊鍒濆鏁版嵁涓哄綋鍓嶆暟鎹�
console.log(this.originalTableData, 'this.originalTableData 褰撳墠琛ㄦ牸json鏁版嵁')
}
--
Gitblit v1.9.1