Merge branch 'dev_maxt' of http://39.99.224.27:9022/changchao/founder_vue into dev_maxt

src/components/ptCxForm_components.vue

@@ -6410,7 +6410,8 @@ export default {
       if (flag) {
         self.doQueryRequest(JSON.stringify(json)).then((response) => {
           if (response.data.success === true) {
-            self.tableData = response.data.data.rows;
+            
+            self.tableData = self.pageBszfc == "yardsq" ? [response.data.data.rows] : response.data.data.rows;
             self.tableDataLength = response.data.data.total;
             self.tPage = Math.ceil(response.data.data.total / self.page_size);
             self.talbeBhgCount = response.data.data.bhgCount;
@@ -6429,7 +6430,7 @@ export default {
             }
             self.closeLoading();
           } else {
-            if (self.pageBszfc == "xprdsq" || self.pageBszfc == "tbxxgl") {
+            if (self.pageBszfc == "xprdsq" || self.pageBszfc == "tbxxgl" || self.pageBszfc == "yardsq") {
               self.tableData = [];
               self.tableDataLength = 0;
               self.$message({

src/views/asjxq/yardDetail.vue

@@ -7,7 +7,7 @@
           (pageType == 'yardsqfsp' ||
             pageType == 'xprdbjsp' ||
             pageType == 'all') &&
-          xprdsqObj.sqr_xm
+          xprdsqObj.sqrXm
         "
       >
         <div class="wrap-shadow" style="padding: 16px 140px 25px 20px">
@@ -109,7 +109,7 @@
       <template
         #sqrdSqfslot
         v-if="
-          (pageType == 'xprdbjsp' || pageType == 'all') && xprdsqfsqObj.spr_xm
+          (pageType == 'xprdbjsp' || pageType == 'all') && xprdsqfsqObj.sprXm
         "
       >
         <div class="wrap-shadow" style="padding: 16px 140px 25px 20px">
@@ -135,7 +135,7 @@
           </div>
         </div>
       </template>
-      <template #sqrdBjslot v-if="pageType == 'all' && xprdbjObj.spr_xm">
+      <template #sqrdBjslot v-if="pageType == 'all' && xprdbjObj.sprXm">
         <div class="wrap-shadow" style="padding: 16px 140px 25px 20px">
           <div class="title">
             <img
@@ -222,10 +222,10 @@ export default {
       },
       //隐案认定申请信息
       xprdsq: [
-        { title: "单位名称", value: "", col: "3", id: "sqr_dw" },
-        { title: "姓名", value: "", col: "3", id: "sqr_xm" },
-        { title: "联系电话", value: "", col: "3", id: "sqr_lxdh" },
-        { title: "申请时间", value: "", col: "3", id: "tqsp_sj" },
+        { title: "单位名称", value: "", col: "3", id: "sqrGajgmc" },
+        { title: "姓名", value: "", col: "3", id: "sqrXm" },
+        { title: "联系电话", value: "", col: "3", id: "sqrLxdh" },
+        { title: "申请时间", value: "", col: "3", id: "tqspsj" },
         { title: "情况说明", value: "", col: "1", id: "qksm" },
         {
           title: "隐案认定申请附件",
@@ -237,22 +237,22 @@ export default {
       xprdsqObj: {},
       //申请方审批信息
       xprdsqfsq: [
-        { title: "公安机关名称", value: "", col: "3", id: "spr_dwmc" },
-        { title: "姓名", value: "", col: "3", id: "spr_xm" },
-        { title: "联系电话", value: "", col: "3", id: "spr_lxdh" },
+        { title: "公安机关名称", value: "", col: "3", id: "spdwGajgmc" },
+        { title: "姓名", value: "", col: "3", id: "sprXm" },
+        { title: "联系电话", value: "", col: "3", id: "sprLxdh" },
         { title: "审批结果", value: "", col: "3", id: "spjg" },
         { title: "审批时间", value: "", col: "1", id: "spsj" },
-        { title: "审批意见", value: "", col: "1", id: "spyj" },
+        { title: "审批意见", value: "", col: "1", id: "spyjJyqk" },
       ],
       xprdsqfsqObj: {},
       //部级审批信息
       xprdbj: [
-        { title: "公安机关名称", value: "", col: "3", id: "spr_dwmc" },
-        { title: "姓名", value: "", col: "3", id: "spr_xm" },
-        { title: "联系电话", value: "", col: "3", id: "spr_lxdh" },
+        { title: "公安机关名称", value: "", col: "3", id: "spdwGajgmc" },
+        { title: "姓名", value: "", col: "3", id: "sprXm" },
+        { title: "联系电话", value: "", col: "3", id: "sprLxdh" },
         { title: "审批结果", value: "", col: "3", id: "spjg" },
         { title: "审批时间", value: "", col: "1", id: "spsj" },
-        { title: "审批意见", value: "", col: "1", id: "spyj" },
+        { title: "审批意见", value: "", col: "1", id: "spyjJyqk" },
       ],
       xprdbjObj: {},
       pageType: "",
@@ -458,6 +458,7 @@ export default {
       self
         .doQueryRequest(params, url)
         .then((res) => {
+          debugger
           self.xprdsqObj = res.data.data.rows;
         })
         .catch((err) => {});
@@ -476,6 +477,7 @@ export default {
           res.data.data.rows.sqfspxx.spjg =
             res.data.data.rows.sqfspxx.spjg == "0" ? "不同意" : "同意";
           self.xprdbjObj = res.data.data.rows.bjspxx;
+          debugger
           self.xprdsqfsqObj = res.data.data.rows.sqfspxx;
         })
         .catch((err) => {});

src/views/yard/yardsqgl.vue

@@ -12,8 +12,8 @@
       <template #btnGroup="scope">
         <div
           v-if="
-            scope.scope.row.rwzt == '04' ||
             scope.scope.row.rwzt == '06' ||
+            scope.scope.row.rwzt == '04' ||
             scope.scope.row.rwzt == '01'
           "
         >
@@ -64,7 +64,7 @@ export default {
           type: "codeTreeDialog", //字典弹框
           props: [], //字典弹框需要的字段
           codeOptions: [],
-          codeTree: "CODE_RDZT",
+          codeTree: "CODE_RWZT",
           value: "",
           col: "3",
           multiple: true,