[Feat 0000] 瓦斯巡检地点、任务管理添加表格项/表单项及对接

src/views/vent/gas/gasInspect/gasInspect.data.ts

@@ -1,4 +1,3 @@
-import { getAllUserInfo } from './gasInspect.api';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 
 export const columns: BasicColumn[] = [
@@ -230,8 +229,8 @@ export const taskColumns: BasicColumn[] = [
   // },
   {
     title: '所属区队',
-    dataIndex: 'districtTeam',
-    key: 'districtTeam',
+    dataIndex: 'teamCode_dictText',
+    key: 'teamCode_dictText',
     align: 'center',
   },
   {
@@ -264,6 +263,12 @@ export const taskColumns: BasicColumn[] = [
     key: 'createTime',
     align: 'center',
   },
+  {
+    title: '任务日期',
+    dataIndex: 'taskTime',
+    key: 'taskTime',
+    align: 'center',
+  },
 ];
 
 export const taskschemas: FormSchema[] = [

src/views/vent/gas/gasInspect/index2.vue

@@ -89,7 +89,7 @@
   import { Modal, message } from 'ant-design-vue';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { getAutoScrollContainer } from '/@/utils/common/compUtils';
+  import dayjs from 'dayjs';
 
   // 任务列表
   const searchParams1 = ref<any>({ deviceName: '' });
@@ -108,17 +108,18 @@
         schemas: [
           {
             label: '日期',
-            field: 'createTime',
+            field: 'taskTime',
             component: 'DatePicker',
+            defaultValue: dayjs(),
             componentProps: {
               showTime: false,
               valueFormat: 'YYYY-MM-DD',
-              getPopupContainer: getAutoScrollContainer,
+              // getPopupContainer: getAutoScrollContainer,
             },
           },
           {
             label: '所属区队',
-            field: 'districtTeam',
+            field: 'teamCode',
             component: 'JDictSelectTag',
             componentProps: {
               dictCode: 'districtTeam',
@@ -147,6 +148,7 @@
         Object.assign(params, {
           ...searchParams2.value,
           taskId: selectedRow.value.id,
+          taskTime: selectedRow.value.taskTime,
         });
       },
       columns: taskDetailsColumns,
@@ -166,6 +168,7 @@
         Object.assign(params, {
           ...searchParams3.value,
           taskId: selectedRow.value.id,
+          taskTime: selectedRow.value.taskTime,
         });
       },
       afterFetch(resultItems) {
@@ -273,6 +276,7 @@
   function patchConfirmHandler(rows, mode) {
     operateGasCheckTaskDetail({
       taskId: selectedRow.value.id,
+      taskTime: selectedRow.value.taskTime,
       operateList: rows.map((e) => {
         return {
           deviceId: e.deviceId, //设备id（巡检地址id）

src/views/vent/gas/gasInspectNonfc/components/addressAdd2.vue

@@ -13,6 +13,9 @@
       <a-form-item label="是否有传感器：">
         <a-checkbox v-model:checked="formAddress.isSensor" style="width: 220px" />
       </a-form-item>
+      <a-form-item label="排序：">
+        <a-input v-model:value="formAddress.orderNum" style="width: 220px" />
+      </a-form-item>
     </a-form>
     <div class="edit-btn">
       <a-button @click="cancelAddress">取消</a-button>
@@ -30,6 +33,7 @@
     strremark: '',
     strinstallpos: '',
     isSensor: false,
+    orderNum: '',
   });
   let $emit = defineEmits(['confirmAddress', 'cancelAddress']);
 
@@ -47,6 +51,7 @@
       strremark: '',
       strinstallpos: '',
       isSensor: false,
+      orderNum: '',
     };
     $emit('cancelAddress');
   };

src/views/vent/gas/gasInspectNonfc/components/inspectEdit2.vue

@@ -16,6 +16,9 @@
       <a-form-item label="是否有传感器：">
         <a-checkbox v-model:checked="formStateEdit.isSensor" style="width: 220px" />
       </a-form-item>
+      <a-form-item label="排序：">
+        <a-input v-model:value="formStateEdit.orderNum" style="width: 220px" />
+      </a-form-item>
     </a-form>
     <div class="edit-btn">
       <a-button @click="cancelEdit">取消</a-button>
@@ -44,6 +47,7 @@
     isSensor: false,
     disTeamId: '',
     insType: '',
+    orderNum: '',
   });
 
   let qdList = ref<any[]>([]); //区队下拉选项列表
@@ -76,6 +80,7 @@
       isSensor: false,
       disTeamId: '',
       insType: '',
+      orderNum: '',
     };
     $emit('cancelEdit');
   };

src/views/vent/gas/gasInspectNonfc/gasInspectNonfc.data.ts

@@ -196,12 +196,12 @@ export const columns2: BasicColumn[] = [
     key: 'isSensor',
     align: 'center',
   },
-  // {
-  //   title: '创建人',
-  //   dataIndex: 'createBy',
-  //   key: 'createBy',
-  //   align: 'center',
-  // },
+  {
+    title: '排序',
+    dataIndex: 'orderNum',
+    key: 'orderNum',
+    align: 'center',
+  },
   // {
   //   title: '创建日期',
   //   dataIndex: 'createTime',