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

src/components/ptCxForm_components.vue

@@ -446,6 +446,8 @@
                   pageBs != 'addThjl' &&
                   pageBs != 'addGlbsh' &&
                   pageBs != 'addTxl' &&
+                  pageBs != 'dzajzb' &&
+                  pageBs != 'queryXsxx' &&
                   pageBs != 'qyeryrlqbxsGl' &&
                   pageBs != 'fzjcgxlfx' &&
                   pageBs != 'qyeryrlqbxsDetailList'

src/views/brainPhoto/brainWffzkyry.vue

@@ -10,15 +10,20 @@
       @add="add"
       ref="rightContent"
     >
+       <template #listOperation="scope">
+        <span class="hbyps" @click="add(scope.scope)">
+          <i class="el-icon-plus"></i>新增</span
+        >
+      </template>
       <template #jrnt="scope">
         <span
-          class="hbyps"
+          class="hbyp"
           @click="toBrai(scope.scope)"
           v-if="scope.scope.row.spzt == '审批通过'"
           >进入脑图</span
         >
          <span
-          class="hbyps"
+          class="hbyp"
           @click="sqspBtna(scope.scope)"
           v-if="scope.scope.row.spzt == '未发起申请'"
           >申请审批</span
@@ -468,7 +473,7 @@ export default {
 </style>
 <style scoped lang="scss">
 @import "@/assets/styles/rightContent.scss";
-.hbyps {
+.hbyp {
   font-size: 14px;
   font-family: Source Han Sans CN;
   font-weight: 400;
@@ -482,4 +487,19 @@ export default {
   line-height: 28px;
   text-align: center;
 }
+.hbyps {
+  width: 64px;
+  height: 24px;
+  background: #ffffff;
+  border: 1px solid #007aff;
+  opacity: 1;
+  border-radius: 4px;
+  text-align: center;
+  align-items: center;
+  display: inline-block;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  color: #007aff !important;
+  cursor: pointer;
+}
 </style>
\ No newline at end of file

src/views/shse/shsexs/queryXsxx.vue

@@ -9,13 +9,15 @@
       :cxUrl="cxUrl"
       @toInfor="toInfor"
       :pageASs='pageASs'
-      @add="add"
       @selectionChange="selectionChange"
       ref="rightContent"
     >
       <template #listOperation="scope">
         <span class="hbyps" @click="toSb(scope.scope)">上报</span>
         <span class="hbyps" @click="toXf(scope.scope)">下发</span>
+        <span class="hbyps" @click="add(scope.scope)">
+          <i class="el-icon-plus"></i>新增</span
+        >
       </template>
       <template #btnGroup="scope">
         <span class="hbyp" @click="xsFk(scope.scope)">线索反馈</span>