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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!65
This commit is contained in:
高嵩
2023-04-23 18:25:29 +08:00
parent df2edb476a 1ff00c7355
commit e047cfaf61
8 changed files with 172 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+2 -2
View File
@@ -934,7 +934,7 @@ export default {
this.replaceLawsNumForm.reviewTimeStart = "" this.replaceLawsNumForm.reviewTimeStart = ""
this.replaceLawsNumForm.reviewTimeEnd = "" this.replaceLawsNumForm.reviewTimeEnd = ""
} }
this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPageNo', this.replaceLawsNumForm, { this.$http.get('lawss/activiti/getSarBussionStandPageNo', this.replaceLawsNumForm, {
_this: this, _this: this,
loading: 'replaceLoading' loading: 'replaceLoading'
}, res => { }, res => {
@@ -976,7 +976,7 @@ export default {
this.replaceLawsNumForm.reviewTimeStart = "" this.replaceLawsNumForm.reviewTimeStart = ""
this.replaceLawsNumForm.reviewTimeEnd = "" this.replaceLawsNumForm.reviewTimeEnd = ""
} }
this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPageNo', this.replaceLawsNumForm, { this.$http.get('lawss/activiti/getSarBussionStandPageNo', this.replaceLawsNumForm, {
_this: this, _this: this,
loading: 'replaceLoading' loading: 'replaceLoading'
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+40 -20
View File
@@ -218,7 +218,7 @@
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px"> <div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div> <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div> </div>
<div style="width: 20%;"> <div style="width: 20%;">
<el-button :disabled="disabledXX" <el-button :disabled="disabledXX"
@@ -1524,30 +1524,30 @@
'form.standStatus': { 'form.standStatus': {
handler (val) { handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
this.FSRQchange()
} }
} }
}, },
'form.issueTime': { 'form.issueTime': {
handler: function() { handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ this.FSRQchange()
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
// const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
// this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
// // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
let year = date.getFullYear()+5; // let year = date.getFullYear()+5;
let month =(date.getMonth() + 1).toString(); // let month =(date.getMonth() + 1).toString();
let day = (date.getDate()).toString(); // let day = (date.getDate()).toString();
if (month.length == 1) { // if (month.length == 1) {
month = "0" + month; // month = "0" + month;
} // }
if (day.length == 1) { // if (day.length == 1) {
day = "0" + day; // day = "0" + day;
} // }
const FSRQBUSS = year + "-" + month + "-" + day; // const FSRQBUSS = year + "-" + month + "-" + day;
this.form["FSRQBUSS"] = FSRQBUSS // this.form["FSRQBUSS"] = FSRQBUSS
//
} // }
}, },
}, },
'form.country': { 'form.country': {
@@ -1568,6 +1568,26 @@
}, },
}, },
methods: { methods: {
FSRQchange(){
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
let year = date.getFullYear()+5;
if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){
year = date.getFullYear()+3;
}
let month =(date.getMonth() + 1).toString();
let day = (date.getDate()).toString();
if (month.length == 1) {
month = "0" + month;
}
if (day.length === 1) {
day = "0" + day;
}
const FSRQBUSS = year + "-" + month + "-" + day;
this.form["FSRQBUSS"] = FSRQBUSS
}
},
regDate(data){ regDate(data){
if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){ if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){
data = data + ' X' data = data + ' X'
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+41 -18
View File
@@ -1101,29 +1101,32 @@
handler (val) { handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
this.getStandInfoByReviseStatus() this.getStandInfoByReviseStatus()
this.FSRQchange()
} }
} }
}, },
'form.issueTime': { 'form.issueTime': {
handler: function() { handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ this.FSRQchange();
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
// const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
// this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
// // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
let year = date.getFullYear()+5; //
let month =(date.getMonth() + 1).toString(); // let year = date.getFullYear()+5;
let day = (date.getDate()).toString(); // let month =(date.getMonth() + 1).toString();
if (month.length == 1) { // let day = (date.getDate()).toString();
month = "0" + month; // if (month.length == 1) {
} // month = "0" + month;
if (day.length === 1) { // }
day = "0" + day; // if (day.length === 1) {
} // day = "0" + day;
const FSRQBUSS = year + "-" + month + "-" + day; // }
this.form["FSRQBUSS"] = FSRQBUSS // const FSRQBUSS = year + "-" + month + "-" + day;
// this.form["FSRQBUSS"] = FSRQBUSS
} // console.log(FSRQBUSS)
//
// }
}, },
}, },
'form.country': { 'form.country': {
@@ -1149,6 +1152,26 @@
}, },
}, },
methods: { methods: {
FSRQchange(){
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
let year = date.getFullYear()+5;
if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){
year = date.getFullYear()+3;
}
let month =(date.getMonth() + 1).toString();
let day = (date.getDate()).toString();
if (month.length == 1) {
month = "0" + month;
}
if (day.length === 1) {
day = "0" + day;
}
const FSRQBUSS = year + "-" + month + "-" + day;
this.form["FSRQBUSS"] = FSRQBUSS
}
},
checkedRoleTransfer (data) { checkedRoleTransfer (data) {
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+40 -18
View File
@@ -1078,29 +1078,31 @@
handler (val) { handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
this.getStandInfoByReviseStatus("") this.getStandInfoByReviseStatus("")
this.FSRQchange()
} }
} }
}, },
'form.issueTime': { 'form.issueTime': {
handler: function() { handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ this.FSRQchange()
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
// const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
// this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
// // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
let year = date.getFullYear()+5; //
let month =(date.getMonth() + 1).toString(); // let year = date.getFullYear()+5;
let day = (date.getDate()).toString(); // let month =(date.getMonth() + 1).toString();
if (month.length == 1) { // let day = (date.getDate()).toString();
month = "0" + month; // if (month.length == 1) {
} // month = "0" + month;
if (day.length == 1) { // }
day = "0" + day; // if (day.length == 1) {
} // day = "0" + day;
const FSRQBUSS = year + "-" + month + "-" + day; // }
this.form["FSRQBUSS"] = FSRQBUSS // const FSRQBUSS = year + "-" + month + "-" + day;
// this.form["FSRQBUSS"] = FSRQBUSS
} //
// }
}, },
}, },
'form.country': { 'form.country': {
@@ -1126,6 +1128,26 @@
}, },
}, },
methods: { methods: {
FSRQchange(){
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
let year = date.getFullYear()+5;
if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){
year = date.getFullYear()+3;
}
let month =(date.getMonth() + 1).toString();
let day = (date.getDate()).toString();
if (month.length == 1) {
month = "0" + month;
}
if (day.length === 1) {
day = "0" + day;
}
const FSRQBUSS = year + "-" + month + "-" + day;
this.form["FSRQBUSS"] = FSRQBUSS
}
},
regDate(data){ regDate(data){
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
data = data + ' X' data = data + ' X'
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+40 -18
View File
@@ -1156,29 +1156,31 @@
handler (val) { handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
this.getStandInfoByReviseStatus() this.getStandInfoByReviseStatus()
this.FSRQchange()
} }
} }
}, },
'form.issueTime': { 'form.issueTime': {
handler: function() { handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ this.FSRQchange()
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
// const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
// this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
// // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
let year = date.getFullYear()+5; //
let month =(date.getMonth() + 1).toString(); // let year = date.getFullYear()+5;
let day = (date.getDate()).toString(); // let month =(date.getMonth() + 1).toString();
if (month.length === 1) { // let day = (date.getDate()).toString();
month = "0" + month; // if (month.length === 1) {
} // month = "0" + month;
if (day.length == 1) { // }
day = "0" + day; // if (day.length == 1) {
} // day = "0" + day;
const FSRQBUSS = year + "-" + month + "-" + day; // }
this.form["FSRQBUSS"] = FSRQBUSS // const FSRQBUSS = year + "-" + month + "-" + day;
// this.form["FSRQBUSS"] = FSRQBUSS
} //
// }
}, },
}, },
'form.country': { 'form.country': {
@@ -1204,6 +1206,26 @@
}, },
}, },
methods: { methods: {
FSRQchange(){
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD'))
let year = date.getFullYear()+5;
if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){
year = date.getFullYear()+3;
}
let month =(date.getMonth() + 1).toString();
let day = (date.getDate()).toString();
if (month.length == 1) {
month = "0" + month;
}
if (day.length === 1) {
day = "0" + day;
}
const FSRQBUSS = year + "-" + month + "-" + day;
this.form["FSRQBUSS"] = FSRQBUSS
}
},
regDate(data){ regDate(data){
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
data = data + ' X' data = data + ' X'
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+1 -1
View File
@@ -20,7 +20,7 @@
<div style="flex: auto;" v-show="active === '1'"> <div style="flex: auto;" v-show="active === '1'">
<formList <formList
:form = "form" :form = "form"
:isTrue="true" :isTrue="false"
:FBGBUSSFileList = "FBGBUSSFileList" :FBGBUSSFileList = "FBGBUSSFileList"
:LSBBBUSSFileList = "LSBBBUSSFileList" :LSBBBUSSFileList = "LSBBBUSSFileList"
:BZSMBUSSFileList = "BZSMBUSSFileList" :BZSMBUSSFileList = "BZSMBUSSFileList"
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+4 -1
View File
@@ -1726,6 +1726,9 @@
zrDeptIdName:this.$store.getters.userInfo.institutionName, zrDeptIdName:this.$store.getters.userInfo.institutionName,
children:[], children:[],
}; };
if(!this.form.modelData){
this.form.modelData = []
}
this.form.modelData.push(list); this.form.modelData.push(list);
this.$message.success("新增成功") this.$message.success("新增成功")
this.showForm.modelNum = "" this.showForm.modelNum = ""
@@ -2915,7 +2918,7 @@
if (valid) { if (valid) {
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.modelData.length === 0){ if(this.form.modelData === undefined || this.form.modelData.length === 0){
this.opinionDialogVisible = true this.opinionDialogVisible = true
}else{ }else{
this.commentTextHandle(); this.commentTextHandle();
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+4 -1
View File
@@ -254,6 +254,7 @@
</el-form> </el-form>
</div> </div>
<el-table <el-table
v-loading = "loading"
:data="standinfoList" :data="standinfoList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@@ -359,6 +360,7 @@ export default {
props: ['message'], props: ['message'],
data(){ data(){
return{ return{
loading:false,
disabledXX:!!this.$route.query.disabledXX, disabledXX:!!this.$route.query.disabledXX,
formLoading:false, formLoading:false,
formRules: { formRules: {
@@ -459,6 +461,7 @@ export default {
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
_this: this, _this: this,
loading: "loading"
}, res => { }, res => {
this.standinfoList = res.data.list this.standinfoList = res.data.list
//展示的数据只能是未开始的 //展示的数据只能是未开始的
@@ -467,7 +470,7 @@ export default {
// this.standinfoList.push(item) // this.standinfoList.push(item)
// } // }
// }) // })
this.total = this.standinfoList.length this.total = res.data.count
this.$nextTick(()=>{ this.$nextTick(()=>{
this.$refs.selection.doLayout() this.$refs.selection.doLayout()
}) })