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:
super_liu
2022-03-25 15:57:28 +08:00
parent 244e050edf 5f980fdf6a
commit 73a15b6196
12 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+11 -1
View File
@@ -828,7 +828,17 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '3'
id: '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '3',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText1: this.commentText1,
filesId: this.addFjList,
filesName: this.form.fjListName
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+1 -1
View File
@@ -61,7 +61,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px; padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+14 -13
View File
@@ -143,19 +143,20 @@
</el-table>
</div>
<div>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="审批意见">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
disabled
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">