下达指令

src/api/hbyp/hbyp.js

@@ -111,4 +111,4 @@ export const tqasj = params =>
 
 // 2.4 下达指令
 export const getWfqdzczlListNew = params =>
-  post(`${base.alyIP}/zczl/getWfqdzczlListNew`, params);
\ No newline at end of file
+  post(`${base.alyIP}/zczl/getZczlDataFromModule`, params);
\ No newline at end of file

src/components/ptCxForm_components.vue

@@ -954,6 +954,12 @@
                 ><img src="../assets/img/an.png"
               /></span>
             </div>
+            <div v-if="pageBs == 'queryHbyp' && columnTitle.prop == 'sfksspStr1' && scope.row.sfksspPdbz == '0'">
+              <i class="el-icon-error"></i>
+            </div>
+              <div v-if="pageBs == 'queryHbyp' && columnTitle.prop == 'sfksspStr1' && scope.row.sfksspPdbz == '1'">
+              <i class="el-icon-success"></i>
+            </div>
             <div v-else-if="columnTitle.toInfor">
               <span
                 v-if="
@@ -981,7 +987,8 @@
                 class="edit"
                 style="margin-right: 16px"
                 v-html="scope.row[columnTitle.prop]"
-              ></span>
+              >
+              </span>
               <span
                 v-if="
                   pageBs == 'addCase' ||
@@ -3365,6 +3372,12 @@ export default {
 }
 </style>
 <style scoped lang="scss">
+/deep/i.el-icon-success {
+    color: #00ff0a;
+}
+/deep/i.el-icon-error {
+    color: red;
+}
 /deep/th.is-center.is-leaf {
   background: #f4f6f7;
 }

src/router/modules/hbyprw.js

@@ -48,14 +48,7 @@ const menuLayouts = [
     },
     component: () => import("@/views/hbyprw/hpyprwSp/hpyprwSp.vue")
   },
-  {
-    path: "/jjhcyp",
-    name: "jjhcyp",
-    meta: {
-      title: '交接合成研判'
-    },
-    component: () => import("@/views/hbyprw/jjhcyp/jjhcyp.vue")
-  },
+ 
 
 
 ];
@@ -106,4 +99,12 @@ export default [
     },
     component: () => import("@/views/hbyprw/fphcyp/fphcyp.vue")
   },
+  {
+    path: "/jjhcyp",
+    name: "jjhcyp",
+    meta: {
+      title: '交接合成研判'
+    },
+    component: () => import("@/views/hbyprw/jjhcyp/jjhcyp.vue")
+  },
 ]
\ No newline at end of file

src/views/hbyprw/hbyprw/detailHbyp.vue

@@ -1187,6 +1187,7 @@ export default {
       fk: {},
       fileListFjXXzjbh: [],
       drawer: false,
+      userIdentitycard: "",
     };
   },
   mounted() {},
@@ -1430,6 +1431,7 @@ export default {
       getUserListWithoutYhz({
         yhzZh: this.pageObject.zbrYhz,
         page: this.currentPage1,
+        sfbrPdbz: "1",
         limit: this.page_size,
       }).then((res) => {
         if (res.code == 200) {
@@ -1565,6 +1567,7 @@ export default {
         background: "rgba(255, 255, 255, 0.7)",
       });
       queryByXxzjbh(params).then((res) => {
+        let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
         if (res.success && res.code == 200) {
           var result = res.data.rows;
           this.pageObject = result;
@@ -1574,6 +1577,10 @@ export default {
           if (this.pageObject.sffkPdbz == "1") {
             this.queryFkList();
           }
+          if (this.pageObject.sffzr == "1") {
+            this.userIdentitycard = userInfo.identitycard;
+          }
+          this.getWfqdzczlListNew();
           this.getRwgzByRwxxzjbh();
 
           loading.close();
@@ -1607,6 +1614,10 @@ export default {
       getWfqdzczlListNew({
         page: this.currentPagZl,
         limit: this.page_sizeZl,
+        xsbh: this.$route.query.xxzjbh,
+        xsType: "03",
+        module: "hcyp",
+        userIdentitycard: this.userIdentitycard ? this.userIdentitycard : "",
       }).then((res) => {
         if (res.code == 200) {
           this.tableLoadingZl = false;
@@ -1634,7 +1645,6 @@ export default {
   created() {
     this.xxzjbh = this.$route.query.xxzjbh;
     this.getInfor();
-    this.getWfqdzczlListNew();
   },
   watch: {
     "examineInfoRl.sfrlPdbz": {

src/views/hbyprw/hbyprw/queryHbyp.vue

@@ -575,7 +575,7 @@ export default {
         },
         {
           label: "是否快速审批",
-          prop: "sfksspStr",
+          prop: "sfksspStr1",
           width: "200",
         },
         // {

src/views/hbyprw/jjhcyp/jjhcyp.vue

@@ -100,6 +100,7 @@ export default {
               name: "接收人用户组:",
               id: "zbrYhz",
               type: "text",
+              prop: "checkEmpty",
               value: "",
               placeholder: "请输入",
               col: "2",
@@ -112,6 +113,7 @@ export default {
               value: "",
               placeholder: "请输入",
               col: "2",
+              prop: "checkEmpty",
               disabled: true,
             },
             {
@@ -121,10 +123,12 @@ export default {
               value: "",
               placeholder: "请输入",
               col: "2",
+              prop: "checkEmpty",
               disabled: true,
             },
             {
               name: "交接原因:",
+              prop: "checkEmpty",
               id: "jjyyJyqk",
               type: "textarea",
               value: "",
@@ -136,12 +140,14 @@ export default {
               id: "jjsGzJyqk",
               type: "textarea",
               value: "",
+              prop: "checkEmpty",
               placeholder: "请输入",
               col: "1",
             },
             {
               name: "工作要求:",
               id: "jjhGzyqJyqk",
+              prop: "checkEmpty",
               type: "textarea",
               value: "",
               placeholder: "请输入",
@@ -217,6 +223,7 @@ export default {
         yhzZh: this.$route.query.yhzZh,
         page: this.currentPage1,
         limit: this.page_size,
+        sfbrPdbz: '1',
       }).then((res) => {
         if (res.code == 200) {
           this.gridData = res.data.rows;