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:
zhutianqi
2021-12-16 18:04:31 +08:00
parent 35de42ff24 4850266ec5
commit ba70659341
19 changed files with 944 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+16 -13
View File
@@ -1124,15 +1124,26 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
this.listForm.commentText = this.commentText;
this.listForm.fileName = this.fileInfoList;
this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '4',
json: JSON.stringify({
taskInfo: '引入法规标准清单',
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
@@ -1145,17 +1156,9 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter");
}
this.isSubmit = false;
this.isSubmit = false
});
}
});
src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+10 -1
View File
@@ -185,7 +185,16 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '15',
json: JSON.stringify({
taskInfo: '备案任务下发',
roleForm: this.roleForm,
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+11 -1
View File
@@ -583,7 +583,17 @@ export default {
this.qbfsForm.fileList = this.fileList
this.qbfsForm.commentText = this.commentText
var json = Object.assign(this.qbfsForm, this.roleForm)
this.$http.get('lawss/activiti/startProcess', {type: '23'}, {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '23',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.qbfsForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+11 -1
View File
@@ -624,7 +624,17 @@ export default {
this.isSubmit = true
this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm)
this.$http.get('lawss/activiti/startProcess', {type: '24'}, {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '24',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.standardSearch,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+11 -3
View File
@@ -474,9 +474,17 @@ export default {
if (valid) {
// this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json);
return
this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+11 -1
View File
@@ -680,7 +680,17 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '16',
json: JSON.stringify({
roleForm: this.roleForm,
dataList: this.dataList,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+14 -11
View File
@@ -854,14 +854,14 @@ export default {
if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息");
}else{
}else {
this.satisfyFlag = true
}
this.dataList.forEach(item => {
if (!item.distributePerson) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人");
}else{
}else {
this.satisfyFlag = true
}
});
@@ -874,7 +874,18 @@ export default {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '5',
json: JSON.stringify({
taskInfo: "选择已拆分标准",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
@@ -887,14 +898,6 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter");
}
this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+12 -1
View File
@@ -867,7 +867,18 @@ export default {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '5',
json: JSON.stringify({
taskInfo: "选择已拆分标准",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+12 -10
View File
@@ -612,7 +612,17 @@ export default {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '6',
json: JSON.stringify({
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
@@ -625,14 +635,6 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter");
}
this.isSubmit = false;
@@ -647,7 +649,7 @@ export default {
return this.$message.warning("请完善基础信息");
}
});
}
}
}
},
choiceZRR(type, title, id) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+11 -1
View File
@@ -629,7 +629,17 @@ export default {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '6',
json: JSON.stringify({
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+12 -9
View File
@@ -655,7 +655,18 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "10" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '10',
json: JSON.stringify({
taskInfo: "产品经理分发",
form: this.qdform,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
@@ -668,14 +679,6 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter");
}
this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+12 -1
View File
@@ -659,7 +659,18 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "10" }, {
this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '10',
json: JSON.stringify({
taskInfo: "产品经理分发",
form: this.qdform,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
src/pages/processCenter/pages/newProcess/index.vue
+13 -13
View File
@@ -125,7 +125,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
<el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
<div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top">
<div class="card-top-left">
@@ -140,7 +140,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
<div class="card-top-left">
@@ -155,7 +155,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
<div class="card-box" @click="handleCreateProcess('laws1')">
<div class="card-top">
<div class="card-top-left">
@@ -190,7 +190,7 @@
<el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
<div class="process-box">
<div class="process-name">
<el-card shadow="hover" v-btn-permission="''">
<el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
<div class="card-box" @click="handleCreateProcess('buss1')">
<div class="card-top">
<div class="card-top-left">
@@ -205,7 +205,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
<div class="card-box" @click="handleCreateProcess('23')">
<div class="card-top">
<div class="card-top-left">
@@ -220,7 +220,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
<div class="card-box" @click="handleCreateProcess('24')">
<div class="card-top">
<div class="card-top-left">
@@ -235,7 +235,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
<div class="card-box" @click="handleCreateProcess('25')">
<div class="card-top">
<div class="card-top-left">
@@ -256,7 +256,7 @@
<el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
<div class="process-box">
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
<el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
<div class="card-box" @click="handleCreateProcess('17')">
<div class="card-top">
<div class="card-top-left">
@@ -271,7 +271,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
<el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
<div class="card-box" @click="handleCreateProcess('18')">
<div class="card-top">
<div class="card-top-left">
@@ -301,7 +301,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
<div class="card-box" @click="handleCreateProcess('21')">
<div class="card-top">
<div class="card-top-left">
@@ -316,7 +316,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
<div class="card-box" @click="handleCreateProcess('16')">
<div class="card-top">
<div class="card-top-left">
@@ -331,7 +331,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
<div class="card-box" @click="handleCreateProcess('15')">
<div class="card-top">
<div class="card-top-left">
@@ -346,7 +346,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
<div class="card-box" @click="handleCreateProcess('14')">
<div class="card-top">
<div class="card-top-left">