Bladeren bron

督查单详情增加字段+封装优化代码

ming 1 jaar geleden
bovenliggende
commit
5d6758a4e3

+ 66 - 15
src/pages/business/zhxf/fireInspect/inspectDetails/index.vue

@@ -17,7 +17,6 @@
 
       <view class="bg-white p15 mb15">
         <uni-section class="block mb10" title="基本信息" type="line"></uni-section>
-
         <view class="tableType3 padding-0">
           <u-row v-for="da in dataList" :key="da">
             <u-col span="4">
@@ -30,6 +29,20 @@
         </view>
       </view>
 
+      <view class="bg-white p15 mb15" v-if="dataArray.handleStatus == 1">
+        <uni-section class="block mb10" title="处理信息" type="line"></uni-section>
+        <view class="tableType3 padding-0">
+          <u-row v-for="da in dataList2" :key="da">
+            <u-col span="4">
+              <view style="text-align: right; padding: 0px 5px 0px 5px">{{ da.title }}</view>
+            </u-col>
+            <u-col span="8">
+              <view style="text-align: left; padding: 0px 5px 0px 5px">{{ da.value }}</view>
+            </u-col>
+          </u-row>
+        </view>
+      </view>
+
       <view class="bg-white p15 mb15">
         <uni-section class="block mb10" title="处理内容" type="line"></uni-section>
 
@@ -93,6 +106,20 @@ const dataList = ref([
     value: "",
   },
 ]);
+const dataList2 = ref([
+  {
+    title: "处理账号/电话",
+    value: "",
+  },
+  {
+    title: "处理时间",
+    value: "",
+  },
+  // {
+  //   title: "处理内容",
+  //   value: "",
+  // },
+]);
 
 const deviceName = ref("");
 const alarmTime = ref("");
@@ -127,28 +154,52 @@ function init() {
 function selectListApi() {
 
   if (productName.value == "电子督察单") {
-    eleInspectList({
-      id: id.value,
-      pageNum: current.value,
-      pageSize: pageSize.value,
-    }).then((requset) => {
-      if (requset.status === "SUCCESS") {
-        dataArray.value = requset.data.records[0];
-        dataList.value[0].value = requset.data.records[0].superviseCode;
-        dataList.value[1].value = requset.data.records[0].content;
-        total.value = requset.data.total;
-      }
-    });
+
+    getDetail(eleInspectList,'电子')
+    // eleInspectList({
+    //   id: id.value,
+    //   pageNum: current.value,
+    //   pageSize: pageSize.value,
+    // }).then((requset) => {
+    //   if (requset.status === "SUCCESS") {
+    //     dataArray.value = requset.data.records[0];
+    //     dataList.value[0].value = requset.data.records[0].superviseCode;
+    //     dataList.value[1].value = requset.data.records[0].content;
+    //     dataList2.value[0].value = requset.data.records[0].handlePhone;
+    //     dataList2.value[1].value = requset.data.records[0].handleTime;
+    //     total.value = requset.data.total;
+    //   }
+    // });
   } else {
-    persInspectList({
+    getDetail(persInspectList,'人工')
+    // persInspectList({
+    //   id: id.value,
+    //   pageNum: current.value,
+    //   pageSize: pageSize.value,
+    // }).then((requset) => {
+    //   if (requset.status === "SUCCESS") {
+    //     dataArray.value = requset.data.records[0];
+    //     dataList.value[0].value = requset.data.records[0].artificialCode;
+    //     dataList.value[1].value = requset.data.records[0].content;
+    //     dataList2.value[0].value = requset.data.records[0].handlePhone;
+    //     dataList2.value[1].value = requset.data.records[0].handleTime;
+    //     total.value = requset.data.total;
+    //   }
+    // });
+  }
+
+  function getDetail(param,param2){
+    param({
       id: id.value,
       pageNum: current.value,
       pageSize: pageSize.value,
     }).then((requset) => {
       if (requset.status === "SUCCESS") {
         dataArray.value = requset.data.records[0];
-        dataList.value[0].value = requset.data.records[0].superviseCode;
+        dataList.value[0].value = param2=='电子'?requset.data.records[0].superviseCode:requset.data.records[0].artificialCode;
         dataList.value[1].value = requset.data.records[0].content;
+        dataList2.value[0].value = requset.data.records[0].handlePhone;
+        dataList2.value[1].value = requset.data.records[0].handleTime;
         total.value = requset.data.total;
       }
     });

+ 7 - 14
src/pages/business/zhxf/fireInspect/inspectDetailsList/index.vue

@@ -85,21 +85,14 @@ function init() {
  */
 function selectListApi() {
   if (productName.value == "电子督察单") {
-    eleInspectList({
-      handleStatus: tabsList.value[tabsCurrent.value].value,
-      pageNum: current.value,
-      pageSize: pageSize.value,
-    }).then((requset) => {
-      if (requset.status === "SUCCESS") {
-        dataList.value = requset.data.records;
-        total.value = requset.data.total;
-        uni.setNavigationBarTitle({
-          title: `${productName.value}(${total.value})`,
-        });
-      }
-    });
+    getList(eleInspectList)
   } else {
-    persInspectList({
+    getList(persInspectList)
+  }
+
+
+  function getList(param){
+    param({
       handleStatus: tabsList.value[tabsCurrent.value].value,
       pageNum: current.value,
       pageSize: pageSize.value,