设备工单

src/api/work/process.js

@@ -43,3 +43,15 @@ export const publicevent = (data) => {
     data
   })
 }
+
+
+
+// =====================设备工单===========================
+
+export const deviceorder = (data) => {
+  return request({
+    url: '/api/work-order/deviceorder/start-process',
+    method: 'post',
+    data
+  })
+}

src/views/work/process/deviceOrder/detail.vue

@@ -6,64 +6,61 @@
           <el-button @click="handleCancel">关闭</el-button>
         </el-form-item>
       </el-row>
-      <el-card shadow="hover">
-        <div slot="header">
-          <span>审批信息</span>
-        </div>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item  label="告警设备">
-            <el-input :disabled="true" v-model="form.deviceId" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="设备类型">
-            <el-input :disabled="true" v-model="form.deviceType" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="告警类型">
-            <el-input :disabled="true" v-model="form.alarmType" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="告警时间">
-            <el-input :disabled="true" v-model="form.alarmTime" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="告警地点">
-          <el-input :disabled="true" type="textarea" v-model="form.alarmPosition" placeholder="暂无数据"/>
-        </el-form-item>
-        <el-form-item label="告警原因" >
-          <el-input :disabled="true" type="textarea" v-model="form.alarmReason" placeholder="暂无数据" />
-        </el-form-item>
-      </el-card>
-      <el-card shadow="hover">
-        <div slot="header">
-          <span>流程信息</span>
-        </div>
-        <el-row type="flex" class="row-bg">
-          <el-timeline>
-            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
-              <el-card shadow="hover">
-                <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
-                <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
-                <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
-                <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </el-row>
-      </el-card>
-      <el-card shadow="hover">
-        <div slot="header">
-          <span>流程跟踪</span>
-        </div>
-        <el-row type="flex" class="row-bg" style="background: white">
-          <img :src="src" alt="design">
-        </el-row>
-      </el-card>
+      <el-collapse v-model="activeNames">
+        <el-collapse-item name="1">
+          <template slot="title" ><span style="font-size: 20px">审批信息</span></template>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item  label="告警设备">
+                <el-tag type="info">{{form.deviceId}}</el-tag>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备类型">
+                <el-tag type="info">{{form.deviceType}}</el-tag>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="告警类型">
+                <el-tag type="info">{{form.alarmType}}</el-tag>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="告警时间">
+                <el-tag type="info">{{form.alarmTime}}</el-tag>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="告警地点">
+            <el-input :disabled="true" type="textarea" v-model="form.alarmPosition" placeholder="暂无数据"/>
+          </el-form-item>
+          <el-form-item label="告警原因" >
+            <el-input :disabled="true" type="textarea" v-model="form.alarmReason" placeholder="暂无数据" />
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="2">
+          <template slot="title" ><span style="font-size: 20px">流程信息</span></template>
+          <el-row type="flex" class="row-bg">
+            <el-timeline>
+              <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
+                <el-card shadow="hover">
+                  <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
+                  <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
+                  <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
+                  <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
+                </el-card>
+              </el-timeline-item>
+            </el-timeline>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item name="3" style="height: 500px">
+          <template slot="title" ><span style="font-size: 20px">流程跟踪</span></template>
+          <el-row type="flex" class="row-bg" style="background: white">
+            <el-image :src="src"></el-image>
+<!--            <img :src="src" alt="design">-->
+          </el-row>
+        </el-collapse-item>
+      </el-collapse>
     </el-form>
   </basic-container>
 </template>
@@ -75,6 +72,7 @@
   export default {
     data() {
       return {
+        activeNames: ['1','2','3'],
         businessId: '',
         processInstanceId: '',
         src: '',

src/views/work/process/deviceOrder/form.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <avue-form :option="option" v-model="form" @submit="handleSubmit"/>
+    <avue-form ref="crud" :option="option" v-model="form" @submit="handleSubmit"/>
   </basic-container>
 </template>
 
@@ -82,17 +82,17 @@
             },
             {
               icon: 'el-icon-info',
-              label: '处理人',
+              label: '受理人',
               prop: 'group2',
               column: [
                 {
-                  label: '处理人',
+                  label: '受理人',
                   prop: 'handlePerson',
                   type: 'select',
                   dicUrl: `/api/blade-user/user-list`,
                   props: {
                     label: "account",
-                    value: "id"
+                    value: "id",
                   },
                   span: 8,
                   rules: [
@@ -101,12 +101,24 @@
                       message: '请选择受理人员',
                       trigger: 'blur'
                     }
-                  ]
+                  ],
+                  change: ({value,column}) => {
+                    if (!this.validatenull(value)){
+                      if (this.$refs.crud.DIC.hasOwnProperty(column.prop)){
+                        let person = this.$refs.crud.DIC[column.prop].find(item => item.id == value);
+                        if (!this.validatenull(person) && !this.validatenull(person.phone)){
+                          return this.form.handlePhone = person.phone
+                        }
+                      }
+                    }
+                    this.form.handlePhone = '';
+                  },
                 },
                 {
-                  label: '处理人电话',
+                  label: '受理人电话',
                   prop: 'handlePhone',
                   labelWidth: 120,
+                  detail: true,
                   span: 8,
                   rules: [
                     {