apply-clients 7.1.36-yuchuan-36 → 7.1.36-yuchuan-38
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/android/Process/AppServiceControl.vue +6 -9
- package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue +5 -4
- package/src/components/product/ApplyGuanXian/GuanXianExplorationUser.vue +4 -6
- package/src/components/product/Function/InstallFunction.vue +3 -4
- package/src/components/product/Function/InstallInfoSelect.vue +24 -21
- package/src/components/product/Ignition/IgnitionDispatch.vue +90 -92
- package/src/components/product/Ignition/IgnitionListManage.vue +21 -19
- package/src/components/product/List/ShowAllActivity.vue +5 -4
- package/src/components/product/Print/BuildOrder/buildOrderList.vue +446 -446
- package/src/components/product/Process/ExplorationUser.vue +5 -8
- package/src/components/product/Process/New1ExplorationUser.vue +6 -8
- package/src/components/product/Process/NewExplorationSelect.vue +5 -4
- package/src/components/product/Process/NewExplorationUser.vue +6 -9
- package/src/components/product/Process/Processes/Print/printCharge.vue +250 -250
- package/src/components/product/Process/Processes/Print/printGaiXianCharge.vue +244 -244
- package/src/components/product/Process/Processes/selectApply.vue +250 -250
- package/src/components/product/Process/Service/ServiceControl.vue +63 -53
- package/src/components/product/Stop/StopApplyList.vue +224 -224
- package/src/components/product/Supervisory/SupervisoryControl.vue +114 -116
- package/src/components/product/Supervisory/SupervisoryhCart.vue +1 -0
- package/src/components/product/Supervisory/YiBanSupervisoryControl.vue +111 -114
- package/src/components/product/Supervisory/YiBanSupervisoryList.vue +9 -9
|
@@ -68,7 +68,6 @@ export default {
|
|
|
68
68
|
this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
|
|
69
69
|
return
|
|
70
70
|
}
|
|
71
|
-
debugger
|
|
72
71
|
this.selectdata = Object.assign({}, this.selectdata, jsonData)
|
|
73
72
|
|
|
74
73
|
// fields 字段填充值
|
|
@@ -160,15 +159,15 @@ export default {
|
|
|
160
159
|
tablename: item.tables[0],
|
|
161
160
|
condition: `f_process_id='${this.selectdata.f_process_id}'`
|
|
162
161
|
}
|
|
163
|
-
|
|
162
|
+
let http = new HttpResetClass()
|
|
163
|
+
res = await http.load(
|
|
164
|
+
'POST',
|
|
164
165
|
'rs/sql/applySingleTable',
|
|
165
166
|
{data: data},
|
|
166
167
|
{resolveMsg: null, rejectMsg: 'onetomany查询失败'}
|
|
167
168
|
)
|
|
168
169
|
}
|
|
169
|
-
|
|
170
170
|
item.rows = res.data
|
|
171
|
-
|
|
172
171
|
// 初始化onetomany中的fields
|
|
173
172
|
for (const field of item.fields) {
|
|
174
173
|
if (!field.value) {
|
|
@@ -220,25 +219,23 @@ export default {
|
|
|
220
219
|
this.$showMessage("请配置获取人员表达式")
|
|
221
220
|
return
|
|
222
221
|
}
|
|
223
|
-
|
|
224
|
-
let res = await
|
|
222
|
+
let http = new HttpResetClass()
|
|
223
|
+
let res = await http.load(
|
|
224
|
+
'POST',
|
|
225
225
|
'rs/search',
|
|
226
226
|
{data: data},
|
|
227
227
|
{resolveMsg: null, rejectMsg: '下发人员查询失败!!!'}
|
|
228
228
|
)
|
|
229
|
-
|
|
230
229
|
let options = res.data.map(source => {
|
|
231
230
|
return {
|
|
232
231
|
"label": source.name,
|
|
233
232
|
"value": source.id
|
|
234
233
|
}
|
|
235
234
|
})
|
|
236
|
-
|
|
237
235
|
if (item.button_fields.length !== 1) {
|
|
238
236
|
this.$showMessage("下发有且只能有一个字段!!!")
|
|
239
237
|
return
|
|
240
238
|
}
|
|
241
|
-
|
|
242
239
|
item.button_fields[0].options = options
|
|
243
240
|
}
|
|
244
241
|
if (item.button_fields) {
|
|
@@ -278,7 +275,6 @@ export default {
|
|
|
278
275
|
}
|
|
279
276
|
// 消除双向绑定,避免子组件(显示层)数据更改,父组件(控制层)也更改
|
|
280
277
|
let temp = JSON.parse(JSON.stringify(this.selectdata))
|
|
281
|
-
debugger
|
|
282
278
|
this.show_data = temp
|
|
283
279
|
this.$nextTick(() => {
|
|
284
280
|
this.showview = true
|
|
@@ -524,12 +520,13 @@ export default {
|
|
|
524
520
|
userid: this.$login.f.id
|
|
525
521
|
}
|
|
526
522
|
|
|
527
|
-
let
|
|
523
|
+
let http = new HttpResetClass()
|
|
524
|
+
let res = await http.load(
|
|
525
|
+
'POST',
|
|
528
526
|
'rs/search',
|
|
529
527
|
{data: data},
|
|
530
528
|
{resolveMsg: null, rejectMsg: '设计人员查询失败!!!'}
|
|
531
529
|
)
|
|
532
|
-
|
|
533
530
|
return res.data.map(item => {
|
|
534
531
|
return {
|
|
535
532
|
label: item.name,
|
|
@@ -834,13 +831,13 @@ export default {
|
|
|
834
831
|
source: 'this.getParentByType($organization$).getChildByName($建设单位$).getChildren()',
|
|
835
832
|
userid: this.$login.f.id
|
|
836
833
|
}
|
|
837
|
-
|
|
838
|
-
let res = await
|
|
834
|
+
let http = new HttpResetClass()
|
|
835
|
+
let res = await http.load(
|
|
836
|
+
'POST',
|
|
839
837
|
`rs/search`,
|
|
840
838
|
{data: data},
|
|
841
839
|
{resolveMsg: null, rejectMsg: '现场负责人查询失败!!!'}
|
|
842
840
|
)
|
|
843
|
-
|
|
844
841
|
return res.data.map(item => {
|
|
845
842
|
return {
|
|
846
843
|
label: item.name,
|
|
@@ -858,8 +855,10 @@ export default {
|
|
|
858
855
|
tablename: 't_user',
|
|
859
856
|
condition: `id='${this.selectdata.f_construction_unit_id}'`
|
|
860
857
|
}
|
|
861
|
-
let
|
|
862
|
-
|
|
858
|
+
let http = new HttpResetClass()
|
|
859
|
+
let res = await http.load(
|
|
860
|
+
'POST',
|
|
861
|
+
`rs/sql/applySingleTable`,
|
|
863
862
|
{data: data},
|
|
864
863
|
{resolveMsg: null, rejectMsg: null}
|
|
865
864
|
)
|
|
@@ -879,12 +878,13 @@ export default {
|
|
|
879
878
|
userid: this.$login.f.id
|
|
880
879
|
}
|
|
881
880
|
data.source = 'this.getParentByType($organization$).getChildByName($'+ this.$login.f.f_department_name + '$).getChildren()'
|
|
882
|
-
let
|
|
883
|
-
|
|
881
|
+
let http = new HttpResetClass()
|
|
882
|
+
let res = await http.load(
|
|
883
|
+
'POST',
|
|
884
|
+
`rs/search`,
|
|
884
885
|
{data: data},
|
|
885
886
|
{resolveMsg: null, rejectMsg: '安装单位施工班组查询失败!!!'}
|
|
886
887
|
)
|
|
887
|
-
|
|
888
888
|
return res.data.map(item => {
|
|
889
889
|
return {
|
|
890
890
|
label: item.name,
|
|
@@ -898,9 +898,10 @@ export default {
|
|
|
898
898
|
source: 'this.getParentByType($organization$).getChildByName($工程施工队$).getChildren()',
|
|
899
899
|
userid: this.$login.f.id
|
|
900
900
|
}
|
|
901
|
-
|
|
902
|
-
let res = await
|
|
903
|
-
'
|
|
901
|
+
let http = new HttpResetClass()
|
|
902
|
+
let res = await http.load(
|
|
903
|
+
'POST',
|
|
904
|
+
`rs/search`,
|
|
904
905
|
{data: data},
|
|
905
906
|
{resolveMsg: null, rejectMsg: '安装单位负责人查询失败!!!'}
|
|
906
907
|
)
|
|
@@ -921,13 +922,13 @@ export default {
|
|
|
921
922
|
source: 'this.getParentByType($organization$).getChildByName($工程施工队$).getChildren()',
|
|
922
923
|
userid: this.$login.f.id
|
|
923
924
|
}
|
|
924
|
-
|
|
925
|
-
let res = await
|
|
926
|
-
'
|
|
925
|
+
let http = new HttpResetClass()
|
|
926
|
+
let res = await http.load(
|
|
927
|
+
'POST',
|
|
928
|
+
`rs/search`,
|
|
927
929
|
{data: data},
|
|
928
930
|
{resolveMsg: null, rejectMsg: '安装单位负责人查询失败!!!'}
|
|
929
931
|
)
|
|
930
|
-
|
|
931
932
|
return res.data.map(item => {
|
|
932
933
|
return {
|
|
933
934
|
label: item.name,
|
|
@@ -941,13 +942,13 @@ export default {
|
|
|
941
942
|
source: 'this.getParentByType($organization$).getChildByName($建设单位$).getChildren()',
|
|
942
943
|
userid: this.$login.f.id
|
|
943
944
|
}
|
|
944
|
-
|
|
945
|
-
let res = await
|
|
946
|
-
'
|
|
945
|
+
let http = new HttpResetClass()
|
|
946
|
+
let res = await http.load(
|
|
947
|
+
'POST',
|
|
948
|
+
`rs/search`,
|
|
947
949
|
{data: data},
|
|
948
950
|
{resolveMsg: null, rejectMsg: '建设单位人员查询失败!!!'}
|
|
949
951
|
)
|
|
950
|
-
|
|
951
952
|
return res.data.map(item => {
|
|
952
953
|
return {
|
|
953
954
|
label: item.name,
|
|
@@ -961,9 +962,10 @@ export default {
|
|
|
961
962
|
source: 'this.getParentByType($organization$).getChildByName($监理单位$).getChildren()',
|
|
962
963
|
userid: this.$login.f.id
|
|
963
964
|
}
|
|
964
|
-
|
|
965
|
-
let res = await
|
|
966
|
-
'
|
|
965
|
+
let http = new HttpResetClass()
|
|
966
|
+
let res = await http.load(
|
|
967
|
+
'POST',
|
|
968
|
+
`rs/search`,
|
|
967
969
|
{data: data},
|
|
968
970
|
{resolveMsg: null, rejectMsg: '监理单位人员查询失败!!!'}
|
|
969
971
|
)
|
|
@@ -986,9 +988,10 @@ export default {
|
|
|
986
988
|
source: 'this.getParentByType($organization$).getChildByName($监理单位$).getChildren()',
|
|
987
989
|
userid: this.$login.f.id
|
|
988
990
|
}
|
|
989
|
-
|
|
990
|
-
let res = await
|
|
991
|
-
'
|
|
991
|
+
let http = new HttpResetClass()
|
|
992
|
+
let res = await http.load(
|
|
993
|
+
'POST',
|
|
994
|
+
`rs/search`,
|
|
992
995
|
{data: data},
|
|
993
996
|
{resolveMsg: null, rejectMsg: '监理单位人员查询失败!!!'}
|
|
994
997
|
)
|
|
@@ -1006,8 +1009,10 @@ export default {
|
|
|
1006
1009
|
source: 'this.getParentByType($organization$).getChildByName($监理班组$).getChildren()',
|
|
1007
1010
|
userid: this.$login.f.id
|
|
1008
1011
|
}
|
|
1009
|
-
let
|
|
1010
|
-
|
|
1012
|
+
let http = new HttpResetClass()
|
|
1013
|
+
let res = await http.load(
|
|
1014
|
+
'POST',
|
|
1015
|
+
`rs/search`,
|
|
1011
1016
|
{data: data},
|
|
1012
1017
|
{resolveMsg: null, rejectMsg: '监理单位人员查询失败!!!'}
|
|
1013
1018
|
)
|
|
@@ -1024,9 +1029,10 @@ export default {
|
|
|
1024
1029
|
source: 'this.getParentByType($organization$).getChildByName($土建单位$).getChildren()',
|
|
1025
1030
|
userid: this.$login.f.id
|
|
1026
1031
|
}
|
|
1027
|
-
|
|
1028
|
-
let res = await
|
|
1029
|
-
'
|
|
1032
|
+
let http = new HttpResetClass()
|
|
1033
|
+
let res = await http.load(
|
|
1034
|
+
'POST',
|
|
1035
|
+
`rs/search`,
|
|
1030
1036
|
{data: data},
|
|
1031
1037
|
{resolveMsg: null, rejectMsg: '土建单位人员查询失败!!!'}
|
|
1032
1038
|
)
|
|
@@ -1046,9 +1052,10 @@ export default {
|
|
|
1046
1052
|
source: 'this.getParentByType($organization$).getChildByName($土建单位$).getChildren()',
|
|
1047
1053
|
userid: this.$login.f.id
|
|
1048
1054
|
}
|
|
1049
|
-
|
|
1050
|
-
let res = await
|
|
1051
|
-
'
|
|
1055
|
+
let http = new HttpResetClass()
|
|
1056
|
+
let res = await http.load(
|
|
1057
|
+
'POST',
|
|
1058
|
+
`rs/search`,
|
|
1052
1059
|
{data: data},
|
|
1053
1060
|
{resolveMsg: null, rejectMsg: '土建单位人员查询失败!!!'}
|
|
1054
1061
|
)
|
|
@@ -1068,9 +1075,10 @@ export default {
|
|
|
1068
1075
|
source: 'this.getParentByType($organization$).getChildByName($检测单位$).getChildren()',
|
|
1069
1076
|
userid: this.$login.f.id
|
|
1070
1077
|
}
|
|
1071
|
-
|
|
1072
|
-
let res = await
|
|
1073
|
-
'
|
|
1078
|
+
let http = new HttpResetClass()
|
|
1079
|
+
let res = await http.load(
|
|
1080
|
+
'POST',
|
|
1081
|
+
`rs/search`,
|
|
1074
1082
|
{data: data},
|
|
1075
1083
|
{resolveMsg: null, rejectMsg: '检测单位人员查询失败!!!'}
|
|
1076
1084
|
)
|
|
@@ -1090,9 +1098,10 @@ export default {
|
|
|
1090
1098
|
source: 'this.getParentByType($organization$).getChildByName($检测单位$).getChildren()',
|
|
1091
1099
|
userid: this.$login.f.id
|
|
1092
1100
|
}
|
|
1093
|
-
|
|
1094
|
-
let res = await
|
|
1095
|
-
'
|
|
1101
|
+
let http = new HttpResetClass()
|
|
1102
|
+
let res = await http.load(
|
|
1103
|
+
'POST',
|
|
1104
|
+
`rs/search`,
|
|
1096
1105
|
{data: data},
|
|
1097
1106
|
{resolveMsg: null, rejectMsg: '检测单位人员查询失败!!!'}
|
|
1098
1107
|
)
|
|
@@ -2037,12 +2046,13 @@ export default {
|
|
|
2037
2046
|
apply: this.show_data,
|
|
2038
2047
|
user: this.$login.f
|
|
2039
2048
|
}
|
|
2040
|
-
let
|
|
2049
|
+
let http = new HttpResetClass()
|
|
2050
|
+
let res = await http.load(
|
|
2051
|
+
'POST',
|
|
2041
2052
|
`rs/logic/ApplyProductService`,
|
|
2042
2053
|
{data: data},
|
|
2043
2054
|
{resolveMsg: null, rejectMsg: '数据保存失败'}
|
|
2044
2055
|
)
|
|
2045
|
-
|
|
2046
2056
|
if (this.show_data.button.after) {
|
|
2047
2057
|
this[this.show_data.button.after]()
|
|
2048
2058
|
}
|