{{ listForm.modelName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
@@ -255,6 +277,7 @@ export default {
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
+ fileList:[],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -356,6 +379,9 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
+ this.fileIds = item.fileId;
+ console.log(this.fileIds);
+ this.getFileInfo();
});
},
// 请求上传的文件信息
@@ -365,11 +391,15 @@ export default {
}, {
_this: this
}, res => {
- console.log(res);
this.$nextTick(() => {
res.data.map(item => {
- this.listForm.modelName = item.oldFileName;
- this.listForm.model = item.id;
+ // 赋值要回显的上传文件内容
+ this.fileList.push({
+ name: item.oldFileName,
+ uid: item.uid,
+ status: item.status,
+ id: item.id
+ });
});
});
}, e => {
@@ -399,8 +429,27 @@ export default {
},
//驳回事件
beforeBack() {
- this.listForm.approvalOpinion = "1";
- this.handleSubmit();
+ if(!this.commentText){
+ this.$message.warning('请填写审批意见')
+ }else{
+ this.listForm.approvalOpinion = "1";
+ this.saveLoading = true
+ 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");
+ }
+ this.saveLoading = false
+ });
+ }/**/
},
//提交事件
handleSubmit() {
@@ -480,6 +529,31 @@ export default {
padding: 0 20px 0;
}
}
+ p {
+ & > a {
+ cursor: pointer;
+ }
+
+ & > i {
+ display: inline-block;
+ margin-left: 3px;
+ width: 18px;
+ height: 16px;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ background-position: center center;
+ vertical-align: sub;
+ cursor: pointer;
+ }
+
+ .icon-download {
+ background-image: url("~assets/images/shangqi/img/download.png");
+ }
+
+ .icon-download2 {
+ background-image: url("~assets/images/shangqi/img/download2.png");
+ }
+ }
.choiceBtn {
.el-button--primary {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c38d5d117..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
>
- {{ this.$route.query.item.cid }}
+ {{ $route.query.item.cid }}
- {{ this.$route.query.item.cname || '-' }}
+ {{ $route.query.item.cname || '-' }}
- {{ this.$route.query.item.endTime || '-' }}
+ {{ $route.query.item.endTime || '-' }}
- {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}
+ {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}
-
修订申请人
@@ -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/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 26187ebbd..352131b8a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -836,29 +836,26 @@ export default {
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
- if(this.fbgbjbdFileId.search(',')){
- this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
- console.log(this.fbgbjbdFileId);
- }
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
}else if(fileType === 'xgd'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
}else if(fileType === 'bpg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
}else if(fileType === 'ssg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
}else if(fileType === 'zqyjg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
}else if(fileType === 'jdwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
}else if(fileType === 'kwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
}else if(fileType === 'glwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
}else if(fileType === 'ca'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
}else if(fileType === 'zbjbd'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
}
},
popoverHide (checkedIds, 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) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 385f8b8b7..5e3894f7f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -533,9 +533,14 @@ export default {
}).then(res => {
let mes = JSON.parse(res.mes);
this.listForm = mes.form;
- this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
+ this.dataList = mes.form.dataList;
+ this.dataList.forEach(item => {
+ if(!item.productLine){
+ this.dataList = null
+ }
+ })
});
},
checkedRole(data) {
@@ -755,8 +760,10 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length == 1) {
- this.listForm.standNumber = this.selectedList[0].standNumber;
+ this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
+ this.listForm.standType = this.selectedList[0].standType;
+ this.listForm.standId = this.selectedList[0].id;
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
@@ -866,12 +873,12 @@ export default {
},
computed: {},
watch: {
- dataList: {
- deep: true,
- handler (val) {
- console.log('dataList update', val)
- }
- }
+ // dataList: {
+ // deep: true,
+ // handler (val) {
+ // console.log('dataList update', val)
+ // }
+ // }
},
mounted() {
//从数据库中查询下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 7b8e2183f..ad4acb396 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -470,6 +470,7 @@ export default {
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
+ standType: "", //标准类型
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
certifiedEngineer: "", //认证工程师
@@ -662,7 +663,6 @@ export default {
saveTaskFirst(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
- this.$router.push("/processCenter");
}).catch(e => {
this.saveLoading = false;
});
@@ -733,8 +733,10 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length === 1) {
- this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
+ this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
+ this.listForm.standType = this.selectedList[0].standType;
+ this.listForm.standId = this.selectedList[0].id;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.id = this.selectedList[0].id;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 06ec3df9c..6b7dfb9d1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -64,7 +64,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
- :height="sarProStateTableHeight"
+ height="56%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">