Commit c8b5cbca authored by 高宇's avatar 高宇

1.优化代码

parent cc4c8296
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-button type="primary" class="tarButon" @click="upload">上传</el-button> <el-button type="primary" class="tarButon" @click="upload">上传</el-button>
</div> </div>
<!-- 第一个模板 --> <!-- 第一个模板 -->
<div v-if="sheetForm"> <div v-if="sheetForm !== null && sheetForm !== ''">
<div class="tableArea" v-if="index === 0 || index=== 4"> <div class="tableArea" v-if="index === 0 || index=== 4">
<div class="measureTable"> <div class="measureTable">
<!-- 测量 --> <!-- 测量 -->
...@@ -738,7 +738,7 @@ export default { ...@@ -738,7 +738,7 @@ export default {
this.index = this.sheetForm.sheetIndex this.index = this.sheetForm.sheetIndex
this.dialogController.open = false this.dialogController.open = false
} }
this.$emit('sheetIndex',this.index) this.$emit('sheetIndex',null)
this.$emit('tarFrom',this.form) this.$emit('tarFrom',this.form)
}) })
} else { } else {
...@@ -753,7 +753,7 @@ export default { ...@@ -753,7 +753,7 @@ export default {
this.form.projetcBList = [] this.form.projetcBList = []
this.index = this.sheetForm.sheetIndex this.index = this.sheetForm.sheetIndex
this.dialogController.open = false this.dialogController.open = false
this.$emit('sheetIndex',null) this.$emit('sheetIndex','')
this.$emit('tarFrom',this.form) this.$emit('tarFrom',this.form)
} }
......
...@@ -1859,7 +1859,7 @@ ...@@ -1859,7 +1859,7 @@
</div> </div>
<div :class="inspectJbAl2o3List.recode3[11].differenceValue === '合格'? 'Value': 'errValue'"> <div :class="inspectJbAl2o3List.recode3[11].differenceValue === '合格'? 'Value': 'errValue'">
<TextToolTip <TextToolTip
:text="inspectJbAl2o3List.recode3[13].differenceValue" :text="inspectJbAl2o3List.recode3[11].differenceValue"
:max-length="8" :max-length="8"
:disabled-show="false" :disabled-show="false"
/> />
...@@ -4191,11 +4191,7 @@ export default { ...@@ -4191,11 +4191,7 @@ export default {
this.inspectJbAl2o3List.twoJcDate = response.data.twoJcDate this.inspectJbAl2o3List.twoJcDate = response.data.twoJcDate
this.inspectJbAl2o3List.limitOne = response.data.limitOne this.inspectJbAl2o3List.limitOne = response.data.limitOne
this.inspectJbAl2o3List.limitTwo = response.data.limitTwo this.inspectJbAl2o3List.limitTwo = response.data.limitTwo
if (response.data.sheetIndex) { this.inspectJbAl2o3List.sheetIndex = response.data.sheetIndex
this.inspectJbAl2o3List.sheetIndex = response.data.sheetIndex
} else {
this.inspectJbAl2o3List.sheetIndex = 0
}
if (response.data.ld && response.data.ld !== ''){ if (response.data.ld && response.data.ld !== ''){
this.tabfourForm.LD = this.handleFirstTableData(response.data.ld ) this.tabfourForm.LD = this.handleFirstTableData(response.data.ld )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment