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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!276
This commit is contained in:
王夏晖
2021-12-31 15:59:59 +08:00
parent 5f5e128794 40dee75a66
commit 8c1ff8cb79
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards2.vue
+1 -1
View File
@@ -335,7 +335,7 @@
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
standType: 'ALL', standType: 'INLAND',
quoteIdList: '', quoteIdList: '',
validFlag: '0' validFlag: '0'
} }
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+1 -1
View File
@@ -421,7 +421,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+6 -2
View File
@@ -291,7 +291,7 @@
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 style="width: 100%;">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
@@ -464,6 +464,7 @@
name: "bzjdStep3", name: "bzjdStep3",
data() { data() {
return { return {
AOLIGEI: '',
commentText3: '', commentText3: '',
BDtext: false, BDtext: false,
itemsNum: '', itemsNum: '',
@@ -746,7 +747,8 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText3: this.commentText3, commentText3: this.commentText3,
itemList: this.itemList, itemList: this.itemList,
standInData: this.sarType standInData: this.sarType,
AOLIGEI: this.AOLIGEI
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -826,6 +828,7 @@
var json = this.json var json = this.json
json.commentText = this.commentText3 json.commentText = this.commentText3
json.itemList = this.itemList json.itemList = this.itemList
json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -858,6 +861,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.AOLIGEI = data.AOLIGEI
this.commentText3 = data.commentText3 || '' this.commentText3 = data.commentText3 || ''
this.todoId = res.id this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
-1
View File
@@ -441,7 +441,6 @@
var json = this.json var json = this.json
json.resolveFlag = 1 json.resolveFlag = 1
json.commentText = this.commentText4 json.commentText = this.commentText4
json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+4 -4
View File
@@ -562,6 +562,7 @@
let _formData = new FormData(); let _formData = new FormData();
let json = this.form let json = this.form
json.data = this.data json.data = this.data
json.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("prcType", "3"); _formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
@@ -635,10 +636,11 @@
else { else {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText3
json.info = this.data json.info = this.data
json.form = this.form json.form = this.form
json.department = this.$store.getters.userInfo.orgName json.department = this.$store.getters.userInfo.orgName
json.onlyKey = this.onlyKey
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -662,7 +664,6 @@
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.options = res.data.list this.options = res.data.list
console.log(res);
} }
}, e => { }, e => {
}) })
@@ -696,10 +697,9 @@
this.form.endTime = data.endTime || data.form.endTime this.form.endTime = data.endTime || data.form.endTime
this.todoId = res.id this.todoId = res.id
this.json = data this.json = data
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.getItemList(data.standId,data.textType) this.getItemList(data.standId,data.textType)
this.data = data.info || data.data || data.form.data || [] this.data = data.info || data.data || data.form.data || []
this.onlyKey = data.onlyKey
console.log(data);
}).catch(e => { }).catch(e => {
}) })
}) })