Przeglądaj źródła

fix:菜单管理删除之后错误问题修复

scholar-wei 3 lat temu
rodzic
commit
1d5f9bf6da

+ 6 - 1
CallCenterWeb.UI/RMYY/src/utils/index.js

165
   }
165
   }
166
   const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
166
   const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
167
     let value = formatObj[key]
167
     let value = formatObj[key]
168
-    if (key === 'a')
168
+    if (key === 'a') {
169
       return [
169
       return [
170
         '星期一',
170
         '星期一',
171
         '星期二',
171
         '星期二',
175
         '星期六',
175
         '星期六',
176
         '星期日'
176
         '星期日'
177
       ][value - 1]
177
       ][value - 1]
178
+    }
178
     if (result.length > 0 && value < 10) {
179
     if (result.length > 0 && value < 10) {
179
       value = '0' + value
180
       value = '0' + value
180
     }
181
     }
514
   }
515
   }
515
   for (const i in temp) {
516
   for (const i in temp) {
516
     if (temp[i].F_ParentId !== 0) {
517
     if (temp[i].F_ParentId !== 0) {
518
+      if (!temp[temp[i].F_ParentId]) {
519
+        temp[temp[i].F_ParentId] = {}
520
+      }
521
+
517
       if (!temp[temp[i].F_ParentId].childnodes) {
522
       if (!temp[temp[i].F_ParentId].childnodes) {
518
         temp[temp[i].F_ParentId].childnodes = {}
523
         temp[temp[i].F_ParentId].childnodes = {}
519
       }
524
       }

+ 10 - 0
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/addOrEditDispatch.vue

569
     },
569
     },
570
     submitForm() {
570
     submitForm() {
571
       const details = []
571
       const details = []
572
+      let isNull = false
572
       this.devList.forEach(function(v, n) {
573
       this.devList.forEach(function(v, n) {
574
+        if (!isNull && !v.devname.split(',')[1]) {
575
+          isNull = true
576
+        }
573
         details.push({
577
         details.push({
574
           F_DicId: v.devname.split(',')[1],
578
           F_DicId: v.devname.split(',')[1],
575
           F_DicName: v.devname.split(',')[0],
579
           F_DicName: v.devname.split(',')[0],
576
           F_Number: v.num
580
           F_Number: v.num
577
         })
581
         })
578
       })
582
       })
583
+
584
+      if (isNull) {
585
+        this.$message.error('请选择对应物资')
586
+        return
587
+      }
588
+
579
       if (this.ruleForm.repairImageid === '') {
589
       if (this.ruleForm.repairImageid === '') {
580
         this.ruleForm.repairImageid = ''
590
         this.ruleForm.repairImageid = ''
581
       } else {
591
       } else {

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

19
                 <th>工单类别:</th>
19
                 <th>工单类别:</th>
20
                 <td>{{ orderDetailData.F_TypeName2 }}</td>
20
                 <td>{{ orderDetailData.F_TypeName2 }}</td>
21
                 <th>超时时限:</th>
21
                 <th>超时时限:</th>
22
-                <td>{{ orderDetailData.GapTime }}</td>
22
+                <td>{{ orderDetailData.GapTime || '-' }}</td>
23
               </tr>
23
               </tr>
24
               <tr>
24
               <tr>
25
                 <th>申请人:</th>
25
                 <th>申请人:</th>
27
                 <th>申请科室:</th>
27
                 <th>申请科室:</th>
28
                 <td>{{ orderDetailData.F_ApplicationDept | formtDeptById }}</td>
28
                 <td>{{ orderDetailData.F_ApplicationDept | formtDeptById }}</td>
29
                 <th>申请时间:</th>
29
                 <th>申请时间:</th>
30
-                <td>{{ orderDetailData.F_AssignTime }}</td>
30
+                <td>{{ orderDetailData.F_CreateTime }}</td>
31
               </tr>
31
               </tr>
32
               <tr>
32
               <tr>
33
                 <th>送达科室:</th>
33
                 <th>送达科室:</th>

+ 11 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

300
         name: ''
300
         name: ''
301
       },
301
       },
302
       rules: {
302
       rules: {
303
+        F_Type2: [{
304
+          required: true,
305
+          message: '请选择工单类别',
306
+          trigger: 'blur'
307
+        }],
303
         F_Customer: [{
308
         F_Customer: [{
304
           required: true,
309
           required: true,
305
           message: '姓名不能为空',
310
           message: '姓名不能为空',
548
       })
553
       })
549
     },
554
     },
550
     submitForm() {
555
     submitForm() {
556
+      console.log(this.ruleForm.F_Type2, 'this.ruleForm.F_type2')
557
+      if (!this.ruleForm.F_Type2) {
558
+        this.$message.error('请选择工单类别')
559
+        return
560
+      }
561
+
551
       this.$refs.ruleForm.validate((valid) => {
562
       this.$refs.ruleForm.validate((valid) => {
552
         if (valid) {
563
         if (valid) {
553
           this.loading = true
564
           this.loading = true