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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-06 17:49:05 +08:00
parent eee6759ca1 16e221c5ca
commit 1d0bbb3f6a
10 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+1 -1
View File
@@ -190,7 +190,7 @@
<p>点击或拖拽上传文件</p> <p>点击或拖拽上传文件</p>
</div> </div>
</el-upload> </el-upload>
<el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress> <!-- <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>-->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+1 -1
View File
@@ -329,7 +329,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -597,13 +597,13 @@
// this.form.itemsNum = bringData[0].showNumber // this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName // this.form.itemsName = bringData[0].standName
// } // }
this.form.standId = bringData[0].id this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.standId, infoId: bringData[0].id,
page: 1, page: 1,
pageSize: 9999 pageSize: 9999
}, { }, {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -602,13 +602,13 @@
// this.form.itemsNum = bringData[0].showNumber // this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName // this.form.itemsName = bringData[0].standName
// } // }
this.form.standId = bringData[0].id this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.standId, infoId: bringData[0].id,
page: 1, page: 1,
pageSize: 9999 pageSize: 9999
}, { }, {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2
View File
@@ -281,6 +281,7 @@ export default {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
standType: '',
}, },
formRules: { formRules: {
cid: [ cid: [
@@ -454,6 +455,7 @@ export default {
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
} }
this.form.standType = bringData[0].standType
this.form.cname = bringData[0].standName; this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+9 -7
View File
@@ -429,17 +429,19 @@ export default {
}, },
checkedRole (data) { checkedRole (data) {
if (this.type === 1) { if (this.type === 1) {
this.dataList[this.zrIndex].liablePeopleId = data[0].id const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
this.dataList[this.zrIndex].liablePeople = data[0].name newRow.liablePeopleId = data[0].id
this.$forceUpdate() newRow.liablePeople = data[0].name
this.$set(this.dataList, this.zrIndex, newRow)
} else if(this.type === 2) { } else if(this.type === 2) {
this.dataList.forEach( item => { this.dataList.forEach((item, index) => {
this.selectList.forEach( items => { this.selectList.forEach( items => {
if (item.standId === items.standId) { if (item.standId === items.standId) {
item.liablePeopleId = data[0].id const newRow = JSON.parse(JSON.stringify(item))
item.liablePeople = data[0].name newRow.liablePeopleId = data[0].id
newRow.liablePeople = data[0].name
this.$set(this.dataList, index, newRow)
} }
this.$forceUpdate()
}) })
}) })
} }