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-28 17:52:04 +08:00
parent 9fab8f5307 2560750e86
commit ce3a22ff11
14 changed files with 191 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+4 -20
View File
@@ -653,27 +653,10 @@
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" clearable v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
<el-option
v-for="item in qcdwOption"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
<el-select :popper-append-to-body="false" multiple filterable clearable v-model="form.qcdw" placeholder="请选择起草单位">
<el-option v-for="item in qcdwOption" :value="item.value" :key="item.value" :label="item.label" multiple filterable></el-option>
</el-select>
</el-form-item>
<!--<el-form-item v-show="form.standInData === '0'" label="体系类别" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option
v-for="item in txlbOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>-->
</el-col>
<el-col :span="12">
<!--适用产品线-->
@@ -2247,7 +2230,7 @@ export default {
this.form = JSON.parse(JSON.stringify(json))
this.getListTree(bringData)
this.form.standId = bringData.id
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : ''
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : ''
@@ -2255,6 +2238,7 @@ export default {
this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : ''
this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : ''
this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : ''
this.form.bfbdtbzh = JSON.parse(JSON.stringify(json)).bfdtbz && JSON.parse(JSON.stringify(json)).bfdtbz !== '[]' ? JSON.parse(JSON.stringify(json)).bfdtbz : ''
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+1
View File
@@ -39,6 +39,7 @@
<el-date-picker
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
placeholder="请选择结束日期">
</el-date-picker>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2
View File
@@ -40,6 +40,7 @@
v-model="form.endTime"
:picker-options="pickerOptions"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
@@ -814,6 +815,7 @@ export default {
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
filesId: this.addFjList,
commentText1: this.commentText1
}))
saveTaskFirst(_formData).then(res => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+1
View File
@@ -37,6 +37,7 @@
disabled
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -35,6 +35,7 @@
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
value-format="yyyy-MM-dd"
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+1
View File
@@ -34,6 +34,7 @@
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
value-format="yyyy-MM-dd"
disabled
v-model="form.endTime"
type="date"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+1
View File
@@ -37,6 +37,7 @@
disabled
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1
View File
@@ -35,6 +35,7 @@
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
value-format="yyyy-MM-dd"
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+112 -47
View File
@@ -349,6 +349,7 @@
name: "bzzqyjStep5",
data() {
return {
clickFlag: false,
commentText5: '',
options: [],
itemId: '',
@@ -460,35 +461,47 @@
this.modalshowflag2 = false
},
itemEdit (row, index) {
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
chapterNumber: row.chapterNumber,
chapterName: row.chapterName,
oldText: row.oldText,
newText: row.newText,
reason: row.reason,
cause: row.cause,
department: row.department,
responUserName: row.responUserName,
responUser: row.responUser,
state: row.state,
source: row.source,
id: row.id,
if(this.clickFlag){
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
chapterNumber: row.chapterNumber,
chapterName: row.chapterName,
oldText: row.oldText,
newText: row.newText,
reason: row.reason,
cause: row.cause,
department: row.department,
responUserName: row.responUserName,
responUser: row.responUser,
state: row.state,
source: row.source,
id: row.id,
}
}else{
this.$message.warning('公开征求意见未结束，无法操作')
}
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
if(this.clickFlag){
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
}else{
this.$message.warning('公开征求意见未结束，无法操作')
}
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
if(this.clickFlag){
this.drawerModal = true
}else{
this.$message.warning('公开征求意见未结束，无法操作')
}
},
checkedRole (data) {
changeAssigneeNew({
@@ -539,42 +552,49 @@
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
let json = this.form;
json.data = this.data;
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText5: this.commentText5
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
if(this.clickFlag){
this.saveLoading = true;
let _formData = new FormData();
let json = this.form;
json.data = this.data;
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText5: this.commentText5
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}else{
this.$message.warning('公开征求意见未结束，无法操作')
}
},
handleSubmit() {
let a = 0
for (let b = 0; b < this.data.length;b++) {
if (this.data[b].state === '3' && !this.data[b].cause) {
a++
let a = 0
for (let b = 0; b < this.data.length;b++) {
if (this.data[b].state === '3' && !this.data[b].cause) {
a++
}
if(!this.data[b].sourceType){
this.data[b].sourceType = '定向'
}
}
}
if (a > 0) {
this.$message.warning('请输入不上报原因')
return;
}
this.isSubmit = true;
if (a > 0) {
this.$message.warning('请输入不上报原因')
return;
}
this.isSubmit = true;
var json = this.json;
json.oldinfo = this.oldData;
json.commentText = this.commentText5;
json.introduce = true;
this.$http.post("lawss/activiti/completeTask", {
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
@@ -586,6 +606,41 @@
this.isSubmit = false;
});
},
// handleSubmit() {
// if(this.clickFlag){
// let a = 0
// for (let b = 0; b < this.data.length;b++) {
// if (this.data[b].state === '3' && !this.data[b].cause) {
// a++
// }
// if(!this.data[b].sourceType){
// this.data[b].sourceType = '定向'
// }
// }
// if (a > 0) {
// this.$message.warning('请输入不上报原因')
// return;
// }
// this.isSubmit = true;
// var json = this.json;
// json.oldinfo = this.oldData;
// json.commentText = this.commentText5;
// json.introduce = true;
// this.$http.post("lawss/activiti/completeTask", {
// json: JSON.stringify(json),
// taskId: this.taskIds,
// userId: this.$store.getters.userInfo.userId
// }, {}, res => {
// if (res.success) {
// this.$message.success("提交成功");
// this.$router.push("/processCenter");
// }
// this.isSubmit = false;
// });
// }else{
// this.$message.warning('公开征求意见未结束，无法操作')
// }
// },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -613,6 +668,15 @@
this.json = data;
this.getItemList(data.standId,this.form.textValue)
this.data = newArr
this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
endTime: this.form.endTime
}, {}, res => {
if (res.message === '1') {
this.clickFlag = false
} else {
this.clickFlag = true
}
})
if (data.introduce) {
} else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
@@ -624,6 +688,7 @@
item.responUser = item.userId
item.state = '1'
item.source = '2'
item.sourceType = '公开'
this.data.push(item);
});
});
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+20 -14
View File
@@ -261,22 +261,28 @@ export default {
if (item.passInfo !== 0) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
}
}
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
/* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/
// for (let i = 0; i<fileData.length; i++) {
// if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
// this.dataList = fileData[0].standardInfoList
// this.standardInfoList = this.dataList
// this.textarea = JSON.parse(JSON.stringify(item)).textarea
// }
// }
} else {
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
// this.textarea = JSON.parse(JSON.stringify(item)).commentText
}
}
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
// for (let i = 0; i<fileData.length; i++) {
// if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
// this.dataList = fileData[0].standardInfoList
// this.standardInfoList = this.dataList
// // this.textarea = JSON.parse(JSON.stringify(item)).commentText
// }
// }
}
})
},
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+9
View File
@@ -1413,6 +1413,15 @@ export default {
this.commentText = mes.commentText;
});
}
if (this.$route.query.row) {
let data = this.$route.query.row
this.qdform.projectId = data.id
this.qdform.projectName = data.projectName
this.qdform.projectNumber = data.projectNumber
this.qdform.detailedListName = data.projectGroup
this.qdform.endTime = data.projectEndDate
this.getStandData(this.qdform.projectId)
}
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this,