流程节点提送

src/views/goodStore/goodsCost/detail.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="goodsCostDetail">
-<<<<<<< HEAD
     <div class="goodsCostDetail-main" v-if="powers.some((i) => i == '007')">
-=======
-    <!-- v-if="powers && powers.length > 0 && powers.some((item) => item == '007')" -->
-    <div class="goodsCostDetail-main">
->>>>>>> sit
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="新建商品成本" name="0" v-if="queryType === 'add'">
           <base-form

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -670,23 +670,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-<<<<<<< HEAD
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "goodsCostAdd"
-        ) || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-=======
-      let tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "goodsCostAdd") ||
         {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
->>>>>>> sit
+      const { action } = tran ?? {};
+      return action ?? [];
     },
   },
   watch: {

src/views/sellOut/sellReturn/detail.vue

@@ -103,16 +103,10 @@
                         prop="receipt_quantity"
                         width="100"
                       />
-
                       <el-table-column label="退货数量" prop="return_num" width="100">
                       </el-table-column>
-<<<<<<< HEAD
-                      <el-table-column label="未发货数量" prop="wsend_num" width="90" />
-                      <el-table-column label="已发货数量" prop="send_num" width="90" />
-=======
                       <el-table-column label="未发货数量" prop="addr_wsend" width="90" />
                       <el-table-column label="已发货数量" prop="addr_send" width="90" />
->>>>>>> sit
                     </el-table>
                   </div>
                   <span v-else>--</span>