diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 64ddfde94..2422224f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -190,7 +190,7 @@
点击或拖拽上传文件
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 337123722..2bd84c26a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -597,13 +597,13 @@
// this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
- this.form.standId = bringData[0].id
+ this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType
this.standId = bringData[0].standId
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
- infoId: this.form.standId,
+ infoId: bringData[0].id,
page: 1,
pageSize: 9999
}, {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index e585ffffa..a636f009c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -602,13 +602,13 @@
// this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
- this.form.standId = bringData[0].id
+ this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType
this.standId = bringData[0].standId
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
- infoId: this.form.standId,
+ infoId: bringData[0].id,
page: 1,
pageSize: 9999
}, {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b00082a3f..5f38e84b8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -217,14 +217,15 @@
clearable
>
- {{ form.xgdName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -233,7 +234,8 @@
class="common-button-primary"
size="mini"
@click="fileUpload('xgd')">
- 点击上传
+
+ 点击上传
@@ -245,14 +247,15 @@
clearable
>
- {{ form.fbgbjbdName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -261,6 +264,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('fbgbjbd')">
+
点击上传
@@ -273,14 +277,15 @@
clearable
>
- {{ form.zbjbdName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -289,6 +294,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('zbjbd')">
+
点击上传
@@ -301,14 +307,15 @@
clearable
>
- {{ form.bpgName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -317,6 +324,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
+
点击上传
@@ -329,14 +337,15 @@
clearable
>
- {{ form.ssgName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -345,6 +354,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
+
点击上传
@@ -359,14 +369,15 @@
clearable
>
- {{ form.kwjName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -375,6 +386,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('kwj')">
+
点击上传
@@ -387,14 +399,15 @@
clearable
>
- {{ form.zqyjgName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -403,6 +416,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('zqyjg')">
+
点击上传
@@ -415,14 +429,15 @@
clearable
>
- {{ form.caName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -431,6 +446,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
+
点击上传
@@ -443,14 +459,15 @@
clearable
>
- {{ form.jdwjName }}
+
- 重新上传
+
+ 查看已上传的文件
@@ -459,6 +476,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
+
点击上传
@@ -702,7 +720,16 @@
clearable
>
- {{ form.glwjName }}
+
+
+
+ 查看已上传文件
+
+
+
点击上传
@@ -1196,6 +1224,16 @@
data () {
return {
fileList: [],
+ caFileList: [],
+ FBGBJBDFileList: [],
+ xgdFileList: [],
+ bpgFileList: [],
+ ssgFileList: [],
+ zqyjgFileList: [],
+ jdwjFileList: [],
+ zbjbdFileList: [],
+ kwjFileList: [],
+ qlwjFileList: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1332,7 +1370,7 @@
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
- kwj: '', // 勘误件
+ kwj: '', // 勘 误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
@@ -1413,9 +1451,9 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
]
,
- // issueTime: [
- // { required: true, message: '请选择标准发布日期', trigger: 'change' }
- // ],
+ issueTime: [
+ { required: false, message: '请选择标准发布日期', trigger: 'change' }
+ ],
qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' }
],
@@ -2040,43 +2078,54 @@
// 导入标准数据成功后执行
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
- if (fileList.length > 1) {
- this.fileList = fileList.splice(0, 1)
- }
+ // if (fileList.length > 1) {
+ // this.fileList = fileList.splice(0, 1)
+ // }
if (response.ok) {
- this.fileMadel = false
- this.fileList = []
+ // this.fileMadel = false
+ // this.fileList = []
if(this.fileType === 'fbgbjbd'){
+ this.FBGBJBDFileList=fileList;
this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name;
}else if(this.fileType === 'xgd'){
- this.form.xgd = response.data.id;
+ this.xgdFileList=fileList;
+ this.form.xgd = response.data.id;
this.form.xgdName = response.data.name;
}else if(this.fileType === 'bpg'){
+ this.bpgFileList=fileList;
this.form.bpg = response.data.id;
this.form.bpgName = response.data.name;
}else if(this.fileType === 'ssg'){
+ this.ssgFileList=fileList;
this.form.ssg = response.data.id;
this.form.ssgName = response.data.name;
}else if(this.fileType === 'zqyjg'){
+ this.zqyjgFileList=fileList;
this.form.zqyjg = response.data.id;
this.form.zqyjgName = response.data.name;
}else if(this.fileType === 'jdwj'){
+ this.jdwjFileList=fileList;
this.form.jdwj = response.data.id;
this.form.jdwjName = response.data.name;
}else if(this.fileType === 'kwj'){
+ this.kwjFileList=fileList;
this.form.kwj = response.data.id;
this.form.kwjName = response.data.name;
}else if(this.fileType === 'xgd'){
+ this.xgdFileList=fileList;
this.form.xgd = response.data.id;
this.form.xgdName = response.data.name;
}else if(this.fileType === 'glwj'){
+ this.qlwjFileList=fileList;
this.form.glwj = response.data.id;
this.form.glwjName = response.data.name;
}else if(this.fileType === 'ca'){
+ this.caFileList=fileList;
this.form.ca = response.data.id;
this.form.caName = response.data.name;
}else if(this.fileType === 'zbjbd'){
+ this.zbjbdFileList=fileList;
this.form.zbjbd = response.data.id;
this.form.zbjbdName = response.data.name;
}
@@ -2089,8 +2138,33 @@
},
fileUpload (type) {
this.fileType = '';
- this.fileMadel = true
+ // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
+
this.fileType = type;
+ if (type==='ca'){
+ this.fileList=this.caFileList;
+ }else if (type==='fbgbjbd'){
+ this.fileList=this.FBGBJBDFileList;
+ }else if (type==='xgd'){
+ this.fileList=this.xgdFileList;
+ }else if(type==='bpg'){
+ this.fileList=this.bpgFileList;
+ }else if (type==='ssg'){
+ this.fileList=this.ssgFileList;
+ }else if (type==='zqyjg'){
+ this.fileList=this.zqyjgFileList;
+ }else if (type==='jdwj'){
+ this.fileList=this.jdwjFileList;
+ }else if (type==='zbjbd'){
+ this.fileList=this.zbjbdFileList;
+ }else if (type==='kwj'){
+ this.fileList=this.kwjFileList;
+ }else if (type==='glwj'){
+ this.fileList=this.qlwjFileList;
+ }
+
+ this.fileMadel = true;
+
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 28fbcddac..9d7c27f09 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1138,13 +1138,13 @@ export default {
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
- { required: false, message: '请选择标准性质', trigger: 'change' }
+ { required: true, message: '请选择标准性质', trigger: 'change' }
],
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
- { required: true, message: '请选择标准发布日期', trigger: 'change' }
+ { required: false, message: '请选择标准发布日期', trigger: 'change' }
],
qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index cbfc3ee3e..74b330f0a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -281,6 +281,7 @@ export default {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
+ standType: '',
},
formRules: {
cid: [
@@ -454,6 +455,7 @@ export default {
} else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
}
+ this.form.standType = bringData[0].standType
this.form.cname = bringData[0].standName;
this.listModel = false;
} else if (this.selectedList.length > 1) {