feat:工单池添加上报类型

apps/web-antd/src/views/property/businessManagement/workOrders/data.ts

@@ -51,6 +51,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'typeName',
     minWidth: 150,
   },
+  {
+    title: '上报类型',
+    field: 'reportingType',
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.reportingType, 'wy_gdsblx');
+      },
+    },
+    width: 100,
+  },
   {
     title: '派单时间',
     field: 'dispatchTime',
@@ -164,6 +174,15 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'selectRequired',
   },
+  {
+    label: '上报类型',
+    fieldName: 'reportingType',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('wy_gdsblx'),
+    },
+    rules: 'selectRequired',
+  },
   // {
   //   label: '状态',
   //   fieldName: 'status',
@@ -206,6 +225,7 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'location',
     component: 'Input',
     rules: 'selectRequired',
+    formItemClass:'col-span-2'
   },
   // {
   //   label: '计划完成时间',
@@ -234,6 +254,7 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '备注',
     fieldName: 'remark',
     component: 'Textarea',
+    formItemClass:'col-span-2'
   },
   // {
   //   label: '是否超时',

apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue

@@ -42,7 +42,7 @@ async function handleOpenChange(open: boolean) {
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="工单详情信息" class="w-[70%]">
     <div v-if="orderDetail">
-      <Descriptions size="small" :column="2" :labelStyle="{width:'120px'}">
+      <Descriptions size="small" :column="2" :labelStyle="{width:'130px'}" bordered>
         <DescriptionsItem label="订单号">
           {{ orderDetail.orderNo }}
         </DescriptionsItem>
@@ -52,6 +52,16 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="工单类型">
          {{orderDetail.typeName}}
         </DescriptionsItem>
+        <DescriptionsItem label="上报类型">
+          <component
+            :is="renderDict(orderDetail.reportingType,'wy_gdsblx')"
+          />
+        </DescriptionsItem>
+        <DescriptionsItem label="处理权重">
+          <component
+            :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
+          />
+        </DescriptionsItem>
         <DescriptionsItem label="发起人">
           {{ orderDetail.initiatorPeople }}
         </DescriptionsItem>
@@ -68,26 +78,23 @@ async function handleOpenChange(open: boolean) {
 <!--          {{ orderDetail.planCompleTime }}-->
 <!--        </DescriptionsItem>-->
 
+
+        <DescriptionsItem label="备注" :span="2">
+          {{ orderDetail.remark }}
+        </DescriptionsItem>
         <DescriptionsItem label="创建时间">
           {{ orderDetail.createTime }}
         </DescriptionsItem>
-        <DescriptionsItem label="备注">
-          {{ orderDetail.remark }}
-        </DescriptionsItem>
         <DescriptionsItem label="完成时间">
           {{ orderDetail.compleTime }}
         </DescriptionsItem>
-        <DescriptionsItem label="处理权重">
-          <component
-            :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
-          />
-        </DescriptionsItem>
+
         <DescriptionsItem label="是否超时" v-if="orderDetail.isTimeOut!=null">
           <component
             :is="renderDict(orderDetail.isTimeOut,'wy_sf')"
           />
         </DescriptionsItem>
-        <DescriptionsItem label="服务评价" v-if="orderDetail.serviceEvalua!=null">
+        <DescriptionsItem label="服务评价" v-if="orderDetail.serviceEvalua!=null" :span="2">
           <Rate :value="orderDetail.serviceEvalua" disabled/>
         </DescriptionsItem>
         <DescriptionsItem label="评价内容" v-if="orderDetail.serviceEvaluaText" :span="2">