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

src/api/zczl/zczl.js

@@ -6,49 +6,49 @@
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\api\zczl\xxgl.js
  */
-import { get, post, postform, postdown } from "@/utils/http.js";
+import {get, post, postform, postdown} from "@/utils/http.js";
 import base from "@/api/base";
 
 
 //导出侦查指令统计Excel
 export const exportZczlExcel = params =>
-  postdown(`${base.alyIP}/zczl/exportZczlExcel`, params);
+    postdown(`${base.alyIP}/zczl/exportZczlExcel`, params);
 export const getTjListPic = params =>
-  post(`${base.alyIP}/zczl/getTjListPic`, params);
+    post(`${base.alyIP}/zczl/getTjListPic`, params);
 //新增侦查指令
 export const doAddZczlxx = params =>
-  postform(`${base.alyIP}/zczl/doAddZczlxxNew`, params);
+    postform(`${base.alyIP}/zczl/doAddZczlxxNew`, params);
 //侦查指令审批
 export const tjsp = params =>
-  post(`${base.alyIP}/zczl/tjsp`, params);
+    post(`${base.alyIP}/zczl/tjspNew`, params);
 //通过侦查指令编号查询指令详情
 export const queryZlxqByZczlbh = params =>
-  postform(`${base.alyIP}/zczl/queryZlxqByZczlbh`, params);
+    postform(`${base.alyIP}/zczl/queryZlxqByZczlbhNew`, params);
 
 //是否都存在联络员
 export const queryLlys = params =>
-  post(`${base.alyIP}/zczl/queryLlys`, params);
+    post(`${base.alyIP}/zczl/queryLlys`, params);
 //删除指令
 export const zlToDelete = params =>
-  post(`${base.alyIP}/zczl/zlToDelete`, params);
+    post(`${base.alyIP}/zczl/zlToDeleteNew`, params);
 //修改侦查指令信息
 export const doEditZczlxx = params =>
-  postform(`${base.alyIP}/zczl/doEditZczlxx`, params);
+    postform(`${base.alyIP}/zczl/doEditZczlxx`, params);
 //修改侦查指令信息
 export const zlTqsp = params =>
-  post(`${base.alyIP}/zczl/zlTqsp`, params);
+    post(`${base.alyIP}/zczl/zlTqspNew`, params);
 //指令签收
 export const zczlQs = params =>
-  post(`${base.alyIP}/zczl/zczlQs`, params);
+    post(`${base.alyIP}/zczl/zczlQs`, params);
 //增加回报或续报
 export const doAddHb = params =>
-  postform(`${base.alyIP}/zczl/doAddHb`, params);
+    postform(`${base.alyIP}/zczl/doAddHb`, params);
 //根据分派编号与是否续报编号拿到回报信息
 export const getHbxxDoHbxgByFpbh = params =>
-  post(`${base.alyIP}/zczl/getHbxxDoHbxgByFpbh`, params);
+    post(`${base.alyIP}/zczl/getHbxxDoHbxgByFpbh`, params);
 //修改回报信息
 export const doHbEdit = params =>
-  postform(`${base.alyIP}/zczl/doHbEdit`, params);
+    postform(`${base.alyIP}/zczl/doHbEdit`, params);
 
 
 //人像比对详情

src/views/zczl/zczl/wfqdzczl.vue

@@ -112,7 +112,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",
@@ -256,7 +256,7 @@ export default {
         },
         {
           label: "指令类型",
-          prop: "zllx_str",
+          prop: "zllxStr",
         },
         {
           label: "指令签收个数",
@@ -272,7 +272,7 @@ export default {
         },
         {
           label: "业务类型",
-          prop: "ywlx_str",
+          prop: "ywlxStr",
         },
         {
           label: "工作要求",

src/views/zczl/zczl/wsqfbdzczl.vue

@@ -100,7 +100,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",

src/views/zczl/zczl/xywspdzczl.vue

 <template>
   <div class="Content">
     <right-content
-      :tableOperation="tableOperation"
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :transformFormTable="transformFormTable"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      @examine="examine"
-      ref="rightContent"
+        :tableOperation="tableOperation"
+        :pageBs="pageBs"
+        :header="header"
+        :cxFormData="cxFormData"
+        :cxQueryField="cxQueryField"
+        :transformFormTable="transformFormTable"
+        :cxDefaultFormThead="cxDefaultFormThead"
+        :cxUrl="cxUrl"
+        @examine="examine"
+        ref="rightContent"
     >
       <template #btnGroup="scope">
         <el-button :disabled="scope.scope.row.ifsp!='能'" @click="examine(scope.scope)" type="text">审批</el-button>
@@ -24,30 +24,30 @@
           <el-col :span="20" :offset="2" style="margin-top: 20px">
             <el-form-item :label="labelForm.xm" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqyxm"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqyxm"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="20" :offset="2">
             <el-form-item :label="labelForm.dwmc" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqydwmc"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqydwmc"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="20" :offset="2">
             <el-form-item :label="labelForm.dh" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqylxdh"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqylxdh"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -64,8 +64,9 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { tjsp, queryZlxqByZczlbh } from "@/api/zczl/zczl.js";
-import  { spsftg, ifsp} from "@/assets/js/transformFormTable.js";
+import {tjsp, queryZlxqByZczlbh} from "@/api/zczl/zczl.js";
+import {spsftg, ifsp} from "@/assets/js/transformFormTable.js";
+
 export default {
   name: "rlqbxsxx",
   components: {
@@ -73,7 +74,7 @@ export default {
   },
   data() {
     return {
-      tableOperation:true,
+      tableOperation: true,
       transformFormTable: {
         ifsp,
         spsftg
@@ -151,7 +152,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",
@@ -209,11 +210,11 @@ export default {
         },
         {
           label: "指令类型",
-          prop: "zllx_str",
+          prop: "zllxStr",
         },
         {
           label: "指令接收单位名称",
-          prop: "zljsdwdm_name",
+          prop: "zjjsdwdm_name",
         },
         {
           label: "指令文号",
@@ -225,7 +226,7 @@ export default {
         },
         {
           label: "业务类型",
-          prop: "ywlx_str",
+          prop: "ywlxStr",
         },
         {
           label: "是否能审批",
@@ -244,7 +245,7 @@ export default {
           prop: "spsftg",
         },
       ],
-      cxUrl: "/zczl/getXywspdzczlList",
+      cxUrl: "/zczl/getXywspdzczlListNew",
       Menu: [
         {
           id: "xywspdzczl",
@@ -274,7 +275,7 @@ export default {
       });
     },
     examine(scope) {
-      if (scope.row.ifsp == "0") {
+      if (scope.row.ifsp == "不能") {
         this.$message.error("不可以审批此条消息");
         return;
       }
@@ -311,56 +312,68 @@ export default {
           }
           self.revokeVisiable = true;
         } else {
+          loading.close();
           this.$message.error("提取信息失败");
         }
       });
     },
   },
-  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;
@@ -368,6 +381,7 @@ export default {
 </style>
 <style scoped lang="scss">
 @import "@/assets/styles/rightContent.scss";
+
 .el-input {
   /deep/ .el-input__inner {
     color: #333;