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

CallCenterWeb.UI/RMYY/src/utils/index.js

@@ -165,7 +165,7 @@ export function timestampToTime(time, cFormat) {
   }
   const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
     let value = formatObj[key]
-    if (key === 'a')
+    if (key === 'a') {
       return [
         '星期一',
         '星期二',
@@ -175,6 +175,7 @@ export function timestampToTime(time, cFormat) {
         '星期六',
         '星期日'
       ][value - 1]
+    }
     if (result.length > 0 && value < 10) {
       value = '0' + value
     }
@@ -514,6 +515,10 @@ export function buildMenuTree(list) {
   }
   for (const i in temp) {
     if (temp[i].F_ParentId !== 0) {
+      if (!temp[temp[i].F_ParentId]) {
+        temp[temp[i].F_ParentId] = {}
+      }
+
       if (!temp[temp[i].F_ParentId].childnodes) {
         temp[temp[i].F_ParentId].childnodes = {}
       }

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/addOrEditDispatch.vue

@@ -569,13 +569,23 @@ export default {
     },
     submitForm() {
       const details = []
+      let isNull = false
       this.devList.forEach(function(v, n) {
+        if (!isNull && !v.devname.split(',')[1]) {
+          isNull = true
+        }
         details.push({
           F_DicId: v.devname.split(',')[1],
           F_DicName: v.devname.split(',')[0],
           F_Number: v.num
         })
       })
+
+      if (isNull) {
+        this.$message.error('请选择对应物资')
+        return
+      }
+
       if (this.ruleForm.repairImageid === '') {
         this.ruleForm.repairImageid = ''
       } else {

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -19,7 +19,7 @@
                 <th>工单类别:</th>
                 <td>{{ orderDetailData.F_TypeName2 }}</td>
                 <th>超时时限:</th>
-                <td>{{ orderDetailData.GapTime }}</td>
+                <td>{{ orderDetailData.GapTime || '-' }}</td>
               </tr>
               <tr>
                 <th>申请人:</th>
@@ -27,7 +27,7 @@
                 <th>申请科室:</th>
                 <td>{{ orderDetailData.F_ApplicationDept | formtDeptById }}</td>
                 <th>申请时间:</th>
-                <td>{{ orderDetailData.F_AssignTime }}</td>
+                <td>{{ orderDetailData.F_CreateTime }}</td>
               </tr>
               <tr>
                 <th>送达科室:</th>

CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

@@ -300,6 +300,11 @@ export default {
         name: ''
       },
       rules: {
+        F_Type2: [{
+          required: true,
+          message: '请选择工单类别',
+          trigger: 'blur'
+        }],
         F_Customer: [{
           required: true,
           message: '姓名不能为空',
@@ -548,6 +553,12 @@ export default {
       })
     },
     submitForm() {
+      console.log(this.ruleForm.F_Type2, 'this.ruleForm.F_type2')
+      if (!this.ruleForm.F_Type2) {
+        this.$message.error('请选择工单类别')
+        return
+      }
+
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true