Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/api/xshb/xshb.js

@@ -98,4 +98,8 @@ export const delXsfj = params =>
 
 // 1.2.3.4 用户警号提取
 export const getZbzzByYhjh = params =>
-  post(`${base.alyIP}/xshb/getZbzzByYhjh`, params);
\ No newline at end of file
+  post(`${base.alyIP}/xshb/getZbzzByYhjh`, params);
+
+// 1.2.3.4 用户警号提取
+export const getWfqdzczlListNew = params =>
+  post(`${base.alyIP}/zczl/getWfqdzczlListNew`, params);
\ No newline at end of file

src/views/hbyprw/hbyprw/queryHbyp.vue

@@ -46,8 +46,12 @@
           @click="toDb(scope.scope)"
           >督办合并研判</span
         >
-        <!-- v-if="scope.scope.row.sfkfk == 1" -->
-        <span class="hbyp" @click="toFk(scope.scope)">反馈合并研判</span>
+        <span
+          v-if="scope.scope.row.sfkfk == 1"
+          class="hbyp"
+          @click="toFk(scope.scope)"
+          >反馈合并研判</span
+        >
         <span class="hbyp" @click="toCbyp(scope.scope)">串并研判</span>
         <span class="hbyp" @click="toXdzl(scope.scope)">下达指令</span>
         <span

src/views/xshb/xshb/djgzxs.vue

@@ -323,6 +323,87 @@
     </div>
     <div style="margin-top: 20px">
       <div class="add">
+        <div class="contents">
+          <div>
+            <div class="title">下达指令管理</div>
+            <div style="margin: -20px 0 0 38px">
+              <div class="zczz">
+                <!-- <div class="xzs" @click="glgxAdd">
+                  <i class="el-icon-plus"></i>
+                  新增
+                </div> -->
+                <el-table
+                  v-loading="loadingXdzl"
+                  :data="xdzlList"
+                  border
+                  stripe
+                  style="width: 100%"
+                >
+                  <el-table-column
+                    v-for="(glgxItem, index) in xdzlxlList"
+                    :key="index"
+                    :label="glgxItem.label"
+                    :width="glgxItem.width"
+                    align="center"
+                  >
+                    <template slot-scope="scope">
+                      <!-- <div v-if="glgxItem.toInr">
+                        <span
+                          style="color: #0061f7; cursor: pointer"
+                          @click="toInr(scope.row)"
+                          class="edit"
+                          v-html="scope.row[glgxItem.prop]"
+                        >
+                        </span>
+                      </div> -->
+                      <!-- <div v-else> -->
+                      <div>
+                        <span v-html="scope.row[glgxItem.prop]"> </span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="200" align="center">
+                    <template slot-scope="scope">
+                      <span
+                        style="margin-right: 10px"
+                        class="anList"
+                         v-if="scope.row.spsftg != '通过'"
+                        @click="eleteXdzl(scope)"
+                        >删除</span
+                      >
+                      <span
+                        v-if="
+                          scope.row.spsftg == '未通过' ||
+                          scope.row.spsftg == '草稿'
+                        "
+                        class="anList"
+                        @click="examine(scope)"
+                        >提请审批</span
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div>
+                  <el-pagination
+                    background
+                    @size-change="handleSizeChangexd"
+                    @current-change="handleCurrentChangexd"
+                    :current-page.sync="pagexd"
+                    :page-sizes="[5, 10, 20, 50]"
+                    :page-size="limitxd"
+                    layout="sizes,prev, pager, next"
+                    :total="tableDataLengthxd"
+                  >
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div style="margin-top: 20px">
+      <div class="add">
         <div class="contents" v-loading="loadingGzjl">
           <div>
             <div class="title">工作结论</div>
@@ -490,7 +571,9 @@ import {
   getHcxxList,
   getHcglxyrList,
   getHcglasjList,
+  getWfqdzczlListNew,
 } from "@/api/xshb/xshb.js";
+import { zlToDelete, zlTqsp } from "@/api/zczl/zczl.js";
 import { getKyxsByxxzjbh } from "@/api/rlqbxs.js";
 import axios from "axios";
 import base from "@/api/base";
