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-04-01 14:59:47 +08:00
parent e96e5a1a68 f3825a985f
commit fddae920ea
6 changed files with 104 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+8 -3
View File
@@ -698,11 +698,15 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
item.commentText = ''
this.$nextTick(() => {
if(item.form){
this.hisListForm = JSON.parse(JSON.stringify(item.form))
this.listForm = JSON.parse(JSON.stringify(item.form))
if(item.taskInfo === '被驳回之后的保存'){
this.commentText = item.commentText
}else{
this.commentText = ''
}
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
@@ -920,7 +924,7 @@ export default {
_formData.append("taskIds", this.taskIds);
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
taskInfo: "选择已拆分标准",
taskInfo: "被驳回之后的保存",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
@@ -1020,7 +1024,8 @@ export default {
commentText: this.commentText
}
};
let json = this.hisListForm
this.listForm.dataList = this.dataList
let json = this.listForm
this.$http.post("lawss/activiti/completeTaskNew", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+11 -11
View File
@@ -43,7 +43,7 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-model="form.standNumber"
v-model.trim="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
@@ -289,7 +289,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%; line-height: 40px">
<div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -314,7 +314,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -339,7 +339,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%; line-height: 40px">
<div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -364,7 +364,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -389,7 +389,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -416,7 +416,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -441,7 +441,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -468,7 +468,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -493,7 +493,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
@@ -518,7 +518,7 @@
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+17 -1
View File
@@ -741,7 +741,7 @@ export default {
.wfhxzgStep1 {
/deep/ .el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 57px) !important;
// height: calc(100% - 57px) !important;
}
/deep/ .el-drawer__container {
@@ -805,3 +805,19 @@ export default {
}
}
</style>
<style lang="less">
.wfhxzgStep1 {
.el-drawer__container {
}
/*.el-table{*/
/* overflow: auto;*/
/*}*/
/*.el-table__body-wrapper{*/
/* overflow:visible;*/
/*}*/
/*.el-table::after{*/
/* position: relative;*/
/*}*/
}
</style>