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

src/components/ptCxForm_components.vue

@@ -553,13 +553,13 @@
                 @click="$emit('ajsx')"
                 >案件筛选</el-button
               >
-              <el-button
+              <!-- <el-button
                 type="primary"
                 size="mini"
                 v-if="pageBs == 'zdxxgl'"
                 @click="$emit('drzjhd')"
                 >excel导入交易活动</el-button
-              >
+              > -->
               <!--  <el-button
                 type="primary"
                 size="mini"

src/views/zdxx/zdxxgl/adjustZdxxgl.vue

@@ -907,6 +907,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssdyxx/selectSsdywp",
       },
@@ -940,6 +944,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssfjdcxx/selectFjdcwp",
       },
@@ -977,6 +985,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssjdcxx/selectJdcwp",
       },
@@ -1014,6 +1026,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssklwpxx/selectSsklxx",
       },
@@ -1051,6 +1067,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssqtwpxx/selectSsqtwpxx",
       },
@@ -1084,6 +1104,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssqzwpxx/selectSsqzxx",
       },
@@ -1117,6 +1141,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/sswwjtxx/selectSswwxx",
       },
@@ -1154,6 +1182,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/ssydtxxx/selectSsydtxxx",
       },
@@ -1191,6 +1223,10 @@ export default {
             prop: "sfzdwp",
             isShowDialog: true,
           },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
         ],
         cxUrl: "/sszjjtxx/selectSszjxx",
       },

src/views/zdxx/zdxxgl/queryZdxxgl.vue

@@ -12,10 +12,13 @@
       @selectionChange="selectionChange"
       @drzjhd="drzjhd"
     >
-    <template #listOperation="scope">
+      <template #listOperation="scope">
         <span class="hbyps" @click="add(scope.scope)">
           <i class="el-icon-plus"></i>新增</span
         >
+        <el-button type="primary" size="mini" @click="drzjhd"
+          >excel导入交易活动</el-button
+        >
       </template>
       <template #btnGroup="scope">
         <span class="hbyp" @click="edit(scope.scope)">修改</span>
@@ -255,14 +258,14 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: true,
           children: [
-            {
-              id: "addZdjyhd",
-              label: "阵地交易(活动)信息采集",
-              index: "addZdjyhd",
-              auth: "M0101",
-              className: "iconfont iconrizhi",
-              disabled: false,
-            },
+            // {
+            //   id: "addZdjyhd",
+            //   label: "阵地交易(活动)信息采集",
+            //   index: "addZdjyhd",
+            //   auth: "M0101",
+            //   className: "iconfont iconrizhi",
+            //   disabled: false,
+            // },
             {
               id: "queryZdxxss",
               label: "阵地线索信息管理",
@@ -586,5 +589,6 @@ export default {
   font-weight: 400 !important;
   color: #007aff !important;
   cursor: pointer;
+  margin-right: 10px;
 }
 </style>