apply-clients 5.0.35-68 → 5.0.35-70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/app_apply/Gongcheng.vue +3614 -3614
- package/src/components/app_apply/ServiceControl.vue +3 -3
- package/src/components/product/EngineeringManagement/EngineeringSelect.vue +2 -2
- package/src/components/product/Process/Processes/Service/ServiceControl.vue +3 -3
|
@@ -122,7 +122,7 @@ export default {
|
|
|
122
122
|
let requestData = {
|
|
123
123
|
tables: this.data.tables, model: model
|
|
124
124
|
}
|
|
125
|
-
requestData.start_activity = '
|
|
125
|
+
requestData.start_activity = '踏勘'
|
|
126
126
|
requestData.loginUser = Vue.user
|
|
127
127
|
requestData.workflow_xmlfilename = this.$workflow_vue.workflow_xmlfilename
|
|
128
128
|
console.log('即将发送请求url=>' + url + ',参数=>' + JSON.stringify(requestData))
|
|
@@ -614,7 +614,7 @@ export default {
|
|
|
614
614
|
},
|
|
615
615
|
// 获取view层button事件
|
|
616
616
|
async 'button'(model){
|
|
617
|
-
if (this.data.defname==='
|
|
617
|
+
if (this.data.defname==='踏勘'){
|
|
618
618
|
if (model.button.button_name === '终止'){
|
|
619
619
|
this.stop_show=true
|
|
620
620
|
return
|
|
@@ -644,7 +644,7 @@ export default {
|
|
|
644
644
|
console.log("button事件接收参数model=>" + JSON.stringify(model))
|
|
645
645
|
model=Object.assign({},this.selectdata,model)
|
|
646
646
|
console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
|
|
647
|
-
if (this.data.defname==='
|
|
647
|
+
if (this.data.defname==='踏勘'&& model.button.button_name === '提交'){
|
|
648
648
|
this.loading=false
|
|
649
649
|
this.apply_show=true
|
|
650
650
|
this.models2 = model
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
</button>
|
|
36
36
|
<button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.clear()">清空</button>
|
|
37
37
|
<button class="btn btn-primary btn-sm" type="button" v-show="$parent.$parent.startFlowonce"
|
|
38
|
-
@click="$parent.$parent.addactive('
|
|
38
|
+
@click="$parent.$parent.addactive('踏勘')">
|
|
39
39
|
<span class="glyphicon glyphicon-plus" ></span>新增流程
|
|
40
40
|
</button>
|
|
41
41
|
</div>
|
|
@@ -290,7 +290,7 @@ export default {
|
|
|
290
290
|
})
|
|
291
291
|
},
|
|
292
292
|
checkUserOperator(){
|
|
293
|
-
if(this.$login.r.find(value => value == '
|
|
293
|
+
if(this.$login.r.find(value => value == '踏勘')){
|
|
294
294
|
this.startFlowonce=true;
|
|
295
295
|
}
|
|
296
296
|
},
|
|
@@ -236,7 +236,7 @@
|
|
|
236
236
|
let requestData = {
|
|
237
237
|
tables: this.data.tables, model: model
|
|
238
238
|
}
|
|
239
|
-
requestData.start_activity = '
|
|
239
|
+
requestData.start_activity = '踏勘'
|
|
240
240
|
requestData.loginUser = this.$login.f
|
|
241
241
|
requestData.workflow_xmlfilename = this.$workflow_vue.workflow_xmlfilename
|
|
242
242
|
console.log('即将发送请求url=>' + url + ',参数=>' + JSON.stringify(requestData))
|
|
@@ -1826,7 +1826,7 @@
|
|
|
1826
1826
|
// 获取view层button事件/
|
|
1827
1827
|
async 'button'(model) {
|
|
1828
1828
|
console.log("button事件接收参数：", model)
|
|
1829
|
-
if (this.data.defname==='
|
|
1829
|
+
if (this.data.defname==='踏勘'){
|
|
1830
1830
|
if (model.button.button_name === '终止'){
|
|
1831
1831
|
this.stop_show=true
|
|
1832
1832
|
return
|
|
@@ -1956,7 +1956,7 @@
|
|
|
1956
1956
|
tables: this.data.tables, model: model
|
|
1957
1957
|
}
|
|
1958
1958
|
}
|
|
1959
|
-
if (this.data.defname==='
|
|
1959
|
+
if (this.data.defname==='踏勘'&&(model.button.button_name === '提交'||model.button.button_name === '通气')){
|
|
1960
1960
|
this.apply_show=true
|
|
1961
1961
|
this.models2 = model
|
|
1962
1962
|
return
|