Преглед изворни кода

fix: 月仓明细条装增加 status

zh пре 2 година
родитељ
комит
4c69c13845

+ 52 - 34
src/views/basic_data/dailyWarehouseRent.vue

@@ -1,4 +1,3 @@
-
 <template>
   <template-page
     ref="pageRef"
@@ -16,7 +15,11 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import add_callback_mixin from '@/components/template/add_callback_mixin.js'
 
-import { getStockCostListCustomer, getStockCostListCustomerV2Export, updateOrderFull } from '@/api/basic_data/dailyWarehouseRent'
+import {
+  getStockCostListCustomer,
+  getStockCostListCustomerV2Export,
+  updateOrderFull
+} from '@/api/basic_data/dailyWarehouseRent'
 
 export default {
   components: { TemplatePage },
@@ -25,9 +28,7 @@ export default {
     return {
       visible: false,
       // 事件组合
-      optionsEvensGroup: [
-
-      ],
+      optionsEvensGroup: [],
       // 表格属性
       tableAttributes: {
         // 启用勾选列
@@ -41,29 +42,38 @@ export default {
       recordSelected: [],
 
       detailsId: '',
-      searchData: this.$route.query.orderId ? [
-        {
-          param: 'order_no',
-          compare: '=',
-          value: this.$route.query.orderId || ''
-        }
-      ] : this.$route.query.yearTime ? [
-        {
-          param: 'year_time',
-          compare: 'like',
-          value: this.$route.query.yearTime
-        },
-        {
-          param: 'month_time',
-          compare: 'like',
-          value: this.$route.query.monthTime
-        },
-        {
-          param: 'customer_number',
-          compare: 'like',
-          value: this.$route.query.customerNumber
-        }
-      ] : []
+      searchData: this.$route.query.orderId
+        ? [
+          {
+            param: 'order_no',
+            compare: '=',
+            value: this.$route.query.orderId || ''
+          }
+        ]
+        : this.$route.query.yearTime
+          ? [
+            {
+              param: 'year_time',
+              compare: 'like',
+              value: this.$route.query.yearTime
+            },
+            {
+              param: 'month_time',
+              compare: 'like',
+              value: this.$route.query.monthTime
+            },
+            {
+              param: 'customer_number',
+              compare: 'like',
+              value: this.$route.query.customerNumber
+            },
+            {
+              param: 'status',
+              compare: '=',
+              value: 'ENABLE'
+            }
+          ]
+          : []
     }
   },
   watch: {
@@ -85,6 +95,11 @@ export default {
               param: 'customer_number',
               compare: 'like',
               value: val.query.customerNumber
+            },
+            {
+              param: 'status',
+              compare: '=',
+              value: 'ENABLE'
             }
           ]
         }
@@ -121,13 +136,16 @@ export default {
         return (
           <div class='operation-btns'>
             {!this.$checkBtnRole('del', this.$route.meta.roles) ? (
-              <el-popconfirm title='确定剔除吗?' onOnConfirm={() => {
-                updateOrderFull({ id: row.orderFullCostId }).then(res => {
-                  this.$refs.pageRef.refreshList()
+              <el-popconfirm
+                title='确定剔除吗?'
+                onOnConfirm={() => {
+                  updateOrderFull({ id: row.orderFullCostId }).then(res => {
+                    this.$refs.pageRef.refreshList()
 
-                  this.$successMsg('剔除成功')
-                })
-              }}>
+                    this.$successMsg('剔除成功')
+                  })
+                }}
+              >
                 <el-button slot='reference' type='text'>
                   剔除
                 </el-button>

+ 1 - 1
src/views/basic_data/monthlyWarehouseRent.vue

@@ -76,7 +76,7 @@ export default {
                   this.$errorMsg('错误数据')
                   return
                 }
-                this.$router.push(`/basic_data/dailyWarehouseRent?yearTime=${row.yearTime}&monthTime=${row.monthTime}&customerNumber=${row.customerNumber}`)
+                this.$router.push(`/basic_data/dailyWarehouseRent?yearTime=${row.yearTime}&monthTime=${row.monthTime}&customerNumber=${row.customerNumber}&status=ENABLE`)
               }}
             >
               明细