侦查指令展示字段适配

src/api/zczl/zczl.js

@@ -14,7 +14,7 @@ import base from "@/api/base";
 export const exportZczlExcel = params =>
     postdown(`${base.alyIP}/zczl/exportZczlExcel`, params);
 export const getTjListPic = params =>
-    post(`${base.alyIP}/zczl/getTjListPic`, params);
+    post(`${base.alyIP}/zczl/getTjListPicNew`, params);
 //新增侦查指令
 export const doAddZczlxx = params =>
     postform(`${base.alyIP}/zczl/doAddZczlxxNew`, params);
@@ -39,10 +39,10 @@ export const zlTqsp = params =>
     post(`${base.alyIP}/zczl/zlTqspNew`, params);
 //指令签收
 export const zczlQs = params =>
-    post(`${base.alyIP}/zczl/zczlQs`, params);
+    post(`${base.alyIP}/zczl/zczlQsNew`, params);
 //增加回报或续报
 export const doAddHb = params =>
-    postform(`${base.alyIP}/zczl/doAddHb`, params);
+    postform(`${base.alyIP}/zczl/doAddHbNew`, params);
 //根据分派编号与是否续报编号拿到回报信息
 export const getHbxxDoHbxgByFpbh = params =>
     post(`${base.alyIP}/zczl/getHbxxDoHbxgByFpbh`, params);

src/views/zczl/zczl/addsqfbzl.vue

@@ -40,15 +40,7 @@ export default {
           objStr: "",
           index: 0,
           data: [
-            {
-              name: "文件列表:",
-              id: "file",
-              type: "file",
-              value: "",
-              requestUrl: "/flwsFj/tbstasjflwsCj/save",
-              col: "1",
-              // prop: 'checkEmpty'
-            },
+
             {
               name: "业务名称:",
               id: "ywmc",
@@ -114,6 +106,16 @@ export default {
               placeholder: "请输入",
               col: "18",
             },
+
+            {
+              name: "文件列表:",
+              id: "file",
+              type: "file",
+              value: "",
+              requestUrl: "/flwsFj/tbstasjflwsCj/save",
+              col: "1",
+              // prop: 'checkEmpty'
+            },
           ],
         },
       ],

src/views/zczl/zczl/bxqjsdzczl.vue

 <template>
   <div class="Content">
     <right-content
-      :tableOperationWidth="tableOperationWidth"
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      :transformFormTable="transformFormTable"
-      @add="add"
-      @edit="edit"
-      @dele="dele"
-      @toInfor="toInfor"
-      ref="rightContent"
+        :tableOperationWidth="tableOperationWidth"
+        :pageBs="pageBs"
+        :header="header"
+        :cxFormData="cxFormData"
+        :cxQueryField="cxQueryField"
+        :cxDefaultFormThead="cxDefaultFormThead"
+        :cxUrl="cxUrl"
+        :transformFormTable="transformFormTable"
+        @add="add"
+        @edit="edit"
+        @dele="dele"
+        @toInfor="toInfor"
+        ref="rightContent"
     >
       <template #btnGroup="scope">
         <el-button @click="edit(scope.scope)" type="text">修改</el-button>
