Merge branch 'sit'

src/views/purchaseIn/purchaseReturn/columns.js

@@ -15,12 +15,12 @@ export default [
   //   prop: "apply_name",
   //   label: "申请人"
   // },
-  {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
-  },
+  // {
+  //   prop: "status",
+  //   label: "状态",
+  //   _slot_: "status",
+  //   width: "120px",
+  // },
   {
     prop: "order_type",
     label: "退货来源",

src/views/purchaseIn/purchaseReturn/detail.vue

@@ -6,7 +6,7 @@
       <div class="detail-page-title">
         <span>采购退货单编号：</span
         ><span v-if="sitem">{{ sitem.bk_code }}</span>
-        <el-button
+        <!-- <el-button
           v-if="
             powers.some((item) => item === '015') &&
             (status === '0' || status === '1' || status === '2')
@@ -27,7 +27,7 @@
           :size="'mini'"
           v-if="status === '1' && powers.some((item) => item == '014')"
           >取消备库申请</el-button
-        >
+        > -->
       </div>
 
       <!-- <el-button
@@ -193,12 +193,12 @@ export default {
       loading: true,
       sitem: null,
       status: "",
-      statusOptions: [
-        // { value: "0", label: "取消" },
-        { value: "1", label: "待业务审核" },
-        { value: "2", label: "通知财务部门" },
-        { value: "3", label: "采购退货成功" },
-      ],
+      // statusOptions: [
+      //   // { value: "0", label: "取消" },
+      //   { value: "1", label: "待业务审核" },
+      //   { value: "2", label: "通知财务部门" },
+      //   { value: "3", label: "采购退货成功" },
+      // ],
     };
   },
   mounted() {

src/views/purchaseIn/purchaseReturn/index.vue

@@ -26,7 +26,7 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 150px; padding: 0 0 0 0px">
+              <!-- <el-col :span="4" style="width: 150px; padding: 0 0 0 0px">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.status"
@@ -47,9 +47,9 @@
                     :value="item.id"
                   />
                 </el-select>
-              </el-col>
+              </el-col> -->
               <!-- 下拉筛选 -->
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 400px; ">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -115,7 +115,7 @@
             </el-row>
           </div>
         </template>
-        <template #status="{ scope }">
+        <!-- <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
@@ -124,7 +124,7 @@
                 .label || '--'
             "
           ></el-tag>
-        </template>
+        </template> -->
         <template #order_type="{ scope }">
           <!-- <el-tag
             :size="tablebtnSize"