فهرست منبع

查询当前地块可执行功能

maxiaoxiao 1 ماه پیش
والد
کامیت
05babefebd

+ 8 - 0
src/api/rsmonitoring/dkjbxx.js

@@ -48,6 +48,14 @@ export function removeField(data) {
     data
   })
 }
+export function getStep(params) {
+  return request({
+    url: '/rsmonitoring/auditflow/record/list/step',
+    method: 'get',
+    params
+  })
+}
+
 
 // 地块县级操作
 export function hgxDkjbxx(data) {

+ 3 - 1
src/components/numCard.vue

@@ -48,7 +48,7 @@ defineProps({
 .numCard {
   width: 100%;
   height: 120px;
-  display: flex;
+  // display: flex;
   // background-color: rgba(255, 192, 203, 0.272);
   flex-direction: row;
   align-items: center;
@@ -60,6 +60,8 @@ defineProps({
     width: 200px;
     height: 85px;
     max-width: 200px;
+    display: inline-block;
+    margin: 0 10px;
     background: linear-gradient(
       180deg,
       rgba(30, 198, 149, 1) 0%,

+ 1 - 1
src/components/tablePage.vue

@@ -35,7 +35,7 @@
             :name="item.slot ? item.slot : ''"
             v-bind="scope"
           ></slot>
-          <span v-else>{{ scope.row[item.prop] || "-" }}</span>
+          <span v-else>{{ scope.row[item.prop] }}</span>
         </template>
       </el-table-column>
     </el-table>

+ 21 - 11
src/views/pageCode/checkLand/index.vue

@@ -59,9 +59,19 @@
     </tablePage>
     <div class="bottom">
       <div class="selected">已选{{ ids.length }}条</div>
-      <el-button type="primary" @click="fieldwork(true)">分发至外业</el-button>
-      <el-button type="primary" @click="fieldwork(false)"
-        >取消外业任务
+      <el-button
+        v-if="route.path == '/checkLand'"
+        type="primary"
+        @click="fieldwork(true)"
+      >
+        分发至外业
+      </el-button>
+      <el-button
+        v-if="route.path == '/checkLand'"
+        type="primary"
+        @click="fieldwork(false)"
+      >
+        取消外业任务
       </el-button>
       <el-button @click="handleDownload">下载</el-button>
     </div>
@@ -154,20 +164,20 @@ const data = reactive({
       { name: "外业退回图斑", pro: "WYQR", ctype: "red" },
       { name: "县级审核退回图斑", pro: "XJTJ", ctype: "red" },
     ],
-    county: [
+    XJ: [
       { name: "待审核", pro: "155" },
       { name: "已审核", pro: "155" },
       { name: "已提交", pro: "155" },
       { name: "市级退回图斑", pro: "155", ctype: "red" },
       { name: "省级退回图斑", pro: "155", ctype: "red" },
     ],
-    city: [
+    SJ: [
       { name: "待审核", pro: "155" },
       { name: "已审核", pro: "155" },
       { name: "已提交", pro: "155" },
       { name: "省级退回图斑", pro: "155", ctype: "red" },
     ],
-    provincial: [
+    SJJ: [
       { name: "待审核", pro: "155" },
       { name: "已审核", pro: "155" },
     ],
@@ -183,9 +193,9 @@ let countparm = {
     WYTJ: [{ auditflowStep: "WYQR", successType: "1" }],
     XJSH: [{ auditflowStep: "XJTJ", successType: "1" }],
   },
-  county: [],
-  city: [],
-  provincial: [],
+  XJ: [],
+  SJ: [],
+  SJJ: [],
 };
 /** 查询地块基本信息(DKJBXX)列表 */
 function getList() {
@@ -198,7 +208,7 @@ function getList() {
 }
 function getcount() {
   countData.value = {};
-  let prams = countparm[route.query.type];
+  let prams = countparm[route.query.type || "normal"];
   Object.keys(prams).forEach((key) => {
     getDkcount({
       startTime: "",
@@ -299,7 +309,7 @@ function handleExport() {
 function handleBrowse(row, index) {
   router.push({
     path: "/remote/gdjc",
-    query: { id: row.id, form: "checkLand", index },
+    query: { id: row.id, form: "checkLand", dataType: route.query.type, index },
     params: { queryParams: queryParams.value },
   });
 }

+ 78 - 92
src/views/remote/farmland/details.vue

@@ -150,50 +150,40 @@
         </el-timeline>
       </el-tab-pane>
     </el-tabs>
-    <!-- 更多详情 -->
-    <el-dialog :title="diatitle" v-model="open" width="500px" append-to-body>
-      <!--  -->
-      <div>图斑编号:{{ resultform.dkbm }}</div>
-      <div>
-        <!-- audiText[resultform.auditflowOperateType].replace("合规性", "") -->
-        审核结论:{{}}
-      </div>
-      <div>审核说明:{{}}</div>
-      <div>
-        附件材料:
-        <tablePage
-          :cloumn="fileHeader"
-          :table="fileList"
-          :indexed="false"
-          :check="false"
-          layout=""
-        >
-          <template #action="{ row }">
-            <span class="usable" @click="preview(row)">查看</span>
-            <span class="usable" @click="download(row)"> 下载 </span>
-          </template>
-        </tablePage>
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="open = false">确 定</el-button>
-          <!-- <el-button @click="open = false">取 消</el-button> -->
-        </div>
-      </template>
-    </el-dialog>
+    <div class="btns">
+      <el-button
+        type="primary"
+        v-show="route.query.dataType != 'normal'"
+        :disabled="!steps.find((x) => x.auditflowStep.includes('SH'))"
+        @click="operate('SH')"
+        >审核</el-button
+      >
+      <el-button
+        type="warning"
+        v-show="route.query.dataType == 'XJ'"
+        :disabled="!steps.find((x) => x.auditflowStep.includes('XJHGX'))"
+        @click="operate('HGX')"
+        >合法性判定</el-button
+      >
+      <el-button
+        type="success"
+        v-show="['XJ', 'XJ'].includes(route.query.dataType)"
+        :disabled="!steps.find((x) => x.auditflowStep.includes('TJ'))"
+        @click="operate('TJ')"
+        >提交</el-button
+      >
+    </div>
+    <shdialog ref="shdiaRef"></shdialog>
+    <tjdialog ref="tjdiaRef"></tjdialog>
   </div>
 </template>
   
   <script setup name="details">
 import Hcxx from "./hcxx.vue";
+import shdialog from "./components/shdialog.vue";
+import tjdialog from "./components/tjdialog.vue";
 import { getDetailsDk } from "@/api/rsmonitoring/dataEntry";
-import {
-  getDkjbxx,
-  getAuditflow,
-  hgxinfo,
-  scinfo,
-  tjinfo,
-} from "@/api/rsmonitoring/dkjbxx";
+import { getDkjbxx, getAuditflow, getStep } from "@/api/rsmonitoring/dkjbxx";
 
 import {
   jbxxs,
@@ -211,6 +201,9 @@ const router = useRouter();
 const formde = ref(route.query.form == "dataEntry");
 const props = defineProps({});
 let nowObj = {};
+const shdiaRef = ref(null);
+const tjdiaRef = ref(null);
+
 const data = reactive({
   activeName: "jbxx",
   ywyptab: "tdxz",
@@ -218,22 +211,10 @@ const data = reactive({
   hcxxList: [{}],
   activities: [],
 });
+const steps = ref([]);
+
+const { activeName, ywyptab, infoObj, hcxxList, activities } = toRefs(data);
 
-const { info, activeName, ywyptab, infoObj, hcxxList, activities } =
-  toRefs(data);
-const resultdata = reactive({
-  open: false,
-  diatitle: "",
-  resultform: {},
-  fileList: { total: 0, data: [{}] },
-  fileHeader: [
-    { label: "文件名称", prop: "bz", align: "center" },
-    { label: "文件格式", prop: "jc_date", width: "120px" },
-    { label: "文件大小(M)", prop: "jc_date", width: "120px" },
-    { label: "操作", slot: "action", align: "center" },
-  ],
-});
-const { open, diatitle, resultform, fileList, fileHeader } = toRefs(resultdata);
 function handleClick({ id }) {
   if (formde.value) {
     getDetailsDk(id).then((res) => {
@@ -249,6 +230,9 @@ function handleClick({ id }) {
       activities.value = res.data;
     });
   }
+  getStep({ dkjdxxId: id }).then((res) => {
+    steps.value = res.data;
+  });
 }
 function getDetails({ pcsjid, id }) {
   activeName.value = "jbxx";
@@ -258,55 +242,57 @@ function getDetails({ pcsjid, id }) {
   handleClick({ pcsjid, id });
 }
 function moreAct(actitem) {
-  diatitle.value = `${actitem.auditflowStepValue}结果`;
-  open.value = true;
-  let pram = {
-    dkid: infoObj.value.id,
-    auditflowStep: actitem.auditflowStep,
-    auditflowId: actitem.id,
-  };
   if (actitem.auditflowOperateType == "001")
-    hgxinfo(pram).then((res) => {
-      resultform.value = res.data || {};
-    });
+    shdiaRef.value.moreAct(actitem, infoObj.value);
   else if (actitem.auditflowOperateType == "002")
-    scinfo(pram).then((res) => {
-      resultform.value = res.data || {};
-    });
+    shdiaRef.value.moreAct(actitem, infoObj.value);
   else if (actitem.auditflowOperateType == "003")
-    tjinfo(pram).then((res) => {
+    tjdiaRef.value.moreAct(actitem, infoObj.value);
+}
+
+function operate(oname) {
+  let aStep = route.query.dataType + oname;
+  if (oname == "SH") {
+    shdiaRef.value.operate(infoObj.value, aStep);
+  } else if (oname == "HGX")
+    scDkjbxx(pram).then((res) => {
       resultform.value = res.data || {};
     });
+  else if (oname == "TJ") tjdiaRef.value.operate(infoObj.value, aStep);
 }
-function download(row) {
-  window.open(`${window.axiosURI}/file/upload/attachment${row.path}`);
-}
-function preview(row) {
-  window.open(` ${window.axiosURI}/file/upload/inline${row.path}`, "_blank");
-}
+
 defineExpose({ getDetails });
 </script>
 <style scoped lang="scss">
-.el-button {
-  margin: 0px !important;
-  margin-bottom: 12px !important;
-}
-
-.timelinediv {
-  .name {
-    color: #95f204;
-  }
-  .operate {
-    color: #f59a23;
-  }
-  .time {
-    color: #5ba7f0;
+.details {
+  .el-button {
+    // margin: 0px !important;
+    margin-bottom: 12px !important;
   }
-  .more {
-    display: inline-block;
+  .btns {
     position: absolute;
-    right: 20px;
-    cursor: pointer;
+    bottom: 20px;
+    .el-button {
+      margin-left: 20px !important;
+    }
+  }
+
+  .timelinediv {
+    .name {
+      color: #95f204;
+    }
+    .operate {
+      color: #f59a23;
+    }
+    .time {
+      color: #5ba7f0;
+    }
+    .more {
+      display: inline-block;
+      position: absolute;
+      right: 20px;
+      cursor: pointer;
+    }
   }
 }
 </style>
@@ -318,7 +304,7 @@ defineExpose({ getDetails });
     height: 100%;
   }
   .el-tabs__content {
-    height: calc(100% - 60px);
+    height: calc(100% - 100px);
     overflow-y: auto;
     overflow-x: hidden;
   }