@@ -511,10 +594,12 @@ export default {
       rotate: true,
       loadingZC: false,
       loadingGlgx: false,
+      loadingXdzl: false,
       loadingGzjl: false,
       tableDataLength: 0,
       tableDataLength1: 0,
       tableDataLength2: 0,
+      tableDataLengthxd: 0,
       propTitle: "线索详情",
       xs: [
         {
@@ -858,6 +943,64 @@ export default {
           prop: "xxdjryXm",
         },
       ],
+      xdzlxlList: [
+        {
+          label: "工作指令编号",
+          prop: "zczlbh",
+          width: "300",
+          toInfor: true,
+        },
+        {
+          label: "指令文号",
+          width: "200",
+          prop: "zlwh",
+        },
+        {
+          width: "200",
+          label: "指令类型",
+          prop: "zllxStr",
+        },
+        {
+          width: "200",
+          label: "指令事由",
+          prop: "zlsy",
+        },
+        {
+          label: "工作要求",
+          width: "200",
+          prop: "gzyq",
+        },
+        {
+          label: "发布时间",
+          width: "200",
+          prop: "fbsj",
+        },
+        {
+          label: "回报期限",
+          width: "200",
+          prop: "hbqx",
+        },
+        {
+          label: "审批是否通过",
+          width: "200",
+          prop: "spsftg",
+        },
+        {
+          label: "指令接收单位",
+          width: "200",
+          prop: "zljsdwdmName",
+        },
+        {
+          label: "指令状态",
+          width: "200",
+          prop: "xjZczlzt",
+        },
+        {
+          width: "200",
+          label: "最近回报时间",
+          prop: "nearyResponseTime",
+        },
+      ],
       gzjl: [
         {
           name: "办结单位",
@@ -948,12 +1091,15 @@ export default {
       ajList: [],
       glgXList1: [],
       gzjlList1: [],
+      xdzlList: [],
       page: 1,
       limit: 5,
       page1: 1,
       limit1: 5,
       page2: 1,
       limit2: 1,
+      pagexd: 1,
+      limitxd: 1,
     };
   },
   created() {
@@ -964,6 +1110,7 @@ export default {
     this.getZbzzList();
     this.getXsglbshList();
     this.getHcxxList();
+    this.getWfqdzczlListNew();
   },
   methods: {
     toInfor(scope) {
@@ -1111,6 +1258,14 @@ export default {
       this.page1 = val;
       this.getXsglbshList();
     },
+    handleSizeChangexd(val) {
+      this.limitxd = val;
+      this.getWfqdzczlListNew();
+    },
+    handleCurrentChangexd(val) {
+      this.pagexd = val;
+      this.getWfqdzczlListNew();
+    },
     handleSizeChange2(val) {
       this.limit2 = val;
       this.getHcxxList();
@@ -1202,6 +1357,27 @@ export default {
         }
       });
     },
+    getWfqdzczlListNew() {
+      this.loadingXdzl = true;
+      let xslxdms = "";
+      if (this.xslx == "rlqb") {
+        xslxdms = "01";
+      } else {
+        xslxdms = "02";
+      }
+      getWfqdzczlListNew({
+        xslxdm: xslxdms,
+        xsbh: this.xsbh,
+        page: this.pagexd,
+        limit: this.limitxd,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.xdzlList = res.data.rows;
+          this.tableDataLengthxd = res.data.total;
+          this.loadingXdzl = false;
+        }
+      });
+    },
     getHcxxList() {
       this.loadingGzjl = true;
       let xslxdms = "";
@@ -1357,6 +1533,60 @@ export default {
         },
       });
     },
+    eleteXdzl(scope) {
+      console.log(scope);
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          zlToDelete({
+            zczlbh: scope.row.zczlbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              this.getWfqdzczlListNew();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    examine(scope) {
+      console.log(scope);
+      this.$confirm("此操作将该指令提请审批, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          zlTqsp({
+            zczlbh: scope.row.zczlbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "提请审批成功",
+              });
+              this.getWfqdzczlListNew();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消提请审批",
+          });
+        });
+    },
     // 关联关系删除
     eleteGlgx(row) {
       this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {