Browse Source

feat:预约报表待执行可删除

snow 1 year ago
parent
commit
f4a8ff3d57
32 changed files with 50 additions and 56 deletions
  1. 16 2
      src/components/BasicForm/src/fields/supplier-permisson/super-admin.vue
  2. 1 1
      src/views/subscribe/businessAnalysis/components/all.vue
  3. 1 1
      src/views/subscribe/businessAnalysis/components/business.vue
  4. 1 1
      src/views/subscribe/frontSubscribe/components/all.vue
  5. 2 1
      src/views/subscribe/frontSubscribe/components/business.vue
  6. 1 1
      src/views/subscribe/fundClaim/components/all.vue
  7. 1 1
      src/views/subscribe/fundClaim/components/business.vue
  8. 1 1
      src/views/subscribe/incomeInvoice/components/all.vue
  9. 1 1
      src/views/subscribe/incomeInvoice/components/business.vue
  10. 1 1
      src/views/subscribe/paymentDetails/components/all.vue
  11. 1 1
      src/views/subscribe/paymentDetails/components/business.vue
  12. 1 1
      src/views/subscribe/procureDetail/components/all.vue
  13. 1 1
      src/views/subscribe/procureDetail/components/business.vue
  14. 1 1
      src/views/subscribe/receivableLedger/components/all.vue
  15. 1 1
      src/views/subscribe/receivableLedger/components/business.vue
  16. 1 1
      src/views/subscribe/reconciliationProcurement/components/all.vue
  17. 1 1
      src/views/subscribe/reconciliationProcurement/components/business.vue
  18. 1 1
      src/views/subscribe/reconciliationSummary/components/all.vue
  19. 1 1
      src/views/subscribe/reconciliationSummary/components/business.vue
  20. 1 1
      src/views/subscribe/returnTicket/components/all.vue
  21. 1 1
      src/views/subscribe/returnTicket/components/business.vue
  22. 1 1
      src/views/subscribe/revenueCost/components/all.vue
  23. 1 1
      src/views/subscribe/revenueCost/components/business.vue
  24. 1 1
      src/views/subscribe/saleInvoice/components/all.vue
  25. 1 1
      src/views/subscribe/saleInvoice/components/business.vue
  26. 1 1
      src/views/subscribe/salesReturnSubscribe/components/all.vue
  27. 1 1
      src/views/subscribe/salesReturnSubscribe/components/business.vue
  28. 1 1
      src/views/subscribe/supplierBusinessAnalysis/components/all.vue
  29. 3 3
      src/views/subscribe/supplierBusinessAnalysis/components/business.vue
  30. 1 22
      src/views/subscribe/supplierBusinessAnalysis/index.vue
  31. 1 1
      src/views/subscribe/yongyou/components/all.vue
  32. 1 1
      src/views/subscribe/yongyou/components/business.vue

+ 16 - 2
src/components/BasicForm/src/fields/supplier-permisson/super-admin.vue

@@ -26,8 +26,6 @@ async function requesetCompanies(
   _companyNo: string,
   isIntial?: boolean
 ) {
-  console.log(_companyNo);
-
   const api = httpSupplierList;
 
   const { data, message, code } = await api({
@@ -53,6 +51,21 @@ async function requesetCompanies(
   });
 }
 
+async function filterMethod(name: string) { 
+  if (!name) return
+
+  const { data, message, code } = await httpSupplierList({
+    name,
+    size: 100
+  });
+
+  responseHandle({
+    code,
+    message,
+    handler: () => list.value = data.list
+  });
+}
+
 const handleChange = value => emit("change", value);
 
 watch(
@@ -83,6 +96,7 @@ defineExpose({
     @change="handleChange"
     style="width: 100%"
     :placeholder="placeholder"
+    :filter-method="filterMethod"
   >
     <ElOption
       v-for="opt in list"

+ 1 - 1
src/views/subscribe/businessAnalysis/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/businessAnalysis/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/frontSubscribe/components/all.vue

@@ -70,7 +70,7 @@ const hooks: PageHooks = {
         </el-link>
 
 
-        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if="hasPermissionWithCode('8') && String(row.status) === '3'">
+        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if="hasPermissionWithCode('8') && (String(row.status) === '3' || String(row.status) === '1')">
           <template #reference>
             <ElButton link size="small" type="primary" :icon="useRenderIcon('delete')" />
           </template>

+ 2 - 1
src/views/subscribe/frontSubscribe/components/business.vue

@@ -93,7 +93,8 @@ function handleCreate() {
             :icon="useRenderIcon('download-line')"
           />
         </el-link>
-        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if=" hasPermissionWithCode('17') && String(row.status) === '3'">
+        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" 
+          v-if=" hasPermissionWithCode('17') && (String(row.status) === '3' || String(row.status) === '1')">
           <template #reference>
             <ElButton link size="small" type="primary" :icon="useRenderIcon('delete')" />
           </template>

+ 1 - 1
src/views/subscribe/fundClaim/components/all.vue

@@ -94,7 +94,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/fundClaim/components/business.vue

@@ -84,7 +84,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/incomeInvoice/components/all.vue

@@ -79,7 +79,7 @@ const hooks: PageHooks = {
       <template #content_action="row">
         <el-link
           :href="row.down_url"
-          v-if="String(row.status) === '2' && hasPermissionWithCode('10')"
+          v-if="String(row.status) === '2' && (String(row.status) === '3' || String(row.status) === '1')"
           target="_blank"
           :underline="false"
         >

+ 1 - 1
src/views/subscribe/incomeInvoice/components/business.vue

@@ -83,7 +83,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/paymentDetails/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/paymentDetails/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/procureDetail/components/all.vue

@@ -94,7 +94,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/procureDetail/components/business.vue

@@ -101,7 +101,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/receivableLedger/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/receivableLedger/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/reconciliationProcurement/components/all.vue

@@ -77,7 +77,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #refresh>
             <ElButton

+ 1 - 1
src/views/subscribe/reconciliationProcurement/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/reconciliationSummary/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/reconciliationSummary/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/returnTicket/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/returnTicket/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/revenueCost/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/revenueCost/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/saleInvoice/components/all.vue

@@ -91,7 +91,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/saleInvoice/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/salesReturnSubscribe/components/all.vue

@@ -91,7 +91,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/salesReturnSubscribe/components/business.vue

@@ -102,7 +102,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/supplierBusinessAnalysis/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 3 - 3
src/views/subscribe/supplierBusinessAnalysis/components/business.vue

@@ -46,7 +46,7 @@ function handleCreate() {
 </script>
 
 <template>
-  <page-auth :page-name="pageName" :all="false">
+  <page-auth :page-name="pageName" :all="true">
     <page-container
       :search-config="searchConfig"
       :hooks="hooks"
@@ -67,7 +67,7 @@ function handleCreate() {
       <template #content_action="row">
         <el-link
           :href="row.down_url"
-          v-if="String(row.status) === '2' && hasPermissionWithCode('19')"
+          v-if="String(row.status) === '2' && hasPermissionWithCode('10')"
           target="_blank"
           :underline="false"
         >
@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8') && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 22
src/views/subscribe/supplierBusinessAnalysis/index.vue

@@ -7,33 +7,12 @@ import NoAuth from "/@/components/NoAuth/NoAuth.vue";
 
 const pageName = "supplierBusinessAnalysis"
 const actived = shallowRef("");
-
 const { hasPermissionWithCode } = usePermission(pageName);
-
-// onMounted(() => {
-//   if (hasPermissionWithCode("3")) {
-//     actived.value = "3";
-//   } else if (hasPermissionWithCode("11")) {
-//     actived.value = "11";
-//   }
-// });
 </script>
 
 <template>
   <div class="report-container">
-    <!-- <el-tabs v-model="actived" style="color: #fff" v-if="actived === '11'"> -->
-      <!-- <el-tab-pane label="查看全部" name="3" v-if="hasPermissionWithCode('3')">
-        <all v-if="actived === '3'" />
-      </el-tab-pane> -->
-      <!-- <el-tab-pane
-        name="11"
-        label="查看供应商"
-        v-if="hasPermissionWithCode('11')"
-      > -->
-        <business />
-      <!-- </el-tab-pane> -->
-    <!-- </el-tabs> -->
-    <!-- <no-auth v-else /> -->
+     <business />
   </div>
 </template>
 

+ 1 - 1
src/views/subscribe/yongyou/components/all.vue

@@ -76,7 +76,7 @@ const hooks: PageHooks = {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('8') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('8')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton

+ 1 - 1
src/views/subscribe/yongyou/components/business.vue

@@ -81,7 +81,7 @@ function handleCreate() {
         <el-popconfirm
           title="是否确认删除该条记录?"
           @confirm="deleteItem(row.id)"
-          v-if="hasPermissionWithCode('17') && String(row.status) === '3'"
+          v-if="hasPermissionWithCode('17')  && (String(row.status) === '3' || String(row.status) === '1')"
         >
           <template #reference>
             <ElButton