diff --git a/public/index.html b/public/index.html
index a4234806f..968506054 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
-
+
@@ -9,15 +9,65 @@
标准法规管理系统
-
-
+
+
+
+
+
+
diff --git a/public/static/images/BG.png b/public/static/images/BG.png
new file mode 100644
index 000000000..bcdbfd0dc
Binary files /dev/null and b/public/static/images/BG.png differ
diff --git a/public/static/images/logo2.png b/public/static/images/logo2.png
new file mode 100644
index 000000000..d6819be30
Binary files /dev/null and b/public/static/images/logo2.png differ
diff --git a/public/static/polyfill/proxy.min.js b/public/static/polyfill/proxy.min.js
new file mode 100644
index 000000000..55b602cf5
--- /dev/null
+++ b/public/static/polyfill/proxy.min.js
@@ -0,0 +1,4 @@
+(function(){function l(){function n(a){return a?"object"===typeof a||"function"===typeof a:!1}var p=null;var g=function(a,b){function f(){}if(!n(a)||!n(b))throw new TypeError("Cannot create proxy with a non-object as target or handler");p=function(){f=function(a){throw new TypeError("Cannot perform '"+a+"' on a proxy that has been revoked");}};var e=b;b={get:null,set:null,apply:null,construct:null};for(var k in e){if(!(k in b))throw new TypeError("Proxy polyfill does not support trap '"+k+"'");b[k]=e[k]}"function"===
+typeof e&&(b.apply=e.apply.bind(e));var c=this,g=!1,q=!1;"function"===typeof a?(c=function(){var h=this&&this.constructor===c,d=Array.prototype.slice.call(arguments);f(h?"construct":"apply");return h&&b.construct?b.construct.call(this,a,d):!h&&b.apply?b.apply(a,this,d):h?(d.unshift(a),new (a.bind.apply(a,d))):a.apply(this,d)},g=!0):a instanceof Array&&(c=[],q=!0);var r=b.get?function(a){f("get");return b.get(this,a,c)}:function(a){f("get");return this[a]},v=b.set?function(a,d){f("set");b.set(this,
+a,d,c)}:function(a,b){f("set");this[a]=b},t={};Object.getOwnPropertyNames(a).forEach(function(b){if(!((g||q)&&b in c)){var d={enumerable:!!Object.getOwnPropertyDescriptor(a,b).enumerable,get:r.bind(a,b),set:v.bind(a,b)};Object.defineProperty(c,b,d);t[b]=!0}});e=!0;Object.setPrototypeOf?Object.setPrototypeOf(c,Object.getPrototypeOf(a)):c.__proto__?c.__proto__=a.__proto__:e=!1;if(b.get||!e)for(var m in a)t[m]||Object.defineProperty(c,m,{get:r.bind(a,m)});Object.seal(a);Object.seal(c);return c};g.revocable=
+function(a,b){return{proxy:new g(a,b),revoke:p}};return g};var u="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)||"undefined"!==typeof navigator&&"ReactNative"===navigator.product?global:self;u.Proxy||(u.Proxy=l(),u.Proxy.revocable=u.Proxy.revocable);})()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index ba033a478..2f265bf1c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -2076,6 +2076,9 @@
this.form.modelDataNameVerify=[]
this.form.modelDataZrUserVerify=[]
this.form.QCDWID= ''
+ this.form.menuId = this.form['TXLBBUSSMenuId']
+ console.log(this.form)
+ console.log(this.form.menuId)
this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.form['id'] = bringData.id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index cd5cdad18..6b488757d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2209,6 +2209,7 @@
this.form.treeType = 'sarMs'
}
}
+ this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
@@ -2411,7 +2412,7 @@
this.rules.commentText[0].required = true;
}
},
- async saveConfStand(standId) {
+ saveConfStand(standId) {
if(this.form.menuId && this.form.menuId !== ''){
let search = {}
let list = []
@@ -2425,6 +2426,9 @@
_this: this
}, res => {
const history = res;
+ this.$message.success("入库成功")
+ this.submitLoading = false
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
resolve(history)
})
})
@@ -2455,6 +2459,8 @@
this.form.reviseStatus = 'buss2_'+this.form.standStatus
this.form.textStatusBuss = '6jnqba2mby'
const json = JSON.stringify(this.form);
+ this.processCreateBuss(json)
+return
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2493,11 +2499,8 @@
_formData.append('infoJson', json)
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.ok) {
- this.$message.success("入库成功")
// 自动匹配配置标准
this.saveConfStand(res.data)
- this.submitLoading = false
- this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
this.isSubmit = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index d978da12a..7a3eb350e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -36,7 +36,8 @@
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@formChoiceQCDW = "formChoiceQCDW"
- />
+ @formChoiceZRR1 = "formChoiceZRR1"
+ />
文件汇总
@@ -1210,6 +1211,9 @@
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
+ formChoiceZRR1(type, title, id){
+ this.choiceZRR1(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -2246,6 +2250,7 @@
this.form.treeType = 'sarMs'
}
}
+ this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 8a5f6397d..70834da99 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -2348,6 +2348,7 @@
this.form.treeType = 'sarMs'
}
}
+ this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index cff34d637..5ec58d3af 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -36,6 +36,7 @@
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@formChoiceQCDW = "formChoiceQCDW"
+ @formChoiceZRR1 = "formChoiceZRR1"
/>
文件汇总
@@ -1211,6 +1212,9 @@
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
+ formChoiceZRR1(type, title, id){
+ this.choiceZRR1(type, title, id)
+ },
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -2247,6 +2251,7 @@
this.form.treeType = 'sarMs'
}
}
+ this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 8fd1fb3e3..882b4b85a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -2359,6 +2359,7 @@
this.form.treeType = 'sarMs'
}
}
+ this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},