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:
hanshaozhuang
2022-07-01 16:30:36 +08:00
parent 0d65c03914 8ed1e58bf7
commit 053e36626c
25 changed files with 172 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+2 -2
View File
@@ -321,8 +321,8 @@ export default {
this.formKey++
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+6 -6
View File
@@ -316,12 +316,12 @@ export default {
this.qbfsForm.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+4 -2
View File
@@ -1868,11 +1868,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+17
View File
@@ -1340,7 +1340,24 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
}else if(this.userType === 'QCRBUSS'){
this.form.QCRBUSSID=idList;
this.form.QCRBUSS=nameList;
this.formKey++
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+4 -2
View File
@@ -1397,11 +1397,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+4 -2
View File
@@ -1485,11 +1485,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+4 -2
View File
@@ -1398,11 +1398,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+4 -2
View File
@@ -1495,11 +1495,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+4 -3
View File
@@ -1790,9 +1790,10 @@
this.roleForm.bzUserName = nameList
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
if(data && data.length > 0){
console.log(data)
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+16
View File
@@ -1378,7 +1378,23 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
}else if(this.userType === 'QCRBUSS'){
this.form.QCRBUSSID=idList;
this.form.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -2
View File
@@ -1433,8 +1433,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -1768,8 +1768,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+12
View File
@@ -1640,6 +1640,18 @@
this.roleForm.bzUserId = idList
this.roleForm.bzUserName = nameList
}
if(data && data.length > 0){
console.log(data)
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -2
View File
@@ -1421,8 +1421,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+2 -2
View File
@@ -1767,8 +1767,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+4 -4
View File
@@ -856,8 +856,8 @@ export default {
let idList = "", nameList = ""
let unitList = "", unitNameList = ""
data.forEach(item => {
unList.push(item.institutionName)
uidList.push(item.institutionId)
unList.push(item.topUnit)
uidList.push(item.topUnitId)
if (nameList.length) {
nameList += ",";
idList += ",";
@@ -866,8 +866,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnit
unitNameList += item.topUnitId
});
let unNameList = []
let unIdList = []
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+2 -2
View File
@@ -717,8 +717,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnitId
unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.addQblxData, 'drafter', idList)
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+2 -2
View File
@@ -1254,8 +1254,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnitId
unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.qbfsForm, 'drafter', idList)
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+9
View File
@@ -22,6 +22,15 @@
<el-form-item class="add-form-item form-item-disabled" label="项目名称" prop="projectName">
<el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+9
View File
@@ -36,6 +36,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+9
View File
@@ -36,6 +36,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
src/pages/processCenter/pages/phone/bzdy/step2.vue
+3
View File
@@ -108,6 +108,7 @@
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import hwh5 from '@/api/hwh5-cloudonline.js'
import axios from "axios";
export default {
@@ -170,6 +171,7 @@
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
hwh5.close()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
@@ -258,6 +260,7 @@
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
hwh5.close()
this.$router.push('/processCenter')
}
this.isSubmit = false