@@ -25,8 +25,9 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { deleteKyxsxx } from "@/api/rlqbxs.js";
-import  { spsftg} from "@/assets/js/transformFormTable.js";
+import {deleteKyxsxx} from "@/api/rlqbxs.js";
+import {spsftg} from "@/assets/js/transformFormTable.js";
+
 export default {
   name: "rlqbxsxx",
   components: {
@@ -34,8 +35,8 @@ export default {
   },
   data() {
     return {
-      tableOperation:true,
-      tableOperationWidth:200,
+      tableOperation: true,
+      tableOperationWidth: 200,
       transformFormTable: {spsftg},
       header: "本辖区接受的侦查指令",
       pageBs: "bxqjsdzczl",
@@ -120,16 +121,16 @@ export default {
       ],
       cxDefaultFormThead: [
         {
-          label: "信息编号",
+          label: "指令事由",
           prop: "zlsy",
         },
         {
-          label: "姓名",
+          label: "业务名称",
           prop: "ywmc",
         },
         {
-          label: "指令回报个数",
-          prop: "zlhbcs",
+          label: "下级指令回报个数",
+          prop: "zlhbgs",
         },
         {
           label: "回报期限",
@@ -137,14 +138,14 @@ export default {
         },
         {
           label: "指令类型",
-          prop: "zllx_str",
+          prop: "zllxStr",
         },
         {
-          label: "指令签收个数",
+          label: "下级指令签收个数",
           prop: "zlqsgs",
         },
         {
-          label: "指令分派个数",
+          label: "下级指令分派个数",
           prop: "zlfpgs",
         },
         {
@@ -157,7 +158,7 @@ export default {
         },
         {
           label: "业务类型",
-          prop: "ywlx_str",
+          prop: "ywlxStr",
         },
         {
           label: "工作要求",
@@ -172,7 +173,7 @@ export default {
           prop: "spsftg",
         },
       ],
-      cxUrl: "/zczl/getBxqjsdzczlList",
+      cxUrl: "/zczl/getBxqjsdzczlListNew",
       Menu: [
         {
           id: "bxqjsdzczl",
@@ -195,7 +196,7 @@ export default {
     edit(scope) {
       this.$router.push({
         path: "adjustRlqbxs",
-        query: { xxzjbh: scope.row.xxzjbh },
+        query: {xxzjbh: scope.row.xxzjbh},
       });
     },
     dele(scope) {
@@ -205,25 +206,25 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          deleteKyxsxx({
-            xxzjbh: scope.row.xxzjbh,
-          }).then((res) => {
-            if (res.success && res.code == 200) {
-              this.$message({
-                type: "success",
-                message: "删除成功",
-              });
-              this.$refs.rightContent.doQuery("yes");
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
+          .then(() => {
+            deleteKyxsxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                this.$refs.rightContent.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
           });
-        });
     },
     toInfor(scope) {
       this.$router.push({
@@ -234,51 +235,62 @@ export default {
       });
     },
   },
-  mounted() {},
+  mounted() {
+  },
 };
 </script>
 <style>
 .el-dialog__body {
   padding: 10px 15px !important;
 }
+
 .rightContent .el-input__inner,
 #formCommonPage .el-input__inner {
   height: 32px;
   line-height: 32px;
   font-family: inherit;
 }
+
 .el-table__header-wrapper th,
 .el-table__header-wrapper tr {
   background: #f4f6f7;
 }
+
 .rightContent .el-input__icon,
 #formCommonPage .el-input__icon,
 .el-input__suffix-inner {
   line-height: 36px;
 }
+
 .rightContent .el-range-separator {
   position: relative;
   top: -4px;
 }
+
 .rightContent .el-textarea__inner,
 #formCommonPage .el-textarea__inner {
   width: 100%;
   font-family: inherit;
 }
+
 .rightContent .el-range-input,
 #formCommonPage .el-range-input {
   vertical-align: top;
 }
+
 .rightContent .el-date-editor .el-range__close-icon {
   margin-top: -4px;
 }
+
 .rightContent .el-form-item__error {
   left: calc(66% - 27px);
   top: 12px;
 }
+
 .success-row {
   background-color: #fbf9f4 !important;
 }
+
 .Content .el-input,
 .Content .el-date-editor--daterange.el-input__inner {
   width: 100% !important;

src/views/zczl/zczl/wfqdzczl.vue

 <template>
   <div class="Content">
     <right-content
-      :tableOperation="tableOperation"
-      :tableOperationWidth="tableOperationWidth"
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      :transformFormTable="transformFormTable"
-      @edit="edit"
-      @dele="dele"
-      @toInfor="toInfor"
-      @toXdzl="toXdzl"
-      @examine="examine"
-      ref="rightContent"
+        :tableOperation="tableOperation"
+        :tableOperationWidth="tableOperationWidth"
+        :pageBs="pageBs"
+        :header="header"
+        :cxFormData="cxFormData"
+        :cxQueryField="cxQueryField"
+        :cxDefaultFormThead="cxDefaultFormThead"
+        :cxUrl="cxUrl"
+        :transformFormTable="transformFormTable"
+        @edit="edit"
+        @dele="dele"
+        @toInfor="toInfor"
+        @toXdzl="toXdzl"
+        @examine="examine"
+        ref="rightContent"
     >
       <template #btnGroup="scope">
         <el-button @click="dele(scope.scope)" type="text">删除</el-button>
-        <el-button @click="examine(scope.scope)" v-if="scope.scope.row.spsftg == '未通过' || scope.scope.row.spsftg == '草稿'" type="text">提请审批</el-button>
+        <el-button @click="examine(scope.scope)"
+                   v-if="scope.scope.row.spsftg == '未通过' || scope.scope.row.spsftg == '草稿'" type="text">提请审批
+        </el-button>
       </template>
     </right-content>
   </div>
@@ -27,8 +29,9 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { zlToDelete, zlTqsp } from "@/api/zczl/zczl.js";
-import  { spsftg, sfczhbxx} from "@/assets/js/transformFormTable.js";
+import {zlToDelete, zlTqsp} from "@/api/zczl/zczl.js";
+import {spsftg, sfczhbxx} from "@/assets/js/transformFormTable.js";
+
 export default {
   name: "rlqbxsxx",
   components: {
@@ -36,8 +39,8 @@ export default {
   },
   data() {
     return {
-      tableOperation:true,
-      tableOperationWidth:200,
+      tableOperation: true,
+      tableOperationWidth: 200,
       header: "我发起的侦查指令",
       pageBs: "wfqdzczl",
       cxFormData: {
@@ -237,10 +240,10 @@ export default {
           label: "侦查指令编号",
           prop: "zczlbh",
         },
-      /*  {
-          label: "分派编号",
-          prop: "fpbh",
-        },*/
+        /*  {
+            label: "分派编号",
+            prop: "fpbh",
+          },*/
         {
           /*table默认得表头*/
           label: "指令事由",
@@ -248,7 +251,7 @@ export default {
         },
         {
           label: "指令回报个数",
-          prop: "zlhbcs",
+          prop: "zlhbgs",
         },
         {
           label: "回报期限",
@@ -321,30 +324,30 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          zlTqsp({
-            zczlbh: scope.row.zczlbh,
-          }).then((res) => {
-            if (res.success && res.code == 200) {
-              this.$message({
-                type: "success",
-                message: "提请审批成功",
-              });
-              this.$refs.rightContent.doQuery("yes");
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消提请审批",
+          .then(() => {
+            zlTqsp({
+              zczlbh: scope.row.zczlbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "提请审批成功",
+                });
+                this.$refs.rightContent.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消提请审批",
+            });
           });
-        });
     },
     edit(scope) {
       this.$router.push({
         path: "addsqfbzl",
-        query: { xxzjbh: scope.row.zczlbh, type: "xdzl" },
+        query: {xxzjbh: scope.row.zczlbh, type: "xdzl"},
       });
     },
     toXdzl() {
@@ -362,25 +365,25 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          zlToDelete({
-            zczlbh: scope.row.zczlbh,
-          }).then((res) => {
-            if (res.success && res.code == 200) {
-              this.$message({
-                type: "success",
-                message: "删除成功",
-              });
-              this.$refs.rightContent.doQuery("yes");
-            }
+          .then(() => {
+            zlToDelete({
+              zczlbh: scope.row.zczlbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                this.$refs.rightContent.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
           });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
     },
     toInfor(scope) {
       this.$router.push({
@@ -392,51 +395,62 @@ export default {
       });
     },
   },
-  mounted() {},
+  mounted() {
+  },
 };
 </script>
 <style>
 .el-dialog__body {
   padding: 10px 15px !important;
 }
+
 .rightContent .el-input__inner,
 #formCommonPage .el-input__inner {
   height: 32px;
   line-height: 32px;
   font-family: inherit;
 }
+
 .el-table__header-wrapper th,
 .el-table__header-wrapper tr {
   background: #f4f6f7;
 }
+
 .rightContent .el-input__icon,
 #formCommonPage .el-input__icon,
 .el-input__suffix-inner {
   line-height: 36px;
 }
+
 .rightContent .el-range-separator {
   position: relative;
   top: -4px;
 }
+
 .rightContent .el-textarea__inner,
 #formCommonPage .el-textarea__inner {
   width: 100%;
   font-family: inherit;
 }
+
 .rightContent .el-range-input,
 #formCommonPage .el-range-input {
   vertical-align: top;
 }
+
 .rightContent .el-date-editor .el-range__close-icon {
   margin-top: -4px;
 }
+
 .rightContent .el-form-item__error {
   left: calc(66% - 27px);
   top: 12px;
 }
+
 .success-row {
   background-color: #fbf9f4 !important;
 }
+
 .Content .el-input,
 .Content .el-date-editor--daterange.el-input__inner {
   width: 100% !important;

src/views/zczl/zczl/xywspdzczl.vue

@@ -214,7 +214,7 @@ export default {
         },
         {
           label: "指令接收单位名称",
-          prop: "zjjsdwdm_name",
+          prop: "zljsdwdm_name",
         },
         {
           label: "指令文号",

src/views/zczl/zczl/zczltj.vue

 <template>
   <div class="Content">
     <right-content
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      @add="add"
-      @edit="edit"
-      @dele="dele"
-      @zczltjExport="zczltjExport"
-      ref="rightContent"
+        :pageBs="pageBs"
+        :header="header"
+        :cxFormData="cxFormData"
+        :cxQueryField="cxQueryField"
+        :cxDefaultFormThead="cxDefaultFormThead"
+        :cxUrl="cxUrl"
+        @add="add"
+        @edit="edit"
+        @dele="dele"
+        @zczltjExport="zczltjExport"
+        ref="rightContent"
     ></right-content>
 
   </div>
@@ -19,9 +19,10 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { exportZczlExcel } from "@/api/zczl/zczl.js";
+import {exportZczlExcel} from "@/api/zczl/zczl.js";
 import axios from "@/utils/http.js";
 import base from "@/api/base";
+
 export default {
   name: "rlqbxsxx",
   components: {
@@ -112,13 +113,13 @@ export default {
           prop: "wqss",
         },
         {
-          label: "开始发布时间",
+          label: "发布时间",
           prop: "fbsj",
         },
-        {
-          label: "结束发布时间",
-          prop: "fbsj_e",
-        },
+        // {
+        //   label: "结束发布时间",
+        //   prop: "fbsj_e",
+        // },
         {
           label: "签收数",
           prop: "qss",
@@ -183,13 +184,15 @@ export default {
     edit(scope) {
       this.$router.push({
         path: "adjustRlqbxs",
-        query: { xxzjbh: scope.row.xxzjbh },
+        query: {xxzjbh: scope.row.xxzjbh},
       });
     },
     zczltjExport(data) {
       let params = new FormData();
       params.append("fbsj_s", data.fbsj_s);
       params.append("fbsj_e", data.fbsj_e);
+      params.append("dwdm", data.dwdm);
+      params.append("type", "zczlTj");
       let loading = this.$loading({
         lock: true,
         text: "正在导出...",
@@ -197,24 +200,24 @@ export default {
         background: "rgba(255, 255, 255, 0.7)",
       });
       axios
-        .post(`${base.alyIP}/zczl/exportZczlExcel`, params, {
-          responseType: "blob",
-        })
-        .then((res) => {
-          loading.close();
-          let blob = new Blob([res], {
-            type: "application/vnd.ms-excel",
+          .post(`${base.alyIP}/zczl/exportZczlExcel`, params, {
+            responseType: "blob",
+          })
+          .then((res) => {
+            loading.close();
+            let blob = new Blob([res], {
+              type: "application/vnd.ms-excel",
+            });
+            // 组装a标签
+            let elink = document.createElement("a");
+            // 设置下载文件名
+            elink.download = "侦查指令统计.xls";
+            elink.style.display = "none";
+            elink.href = URL.createObjectURL(blob);
+            document.body.appendChild(elink);
+            elink.click();
+            document.body.removeChild(elink);
           });
-          // 组装a标签
-          let elink = document.createElement("a");
-          // 设置下载文件名
-          elink.download = "侦查指令统计.xls";
-          elink.style.display = "none";
-          elink.href = URL.createObjectURL(blob);
-          document.body.appendChild(elink);
-          elink.click();
-          document.body.removeChild(elink);
-        });
     },
     dele(scope) {
       console.log(scope);
@@ -223,72 +226,83 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          deleteKyxsxx({
-            xxzjbh: scope.row.xxzjbh,
-          }).then((res) => {
-            if (res.success && res.code == 200) {
-              this.$message({
-                type: "success",
-                message: "删除成功",
-              });
-              this.$refs.rightContent.doQuery("yes");
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
+          .then(() => {
+            deleteKyxsxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                this.$refs.rightContent.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
           });
-        });
     },
   },
-  mounted() {},
+  mounted() {
+  },
 };
 </script>
 <style>
 .el-dialog__body {
   padding: 10px 15px !important;
 }
+
 .rightContent .el-input__inner,
 #formCommonPage .el-input__inner {
   height: 32px;
   line-height: 32px;
   font-family: inherit;
 }
+
 .el-table__header-wrapper th,
 .el-table__header-wrapper tr {
   background: #f4f6f7;
 }
+
 .rightContent .el-input__icon,
 #formCommonPage .el-input__icon,
 .el-input__suffix-inner {
   line-height: 36px;
 }
+
 .rightContent .el-range-separator {
   position: relative;
   top: -4px;
 }
+
 .rightContent .el-textarea__inner,
 #formCommonPage .el-textarea__inner {
   width: 100%;
   font-family: inherit;
 }
+
 .rightContent .el-range-input,
 #formCommonPage .el-range-input {
   vertical-align: top;
 }
+
 .rightContent .el-date-editor .el-range__close-icon {
   margin-top: -4px;
 }
+
 .rightContent .el-form-item__error {
   left: calc(66% - 27px);
   top: 12px;
 }
+
 .success-row {
   background-color: #fbf9f4 !important;
 }
+
 .Content .el-input,
 .Content .el-date-editor--daterange.el-input__inner {
   width: 100% !important;