|
@@ -124,6 +124,7 @@
|
124
|
124
|
:options="handleTypes"
|
125
|
125
|
position="right"
|
126
|
126
|
:hollow-style="true"
|
|
127
|
+ @input="changeHandleTypes"
|
127
|
128
|
/>
|
128
|
129
|
</div>
|
129
|
130
|
<!-- 直接处理 begin -->
|
|
@@ -138,7 +139,7 @@
|
138
|
139
|
class="btn_plcaeholde"
|
139
|
140
|
></cube-form-item>
|
140
|
141
|
<cube-form-item
|
141
|
|
- v-if="order == 1"
|
|
142
|
+ v-if="order == 1 && isShowDes"
|
142
|
143
|
:field="fields[13]"
|
143
|
144
|
class="btn_plcaeholde"
|
144
|
145
|
></cube-form-item>
|
|
@@ -391,6 +392,7 @@ export default {
|
391
|
392
|
closecodeArr: [], //关闭代码数组
|
392
|
393
|
handlerUserArr: [], //处理人数组
|
393
|
394
|
candidateGroupsArr: [], //处理组数组
|
|
395
|
+ isShowDes: false,
|
394
|
396
|
handleTypes: [
|
395
|
397
|
{
|
396
|
398
|
label: "直接处理",
|
|
@@ -762,6 +764,14 @@ export default {
|
762
|
764
|
}
|
763
|
765
|
},
|
764
|
766
|
methods: {
|
|
767
|
+ // 切换处理方式liaomingming
|
|
768
|
+ changeHandleTypes() {
|
|
769
|
+ let reverseArr = this.model.category.filter(Boolean).reverse(); //数组翻转,取第一项不为空的
|
|
770
|
+ let sjId = reverseArr[0]; //事件Id baba
|
|
771
|
+ let sj = this.initSjList.filter(v => v.id == sjId)[0];
|
|
772
|
+ console.log(this.order,sj);
|
|
773
|
+ this.isShowDes = !(this.order == 1 && sj && sj.hasSimple == 1);
|
|
774
|
+ },
|
765
|
775
|
//扫资产
|
766
|
776
|
scan() {
|
767
|
777
|
SM(this).then(ress1 => {
|
|
@@ -1170,7 +1180,6 @@ export default {
|
1170
|
1180
|
that.selectHouseNumber,
|
1171
|
1181
|
"2020年4月25日14:09:29"
|
1172
|
1182
|
);
|
1173
|
|
- // liaomingming
|
1174
|
1183
|
console.log(that.modelData.incident.category.id, this.initSjList, "事件");
|
1175
|
1184
|
if (
|
1176
|
1185
|
this.order == 1 &&
|
|
@@ -1270,7 +1279,6 @@ export default {
|
1270
|
1279
|
(this.integralMechanism == 2 &&
|
1271
|
1280
|
this.loginUser.userType.value == 2))
|
1272
|
1281
|
) {
|
1273
|
|
- //liaomingming
|
1274
|
1282
|
this.$http
|
1275
|
1283
|
.post("service/common/common/getDictionary", {
|
1276
|
1284
|
key: "incident_integral_state",
|
|
@@ -1428,18 +1436,26 @@ export default {
|
1428
|
1436
|
//派人
|
1429
|
1437
|
this.order = 2;
|
1430
|
1438
|
this.model.handleUserOrGroup = true;
|
1431
|
|
- this.model.handlerUser = sj.handleUser.id;
|
|
1439
|
+ this.model.handlerUser = sj.handleUser ? sj.handleUser.id : "";
|
1432
|
1440
|
} else if (sj.userOrGroupType === 2) {
|
1433
|
1441
|
//派组
|
1434
|
1442
|
this.order = 2;
|
1435
|
1443
|
this.model.handleUserOrGroup = false;
|
1436
|
|
- this.model.candidateGroups = sj.group.id;
|
|
1444
|
+ this.model.candidateGroups = sj.group ? sj.group.id : "";
|
1437
|
1445
|
} else {
|
1438
|
1446
|
this.order = 1;
|
1439
|
1447
|
this.model.handleUserOrGroup = false;
|
1440
|
1448
|
this.model.handlerUser = "";
|
1441
|
1449
|
this.model.candidateGroups = "";
|
1442
|
1450
|
}
|
|
1451
|
+ console.log(this.order, sj.hasSimple);
|
|
1452
|
+ if (this.order == 1 && sj.hasSimple == 1) {
|
|
1453
|
+ // 直接处理 && 简单处理
|
|
1454
|
+ // liaomingming
|
|
1455
|
+ this.isShowDes = false;
|
|
1456
|
+ }else{
|
|
1457
|
+ this.isShowDes = true;
|
|
1458
|
+ }
|
1443
|
1459
|
},
|
1444
|
1460
|
// 事件分类
|
1445
|
1461
|
getIncidentcategory() {
|