FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
zhutianqi
2021-12-29 17:49:52 +08:00
parent 7018c2b4e9
commit f704f6d8e8
6 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+1
View File
@@ -485,6 +485,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+1
View File
@@ -857,6 +857,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentText = data.commentText
this.todoId = res.id this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1
View File
@@ -484,6 +484,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1
View File
@@ -472,6 +472,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -1
View File
@@ -470,6 +470,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -479,7 +480,6 @@
} }
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
console.log(data.itemList);
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false this.loading = false
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+6 -1
View File
@@ -236,7 +236,6 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="sarStandCompareHisInfo">查询 @click="sarStandCompareHisInfo">查询
</el-button> </el-button>
<el-button <el-button
@@ -728,6 +727,12 @@ export default {
this.form.standType = bringData[0].standType this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id this.form.standId = bringData[0].id
this.listModel = false; this.listModel = false;
this.$http.get('SarStandItems/sar-stand-items/getFileType', {
standId: bringData[0].id
}, res => {
console.log(data);
console.log(res.data);
})
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
} else { } else {