Commit c38bd440 authored by 高宇's avatar 高宇

Merge remote-tracking branch 'origin/project9-8' into project9-8

# Conflicts:
#	src/views/checkList.vue
parents b685f323 93ea3b3a
...@@ -1957,6 +1957,7 @@ export default { ...@@ -1957,6 +1957,7 @@ export default {
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3)
this.inspectInfoList.approveStatus = '0' this.inspectInfoList.approveStatus = '0'
// const businessId = this.$route.query.businessId // const businessId = this.$route.query.businessId
this.getJcCode()
const ossIdList = this.getOssIdList() const ossIdList = this.getOssIdList()
const obj = { const obj = {
incomeInspectInfo: this.inspectInfoList, incomeInspectInfo: this.inspectInfoList,
...@@ -1991,6 +1992,7 @@ export default { ...@@ -1991,6 +1992,7 @@ export default {
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3)
this.inspectInfoList.approveStatus = '1' this.inspectInfoList.approveStatus = '1'
const ossIdList = this.getOssIdList() const ossIdList = this.getOssIdList()
this.getJcCode()
var obj = { var obj = {
incomeInspectInfo: this.inspectInfoList, incomeInspectInfo: this.inspectInfoList,
incomeInspectJbAl2o3: this.inspectJbAl2o3List, incomeInspectJbAl2o3: this.inspectJbAl2o3List,
......
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