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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-29 15:03:36 +08:00
parent 6e334ed07d 846df5c761
commit abe054b2c0
14 changed files with 195 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+4 -1
View File
@@ -843,6 +843,7 @@
<el-upload
multiple
drag
:file-list="fileList"
:action="fileUrl"
ref="importfile"
name="file"
@@ -1162,6 +1163,7 @@
},
data () {
return {
fileList: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1967,10 +1969,11 @@
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) {
fileList.splice(0, 1)
this.fileList = fileList.splice(0, 1)
}
if (response.ok) {
this.fileMadel = false
this.fileList = []
if(this.fileType === 'fbgbjbd'){
this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name;
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -387,6 +392,7 @@ export default {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -335,6 +340,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+41 -33
View File
@@ -312,42 +312,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.listForm.BZFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
}
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -335,6 +340,7 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>