From cebd1aee97beda4cf29e67875664cb7c121c16ed Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Wed, 15 May 2019 21:03:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/public.js | 13 + src/store/getters.js | 7 +- src/store/modules/user.js | 17 +- .../AccessMaterials/AccessMaterialsList.vue | 6 +- .../AccessMaterials/AddAccessMaterials.vue | 16 +- .../AccessMaterials/AddRetreatMaterials.vue | 16 +- .../AccessMaterials/RetreatMaterialsList.vue | 6 +- .../AccessMaterials/components/MyCenter.vue | 6 +- .../AccessMaterials/components/MyDialog.vue | 18 +- .../AccessMaterials/components/MyDialog2.vue | 18 +- .../components/MyMaterials.vue | 6 +- .../components/ProduceTask.vue | 6 +- src/views/AdjustPrice/AddAdjustPrice.vue | 16 +- src/views/AdjustPrice/AdjustPriceList.vue | 8 +- .../AdjustPrice/components/DetailList.vue | 10 +- src/views/AdjustPrice/components/MyDialog.vue | 10 +- src/views/AdjustPrice/components/MyEdit.vue | 10 +- src/views/AdjustPrice/components/MyOther.vue | 10 +- src/views/AdvancePay/AddAdvancePay.vue | 16 +- src/views/AdvancePay/components/MyApply.vue | 6 +- src/views/AdvancePay/components/MyDialog.vue | 18 +- src/views/AdvancePay/components/MyLnquiry.vue | 6 +- src/views/AdvancePay/components/MyOrder.vue | 6 +- src/views/AdvancePay/components/MyPlan.vue | 6 +- src/views/Advancemanage/AddAdvanceOrder.vue | 16 +- src/views/Advancemanage/AddAdvanceProduct.vue | 16 +- src/views/Advancemanage/AddPrepReturn.vue | 16 +- src/views/Advancemanage/AdvanceOrderList.vue | 6 +- .../Advancemanage/AdvanceProductList.vue | 6 +- src/views/Advancemanage/PrepReturnList.vue | 6 +- .../Advancemanage/components/MyAdvance.vue | 6 +- .../Advancemanage/components/MyApply.vue | 6 +- .../Advancemanage/components/MyArrival.vue | 6 +- .../Advancemanage/components/MyDialog.vue | 18 +- .../Advancemanage/components/MyDialog2.vue | 18 +- .../Advancemanage/components/MyDialog3.vue | 18 +- .../Advancemanage/components/MyLnquiry.vue | 6 +- src/views/Advancemanage/components/MyPlan.vue | 6 +- .../Advancemanage/components/MyPresale.vue | 6 +- src/views/AgentCollect/components/MyApply.vue | 6 +- .../AgentCollect/components/MyDialog.vue | 16 +- .../AgentCollect/components/MyRequire.vue | 6 +- src/views/AgentCollect/index.vue | 6 +- src/views/BuildUp/AddBuildUp.vue | 14 +- src/views/BuildUp/BuildUpList.vue | 8 +- src/views/BuildUp/components/DetailList.vue | 10 +- src/views/BuildUp/components/MyDialog.vue | 10 +- src/views/BuildUp/components/MyEdit.vue | 10 +- src/views/BuildUp/components/MyOther.vue | 10 +- src/views/BuildUp/components/MyRules.vue | 10 +- src/views/ChangeCount/AddChangeCount.vue | 16 +- src/views/ChangeCount/ChangeCountList.vue | 6 +- src/views/ChangeCount/components/MyApply.vue | 6 +- src/views/ChangeCount/components/MyDialog.vue | 18 +- .../ChangeCount/components/MyInstallment.vue | 6 +- .../ChangeCount/components/MyRequire.vue | 6 +- src/views/CheckFail/AddCheckFail.vue | 16 +- src/views/CheckFail/CheckFailList.vue | 6 +- src/views/CheckFail/components/MyApply.vue | 6 +- src/views/CheckFail/components/MyArrival.vue | 6 +- src/views/CheckFail/components/MyCenter.vue | 6 +- src/views/CheckFail/components/MyDialog.vue | 18 +- src/views/CheckFail/components/MyQuality.vue | 6 +- src/views/CheckFail/components/MyReport.vue | 6 +- .../CheckFail/components/ProduceTask.vue | 6 +- src/views/CheckReport/AddCheckReport.vue | 16 +- src/views/CheckReport/CheckReportList.vue | 6 +- src/views/CheckReport/components/MyApply.vue | 6 +- .../CheckReport/components/MyArrival.vue | 6 +- src/views/CheckReport/components/MyCenter.vue | 6 +- src/views/CheckReport/components/MyDialog.vue | 18 +- .../CheckReport/components/MyQuality.vue | 6 +- .../CheckReport/components/ProduceTask.vue | 6 +- src/views/CollectList/components/MyApply.vue | 6 +- src/views/CollectList/components/MyDialog.vue | 16 +- .../CollectList/components/MyRequire.vue | 6 +- src/views/CollectList/index.vue | 6 +- src/views/Collection/AddRecoverVehicle.vue | 16 +- src/views/Collection/CollectionList.vue | 6 +- src/views/Collection/RecoverVehicleList.vue | 6 +- src/views/Collection/components/MyApply.vue | 6 +- src/views/Collection/components/MyDialog.vue | 18 +- .../Collection/components/MyInstallment.vue | 6 +- src/views/Collection/components/MyRequire.vue | 6 +- .../CustomerMarketing/AddCustomerChat.vue | 12 +- .../CustomerMarketing/AddCustomerVisit.vue | 12 +- .../CustomerMarketing/CustomerChatList.vue | 6 +- .../CustomerMarketing/CustomerVisitList.vue | 6 +- .../CustomerMarketing/components/MyApply.vue | 6 +- .../CustomerMarketing/components/MyDialog.vue | 16 +- .../components/MyDialog2.vue | 16 +- .../components/MyInstallment.vue | 6 +- .../components/MyRequire.vue | 6 +- src/views/DailyAdjust/AddDailyAdjust.vue | 12 +- src/views/DailyAdjust/DailyAdjustList.vue | 8 +- .../DailyAdjust/components/DeailList.vue | 10 +- src/views/DailyAdjust/components/MyDialog.vue | 10 +- src/views/DailyAdjust/components/MyEdit.vue | 10 +- src/views/DailyAdjust/components/MyOther.vue | 10 +- .../NewEmployeeInformation.vue | 385 +++++++++++------- src/views/Expenses/AddExpenses.vue | 16 +- src/views/Expenses/ExpensesList.vue | 6 +- src/views/Expenses/components/MyApply.vue | 6 +- src/views/Expenses/components/MyDialog.vue | 18 +- src/views/Expenses/components/MyPlan.vue | 6 +- src/views/Getauthority/index.vue | 2 +- src/views/GroupBuyRules/AddGroupBuyRules.vue | 12 +- .../GroupBuyRules/components/MyApply.vue | 6 +- .../GroupBuyRules/components/MyDialog.vue | 16 +- .../GroupBuyRules/components/MyDialog2.vue | 16 +- .../components/MyInstallment.vue | 6 +- .../GroupBuyRules/components/MyRequire.vue | 6 +- .../InstallmentApply/AddInstallmentApply.vue | 12 +- .../InstallmentApply/InstallmentApplyList.vue | 6 +- .../InstallmentApply/components/MyApply.vue | 6 +- .../InstallmentApply/components/MyDialog.vue | 16 +- .../InstallmentApply/components/MyRequire.vue | 6 +- .../InstallmentList/components/MyApply.vue | 6 +- .../InstallmentList/components/MyDialog.vue | 16 +- .../InstallmentList/components/MyRequire.vue | 6 +- src/views/InstallmentList/index.vue | 6 +- .../Installmentrate/InstallmentrateList.vue | 4 +- .../Installmentrate/overdueFineRules.vue | 4 +- src/views/Installmentrate/rewardRules.vue | 4 +- .../InventoryCount/AddInventoryCount.vue | 12 +- .../InventoryCount/InventoryCountList.vue | 2 +- .../InventoryCount/components/DetailList.vue | 10 +- .../InventoryCount/components/MyDialog.vue | 10 +- .../AddInventoryOverflow.vue | 16 +- src/views/InventoryOverflow/OverflowList.vue | 8 +- .../components/DetailList.vue | 10 +- .../InventoryOverflow/components/MyDialog.vue | 10 +- .../InventoryOverflow/components/MyEdit.vue | 10 +- .../InventoryOverflow/components/MyOther.vue | 10 +- .../Inventorydamaged/AddInventorydamaged.vue | 12 +- .../Inventorydamaged/InventorydamagedList.vue | 6 +- .../components/DetailList.vue | 8 +- .../Inventorydamaged/components/MyDialog.vue | 8 +- src/views/Invoice/AddInvoice.vue | 16 +- src/views/Invoice/InvoiceList.vue | 6 +- src/views/Invoice/components/MyApply.vue | 6 +- src/views/Invoice/components/MyArrival.vue | 6 +- src/views/Invoice/components/MyDialog.vue | 18 +- src/views/Invoice/components/MyLnquiry.vue | 6 +- src/views/Invoice/components/MyPlan.vue | 6 +- src/views/MaterialsList/AddMaterialsList.vue | 12 +- src/views/MaterialsList/MaterialsListli.vue | 6 +- .../MaterialsList/components/MyDialog.vue | 16 +- src/views/OutSourcing/AddOutSourcing.vue | 12 +- src/views/OutSourcing/OutSourcingList.vue | 6 +- src/views/OutSourcing/components/MyDialog.vue | 16 +- src/views/OverdueList/index.vue | 6 +- src/views/PrepReceipt/AddPrepReceipt.vue | 16 +- src/views/PrepReceipt/PrepReceiptList.vue | 6 +- src/views/PrepReceipt/components/MyApply.vue | 6 +- src/views/PrepReceipt/components/MyDialog.vue | 18 +- src/views/PrepReceipt/components/MyOrder.vue | 6 +- src/views/PrepReceipt/components/MyPlan.vue | 6 +- src/views/ProcessFile/AddProductionFile.vue | 8 +- src/views/ProcessFile/AddStandardProcess.vue | 12 +- src/views/ProcessFile/AddWorkCenter.vue | 8 +- src/views/ProcessFile/ProductionFile.vue | 6 +- src/views/ProcessFile/StandardProcess.vue | 6 +- src/views/ProcessFile/WorkCenter.vue | 6 +- src/views/ProcessFile/components/MyCenter.vue | 6 +- src/views/ProcessFile/components/MyDetail.vue | 6 +- src/views/ProcessFile/components/MyDialog.vue | 14 +- .../ProcessFile/components/MyDialog2.vue | 14 +- .../ProcessFile/components/MyDialog3.vue | 16 +- src/views/ProducePlan/AddProducePlan.vue | 12 +- src/views/ProducePlan/ProducePlanList.vue | 6 +- src/views/ProducePlan/components/MyCenter.vue | 6 +- src/views/ProducePlan/components/MyDialog.vue | 16 +- .../ProduceRequire/components/MyApply.vue | 6 +- .../ProduceRequire/components/MyCenter.vue | 6 +- .../ProduceRequire/components/MyContract.vue | 6 +- .../ProduceRequire/components/MyDialog.vue | 18 +- .../ProduceRequire/components/MyLnquiry.vue | 6 +- .../ProduceRequire/components/MyPlan.vue | 6 +- src/views/ProduceRequire/index.vue | 6 +- src/views/ProduceTask/AddProduceReport.vue | 12 +- src/views/ProduceTask/AddProduceTask.vue | 12 +- src/views/ProduceTask/ProduceReportList.vue | 6 +- src/views/ProduceTask/ProduceTaskList.vue | 6 +- src/views/ProduceTask/components/MyCenter.vue | 6 +- src/views/ProduceTask/components/MyDialog.vue | 16 +- .../ProduceTask/components/MyDialog2.vue | 16 +- .../ProduceTask/components/ProducePlan.vue | 6 +- .../ProduceTask/components/ProduceTask.vue | 6 +- src/views/Product/components/MyCenter.vue | 6 +- src/views/QualityCheck/AddQualityCheck.vue | 16 +- src/views/QualityCheck/QualityCheckList.vue | 6 +- src/views/QualityCheck/components/MyApply.vue | 6 +- .../QualityCheck/components/MyArrival.vue | 6 +- .../QualityCheck/components/MyCenter.vue | 6 +- .../QualityCheck/components/MyDialog.vue | 18 +- .../QualityCheck/components/MyLnquiry.vue | 6 +- src/views/QualityCheck/components/MyPlan.vue | 6 +- .../QualityCheck/components/ProduceTask.vue | 6 +- src/views/Receipt/AddReceipt.vue | 16 +- src/views/Receipt/ReceiptList.vue | 6 +- .../Receipt/components/MyAgentcollect.vue | 6 +- src/views/Receipt/components/MyApply.vue | 6 +- src/views/Receipt/components/MyDialog.vue | 18 +- .../Receipt/components/MyInstallment.vue | 6 +- src/views/Receipt/components/MyRequire.vue | 6 +- src/views/Recycling/AddRecycling.vue | 16 +- src/views/Recycling/RecyclingList.vue | 6 +- src/views/Recycling/components/MyApply.vue | 6 +- src/views/Recycling/components/MyDialog.vue | 18 +- src/views/Recycling/components/MyPlan.vue | 6 +- src/views/RequirePlan/AddRequirePlan.vue | 12 +- src/views/RequirePlan/RequirePlanList.vue | 6 +- src/views/RequirePlan/components/MyCenter.vue | 6 +- src/views/RequirePlan/components/MyDialog.vue | 16 +- .../RequirePlan/components/ProducePlan.vue | 6 +- src/views/SaleContract/AddSaleContract.vue | 16 +- src/views/SaleContract/SaleContractList.vue | 6 +- src/views/SaleContract/components/MyApply.vue | 6 +- .../SaleContract/components/MyDialog.vue | 18 +- .../SaleContract/components/MyLnquiry.vue | 6 +- .../SaleContract/components/MyOpportunity.vue | 6 +- src/views/SaleContract/components/MyPlan.vue | 6 +- .../SaleOpportunity/AddSaleOpportunity.vue | 16 +- .../SaleOpportunity/SaleOpportunityList.vue | 6 +- .../SaleOpportunity/components/MyApply.vue | 6 +- .../SaleOpportunity/components/MyDialog.vue | 18 +- .../SaleOpportunity/components/MyRequire.vue | 6 +- src/views/SaleOrder/AddSaleOrder.vue | 16 +- src/views/SaleOrder/SaleOrderList.vue | 6 +- src/views/SaleOrder/components/MyApply.vue | 6 +- src/views/SaleOrder/components/MyDialog.vue | 16 +- src/views/SaleOrder/components/MyRequire.vue | 6 +- src/views/SaleOut/AddSaleOut.vue | 16 +- src/views/SaleOut/SaleOutList.vue | 6 +- src/views/SaleOut/components/MyAdvance.vue | 6 +- src/views/SaleOut/components/MyApply.vue | 6 +- src/views/SaleOut/components/MyDialog.vue | 18 +- .../SaleOut/components/MyOpportunity.vue | 6 +- src/views/SaleOut/components/MyOrder.vue | 6 +- src/views/SaleOut/components/MyPresale.vue | 6 +- src/views/SaleOut/components/MyRequire.vue | 6 +- src/views/SalePlan/AddSalePlan.vue | 14 +- src/views/SalePlan/SalePlanList.vue | 6 +- src/views/SalePlan/components/MyApply.vue | 6 +- src/views/SalePlan/components/MyDialog.vue | 16 +- src/views/SalePlan/components/MyRequire.vue | 6 +- src/views/SaleReturn/AddSaleReturn.vue | 14 +- src/views/SaleReturn/SaleReturnList.vue | 6 +- src/views/SaleReturn/components/MyApply.vue | 6 +- src/views/SaleReturn/components/MyDialog.vue | 16 +- src/views/SaleReturn/components/MyRequire.vue | 6 +- .../ShouldPayList/components/MyApply.vue | 6 +- .../ShouldPayList/components/MyDialog.vue | 18 +- .../ShouldPayList/components/MyLnquiry.vue | 6 +- .../ShouldPayList/components/MyOrder.vue | 6 +- src/views/ShouldPayList/components/MyPlan.vue | 6 +- src/views/ShouldPayList/index.vue | 6 +- .../SmartReplenishmentList.vue | 6 +- src/views/StockAlarm/BatchAlarm.vue | 8 +- .../StockAlarm/SearchStockAlarmRules.vue | 16 +- src/views/StockAlarm/StockAlarmList.vue | 8 +- src/views/StockAlarm/components/MyDialog.vue | 10 +- src/views/StockAlarm/components/MyEdit.vue | 10 +- src/views/StockAlarm/components/MyOther.vue | 10 +- src/views/StockAlarm/components/MyRules.vue | 10 +- src/views/StockApply/AddStockApply.vue | 16 +- src/views/StockApply/StockApplyList.vue | 6 +- src/views/StockApply/components/MyDialog.vue | 18 +- src/views/StockApply/components/MyOrder.vue | 6 +- src/views/StockArrival/AddStockArrival.vue | 16 +- src/views/StockArrival/StockArrivalList.vue | 6 +- src/views/StockArrival/components/MyApply.vue | 6 +- .../StockArrival/components/MyDialog.vue | 18 +- .../StockArrival/components/MyLnquiry.vue | 6 +- src/views/StockArrival/components/MyOrder.vue | 6 +- src/views/StockArrival/components/MyPlan.vue | 6 +- src/views/StockContract/AddStockContract.vue | 16 +- src/views/StockContract/StockContractList.vue | 6 +- .../StockContract/components/MyApply.vue | 6 +- .../StockContract/components/MyDialog.vue | 18 +- .../StockContract/components/MyLnquiry.vue | 6 +- src/views/StockContract/components/MyPlan.vue | 6 +- src/views/StockInquiry/AddStockInquiry.vue | 16 +- src/views/StockInquiry/StockInquiryList.vue | 6 +- src/views/StockInquiry/components/MyApply.vue | 6 +- .../StockInquiry/components/MyDialog.vue | 18 +- src/views/StockInquiry/components/MyPlan.vue | 6 +- src/views/StockOrder/AddStockOrder.vue | 16 +- src/views/StockOrder/StockOrderList.vue | 6 +- src/views/StockOrder/components/MyApply.vue | 6 +- .../StockOrder/components/MyContract.vue | 6 +- src/views/StockOrder/components/MyDialog.vue | 18 +- src/views/StockOrder/components/MyLnquiry.vue | 6 +- src/views/StockOrder/components/MyPlan.vue | 6 +- src/views/StockOut/AddOtherStockOut.vue | 16 +- src/views/StockOut/OtherStockOutList.vue | 8 +- src/views/StockOut/components/DetailList.vue | 10 +- src/views/StockOut/components/MyDialog.vue | 10 +- src/views/StockOut/components/MyEdit.vue | 10 +- src/views/StockOut/components/MyOther.vue | 10 +- src/views/StockPlan/AddStockPlan.vue | 14 +- src/views/StockPlan/StockPlanList.vue | 6 +- src/views/StockPlan/components/MyApply.vue | 6 +- src/views/StockPlan/components/MyDialog.vue | 16 +- src/views/StockPlan/components/MyRequire.vue | 6 +- src/views/StockQuery/ArrivalSummary.vue | 6 +- src/views/StockQuery/OnSummary.vue | 6 +- src/views/StockQuery/StockPrice.vue | 6 +- src/views/StockQuery/components/MyApply.vue | 6 +- src/views/StockQuery/components/MyArrival.vue | 6 +- src/views/StockQuery/components/MyDialog.vue | 18 +- src/views/StockQuery/components/MyLnquiry.vue | 6 +- src/views/StockQuery/components/MyOrder.vue | 6 +- src/views/StockQuery/components/MyPlan.vue | 6 +- src/views/StockRequire/index.vue | 6 +- src/views/StockRetreat/AddStockRetreat.vue | 16 +- src/views/StockRetreat/StockRetreatList.vue | 6 +- src/views/StockRetreat/components/MyApply.vue | 6 +- .../StockRetreat/components/MyArrival.vue | 6 +- .../StockRetreat/components/MyDialog.vue | 18 +- .../StockRetreat/components/MyLnquiry.vue | 6 +- src/views/StockRetreat/components/MyOrder.vue | 6 +- src/views/StockRetreat/components/MyPlan.vue | 6 +- src/views/Stockenter/AddOtherenter.vue | 16 +- src/views/Stockenter/OtherEnterList.vue | 8 +- src/views/Stockenter/ProduceEnter.vue | 16 +- src/views/Stockenter/ProduceEnterList.vue | 8 +- src/views/Stockenter/Stockenterlist.vue | 6 +- src/views/Stockenter/addstockenter.vue | 35 +- .../Stockenter/components/DetailList.vue | 10 +- .../Stockenter/components/DetailList2.vue | 10 +- .../Stockenter/components/DetailList3.vue | 10 +- src/views/Stockenter/components/MyArrival.vue | 6 +- src/views/Stockenter/components/MyDialog.vue | 10 +- src/views/Stockenter/components/MyEdit.vue | 10 +- src/views/Stockenter/components/MyOther.vue | 10 +- src/views/Storagemove/AddMoveApplication.vue | 16 +- src/views/Storagemove/AddStoragemove.vue | 16 +- src/views/Storagemove/MoveApplicationList.vue | 8 +- src/views/Storagemove/StoragemoveList.vue | 8 +- .../Storagemove/components/DetailList.vue | 10 +- .../Storagemove/components/MyApplication.vue | 10 +- src/views/Storagemove/components/MyDialog.vue | 10 +- src/views/Storagemove/components/MyEdit.vue | 10 +- src/views/Storagemove/components/MyEdit2.vue | 10 +- src/views/Storagemove/components/MyOther.vue | 10 +- src/views/Supplier/components/MyDialog.vue | 10 +- src/views/TearDown/AddTearDown.vue | 14 +- src/views/TearDown/TearDownList.vue | 8 +- src/views/TearDown/components/DetailList.vue | 10 +- src/views/TearDown/components/MyDialog.vue | 10 +- src/views/TearDown/components/MyEdit.vue | 10 +- src/views/TearDown/components/MyOther.vue | 10 +- src/views/TearDown/components/MyRules.vue | 10 +- src/views/Transfer/AddTransfer.vue | 16 +- src/views/Transfer/TransferList.vue | 6 +- src/views/Transfer/components/MyApply.vue | 6 +- src/views/Transfer/components/MyDialog.vue | 18 +- src/views/Transfer/components/MyPlan.vue | 6 +- src/views/WarehouseAdjust/AddInitialenter.vue | 8 +- .../WarehouseAdjust/AddLocationAdjust.vue | 12 +- src/views/WarehouseAdjust/AddStockAlarm.vue | 12 +- src/views/WarehouseAdjust/Enterlist.vue | 6 +- .../WarehouseAdjust/LocationAdjustList.vue | 6 +- .../WarehouseAdjust/components/DetailList.vue | 8 +- .../WarehouseAdjust/components/MyDialog.vue | 8 +- .../WarehouseAdjust/components/MyDialog2.vue | 8 +- .../WarehouseAdjust/components/MyEdit.vue | 10 +- .../WarehouseAdjust/components/MyLocation.vue | 8 +- .../WarehouseAdjust/inventorydetaillist.vue | 8 +- src/views/income/AddIncome.vue | 16 +- src/views/income/IncomeList.vue | 6 +- src/views/income/components/MyApply.vue | 6 +- src/views/income/components/MyDialog.vue | 18 +- src/views/income/components/MyPlan.vue | 6 +- src/views/payment/AddPayment.vue | 16 +- src/views/payment/components/MyApply.vue | 6 +- src/views/payment/components/MyDialog.vue | 18 +- src/views/payment/components/MyLnquiry.vue | 6 +- src/views/payment/components/MyOrder.vue | 6 +- src/views/payment/components/MyPlan.vue | 6 +- src/views/payment/paymentList.vue | 6 +- 383 files changed, 2074 insertions(+), 1949 deletions(-) diff --git a/src/api/public.js b/src/api/public.js index a1ab14be..293cb950 100644 --- a/src/api/public.js +++ b/src/api/public.js @@ -353,3 +353,16 @@ export function agentCollectList(query) { data: params }) } + +// 取角色名称 +export function getDetailById(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('detailId', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/role/getDetailById', + method: 'post', + data: params + }) +} diff --git a/src/store/getters.js b/src/store/getters.js index eba55278..d87fb699 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -16,8 +16,9 @@ const getters = { addRouters: state => state.permission.addRouters, errorLogs: state => state.errorLog.logs, userId: state => state.user.userId, - regionid: state => state.user.regionid, - repositoryid: state => state.user.repositoryid, - yin: state => state.app.yin + regionId: state => state.user.regionId, + repositoryId: state => state.user.repositoryId, + yin: state => state.app.yin, + countryId: state => state.user.countryId } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e7bcc4f7..fa3cb095 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -15,8 +15,9 @@ const user = { articlePlatform: [] }, userId: '', - regionid: '', - repositoryid: '' + regionId: '', + repositoryId: '', + countryId: '' }, mutations: { @@ -47,11 +48,14 @@ const user = { SET_USERID: (state, userId) => { state.userId = userId }, - SET_REGIONID: (state, regionid) => { - state.regionid = regionid + SET_REGIONID: (state, regionId) => { + state.regionId = regionId }, - SET_REPOSITORYID: (state, repositoryid) => { - state.repositoryid = repositoryid + SET_REPOSITORYID: (state, repositoryId) => { + state.repositoryId = repositoryId + }, + SET_COUNTTRYID: (state, countryId) => { + state.countryId = countryId } }, @@ -94,6 +98,7 @@ const user = { commit('SET_USERID', data.userId) commit('SET_REGIONID', data.regionId) commit('SET_REPOSITORYID', data.repositoryId) + commit('SET_COUNTTRYID', data.countryId) resolve(response) }).catch(error => { reject(error) diff --git a/src/views/AccessMaterials/AccessMaterialsList.vue b/src/views/AccessMaterials/AccessMaterialsList.vue index 20dae208..c0e44202 100644 --- a/src/views/AccessMaterials/AccessMaterialsList.vue +++ b/src/views/AccessMaterials/AccessMaterialsList.vue @@ -262,9 +262,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/AddAccessMaterials.vue b/src/views/AccessMaterials/AddAccessMaterials.vue index c8a8accc..525a1c3a 100644 --- a/src/views/AccessMaterials/AddAccessMaterials.vue +++ b/src/views/AccessMaterials/AddAccessMaterials.vue @@ -206,10 +206,10 @@ export default { control: false, // 生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 生产任务规则数据 @@ -474,10 +474,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceTaskNumber = null diff --git a/src/views/AccessMaterials/AddRetreatMaterials.vue b/src/views/AccessMaterials/AddRetreatMaterials.vue index 9ba0477c..77e16a8b 100644 --- a/src/views/AccessMaterials/AddRetreatMaterials.vue +++ b/src/views/AccessMaterials/AddRetreatMaterials.vue @@ -171,10 +171,10 @@ export default { control: false, // 生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 生产任务规则数据 @@ -405,10 +405,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.receivePersonId = null diff --git a/src/views/AccessMaterials/RetreatMaterialsList.vue b/src/views/AccessMaterials/RetreatMaterialsList.vue index 1fe156e8..45035bcf 100644 --- a/src/views/AccessMaterials/RetreatMaterialsList.vue +++ b/src/views/AccessMaterials/RetreatMaterialsList.vue @@ -258,9 +258,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/MyCenter.vue b/src/views/AccessMaterials/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/AccessMaterials/components/MyCenter.vue +++ b/src/views/AccessMaterials/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/MyDialog.vue b/src/views/AccessMaterials/components/MyDialog.vue index d4b6907b..5d458574 100644 --- a/src/views/AccessMaterials/components/MyDialog.vue +++ b/src/views/AccessMaterials/components/MyDialog.vue @@ -477,10 +477,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceTaskNumber = null @@ -490,11 +490,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/AccessMaterials/components/MyDialog2.vue b/src/views/AccessMaterials/components/MyDialog2.vue index 28cf62a4..07d8bbbc 100644 --- a/src/views/AccessMaterials/components/MyDialog2.vue +++ b/src/views/AccessMaterials/components/MyDialog2.vue @@ -423,10 +423,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.receivePersonId = null @@ -435,11 +435,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/AccessMaterials/components/MyMaterials.vue b/src/views/AccessMaterials/components/MyMaterials.vue index e4f63c36..01366e06 100644 --- a/src/views/AccessMaterials/components/MyMaterials.vue +++ b/src/views/AccessMaterials/components/MyMaterials.vue @@ -238,9 +238,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/ProduceTask.vue b/src/views/AccessMaterials/components/ProduceTask.vue index 1c5ae8f7..9b24ccb1 100644 --- a/src/views/AccessMaterials/components/ProduceTask.vue +++ b/src/views/AccessMaterials/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdjustPrice/AddAdjustPrice.vue b/src/views/AdjustPrice/AddAdjustPrice.vue index e05fb518..020f788b 100644 --- a/src/views/AdjustPrice/AddAdjustPrice.vue +++ b/src/views/AdjustPrice/AddAdjustPrice.vue @@ -147,10 +147,10 @@ export default { control: false, // 调价信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 调价单规则数据 @@ -280,10 +280,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.handlePersonId = '' diff --git a/src/views/AdjustPrice/AdjustPriceList.vue b/src/views/AdjustPrice/AdjustPriceList.vue index 28dc878e..c0bc0ace 100644 --- a/src/views/AdjustPrice/AdjustPriceList.vue +++ b/src/views/AdjustPrice/AdjustPriceList.vue @@ -224,10 +224,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/AdjustPrice/components/DetailList.vue b/src/views/AdjustPrice/components/DetailList.vue index 9c51e466..dcb65694 100644 --- a/src/views/AdjustPrice/components/DetailList.vue +++ b/src/views/AdjustPrice/components/DetailList.vue @@ -315,11 +315,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyDialog.vue b/src/views/AdjustPrice/components/MyDialog.vue index 19f1167a..849d2539 100644 --- a/src/views/AdjustPrice/components/MyDialog.vue +++ b/src/views/AdjustPrice/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyEdit.vue b/src/views/AdjustPrice/components/MyEdit.vue index 2e06db4b..fe6a3090 100644 --- a/src/views/AdjustPrice/components/MyEdit.vue +++ b/src/views/AdjustPrice/components/MyEdit.vue @@ -305,11 +305,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyOther.vue b/src/views/AdjustPrice/components/MyOther.vue index 22759834..45c8ec9b 100644 --- a/src/views/AdjustPrice/components/MyOther.vue +++ b/src/views/AdjustPrice/components/MyOther.vue @@ -321,11 +321,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdvancePay/AddAdvancePay.vue b/src/views/AdvancePay/AddAdvancePay.vue index c70f423e..8c390b9e 100644 --- a/src/views/AdvancePay/AddAdvancePay.vue +++ b/src/views/AdvancePay/AddAdvancePay.vue @@ -166,10 +166,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, payDate: null }, @@ -378,10 +378,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/AdvancePay/components/MyApply.vue b/src/views/AdvancePay/components/MyApply.vue index 3a466ebf..7568572b 100644 --- a/src/views/AdvancePay/components/MyApply.vue +++ b/src/views/AdvancePay/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyDialog.vue b/src/views/AdvancePay/components/MyDialog.vue index b03dd344..eff54921 100644 --- a/src/views/AdvancePay/components/MyDialog.vue +++ b/src/views/AdvancePay/components/MyDialog.vue @@ -363,10 +363,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -378,11 +378,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/AdvancePay/components/MyLnquiry.vue b/src/views/AdvancePay/components/MyLnquiry.vue index 1ac29aba..de2a778d 100644 --- a/src/views/AdvancePay/components/MyLnquiry.vue +++ b/src/views/AdvancePay/components/MyLnquiry.vue @@ -248,9 +248,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, judgeStat: '' }, // 传给组件的数据 diff --git a/src/views/AdvancePay/components/MyOrder.vue b/src/views/AdvancePay/components/MyOrder.vue index 065e7de5..1a1cf348 100644 --- a/src/views/AdvancePay/components/MyOrder.vue +++ b/src/views/AdvancePay/components/MyOrder.vue @@ -245,9 +245,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyPlan.vue b/src/views/AdvancePay/components/MyPlan.vue index 02a48b31..90ec1b6c 100644 --- a/src/views/AdvancePay/components/MyPlan.vue +++ b/src/views/AdvancePay/components/MyPlan.vue @@ -226,9 +226,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/AddAdvanceOrder.vue b/src/views/Advancemanage/AddAdvanceOrder.vue index f056d337..62e941cd 100644 --- a/src/views/Advancemanage/AddAdvanceOrder.vue +++ b/src/views/Advancemanage/AddAdvanceOrder.vue @@ -210,10 +210,10 @@ export default { advancecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 }, // 采购申请单规则数据 @@ -433,10 +433,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null diff --git a/src/views/Advancemanage/AddAdvanceProduct.vue b/src/views/Advancemanage/AddAdvanceProduct.vue index aa885502..516b1c00 100644 --- a/src/views/Advancemanage/AddAdvanceProduct.vue +++ b/src/views/Advancemanage/AddAdvanceProduct.vue @@ -224,10 +224,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1', depositBegintime: null, depositEndtime: null, @@ -368,10 +368,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.depositTime = null diff --git a/src/views/Advancemanage/AddPrepReturn.vue b/src/views/Advancemanage/AddPrepReturn.vue index e361bbf1..62f1ebc5 100644 --- a/src/views/Advancemanage/AddPrepReturn.vue +++ b/src/views/Advancemanage/AddPrepReturn.vue @@ -233,10 +233,10 @@ export default { advancecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 }, // 采购申请单规则数据 @@ -469,10 +469,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null diff --git a/src/views/Advancemanage/AdvanceOrderList.vue b/src/views/Advancemanage/AdvanceOrderList.vue index e741e30a..fb9948b4 100644 --- a/src/views/Advancemanage/AdvanceOrderList.vue +++ b/src/views/Advancemanage/AdvanceOrderList.vue @@ -252,9 +252,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/AdvanceProductList.vue b/src/views/Advancemanage/AdvanceProductList.vue index d98a3ceb..6eb32fad 100644 --- a/src/views/Advancemanage/AdvanceProductList.vue +++ b/src/views/Advancemanage/AdvanceProductList.vue @@ -223,9 +223,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/PrepReturnList.vue b/src/views/Advancemanage/PrepReturnList.vue index 0f89bf8c..fd97cc2e 100644 --- a/src/views/Advancemanage/PrepReturnList.vue +++ b/src/views/Advancemanage/PrepReturnList.vue @@ -268,9 +268,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyAdvance.vue b/src/views/Advancemanage/components/MyAdvance.vue index 2896538d..86c413e2 100644 --- a/src/views/Advancemanage/components/MyAdvance.vue +++ b/src/views/Advancemanage/components/MyAdvance.vue @@ -202,9 +202,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyApply.vue b/src/views/Advancemanage/components/MyApply.vue index 3a466ebf..7568572b 100644 --- a/src/views/Advancemanage/components/MyApply.vue +++ b/src/views/Advancemanage/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyArrival.vue b/src/views/Advancemanage/components/MyArrival.vue index c132f293..c815694e 100644 --- a/src/views/Advancemanage/components/MyArrival.vue +++ b/src/views/Advancemanage/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyDialog.vue b/src/views/Advancemanage/components/MyDialog.vue index 4d6fdda2..75e2893a 100644 --- a/src/views/Advancemanage/components/MyDialog.vue +++ b/src/views/Advancemanage/components/MyDialog.vue @@ -526,10 +526,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null @@ -541,11 +541,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyDialog2.vue b/src/views/Advancemanage/components/MyDialog2.vue index 834e165f..61e26820 100644 --- a/src/views/Advancemanage/components/MyDialog2.vue +++ b/src/views/Advancemanage/components/MyDialog2.vue @@ -426,10 +426,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null @@ -441,11 +441,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyDialog3.vue b/src/views/Advancemanage/components/MyDialog3.vue index eed2a0b8..1da0ec4a 100644 --- a/src/views/Advancemanage/components/MyDialog3.vue +++ b/src/views/Advancemanage/components/MyDialog3.vue @@ -380,10 +380,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.depositTime = null @@ -402,11 +402,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyLnquiry.vue b/src/views/Advancemanage/components/MyLnquiry.vue index 1ac29aba..de2a778d 100644 --- a/src/views/Advancemanage/components/MyLnquiry.vue +++ b/src/views/Advancemanage/components/MyLnquiry.vue @@ -248,9 +248,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, judgeStat: '' }, // 传给组件的数据 diff --git a/src/views/Advancemanage/components/MyPlan.vue b/src/views/Advancemanage/components/MyPlan.vue index 02a48b31..90ec1b6c 100644 --- a/src/views/Advancemanage/components/MyPlan.vue +++ b/src/views/Advancemanage/components/MyPlan.vue @@ -226,9 +226,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyPresale.vue b/src/views/Advancemanage/components/MyPresale.vue index d8ae3d3e..e62f72d6 100644 --- a/src/views/Advancemanage/components/MyPresale.vue +++ b/src/views/Advancemanage/components/MyPresale.vue @@ -227,9 +227,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/components/MyApply.vue b/src/views/AgentCollect/components/MyApply.vue index 716007a5..b7af84b2 100644 --- a/src/views/AgentCollect/components/MyApply.vue +++ b/src/views/AgentCollect/components/MyApply.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/components/MyDialog.vue b/src/views/AgentCollect/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/AgentCollect/components/MyDialog.vue +++ b/src/views/AgentCollect/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/AgentCollect/components/MyRequire.vue b/src/views/AgentCollect/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/AgentCollect/components/MyRequire.vue +++ b/src/views/AgentCollect/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/index.vue b/src/views/AgentCollect/index.vue index f6f2ec8d..ffc4828d 100644 --- a/src/views/AgentCollect/index.vue +++ b/src/views/AgentCollect/index.vue @@ -248,9 +248,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, time: null }, // 传给组件的数据 diff --git a/src/views/BuildUp/AddBuildUp.vue b/src/views/BuildUp/AddBuildUp.vue index bc4b4e2e..7a7fc764 100644 --- a/src/views/BuildUp/AddBuildUp.vue +++ b/src/views/BuildUp/AddBuildUp.vue @@ -187,10 +187,10 @@ export default { buildcontrol: false, // 组装信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 组装单规则数据 @@ -340,9 +340,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.buildupRepositoryId = '' diff --git a/src/views/BuildUp/BuildUpList.vue b/src/views/BuildUp/BuildUpList.vue index 383da835..4494c607 100644 --- a/src/views/BuildUp/BuildUpList.vue +++ b/src/views/BuildUp/BuildUpList.vue @@ -214,10 +214,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/BuildUp/components/DetailList.vue b/src/views/BuildUp/components/DetailList.vue index f2fc7f9c..fbc59ce8 100644 --- a/src/views/BuildUp/components/DetailList.vue +++ b/src/views/BuildUp/components/DetailList.vue @@ -348,11 +348,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/BuildUp/components/MyDialog.vue b/src/views/BuildUp/components/MyDialog.vue index 66a403ff..dde74ec0 100644 --- a/src/views/BuildUp/components/MyDialog.vue +++ b/src/views/BuildUp/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/BuildUp/components/MyEdit.vue b/src/views/BuildUp/components/MyEdit.vue index 3d63ab55..bea55b2c 100644 --- a/src/views/BuildUp/components/MyEdit.vue +++ b/src/views/BuildUp/components/MyEdit.vue @@ -355,11 +355,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/BuildUp/components/MyOther.vue b/src/views/BuildUp/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/BuildUp/components/MyOther.vue +++ b/src/views/BuildUp/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/BuildUp/components/MyRules.vue b/src/views/BuildUp/components/MyRules.vue index 4f411b6c..1c398cae 100644 --- a/src/views/BuildUp/components/MyRules.vue +++ b/src/views/BuildUp/components/MyRules.vue @@ -126,12 +126,12 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId this.personalForm.createId = 3 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/ChangeCount/AddChangeCount.vue b/src/views/ChangeCount/AddChangeCount.vue index 062f273e..7d684e2c 100644 --- a/src/views/ChangeCount/AddChangeCount.vue +++ b/src/views/ChangeCount/AddChangeCount.vue @@ -158,10 +158,10 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 商品信息 @@ -228,10 +228,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.saleRepositoryId = null diff --git a/src/views/ChangeCount/ChangeCountList.vue b/src/views/ChangeCount/ChangeCountList.vue index ce3586f1..3b9bf004 100644 --- a/src/views/ChangeCount/ChangeCountList.vue +++ b/src/views/ChangeCount/ChangeCountList.vue @@ -270,9 +270,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyApply.vue b/src/views/ChangeCount/components/MyApply.vue index 716007a5..b7af84b2 100644 --- a/src/views/ChangeCount/components/MyApply.vue +++ b/src/views/ChangeCount/components/MyApply.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyDialog.vue b/src/views/ChangeCount/components/MyDialog.vue index 68eed3d7..44e483cc 100644 --- a/src/views/ChangeCount/components/MyDialog.vue +++ b/src/views/ChangeCount/components/MyDialog.vue @@ -231,10 +231,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.saleRepositoryId = null @@ -251,11 +251,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/ChangeCount/components/MyInstallment.vue b/src/views/ChangeCount/components/MyInstallment.vue index acbf3bdc..f3207efd 100644 --- a/src/views/ChangeCount/components/MyInstallment.vue +++ b/src/views/ChangeCount/components/MyInstallment.vue @@ -216,9 +216,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyRequire.vue b/src/views/ChangeCount/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/ChangeCount/components/MyRequire.vue +++ b/src/views/ChangeCount/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/AddCheckFail.vue b/src/views/CheckFail/AddCheckFail.vue index 44605577..94774bf4 100644 --- a/src/views/CheckFail/AddCheckFail.vue +++ b/src/views/CheckFail/AddCheckFail.vue @@ -207,10 +207,10 @@ export default { producecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '1' }, @@ -414,10 +414,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.handlePersonId = null diff --git a/src/views/CheckFail/CheckFailList.vue b/src/views/CheckFail/CheckFailList.vue index 41402210..736cb1f1 100644 --- a/src/views/CheckFail/CheckFailList.vue +++ b/src/views/CheckFail/CheckFailList.vue @@ -257,9 +257,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyApply.vue b/src/views/CheckFail/components/MyApply.vue index 3a466ebf..7568572b 100644 --- a/src/views/CheckFail/components/MyApply.vue +++ b/src/views/CheckFail/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyArrival.vue b/src/views/CheckFail/components/MyArrival.vue index db020562..a96fc830 100644 --- a/src/views/CheckFail/components/MyArrival.vue +++ b/src/views/CheckFail/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyCenter.vue b/src/views/CheckFail/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/CheckFail/components/MyCenter.vue +++ b/src/views/CheckFail/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyDialog.vue b/src/views/CheckFail/components/MyDialog.vue index 90c5a498..25e629cc 100644 --- a/src/views/CheckFail/components/MyDialog.vue +++ b/src/views/CheckFail/components/MyDialog.vue @@ -411,10 +411,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.handlePersonId = null @@ -426,11 +426,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/CheckFail/components/MyQuality.vue b/src/views/CheckFail/components/MyQuality.vue index 9223eefe..4bbb8988 100644 --- a/src/views/CheckFail/components/MyQuality.vue +++ b/src/views/CheckFail/components/MyQuality.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyReport.vue b/src/views/CheckFail/components/MyReport.vue index e4c07520..bb63df10 100644 --- a/src/views/CheckFail/components/MyReport.vue +++ b/src/views/CheckFail/components/MyReport.vue @@ -255,9 +255,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/ProduceTask.vue b/src/views/CheckFail/components/ProduceTask.vue index 972ffd77..f01ad84e 100644 --- a/src/views/CheckFail/components/ProduceTask.vue +++ b/src/views/CheckFail/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue index c5089198..ae5e8506 100644 --- a/src/views/CheckReport/AddCheckReport.vue +++ b/src/views/CheckReport/AddCheckReport.vue @@ -356,10 +356,10 @@ export default { producecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isRecheck: 1, sourceType: '4' }, @@ -678,10 +678,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.inspectionPersonId = null diff --git a/src/views/CheckReport/CheckReportList.vue b/src/views/CheckReport/CheckReportList.vue index fb71a2df..d4946695 100644 --- a/src/views/CheckReport/CheckReportList.vue +++ b/src/views/CheckReport/CheckReportList.vue @@ -277,9 +277,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyApply.vue b/src/views/CheckReport/components/MyApply.vue index 3a466ebf..7568572b 100644 --- a/src/views/CheckReport/components/MyApply.vue +++ b/src/views/CheckReport/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyArrival.vue b/src/views/CheckReport/components/MyArrival.vue index cea877c2..4005a94b 100644 --- a/src/views/CheckReport/components/MyArrival.vue +++ b/src/views/CheckReport/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyCenter.vue b/src/views/CheckReport/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/CheckReport/components/MyCenter.vue +++ b/src/views/CheckReport/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyDialog.vue b/src/views/CheckReport/components/MyDialog.vue index d7eb61df..5cfd936e 100644 --- a/src/views/CheckReport/components/MyDialog.vue +++ b/src/views/CheckReport/components/MyDialog.vue @@ -538,10 +538,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.inspectionPersonId = null @@ -553,11 +553,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/CheckReport/components/MyQuality.vue b/src/views/CheckReport/components/MyQuality.vue index 4b47bd6d..5e40f868 100644 --- a/src/views/CheckReport/components/MyQuality.vue +++ b/src/views/CheckReport/components/MyQuality.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/ProduceTask.vue b/src/views/CheckReport/components/ProduceTask.vue index 383c3962..343125d3 100644 --- a/src/views/CheckReport/components/ProduceTask.vue +++ b/src/views/CheckReport/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/components/MyApply.vue b/src/views/CollectList/components/MyApply.vue index 716007a5..b7af84b2 100644 --- a/src/views/CollectList/components/MyApply.vue +++ b/src/views/CollectList/components/MyApply.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/components/MyDialog.vue b/src/views/CollectList/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/CollectList/components/MyDialog.vue +++ b/src/views/CollectList/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/CollectList/components/MyRequire.vue b/src/views/CollectList/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/CollectList/components/MyRequire.vue +++ b/src/views/CollectList/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/index.vue b/src/views/CollectList/index.vue index e9fa2165..4a93a0bc 100644 --- a/src/views/CollectList/index.vue +++ b/src/views/CollectList/index.vue @@ -242,9 +242,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, time: null }, // 传给组件的数据 diff --git a/src/views/Collection/AddRecoverVehicle.vue b/src/views/Collection/AddRecoverVehicle.vue index 924589ec..88d21059 100644 --- a/src/views/Collection/AddRecoverVehicle.vue +++ b/src/views/Collection/AddRecoverVehicle.vue @@ -180,10 +180,10 @@ export default { list3: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, receiveDate: null }, // 商品信息 @@ -270,10 +270,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.getdatatime() diff --git a/src/views/Collection/CollectionList.vue b/src/views/Collection/CollectionList.vue index 6d0cb1d7..e3637bd2 100644 --- a/src/views/Collection/CollectionList.vue +++ b/src/views/Collection/CollectionList.vue @@ -246,9 +246,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, stat: 4 }, // 传给组件的数据 diff --git a/src/views/Collection/RecoverVehicleList.vue b/src/views/Collection/RecoverVehicleList.vue index 984935fe..6768d6e0 100644 --- a/src/views/Collection/RecoverVehicleList.vue +++ b/src/views/Collection/RecoverVehicleList.vue @@ -262,9 +262,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyApply.vue b/src/views/Collection/components/MyApply.vue index 716007a5..b7af84b2 100644 --- a/src/views/Collection/components/MyApply.vue +++ b/src/views/Collection/components/MyApply.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyDialog.vue b/src/views/Collection/components/MyDialog.vue index bc1e98cd..e19f7f32 100644 --- a/src/views/Collection/components/MyDialog.vue +++ b/src/views/Collection/components/MyDialog.vue @@ -286,10 +286,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.getdatatime() @@ -301,11 +301,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Collection/components/MyInstallment.vue b/src/views/Collection/components/MyInstallment.vue index acbf3bdc..f3207efd 100644 --- a/src/views/Collection/components/MyInstallment.vue +++ b/src/views/Collection/components/MyInstallment.vue @@ -216,9 +216,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyRequire.vue b/src/views/Collection/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/Collection/components/MyRequire.vue +++ b/src/views/Collection/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/AddCustomerChat.vue b/src/views/CustomerMarketing/AddCustomerChat.vue index 7e090b6b..9a581ee1 100644 --- a/src/views/CustomerMarketing/AddCustomerChat.vue +++ b/src/views/CustomerMarketing/AddCustomerChat.vue @@ -108,9 +108,9 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -147,9 +147,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/CustomerMarketing/AddCustomerVisit.vue b/src/views/CustomerMarketing/AddCustomerVisit.vue index 06291565..fbc2e427 100644 --- a/src/views/CustomerMarketing/AddCustomerVisit.vue +++ b/src/views/CustomerMarketing/AddCustomerVisit.vue @@ -107,9 +107,9 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -160,9 +160,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/CustomerMarketing/CustomerChatList.vue b/src/views/CustomerMarketing/CustomerChatList.vue index be62877b..a1d0360d 100644 --- a/src/views/CustomerMarketing/CustomerChatList.vue +++ b/src/views/CustomerMarketing/CustomerChatList.vue @@ -242,9 +242,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/CustomerVisitList.vue b/src/views/CustomerMarketing/CustomerVisitList.vue index 4648d082..c09ac84a 100644 --- a/src/views/CustomerMarketing/CustomerVisitList.vue +++ b/src/views/CustomerMarketing/CustomerVisitList.vue @@ -237,9 +237,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyApply.vue b/src/views/CustomerMarketing/components/MyApply.vue index 716007a5..b7af84b2 100644 --- a/src/views/CustomerMarketing/components/MyApply.vue +++ b/src/views/CustomerMarketing/components/MyApply.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyDialog.vue b/src/views/CustomerMarketing/components/MyDialog.vue index 097ddde4..f06b7eab 100644 --- a/src/views/CustomerMarketing/components/MyDialog.vue +++ b/src/views/CustomerMarketing/components/MyDialog.vue @@ -162,9 +162,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -172,11 +172,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/CustomerMarketing/components/MyDialog2.vue b/src/views/CustomerMarketing/components/MyDialog2.vue index 02f7250b..3e3ffc65 100644 --- a/src/views/CustomerMarketing/components/MyDialog2.vue +++ b/src/views/CustomerMarketing/components/MyDialog2.vue @@ -176,9 +176,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -187,11 +187,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/CustomerMarketing/components/MyInstallment.vue b/src/views/CustomerMarketing/components/MyInstallment.vue index acbf3bdc..f3207efd 100644 --- a/src/views/CustomerMarketing/components/MyInstallment.vue +++ b/src/views/CustomerMarketing/components/MyInstallment.vue @@ -216,9 +216,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyRequire.vue b/src/views/CustomerMarketing/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/CustomerMarketing/components/MyRequire.vue +++ b/src/views/CustomerMarketing/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/DailyAdjust/AddDailyAdjust.vue b/src/views/DailyAdjust/AddDailyAdjust.vue index 58e5d8c5..e37c7d45 100644 --- a/src/views/DailyAdjust/AddDailyAdjust.vue +++ b/src/views/DailyAdjust/AddDailyAdjust.vue @@ -160,9 +160,9 @@ export default { control: false, // 日常调整信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId2: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId2: this.$store.getters.repositoryId, regionId: 2 }, // 日常调整单规则数据 @@ -309,9 +309,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personId = '' diff --git a/src/views/DailyAdjust/DailyAdjustList.vue b/src/views/DailyAdjust/DailyAdjustList.vue index fa015d5f..6d7ac7cf 100644 --- a/src/views/DailyAdjust/DailyAdjustList.vue +++ b/src/views/DailyAdjust/DailyAdjustList.vue @@ -219,10 +219,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/DailyAdjust/components/DeailList.vue b/src/views/DailyAdjust/components/DeailList.vue index 8484c925..93ab061f 100644 --- a/src/views/DailyAdjust/components/DeailList.vue +++ b/src/views/DailyAdjust/components/DeailList.vue @@ -289,11 +289,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/DailyAdjust/components/MyDialog.vue b/src/views/DailyAdjust/components/MyDialog.vue index 66a403ff..dde74ec0 100644 --- a/src/views/DailyAdjust/components/MyDialog.vue +++ b/src/views/DailyAdjust/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/DailyAdjust/components/MyEdit.vue b/src/views/DailyAdjust/components/MyEdit.vue index ed51d939..6ee12a60 100644 --- a/src/views/DailyAdjust/components/MyEdit.vue +++ b/src/views/DailyAdjust/components/MyEdit.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/DailyAdjust/components/MyOther.vue b/src/views/DailyAdjust/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/DailyAdjust/components/MyOther.vue +++ b/src/views/DailyAdjust/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/EmployeeInformation/NewEmployeeInformation.vue b/src/views/EmployeeInformation/NewEmployeeInformation.vue index 4cb105a5..499ccbbc 100644 --- a/src/views/EmployeeInformation/NewEmployeeInformation.vue +++ b/src/views/EmployeeInformation/NewEmployeeInformation.vue @@ -1,146 +1,210 @@ From 4b81f60dfad059ab7a280e6f31bfaec91c7fb5c0 Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Thu, 16 May 2019 20:31:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/EmployeeInformation.js | 6 + src/api/Repository.js | 6 + src/lang/zh.js | 11 +- src/store/getters.js | 5 +- src/store/modules/user.js | 17 +- .../AccessMaterials/components/MyCreate.vue | 4 +- .../AccessMaterials/components/MyDelivery.vue | 4 +- .../AccessMaterials/components/MyEmp.vue | 4 +- .../components/MyMaterials.vue | 1 + .../components/MyRepository.vue | 3 + .../components/ProduceTask.vue | 1 + src/views/AdjustPrice/components/MyAccept.vue | 4 +- src/views/AdjustPrice/components/MyCreate.vue | 4 +- .../AdjustPrice/components/MyDelivery.vue | 4 +- src/views/AdjustPrice/components/MyEmp.vue | 4 +- .../AdjustPrice/components/MyRepository.vue | 3 + src/views/AdvancePay/components/MyApply.vue | 1 + .../AdvancePay/components/MyDelivery.vue | 4 +- src/views/AdvancePay/components/MyEmp.vue | 4 +- src/views/AdvancePay/components/MyLnquiry.vue | 4 +- src/views/AdvancePay/components/MyOrder.vue | 1 + src/views/AdvancePay/components/MyPlan.vue | 1 + .../Advancemanage/components/MyApply.vue | 1 + .../Advancemanage/components/MyArrival.vue | 1 + .../Advancemanage/components/MyDelivery.vue | 4 +- src/views/Advancemanage/components/MyEmp.vue | 4 +- .../Advancemanage/components/MyLnquiry.vue | 4 +- src/views/Advancemanage/components/MyPlan.vue | 1 + .../Advancemanage/components/MyPresale.vue | 1 + src/views/AgentCollect/components/MyApply.vue | 1 + .../AgentCollect/components/MyDelivery.vue | 4 +- src/views/AgentCollect/components/MyEmp.vue | 4 +- src/views/BasicSettings/components/MyEmp.vue | 4 +- src/views/BuildUp/components/MyAccept.vue | 4 +- src/views/BuildUp/components/MyCreate.vue | 4 +- src/views/BuildUp/components/MyDelivery.vue | 4 +- src/views/BuildUp/components/MyEmp.vue | 4 +- src/views/BuildUp/components/MyRepository.vue | 3 + .../ChangeCount/components/MyDelivery.vue | 4 +- src/views/ChangeCount/components/MyEmp.vue | 4 +- .../ChangeCount/components/MyRepository.vue | 3 + src/views/CheckFail/components/MyAccept.vue | 4 +- src/views/CheckFail/components/MyDelivery.vue | 4 +- src/views/CheckFail/components/MyEmp.vue | 4 +- src/views/CheckFail/components/MyEmp2.vue | 4 +- src/views/CheckReport/components/MyAccept.vue | 4 +- .../CheckReport/components/MyDelivery.vue | 4 +- src/views/CheckReport/components/MyEmp.vue | 2 +- src/views/CheckReport/components/MyEmp2.vue | 4 +- .../CollectList/components/MyDelivery.vue | 4 +- src/views/CollectList/components/MyEmp.vue | 4 +- .../Collection/components/MyDelivery.vue | 4 +- src/views/Collection/components/MyEmp.vue | 4 +- .../Collection/components/MyRepository.vue | 3 + src/views/Customer/components/MyEmp.vue | 4 +- .../components/MyDelivery.vue | 4 +- .../CustomerMarketing/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + src/views/DailyAdjust/components/MyAccept.vue | 4 +- src/views/DailyAdjust/components/MyCreate.vue | 4 +- .../DailyAdjust/components/MyDelivery.vue | 4 +- src/views/DailyAdjust/components/MyEmp.vue | 4 +- .../DailyAdjust/components/MyRepository.vue | 3 + .../EmployeeInformationList.vue | 2 + .../NewEmployeeContract.vue | 4 +- .../components/MyCreate.vue | 4 +- src/views/Expenses/components/MyEmp.vue | 4 +- .../Expenses/components/MyRepository.vue | 3 + .../GroupBuyRules/components/MyDelivery.vue | 4 +- src/views/GroupBuyRules/components/MyEmp.vue | 4 +- .../GroupBuyRules/components/MyRepository.vue | 3 + .../components/MyDelivery.vue | 4 +- .../InstallmentApply/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + .../InstallmentList/components/MyDelivery.vue | 4 +- .../InstallmentList/components/MyEmp.vue | 4 +- .../InventoryCount/components/MyCreate.vue | 4 +- .../InventoryCount/components/MyDriver.vue | 4 +- src/views/InventoryCount/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + .../InventoryOverflow/components/MyAccept.vue | 4 +- .../InventoryOverflow/components/MyCreate.vue | 4 +- .../components/MyDelivery.vue | 4 +- .../InventoryOverflow/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + .../Inventorydamaged/components/MyCreate.vue | 4 +- .../Inventorydamaged/components/MyDriver.vue | 4 +- .../Inventorydamaged/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + src/views/Invoice/components/MyDelivery.vue | 4 +- src/views/Invoice/components/MyEmp.vue | 4 +- .../LogisticsCar/components/MyCreate.vue | 4 +- .../LogisticsCar/components/MyDriver.vue | 4 +- src/views/LogisticsCar/components/MyEmp.vue | 4 +- src/views/LogisticsCar/components/MyOut.vue | 4 +- .../OutFactory/components/MyDelivery.vue | 4 +- .../OutSourcing/components/MyDelivery.vue | 4 +- src/views/PrepReceipt/components/MyEmp.vue | 4 +- .../PrepReceipt/components/MyRepository.vue | 3 + src/views/ProducePlan/components/MyEmp.vue | 4 +- .../ProduceRequire/components/MyDelivery.vue | 4 +- src/views/ProduceRequire/components/MyEmp.vue | 4 +- .../ProduceTask/components/MyDelivery.vue | 4 +- src/views/ProduceTask/components/MyEmp.vue | 4 +- src/views/Product/components/MyEmp.vue | 4 +- .../QualityCheck/components/MyDelivery.vue | 4 +- src/views/QualityCheck/components/MyEmp.vue | 4 +- src/views/Receipt/components/MyDelivery.vue | 4 +- src/views/Receipt/components/MyEmp.vue | 4 +- src/views/Recycling/components/MyEmp.vue | 4 +- .../Recycling/components/MyRepository.vue | 3 + src/views/Repository/NewRepository.vue | 4 +- src/views/Repository/RepositoryList.vue | 6 + src/views/RequirePlan/components/MyEmp.vue | 4 +- .../RequirePlan/components/MyRepository.vue | 3 + src/views/SaleContract/AddSaleContract.vue | 190 ++++++++- .../SaleContract/components/MyDelivery.vue | 4 +- .../SaleContract/components/MyDialog.vue | 163 ++++++- src/views/SaleContract/components/MyEmp.vue | 4 +- .../components/MyInstallmentapply.vue | 401 ++++++++++++++++++ .../SaleOpportunity/components/MyDelivery.vue | 4 +- .../SaleOpportunity/components/MyEmp.vue | 4 +- src/views/SaleOrder/components/MyDelivery.vue | 4 +- src/views/SaleOrder/components/MyEmp.vue | 4 +- src/views/SaleOut/components/MyAccept.vue | 4 +- src/views/SaleOut/components/MyDelivery.vue | 4 +- src/views/SaleOut/components/MyEmp.vue | 4 +- src/views/SaleOut/components/MyRepository.vue | 3 + src/views/SalePlan/components/MyDelivery.vue | 4 +- src/views/SalePlan/components/MyEmp.vue | 4 +- .../SaleReturn/components/MyDelivery.vue | 4 +- src/views/SaleReturn/components/MyEmp.vue | 4 +- .../ShouldPayList/components/MyDelivery.vue | 4 +- src/views/ShouldPayList/components/MyEmp.vue | 4 +- src/views/StockAlarm/components/MyAccept.vue | 4 +- src/views/StockAlarm/components/MyCreate.vue | 4 +- .../StockAlarm/components/MyDelivery.vue | 4 +- src/views/StockAlarm/components/MyEmp.vue | 4 +- .../StockAlarm/components/MyRepository.vue | 3 + src/views/StockApply/components/MyEmp.vue | 4 +- .../StockArrival/components/MyDelivery.vue | 4 +- src/views/StockArrival/components/MyEmp.vue | 2 +- .../StockContract/components/MyDelivery.vue | 4 +- src/views/StockContract/components/MyEmp.vue | 4 +- src/views/StockInquiry/components/MyEmp.vue | 2 +- .../StockOrder/components/MyDelivery.vue | 4 +- src/views/StockOrder/components/MyEmp.vue | 4 +- src/views/StockOut/components/MyAccept.vue | 4 +- src/views/StockOut/components/MyCreate.vue | 2 +- src/views/StockOut/components/MyDelivery.vue | 4 +- src/views/StockOut/components/MyEmp.vue | 4 +- .../StockOut/components/MyRepository.vue | 3 + src/views/StockPlan/components/MyDelivery.vue | 4 +- src/views/StockPlan/components/MyEmp.vue | 4 +- .../StockQuery/components/MyDelivery.vue | 4 +- src/views/StockQuery/components/MyEmp.vue | 4 +- .../StockRetreat/components/MyDelivery.vue | 4 +- src/views/StockRetreat/components/MyEmp.vue | 4 +- .../StockRetreat/components/MyRepository.vue | 3 + src/views/Stockenter/components/MyAccept.vue | 4 +- src/views/Stockenter/components/MyArrival.vue | 1 + src/views/Stockenter/components/MyCreate.vue | 4 +- .../Stockenter/components/MyDelivery.vue | 4 +- src/views/Stockenter/components/MyEmp.vue | 4 +- src/views/Stockenter/components/MyEmp2.vue | 4 +- .../Stockenter/components/MyRepository.vue | 3 + src/views/Storagemove/components/MyAccept.vue | 4 +- src/views/Storagemove/components/MyCreate.vue | 4 +- .../Storagemove/components/MyDelivery.vue | 4 +- src/views/Storagemove/components/MyDepot.vue | 3 + src/views/Storagemove/components/MyEmp.vue | 4 +- .../Storagemove/components/MyRepository.vue | 3 + src/views/Supplier/components/MyEmp.vue | 4 +- src/views/TearDown/components/MyAccept.vue | 4 +- src/views/TearDown/components/MyCreate.vue | 4 +- src/views/TearDown/components/MyDelivery.vue | 4 +- src/views/TearDown/components/MyEmp.vue | 4 +- .../TearDown/components/MyRepository.vue | 3 + src/views/Transfer/components/MyEmp.vue | 4 +- .../Transfer/components/MyRepository.vue | 3 + .../WarehouseAdjust/components/MyAccept.vue | 4 +- .../WarehouseAdjust/components/MyCreate.vue | 4 +- .../WarehouseAdjust/components/MyDelivery.vue | 4 +- .../WarehouseAdjust/components/MyDriver.vue | 4 +- .../WarehouseAdjust/components/MyEmp.vue | 4 +- .../components/MyRepository.vue | 3 + src/views/income/components/MyEmp.vue | 4 +- src/views/income/components/MyRepository.vue | 3 + src/views/payment/components/MyDelivery.vue | 4 +- src/views/payment/components/MyEmp.vue | 4 +- 190 files changed, 1148 insertions(+), 311 deletions(-) create mode 100644 src/views/SaleContract/components/MyInstallmentapply.vue diff --git a/src/api/EmployeeInformation.js b/src/api/EmployeeInformation.js index 7e6a6895..6629cea6 100644 --- a/src/api/EmployeeInformation.js +++ b/src/api/EmployeeInformation.js @@ -163,6 +163,12 @@ export function getemplist(query) { if (query.regionid !== '' && query.regionid !== undefined) { params.append('regionid', query.regionid) // 你要传给后台的参数值 key/value } + if (query.loginRepositoryId !== '' && query.loginRepositoryId !== undefined && query.loginRepositoryId !== null) { + params.append('loginRepositoryId', query.loginRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== undefined && query.regionIds !== null) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } if (query.postid !== '') { params.append('postid', query.postid) // 你要传给后台的参数值 key/value } diff --git a/src/api/Repository.js b/src/api/Repository.js index 31ad3dc8..d08da357 100644 --- a/src/api/Repository.js +++ b/src/api/Repository.js @@ -85,6 +85,12 @@ export function searchRepository2(query) { if (query.iseffective !== '' && query.iseffective !== null && query.iseffective !== undefined) { params.append('iseffective', query.iseffective) // 你要传给后台的参数值 key/value } + if (query.loginRepositoryId !== '' && query.loginRepositoryId !== undefined && query.loginRepositoryId !== null) { + params.append('loginRepositoryId', query.loginRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== undefined && query.regionIds !== null) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } if (query.regionId !== '' && query.regionId !== null && query.regionId !== undefined) { params.append('regionId', query.regionId) // 你要传给后台的参数值 key/value } diff --git a/src/lang/zh.js b/src/lang/zh.js index 931240a4..1f481ec1 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1459,7 +1459,16 @@ export default { contractStat: '合同状态', invoiceType: '开票类型', taxRate: '汇率', - allMoney: '金额' + allMoney: '金额', + installmentCount: '分期期数', + dayOfMonth: '每月还款日期', + installmentAllMoney: '分期总金额', + installmentBegintime: '分期开始时间', + installmentEndtime: '分期结束时间', + notaryPerson: '公证人', + notaryDate: '公证日期', + firstMoney: '首付金额', + eachMoney: '每期还款金额' }, income: { title: '收入单主题', diff --git a/src/store/getters.js b/src/store/getters.js index d87fb699..ccfa1d95 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -19,6 +19,9 @@ const getters = { regionId: state => state.user.regionId, repositoryId: state => state.user.repositoryId, yin: state => state.app.yin, - countryId: state => state.user.countryId + countryId: state => state.user.countryId, + deptId: state => state.user.deptId, + regionName: state => state.user.regionName, + repositoryName: state => state.user.repositoryName } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index fa3cb095..e0ef36c0 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -17,7 +17,10 @@ const user = { userId: '', regionId: '', repositoryId: '', - countryId: '' + countryId: '', + deptId: '', + regionName: '', + repositoryName: '' }, mutations: { @@ -56,6 +59,15 @@ const user = { }, SET_COUNTTRYID: (state, countryId) => { state.countryId = countryId + }, + SET_DEPTID: (state, deptId) => { + state.deptId = deptId + }, + SET_REGIONNAME: (state, regionName) => { + state.regionName = regionName + }, + SET_REPOSITORYNAME: (state, repositoryName) => { + state.repositoryName = repositoryName } }, @@ -99,6 +111,9 @@ const user = { commit('SET_REGIONID', data.regionId) commit('SET_REPOSITORYID', data.repositoryId) commit('SET_COUNTTRYID', data.countryId) + commit('SET_DEPTID', data.deptId) + commit('SET_REGIONNAME', data.regionName) + commit('SET_REPOSITORYNAME', data.repositoryName) resolve(response) }).catch(error => { reject(error) diff --git a/src/views/AccessMaterials/components/MyCreate.vue b/src/views/AccessMaterials/components/MyCreate.vue index fa841bf1..fc706e4f 100644 --- a/src/views/AccessMaterials/components/MyCreate.vue +++ b/src/views/AccessMaterials/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyDelivery.vue b/src/views/AccessMaterials/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AccessMaterials/components/MyDelivery.vue +++ b/src/views/AccessMaterials/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyEmp.vue b/src/views/AccessMaterials/components/MyEmp.vue index 68a77b96..85a50ee5 100644 --- a/src/views/AccessMaterials/components/MyEmp.vue +++ b/src/views/AccessMaterials/components/MyEmp.vue @@ -183,7 +183,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -304,7 +304,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyMaterials.vue b/src/views/AccessMaterials/components/MyMaterials.vue index 01366e06..9cb126c7 100644 --- a/src/views/AccessMaterials/components/MyMaterials.vue +++ b/src/views/AccessMaterials/components/MyMaterials.vue @@ -238,6 +238,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AccessMaterials/components/MyRepository.vue b/src/views/AccessMaterials/components/MyRepository.vue index 0eab9f54..bf2d0bb3 100644 --- a/src/views/AccessMaterials/components/MyRepository.vue +++ b/src/views/AccessMaterials/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/AccessMaterials/components/ProduceTask.vue b/src/views/AccessMaterials/components/ProduceTask.vue index 9b24ccb1..6220c9ad 100644 --- a/src/views/AccessMaterials/components/ProduceTask.vue +++ b/src/views/AccessMaterials/components/ProduceTask.vue @@ -219,6 +219,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdjustPrice/components/MyAccept.vue b/src/views/AdjustPrice/components/MyAccept.vue index 1d6bd1a0..f1bea415 100644 --- a/src/views/AdjustPrice/components/MyAccept.vue +++ b/src/views/AdjustPrice/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyCreate.vue b/src/views/AdjustPrice/components/MyCreate.vue index 91ba3aa7..7b11b81c 100644 --- a/src/views/AdjustPrice/components/MyCreate.vue +++ b/src/views/AdjustPrice/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyDelivery.vue b/src/views/AdjustPrice/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/AdjustPrice/components/MyDelivery.vue +++ b/src/views/AdjustPrice/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyEmp.vue b/src/views/AdjustPrice/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/AdjustPrice/components/MyEmp.vue +++ b/src/views/AdjustPrice/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyRepository.vue b/src/views/AdjustPrice/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/AdjustPrice/components/MyRepository.vue +++ b/src/views/AdjustPrice/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/AdvancePay/components/MyApply.vue b/src/views/AdvancePay/components/MyApply.vue index 7568572b..cbfacd97 100644 --- a/src/views/AdvancePay/components/MyApply.vue +++ b/src/views/AdvancePay/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdvancePay/components/MyDelivery.vue b/src/views/AdvancePay/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AdvancePay/components/MyDelivery.vue +++ b/src/views/AdvancePay/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdvancePay/components/MyEmp.vue b/src/views/AdvancePay/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/AdvancePay/components/MyEmp.vue +++ b/src/views/AdvancePay/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdvancePay/components/MyLnquiry.vue b/src/views/AdvancePay/components/MyLnquiry.vue index de2a778d..57b77c78 100644 --- a/src/views/AdvancePay/components/MyLnquiry.vue +++ b/src/views/AdvancePay/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyOrder.vue b/src/views/AdvancePay/components/MyOrder.vue index 1a1cf348..85217e23 100644 --- a/src/views/AdvancePay/components/MyOrder.vue +++ b/src/views/AdvancePay/components/MyOrder.vue @@ -245,6 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdvancePay/components/MyPlan.vue b/src/views/AdvancePay/components/MyPlan.vue index 90ec1b6c..7ce7141e 100644 --- a/src/views/AdvancePay/components/MyPlan.vue +++ b/src/views/AdvancePay/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyApply.vue b/src/views/Advancemanage/components/MyApply.vue index 7568572b..cbfacd97 100644 --- a/src/views/Advancemanage/components/MyApply.vue +++ b/src/views/Advancemanage/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyArrival.vue b/src/views/Advancemanage/components/MyArrival.vue index c815694e..9d4b9bf1 100644 --- a/src/views/Advancemanage/components/MyArrival.vue +++ b/src/views/Advancemanage/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyDelivery.vue b/src/views/Advancemanage/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Advancemanage/components/MyDelivery.vue +++ b/src/views/Advancemanage/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Advancemanage/components/MyEmp.vue b/src/views/Advancemanage/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Advancemanage/components/MyEmp.vue +++ b/src/views/Advancemanage/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Advancemanage/components/MyLnquiry.vue b/src/views/Advancemanage/components/MyLnquiry.vue index de2a778d..57b77c78 100644 --- a/src/views/Advancemanage/components/MyLnquiry.vue +++ b/src/views/Advancemanage/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyPlan.vue b/src/views/Advancemanage/components/MyPlan.vue index 90ec1b6c..7ce7141e 100644 --- a/src/views/Advancemanage/components/MyPlan.vue +++ b/src/views/Advancemanage/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyPresale.vue b/src/views/Advancemanage/components/MyPresale.vue index e62f72d6..f6b18be1 100644 --- a/src/views/Advancemanage/components/MyPresale.vue +++ b/src/views/Advancemanage/components/MyPresale.vue @@ -227,6 +227,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AgentCollect/components/MyApply.vue b/src/views/AgentCollect/components/MyApply.vue index b7af84b2..4be46baf 100644 --- a/src/views/AgentCollect/components/MyApply.vue +++ b/src/views/AgentCollect/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AgentCollect/components/MyDelivery.vue b/src/views/AgentCollect/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AgentCollect/components/MyDelivery.vue +++ b/src/views/AgentCollect/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AgentCollect/components/MyEmp.vue b/src/views/AgentCollect/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/AgentCollect/components/MyEmp.vue +++ b/src/views/AgentCollect/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BasicSettings/components/MyEmp.vue b/src/views/BasicSettings/components/MyEmp.vue index ad36b0c8..b63e477e 100644 --- a/src/views/BasicSettings/components/MyEmp.vue +++ b/src/views/BasicSettings/components/MyEmp.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyAccept.vue b/src/views/BuildUp/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/BuildUp/components/MyAccept.vue +++ b/src/views/BuildUp/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyCreate.vue b/src/views/BuildUp/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/BuildUp/components/MyCreate.vue +++ b/src/views/BuildUp/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyDelivery.vue b/src/views/BuildUp/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/BuildUp/components/MyDelivery.vue +++ b/src/views/BuildUp/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyEmp.vue b/src/views/BuildUp/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/BuildUp/components/MyEmp.vue +++ b/src/views/BuildUp/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyRepository.vue b/src/views/BuildUp/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/BuildUp/components/MyRepository.vue +++ b/src/views/BuildUp/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/ChangeCount/components/MyDelivery.vue b/src/views/ChangeCount/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ChangeCount/components/MyDelivery.vue +++ b/src/views/ChangeCount/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ChangeCount/components/MyEmp.vue b/src/views/ChangeCount/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ChangeCount/components/MyEmp.vue +++ b/src/views/ChangeCount/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ChangeCount/components/MyRepository.vue b/src/views/ChangeCount/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/ChangeCount/components/MyRepository.vue +++ b/src/views/ChangeCount/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/CheckFail/components/MyAccept.vue b/src/views/CheckFail/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/CheckFail/components/MyAccept.vue +++ b/src/views/CheckFail/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyDelivery.vue b/src/views/CheckFail/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CheckFail/components/MyDelivery.vue +++ b/src/views/CheckFail/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyEmp.vue b/src/views/CheckFail/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CheckFail/components/MyEmp.vue +++ b/src/views/CheckFail/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyEmp2.vue b/src/views/CheckFail/components/MyEmp2.vue index 29b1058d..1d250784 100644 --- a/src/views/CheckFail/components/MyEmp2.vue +++ b/src/views/CheckFail/components/MyEmp2.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyAccept.vue b/src/views/CheckReport/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/CheckReport/components/MyAccept.vue +++ b/src/views/CheckReport/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyDelivery.vue b/src/views/CheckReport/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CheckReport/components/MyDelivery.vue +++ b/src/views/CheckReport/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyEmp.vue b/src/views/CheckReport/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/CheckReport/components/MyEmp.vue +++ b/src/views/CheckReport/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/CheckReport/components/MyEmp2.vue b/src/views/CheckReport/components/MyEmp2.vue index 29b1058d..1d250784 100644 --- a/src/views/CheckReport/components/MyEmp2.vue +++ b/src/views/CheckReport/components/MyEmp2.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CollectList/components/MyDelivery.vue b/src/views/CollectList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CollectList/components/MyDelivery.vue +++ b/src/views/CollectList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CollectList/components/MyEmp.vue b/src/views/CollectList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CollectList/components/MyEmp.vue +++ b/src/views/CollectList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Collection/components/MyDelivery.vue b/src/views/Collection/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Collection/components/MyDelivery.vue +++ b/src/views/Collection/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Collection/components/MyEmp.vue b/src/views/Collection/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Collection/components/MyEmp.vue +++ b/src/views/Collection/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Collection/components/MyRepository.vue b/src/views/Collection/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Collection/components/MyRepository.vue +++ b/src/views/Collection/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Customer/components/MyEmp.vue b/src/views/Customer/components/MyEmp.vue index 71c27ab1..fdd84944 100644 --- a/src/views/Customer/components/MyEmp.vue +++ b/src/views/Customer/components/MyEmp.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -265,7 +265,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/components/MyDelivery.vue b/src/views/CustomerMarketing/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CustomerMarketing/components/MyDelivery.vue +++ b/src/views/CustomerMarketing/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/components/MyEmp.vue b/src/views/CustomerMarketing/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CustomerMarketing/components/MyEmp.vue +++ b/src/views/CustomerMarketing/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/components/MyRepository.vue b/src/views/CustomerMarketing/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/CustomerMarketing/components/MyRepository.vue +++ b/src/views/CustomerMarketing/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/DailyAdjust/components/MyAccept.vue b/src/views/DailyAdjust/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/DailyAdjust/components/MyAccept.vue +++ b/src/views/DailyAdjust/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyCreate.vue b/src/views/DailyAdjust/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/DailyAdjust/components/MyCreate.vue +++ b/src/views/DailyAdjust/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyDelivery.vue b/src/views/DailyAdjust/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/DailyAdjust/components/MyDelivery.vue +++ b/src/views/DailyAdjust/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyEmp.vue b/src/views/DailyAdjust/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/DailyAdjust/components/MyEmp.vue +++ b/src/views/DailyAdjust/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyRepository.vue b/src/views/DailyAdjust/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/DailyAdjust/components/MyRepository.vue +++ b/src/views/DailyAdjust/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/EmployeeInformation/EmployeeInformationList.vue b/src/views/EmployeeInformation/EmployeeInformationList.vue index 19760e4b..1c2e509f 100644 --- a/src/views/EmployeeInformation/EmployeeInformationList.vue +++ b/src/views/EmployeeInformation/EmployeeInformationList.vue @@ -239,6 +239,8 @@ export default { employeename: '', pagenum: 1, pagesize: 10, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, stat: '', time: '', jobnumber: '' diff --git a/src/views/EmployeeInformation/NewEmployeeContract.vue b/src/views/EmployeeInformation/NewEmployeeContract.vue index 7b4eec79..e4d7aca0 100644 --- a/src/views/EmployeeInformation/NewEmployeeContract.vue +++ b/src/views/EmployeeInformation/NewEmployeeContract.vue @@ -261,7 +261,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -417,7 +417,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/EmployeeInformation/components/MyCreate.vue b/src/views/EmployeeInformation/components/MyCreate.vue index 45a2b64d..144dd568 100644 --- a/src/views/EmployeeInformation/components/MyCreate.vue +++ b/src/views/EmployeeInformation/components/MyCreate.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -264,7 +264,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Expenses/components/MyEmp.vue b/src/views/Expenses/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Expenses/components/MyEmp.vue +++ b/src/views/Expenses/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Expenses/components/MyRepository.vue b/src/views/Expenses/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Expenses/components/MyRepository.vue +++ b/src/views/Expenses/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/GroupBuyRules/components/MyDelivery.vue b/src/views/GroupBuyRules/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/GroupBuyRules/components/MyDelivery.vue +++ b/src/views/GroupBuyRules/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/GroupBuyRules/components/MyEmp.vue b/src/views/GroupBuyRules/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/GroupBuyRules/components/MyEmp.vue +++ b/src/views/GroupBuyRules/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/GroupBuyRules/components/MyRepository.vue b/src/views/GroupBuyRules/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/GroupBuyRules/components/MyRepository.vue +++ b/src/views/GroupBuyRules/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/InstallmentApply/components/MyDelivery.vue b/src/views/InstallmentApply/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/InstallmentApply/components/MyDelivery.vue +++ b/src/views/InstallmentApply/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentApply/components/MyEmp.vue b/src/views/InstallmentApply/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/InstallmentApply/components/MyEmp.vue +++ b/src/views/InstallmentApply/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentApply/components/MyRepository.vue b/src/views/InstallmentApply/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/InstallmentApply/components/MyRepository.vue +++ b/src/views/InstallmentApply/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/InstallmentList/components/MyDelivery.vue b/src/views/InstallmentList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/InstallmentList/components/MyDelivery.vue +++ b/src/views/InstallmentList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentList/components/MyEmp.vue b/src/views/InstallmentList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/InstallmentList/components/MyEmp.vue +++ b/src/views/InstallmentList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyCreate.vue b/src/views/InventoryCount/components/MyCreate.vue index 187fb6a6..190bda11 100644 --- a/src/views/InventoryCount/components/MyCreate.vue +++ b/src/views/InventoryCount/components/MyCreate.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyDriver.vue b/src/views/InventoryCount/components/MyDriver.vue index 1d93b4b9..43447fa6 100644 --- a/src/views/InventoryCount/components/MyDriver.vue +++ b/src/views/InventoryCount/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -284,7 +284,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyEmp.vue b/src/views/InventoryCount/components/MyEmp.vue index 700a36b0..e91c4250 100644 --- a/src/views/InventoryCount/components/MyEmp.vue +++ b/src/views/InventoryCount/components/MyEmp.vue @@ -166,7 +166,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -274,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyRepository.vue b/src/views/InventoryCount/components/MyRepository.vue index 2557ab10..e4a7fb51 100644 --- a/src/views/InventoryCount/components/MyRepository.vue +++ b/src/views/InventoryCount/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/InventoryOverflow/components/MyAccept.vue b/src/views/InventoryOverflow/components/MyAccept.vue index 1d6bd1a0..f1bea415 100644 --- a/src/views/InventoryOverflow/components/MyAccept.vue +++ b/src/views/InventoryOverflow/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyCreate.vue b/src/views/InventoryOverflow/components/MyCreate.vue index 455f5f08..df9b0338 100644 --- a/src/views/InventoryOverflow/components/MyCreate.vue +++ b/src/views/InventoryOverflow/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyDelivery.vue b/src/views/InventoryOverflow/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/InventoryOverflow/components/MyDelivery.vue +++ b/src/views/InventoryOverflow/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyEmp.vue b/src/views/InventoryOverflow/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/InventoryOverflow/components/MyEmp.vue +++ b/src/views/InventoryOverflow/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyRepository.vue b/src/views/InventoryOverflow/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/InventoryOverflow/components/MyRepository.vue +++ b/src/views/InventoryOverflow/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Inventorydamaged/components/MyCreate.vue b/src/views/Inventorydamaged/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/Inventorydamaged/components/MyCreate.vue +++ b/src/views/Inventorydamaged/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyDriver.vue b/src/views/Inventorydamaged/components/MyDriver.vue index 2457c9da..d9d8ea4f 100644 --- a/src/views/Inventorydamaged/components/MyDriver.vue +++ b/src/views/Inventorydamaged/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyEmp.vue b/src/views/Inventorydamaged/components/MyEmp.vue index 700a36b0..e91c4250 100644 --- a/src/views/Inventorydamaged/components/MyEmp.vue +++ b/src/views/Inventorydamaged/components/MyEmp.vue @@ -166,7 +166,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -274,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyRepository.vue b/src/views/Inventorydamaged/components/MyRepository.vue index dd9e8986..bfae6e43 100644 --- a/src/views/Inventorydamaged/components/MyRepository.vue +++ b/src/views/Inventorydamaged/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Invoice/components/MyDelivery.vue b/src/views/Invoice/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Invoice/components/MyDelivery.vue +++ b/src/views/Invoice/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Invoice/components/MyEmp.vue b/src/views/Invoice/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Invoice/components/MyEmp.vue +++ b/src/views/Invoice/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyCreate.vue b/src/views/LogisticsCar/components/MyCreate.vue index 46880f5f..cf95e4bf 100644 --- a/src/views/LogisticsCar/components/MyCreate.vue +++ b/src/views/LogisticsCar/components/MyCreate.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyDriver.vue b/src/views/LogisticsCar/components/MyDriver.vue index 009d2d79..e0993ec9 100644 --- a/src/views/LogisticsCar/components/MyDriver.vue +++ b/src/views/LogisticsCar/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -264,7 +264,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyEmp.vue b/src/views/LogisticsCar/components/MyEmp.vue index 55ca6f0e..738fe8b3 100644 --- a/src/views/LogisticsCar/components/MyEmp.vue +++ b/src/views/LogisticsCar/components/MyEmp.vue @@ -177,7 +177,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -293,7 +293,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyOut.vue b/src/views/LogisticsCar/components/MyOut.vue index 089aeb63..1a1433fb 100644 --- a/src/views/LogisticsCar/components/MyOut.vue +++ b/src/views/LogisticsCar/components/MyOut.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/OutFactory/components/MyDelivery.vue b/src/views/OutFactory/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/OutFactory/components/MyDelivery.vue +++ b/src/views/OutFactory/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/OutSourcing/components/MyDelivery.vue b/src/views/OutSourcing/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/OutSourcing/components/MyDelivery.vue +++ b/src/views/OutSourcing/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/PrepReceipt/components/MyEmp.vue b/src/views/PrepReceipt/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/PrepReceipt/components/MyEmp.vue +++ b/src/views/PrepReceipt/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/PrepReceipt/components/MyRepository.vue b/src/views/PrepReceipt/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/PrepReceipt/components/MyRepository.vue +++ b/src/views/PrepReceipt/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/ProducePlan/components/MyEmp.vue b/src/views/ProducePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ProducePlan/components/MyEmp.vue +++ b/src/views/ProducePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceRequire/components/MyDelivery.vue b/src/views/ProduceRequire/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ProduceRequire/components/MyDelivery.vue +++ b/src/views/ProduceRequire/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceRequire/components/MyEmp.vue b/src/views/ProduceRequire/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ProduceRequire/components/MyEmp.vue +++ b/src/views/ProduceRequire/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceTask/components/MyDelivery.vue b/src/views/ProduceTask/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ProduceTask/components/MyDelivery.vue +++ b/src/views/ProduceTask/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceTask/components/MyEmp.vue b/src/views/ProduceTask/components/MyEmp.vue index 68a77b96..85a50ee5 100644 --- a/src/views/ProduceTask/components/MyEmp.vue +++ b/src/views/ProduceTask/components/MyEmp.vue @@ -183,7 +183,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -304,7 +304,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Product/components/MyEmp.vue b/src/views/Product/components/MyEmp.vue index 8487db95..6a196311 100644 --- a/src/views/Product/components/MyEmp.vue +++ b/src/views/Product/components/MyEmp.vue @@ -159,7 +159,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -264,7 +264,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/QualityCheck/components/MyDelivery.vue b/src/views/QualityCheck/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/QualityCheck/components/MyDelivery.vue +++ b/src/views/QualityCheck/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/QualityCheck/components/MyEmp.vue b/src/views/QualityCheck/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/QualityCheck/components/MyEmp.vue +++ b/src/views/QualityCheck/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Receipt/components/MyDelivery.vue b/src/views/Receipt/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Receipt/components/MyDelivery.vue +++ b/src/views/Receipt/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Receipt/components/MyEmp.vue b/src/views/Receipt/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Receipt/components/MyEmp.vue +++ b/src/views/Receipt/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Recycling/components/MyEmp.vue b/src/views/Recycling/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Recycling/components/MyEmp.vue +++ b/src/views/Recycling/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Recycling/components/MyRepository.vue b/src/views/Recycling/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Recycling/components/MyRepository.vue +++ b/src/views/Recycling/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Repository/NewRepository.vue b/src/views/Repository/NewRepository.vue index 49261fb1..6a50f32a 100644 --- a/src/views/Repository/NewRepository.vue +++ b/src/views/Repository/NewRepository.vue @@ -427,7 +427,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -664,7 +664,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Repository/RepositoryList.vue b/src/views/Repository/RepositoryList.vue index 6b3bbaa8..0e1e98e1 100644 --- a/src/views/Repository/RepositoryList.vue +++ b/src/views/Repository/RepositoryList.vue @@ -495,6 +495,8 @@ export default { iseffective: '', regionId: '', countyrId: '', + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, id: '', pagenum: 1, pagesize: 10 @@ -567,6 +569,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -941,6 +945,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/RequirePlan/components/MyEmp.vue b/src/views/RequirePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/RequirePlan/components/MyEmp.vue +++ b/src/views/RequirePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/RequirePlan/components/MyRepository.vue b/src/views/RequirePlan/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/RequirePlan/components/MyRepository.vue +++ b/src/views/RequirePlan/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/SaleContract/AddSaleContract.vue b/src/views/SaleContract/AddSaleContract.vue index 7e72796d..957199e0 100644 --- a/src/views/SaleContract/AddSaleContract.vue +++ b/src/views/SaleContract/AddSaleContract.vue @@ -25,10 +25,12 @@ + - + + @@ -38,7 +40,7 @@ - + @@ -92,7 +94,7 @@ - + @@ -128,6 +130,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,9 +308,11 @@ import MyApply from './components/MyApply' import MyPlan from './components/MyPlan' import MyDelivery from './components/MyDelivery' import MyOpportunity from './components/MyOpportunity' +import MyInstallmentapply from './components/MyInstallmentapply' +import MyCustomer from '../SaleOpportunity/components/MyCustomer' export default { name: 'AddSaleContract', - components: { MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, + components: { MyCustomer, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, data() { const validatePass = (rule, value, callback) => { console.log(this.supplierId) @@ -271,6 +339,31 @@ export default { } } return { + pickerOptions0: { + disabledDate: (time) => { + if (this.personalForm.installmentEndtime !== null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } else if (this.personalForm.installmentEndtime === null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } + } + }, + pickerOptions1: { + disabledDate: (time) => { + return time.getTime() < new Date(this.personalForm.installmentBegintime).getTime() - 8.64e7 + } + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() < new Date().getTime() - 8.64e7 + } + }, + // 是否可以编辑分期数据 + isinstallappley: false, + // 回显客户 + customerId: '', + // 控制客户弹窗 + customercontrol: false, // 合计数据 allNumber: '', allMoney: '', @@ -278,6 +371,8 @@ export default { allIncludeTaxMoney: '', allDiscountMoney: '', allMoneyMoveDiscount: '', + // 分期申请 + installappleycontrol: false, // 交货方式 giveIds: [], // 运送方式 @@ -302,8 +397,10 @@ export default { choosedata: [], // 部门数据 depts: [], + // 销售门店 + saleRepositoryId: this.$store.getters.repositoryName, // 业务员回显 - salePersonId: '', + salePersonId: this.$store.getters.name, // 控制业务员 stockControl: false, // 类别数据 @@ -321,7 +418,13 @@ export default { countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionId: this.$store.getters.regionId, - isVat: 1 + salePersonId: this.$store.getters.userId, + isVat: 1, + installmentEndtime: null, + installmentBegintime: null, + notaryDate: null, + deptId: this.$store.getters.deptId, + saleRepositoryId: this.$store.getters.repositoryId }, // 采购申请单规则数据 personalrules: { @@ -359,9 +462,23 @@ export default { this.getways() }, methods: { + // 选择客户focus + chooseCustomer() { + this.customercontrol = true + }, + customerdata(val) { + this.personalForm.customerId = val.id + this.customerId = val.customerName + this.personalForm.customerPhone = val.phoneNumber + }, + clearfinal() { + this.personalForm.installmentEndtime = null + }, chooseData() { if (this.personalForm.sourceType === '1') { this.opportunitycontrol = true + } else if (this.personalForm.sourceType === '2') { + this.installappleycontrol = true } }, // 总计 @@ -484,8 +601,14 @@ export default { console.log(this.personalForm.sourceType) if (this.personalForm.sourceType === '1') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = true } else if (this.personalForm.sourceType === '2') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = false } }, // 从源单中添加商品 @@ -501,6 +624,7 @@ export default { // 从销售机会过来的源单数据 opportunityDetail(val) { console.log(val) + this.$refs.editable.clear() const nowlistdata = this.$refs.editable.getRecords() for (let i = 0; i < val.length; i++) { for (let j = 0; j < nowlistdata.length; j++) { @@ -518,11 +642,31 @@ export default { }, opportunity(val) { this.personalForm.sourceNumber = val.opportunityNumber - this.personalForm.customerName = val.customerName - this.personalForm.customerPhone = val.customerPhone this.personalForm.salePersonId = val.handlePersonId this.salePersonId = val.handlePersonName }, + installappleyDetail(val) { + console.log(val) + this.$refs.editable.clear() + const nowlistdata = this.$refs.editable.getRecords() + for (let i = 0; i < val.length; i++) { + for (let j = 0; j < nowlistdata.length; j++) { + if (val[i].sourceNumber === nowlistdata[j].sourceNumber) { + this.$notify.error({ + title: '错误', + message: '物品已添加', + offset: 100 + }) + return false + } + } + this.$refs.editable.insert(val[i]) + } + }, + installappley(val) { + this.personalForm.sourceNumber = val.applyNumber + this.personalForm.installmentCount = val.installmentCount + }, // 更新类型 updatecountry() { this.getTypes() @@ -557,8 +701,12 @@ export default { }, // 业务员回显 stockName(val) { + console.log(val) this.salePersonId = val.personName this.personalForm.salePersonId = val.id + this.personalForm.deptId = val.deptId + this.personalForm.saleRepositoryId = val.repositoryId + this.saleRepositoryId = val.repositoryName }, // 我方签约人foucs事件触发 handlechooseDelivery() { @@ -597,12 +745,19 @@ export default { countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionId: this.$store.getters.regionId, - isVat: 1 + salePersonId: this.$store.getters.userId, + isVat: 1, + installmentEndtime: null, + installmentBegintime: null, + notaryDate: null, + deptId: this.$store.getters.deptId, + saleRepositoryId: this.$store.getters.repositoryId } this.supplierId = null this.inquiryPersonId = null this.stockPersonId = null this.ourContractorId = null + this.isinstallappley = false }, // 保存操作 handlesave() { @@ -649,11 +804,11 @@ export default { if (elem.taxRate !== null || elem.taxRate !== '' || elem.taxRate !== undefined) { elem.taxRate = elem.taxRate / 100 } - if (elem.discountRate === null || elem.discountRate === '' || elem.discountRate === undefined) { - delete elem.discountRate + if (elem.discount === null || elem.discount === '' || elem.discount === undefined) { + delete elem.discount } - if (elem.discountRate !== null || elem.discountRate !== '' || elem.discountRate !== undefined) { - elem.discountRate = elem.discountRate / 100 + if (elem.discount !== null || elem.discount !== '' || elem.discount !== undefined) { + elem.discount = elem.discount / 100 } if (elem.money === null || elem.money === '' || elem.money === undefined) { delete elem.money @@ -724,9 +879,13 @@ export default { } - diff --git a/src/views/SaleContract/components/MyDelivery.vue b/src/views/SaleContract/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleContract/components/MyDelivery.vue +++ b/src/views/SaleContract/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleContract/components/MyDialog.vue b/src/views/SaleContract/components/MyDialog.vue index cb4942e7..f4ab1542 100644 --- a/src/views/SaleContract/components/MyDialog.vue +++ b/src/views/SaleContract/components/MyDialog.vue @@ -24,10 +24,12 @@ + - + + @@ -37,7 +39,7 @@ - + @@ -91,7 +93,7 @@ - + @@ -127,6 +129,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,8 +302,10 @@ import MyApply from './MyApply' import MyPlan from './MyPlan' import MyDelivery from './MyDelivery' import MyOpportunity from './MyOpportunity' +import MyInstallmentapply from './MyInstallmentapply' +import MyCustomer from '../../SaleOpportunity/components/MyCustomer' export default { - components: { MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, + components: { MyCustomer, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, props: { editcontrol: { type: Boolean, @@ -279,6 +342,37 @@ export default { } } return { + pickerOptions0: { + disabledDate: (time) => { + if (this.personalForm.installmentEndtime !== null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } else if (this.personalForm.installmentEndtime === null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } + } + }, + pickerOptions1: { + disabledDate: (time) => { + return time.getTime() < new Date(this.personalForm.installmentBegintime).getTime() - 8.64e7 + } + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() < new Date().getTime() - 8.64e7 + } + }, + // 是否可以编辑分期数据 + isinstallappley: false, + // 回显客户 + customerId: '', + // 控制客户弹窗 + customercontrol: false, + // 分期申请 + installappleycontrol: false, + // 销售门店 + saleRepositoryId: this.$store.getters.repositoryName, + // 业务员回显 + salePersonId: this.$store.getters.name, // 选择的数据 choosedata: [], // 弹窗组件的控制 @@ -314,8 +408,6 @@ export default { empcontrol: false, // 部门数据 depts: [], - // 业务员回显 - salePersonId: '', // 控制业务员 stockControl: false, // 类别数据 @@ -375,9 +467,23 @@ export default { this.getways() }, methods: { + // 选择客户focus + chooseCustomer() { + this.customercontrol = true + }, + customerdata(val) { + this.personalForm.customerId = val.id + this.customerId = val.customerName + this.personalForm.customerPhone = val.phoneNumber + }, + clearfinal() { + this.personalForm.installmentEndtime = null + }, chooseData() { if (this.personalForm.sourceType === '1') { this.opportunitycontrol = true + } else if (this.personalForm.sourceType === '2') { + this.installappleycontrol = true } }, // 总计 @@ -500,8 +606,14 @@ export default { console.log(this.personalForm.sourceType) if (this.personalForm.sourceType === '1') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = true } else if (this.personalForm.sourceType === '2') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = false } }, // 从源单中添加商品 @@ -517,6 +629,7 @@ export default { // 从销售机会过来的源单数据 opportunityDetail(val) { console.log(val) + this.$refs.editable.clear() const nowlistdata = this.$refs.editable.getRecords() for (let i = 0; i < val.length; i++) { for (let j = 0; j < nowlistdata.length; j++) { @@ -534,11 +647,31 @@ export default { }, opportunity(val) { this.personalForm.sourceNumber = val.opportunityNumber - this.personalForm.customerName = val.customerName - this.personalForm.customerPhone = val.customerPhone this.personalForm.salePersonId = val.handlePersonId this.salePersonId = val.handlePersonName }, + installappleyDetail(val) { + console.log(val) + this.$refs.editable.clear() + const nowlistdata = this.$refs.editable.getRecords() + for (let i = 0; i < val.length; i++) { + for (let j = 0; j < nowlistdata.length; j++) { + if (val[i].sourceNumber === nowlistdata[j].sourceNumber) { + this.$notify.error({ + title: '错误', + message: '物品已添加', + offset: 100 + }) + return false + } + } + this.$refs.editable.insert(val[i]) + } + }, + installappley(val) { + this.personalForm.sourceNumber = val.applyNumber + this.personalForm.installmentCount = val.installmentCount + }, // 更新类型 updatecountry() { this.getTypes() @@ -573,8 +706,12 @@ export default { }, // 业务员回显 stockName(val) { + console.log(val) this.salePersonId = val.personName this.personalForm.salePersonId = val.id + this.personalForm.deptId = val.deptId + this.personalForm.saleRepositoryId = val.repositoryId + this.saleRepositoryId = val.repositoryName }, // 我方签约人foucs事件触发 handlechooseDelivery() { @@ -671,11 +808,11 @@ export default { if (elem.taxRate !== null || elem.taxRate !== '' || elem.taxRate !== undefined) { elem.taxRate = elem.taxRate / 100 } - if (elem.discountRate === null || elem.discountRate === '' || elem.discountRate === undefined) { - delete elem.discountRate + if (elem.discount === null || elem.discount === '' || elem.discount === undefined) { + delete elem.discount } - if (elem.discountRate !== null || elem.discountRate !== '' || elem.discountRate !== undefined) { - elem.discountRate = elem.discountRate / 100 + if (elem.discount !== null || elem.discount !== '' || elem.discount !== undefined) { + elem.discount = elem.discount / 100 } if (elem.money === null || elem.money === '' || elem.money === undefined) { delete elem.money @@ -736,7 +873,7 @@ export default { } - diff --git a/src/views/SaleOpportunity/components/MyDelivery.vue b/src/views/SaleOpportunity/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOpportunity/components/MyDelivery.vue +++ b/src/views/SaleOpportunity/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOpportunity/components/MyEmp.vue b/src/views/SaleOpportunity/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOpportunity/components/MyEmp.vue +++ b/src/views/SaleOpportunity/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOrder/components/MyDelivery.vue b/src/views/SaleOrder/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOrder/components/MyDelivery.vue +++ b/src/views/SaleOrder/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOrder/components/MyEmp.vue b/src/views/SaleOrder/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOrder/components/MyEmp.vue +++ b/src/views/SaleOrder/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyAccept.vue b/src/views/SaleOut/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/SaleOut/components/MyAccept.vue +++ b/src/views/SaleOut/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyDelivery.vue b/src/views/SaleOut/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOut/components/MyDelivery.vue +++ b/src/views/SaleOut/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyEmp.vue b/src/views/SaleOut/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOut/components/MyEmp.vue +++ b/src/views/SaleOut/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyRepository.vue b/src/views/SaleOut/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/SaleOut/components/MyRepository.vue +++ b/src/views/SaleOut/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/SalePlan/components/MyDelivery.vue b/src/views/SalePlan/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SalePlan/components/MyDelivery.vue +++ b/src/views/SalePlan/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SalePlan/components/MyEmp.vue b/src/views/SalePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SalePlan/components/MyEmp.vue +++ b/src/views/SalePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleReturn/components/MyDelivery.vue b/src/views/SaleReturn/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleReturn/components/MyDelivery.vue +++ b/src/views/SaleReturn/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleReturn/components/MyEmp.vue b/src/views/SaleReturn/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleReturn/components/MyEmp.vue +++ b/src/views/SaleReturn/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ShouldPayList/components/MyDelivery.vue b/src/views/ShouldPayList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ShouldPayList/components/MyDelivery.vue +++ b/src/views/ShouldPayList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ShouldPayList/components/MyEmp.vue b/src/views/ShouldPayList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ShouldPayList/components/MyEmp.vue +++ b/src/views/ShouldPayList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyAccept.vue b/src/views/StockAlarm/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/StockAlarm/components/MyAccept.vue +++ b/src/views/StockAlarm/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyCreate.vue b/src/views/StockAlarm/components/MyCreate.vue index 1561e346..0599dfcc 100644 --- a/src/views/StockAlarm/components/MyCreate.vue +++ b/src/views/StockAlarm/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyDelivery.vue b/src/views/StockAlarm/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/StockAlarm/components/MyDelivery.vue +++ b/src/views/StockAlarm/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyEmp.vue b/src/views/StockAlarm/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/StockAlarm/components/MyEmp.vue +++ b/src/views/StockAlarm/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyRepository.vue b/src/views/StockAlarm/components/MyRepository.vue index 83d4d5a0..3e80fc55 100644 --- a/src/views/StockAlarm/components/MyRepository.vue +++ b/src/views/StockAlarm/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/StockApply/components/MyEmp.vue b/src/views/StockApply/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockApply/components/MyEmp.vue +++ b/src/views/StockApply/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockArrival/components/MyDelivery.vue b/src/views/StockArrival/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockArrival/components/MyDelivery.vue +++ b/src/views/StockArrival/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockArrival/components/MyEmp.vue b/src/views/StockArrival/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/StockArrival/components/MyEmp.vue +++ b/src/views/StockArrival/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockContract/components/MyDelivery.vue b/src/views/StockContract/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockContract/components/MyDelivery.vue +++ b/src/views/StockContract/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockContract/components/MyEmp.vue b/src/views/StockContract/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockContract/components/MyEmp.vue +++ b/src/views/StockContract/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockInquiry/components/MyEmp.vue b/src/views/StockInquiry/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/StockInquiry/components/MyEmp.vue +++ b/src/views/StockInquiry/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockOrder/components/MyDelivery.vue b/src/views/StockOrder/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockOrder/components/MyDelivery.vue +++ b/src/views/StockOrder/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOrder/components/MyEmp.vue b/src/views/StockOrder/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockOrder/components/MyEmp.vue +++ b/src/views/StockOrder/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyAccept.vue b/src/views/StockOut/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/StockOut/components/MyAccept.vue +++ b/src/views/StockOut/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyCreate.vue b/src/views/StockOut/components/MyCreate.vue index ed5e5a1b..f8ba97a0 100644 --- a/src/views/StockOut/components/MyCreate.vue +++ b/src/views/StockOut/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockOut/components/MyDelivery.vue b/src/views/StockOut/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/StockOut/components/MyDelivery.vue +++ b/src/views/StockOut/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyEmp.vue b/src/views/StockOut/components/MyEmp.vue index 289f1b96..b91ee66d 100644 --- a/src/views/StockOut/components/MyEmp.vue +++ b/src/views/StockOut/components/MyEmp.vue @@ -161,6 +161,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyRepository.vue b/src/views/StockOut/components/MyRepository.vue index beca53f0..30e2db64 100644 --- a/src/views/StockOut/components/MyRepository.vue +++ b/src/views/StockOut/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/StockPlan/components/MyDelivery.vue b/src/views/StockPlan/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockPlan/components/MyDelivery.vue +++ b/src/views/StockPlan/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockPlan/components/MyEmp.vue b/src/views/StockPlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockPlan/components/MyEmp.vue +++ b/src/views/StockPlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockQuery/components/MyDelivery.vue b/src/views/StockQuery/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockQuery/components/MyDelivery.vue +++ b/src/views/StockQuery/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockQuery/components/MyEmp.vue b/src/views/StockQuery/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockQuery/components/MyEmp.vue +++ b/src/views/StockQuery/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockRetreat/components/MyDelivery.vue b/src/views/StockRetreat/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockRetreat/components/MyDelivery.vue +++ b/src/views/StockRetreat/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockRetreat/components/MyEmp.vue b/src/views/StockRetreat/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockRetreat/components/MyEmp.vue +++ b/src/views/StockRetreat/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockRetreat/components/MyRepository.vue b/src/views/StockRetreat/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/StockRetreat/components/MyRepository.vue +++ b/src/views/StockRetreat/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Stockenter/components/MyAccept.vue b/src/views/Stockenter/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/Stockenter/components/MyAccept.vue +++ b/src/views/Stockenter/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue index e0ea0556..ac5c758e 100644 --- a/src/views/Stockenter/components/MyArrival.vue +++ b/src/views/Stockenter/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Stockenter/components/MyCreate.vue b/src/views/Stockenter/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/Stockenter/components/MyCreate.vue +++ b/src/views/Stockenter/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyDelivery.vue b/src/views/Stockenter/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Stockenter/components/MyDelivery.vue +++ b/src/views/Stockenter/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyEmp.vue b/src/views/Stockenter/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Stockenter/components/MyEmp.vue +++ b/src/views/Stockenter/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyEmp2.vue b/src/views/Stockenter/components/MyEmp2.vue index 6eb18016..04353b17 100644 --- a/src/views/Stockenter/components/MyEmp2.vue +++ b/src/views/Stockenter/components/MyEmp2.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyRepository.vue b/src/views/Stockenter/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Stockenter/components/MyRepository.vue +++ b/src/views/Stockenter/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Storagemove/components/MyAccept.vue b/src/views/Storagemove/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/Storagemove/components/MyAccept.vue +++ b/src/views/Storagemove/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyCreate.vue b/src/views/Storagemove/components/MyCreate.vue index 1561e346..0599dfcc 100644 --- a/src/views/Storagemove/components/MyCreate.vue +++ b/src/views/Storagemove/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyDelivery.vue b/src/views/Storagemove/components/MyDelivery.vue index bf1a89c6..b3e38f77 100644 --- a/src/views/Storagemove/components/MyDelivery.vue +++ b/src/views/Storagemove/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyDepot.vue b/src/views/Storagemove/components/MyDepot.vue index d39987ed..7ec066f8 100644 --- a/src/views/Storagemove/components/MyDepot.vue +++ b/src/views/Storagemove/components/MyDepot.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Storagemove/components/MyEmp.vue b/src/views/Storagemove/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/Storagemove/components/MyEmp.vue +++ b/src/views/Storagemove/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyRepository.vue b/src/views/Storagemove/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/Storagemove/components/MyRepository.vue +++ b/src/views/Storagemove/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Supplier/components/MyEmp.vue b/src/views/Supplier/components/MyEmp.vue index 71c27ab1..fdd84944 100644 --- a/src/views/Supplier/components/MyEmp.vue +++ b/src/views/Supplier/components/MyEmp.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -265,7 +265,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyAccept.vue b/src/views/TearDown/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/TearDown/components/MyAccept.vue +++ b/src/views/TearDown/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyCreate.vue b/src/views/TearDown/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/TearDown/components/MyCreate.vue +++ b/src/views/TearDown/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyDelivery.vue b/src/views/TearDown/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/TearDown/components/MyDelivery.vue +++ b/src/views/TearDown/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyEmp.vue b/src/views/TearDown/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/TearDown/components/MyEmp.vue +++ b/src/views/TearDown/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyRepository.vue b/src/views/TearDown/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/TearDown/components/MyRepository.vue +++ b/src/views/TearDown/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Transfer/components/MyEmp.vue b/src/views/Transfer/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Transfer/components/MyEmp.vue +++ b/src/views/Transfer/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Transfer/components/MyRepository.vue b/src/views/Transfer/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Transfer/components/MyRepository.vue +++ b/src/views/Transfer/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/WarehouseAdjust/components/MyAccept.vue b/src/views/WarehouseAdjust/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/WarehouseAdjust/components/MyAccept.vue +++ b/src/views/WarehouseAdjust/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyCreate.vue b/src/views/WarehouseAdjust/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/WarehouseAdjust/components/MyCreate.vue +++ b/src/views/WarehouseAdjust/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyDelivery.vue b/src/views/WarehouseAdjust/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/WarehouseAdjust/components/MyDelivery.vue +++ b/src/views/WarehouseAdjust/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyDriver.vue b/src/views/WarehouseAdjust/components/MyDriver.vue index 3d216d80..408e9822 100644 --- a/src/views/WarehouseAdjust/components/MyDriver.vue +++ b/src/views/WarehouseAdjust/components/MyDriver.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -262,7 +262,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyEmp.vue b/src/views/WarehouseAdjust/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/WarehouseAdjust/components/MyEmp.vue +++ b/src/views/WarehouseAdjust/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyRepository.vue b/src/views/WarehouseAdjust/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/WarehouseAdjust/components/MyRepository.vue +++ b/src/views/WarehouseAdjust/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/income/components/MyEmp.vue b/src/views/income/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/income/components/MyEmp.vue +++ b/src/views/income/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/income/components/MyRepository.vue b/src/views/income/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/income/components/MyRepository.vue +++ b/src/views/income/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/payment/components/MyDelivery.vue b/src/views/payment/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/payment/components/MyDelivery.vue +++ b/src/views/payment/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/payment/components/MyEmp.vue b/src/views/payment/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/payment/components/MyEmp.vue +++ b/src/views/payment/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } From 582315d89356d6a63b4309bbae114a4bd4fe3fbb Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Mon, 20 May 2019 09:34:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 + src/api/Advancemanage.js | 3 + src/api/DeliverGoods.js | 103 +++ src/api/ProducePlan.js | 3 + src/api/SaleOpportunity.js | 3 + src/icons/svg/peisong.svg | 1 + src/lang/zh.js | 19 +- src/router/index.js | 102 +-- .../AccessMaterials/AccessMaterialsList.vue | 3 +- .../AccessMaterials/RetreatMaterialsList.vue | 3 +- .../components/ProduceTask.vue | 2 +- src/views/AdjustPrice/AdjustPriceList.vue | 1 - src/views/AdvancePay/components/MyApply.vue | 2 +- src/views/AdvancePay/components/MyLnquiry.vue | 2 +- src/views/AdvancePay/components/MyOrder.vue | 2 +- src/views/AdvancePay/components/MyPlan.vue | 2 +- src/views/Advancemanage/AdvanceOrderList.vue | 3 +- .../Advancemanage/AdvanceProductList.vue | 3 +- src/views/Advancemanage/PrepReturnList.vue | 3 +- .../Advancemanage/components/MyApply.vue | 2 +- .../Advancemanage/components/MyArrival.vue | 2 +- .../Advancemanage/components/MyLnquiry.vue | 2 +- src/views/Advancemanage/components/MyPlan.vue | 2 +- .../Advancemanage/components/MyPresale.vue | 2 +- src/views/AgentCollect/components/MyApply.vue | 2 +- src/views/AgentCollect/index.vue | 1 - src/views/BuildUp/BuildUpList.vue | 1 - src/views/ChangeCount/ChangeCountList.vue | 3 +- src/views/ChangeCount/components/MyApply.vue | 1 + .../ChangeCount/components/MyInstallment.vue | 1 + src/views/CheckFail/CheckFailList.vue | 3 +- src/views/CheckFail/components/MyApply.vue | 1 + src/views/CheckFail/components/MyArrival.vue | 1 + src/views/CheckFail/components/MyQuality.vue | 1 + src/views/CheckFail/components/MyReport.vue | 1 + .../CheckFail/components/ProduceTask.vue | 1 + src/views/CheckReport/CheckReportList.vue | 3 +- src/views/CheckReport/components/MyApply.vue | 1 + .../CheckReport/components/MyArrival.vue | 1 + .../CheckReport/components/MyQuality.vue | 1 + .../CheckReport/components/ProduceTask.vue | 1 + src/views/CollectList/components/MyApply.vue | 1 + src/views/CollectList/index.vue | 1 - src/views/Collection/CollectionList.vue | 1 - src/views/Collection/RecoverVehicleList.vue | 3 +- src/views/Collection/components/MyApply.vue | 1 + .../Collection/components/MyInstallment.vue | 1 + .../CustomerMarketing/CustomerChatList.vue | 3 +- .../CustomerMarketing/CustomerVisitList.vue | 3 +- .../CustomerMarketing/components/MyApply.vue | 1 + .../components/MyInstallment.vue | 1 + src/views/DailyAdjust/DailyAdjustList.vue | 1 - src/views/DeliverGoods/AddDeliverGoods.vue | 461 +++++++++++++ src/views/DeliverGoods/DeliverGoodsList.vue | 605 ++++++++++++++++++ .../DeliverGoods/components/DetailList.vue | 363 +++++++++++ .../DeliverGoods/components/MyAccept.vue | 324 ++++++++++ src/views/DeliverGoods/components/MyAgent.vue | 357 +++++++++++ src/views/DeliverGoods/components/MyApply.vue | 374 +++++++++++ .../DeliverGoods/components/MyCustomer.vue | 365 +++++++++++ .../DeliverGoods/components/MyDelivery.vue | 326 ++++++++++ src/views/DeliverGoods/components/MyDepot.vue | 272 ++++++++ .../DeliverGoods/components/MyDetail.vue | 315 +++++++++ .../DeliverGoods/components/MyDialog.vue | 480 ++++++++++++++ src/views/DeliverGoods/components/MyEmp.vue | 332 ++++++++++ src/views/DeliverGoods/components/MyMove.vue | 385 +++++++++++ .../DeliverGoods/components/MyRepository.vue | 266 ++++++++ .../DeliverGoods/components/MyRequire.vue | 331 ++++++++++ .../DeliverGoods/components/MySaleout.vue | 429 +++++++++++++ .../NewEmployeeInformation.vue | 2 +- .../components/Mydialog.vue | 14 +- src/views/Expenses/ExpensesList.vue | 3 +- src/views/Expenses/components/MyApply.vue | 1 + src/views/Expenses/components/MyPlan.vue | 1 + .../GroupBuyRules/components/MyApply.vue | 1 + .../components/MyInstallment.vue | 1 + .../InstallmentApply/InstallmentApplyList.vue | 3 +- .../InstallmentApply/components/MyApply.vue | 1 + .../InstallmentList/components/MyApply.vue | 1 + src/views/InstallmentList/index.vue | 3 +- .../InventoryCount/InventoryCountList.vue | 5 +- src/views/InventoryOverflow/OverflowList.vue | 1 - .../Inventorydamaged/InventorydamagedList.vue | 3 +- src/views/Invoice/InvoiceList.vue | 3 +- src/views/Invoice/components/MyApply.vue | 1 + src/views/Invoice/components/MyArrival.vue | 1 + src/views/Invoice/components/MyLnquiry.vue | 4 +- src/views/Invoice/components/MyPlan.vue | 1 + src/views/LogisticsCar/AddLogisticsCar.vue | 2 +- src/views/MaterialsList/MaterialsListli.vue | 3 +- src/views/OutSourcing/OutSourcingList.vue | 3 +- src/views/OverdueList/index.vue | 1 - src/views/PrepReceipt/PrepReceiptList.vue | 3 +- src/views/PrepReceipt/components/MyApply.vue | 1 + src/views/PrepReceipt/components/MyOrder.vue | 1 + src/views/PrepReceipt/components/MyPlan.vue | 1 + src/views/ProcessFile/ProductionFile.vue | 3 +- src/views/ProcessFile/StandardProcess.vue | 3 +- src/views/ProcessFile/WorkCenter.vue | 3 +- src/views/ProducePlan/ProducePlanList.vue | 3 +- .../ProduceRequire/components/MyApply.vue | 1 + .../ProduceRequire/components/MyContract.vue | 1 + .../ProduceRequire/components/MyLnquiry.vue | 4 +- .../ProduceRequire/components/MyPlan.vue | 1 + src/views/ProduceRequire/index.vue | 1 - src/views/ProduceTask/ProduceReportList.vue | 3 +- src/views/ProduceTask/ProduceTaskList.vue | 3 +- .../ProduceTask/components/ProducePlan.vue | 1 + .../ProduceTask/components/ProduceTask.vue | 1 + src/views/QualityCheck/QualityCheckList.vue | 3 +- src/views/QualityCheck/components/MyApply.vue | 1 + .../QualityCheck/components/MyArrival.vue | 1 + .../QualityCheck/components/MyLnquiry.vue | 4 +- src/views/QualityCheck/components/MyPlan.vue | 1 + .../QualityCheck/components/ProduceTask.vue | 1 + src/views/Receipt/ReceiptList.vue | 3 +- src/views/Receipt/components/MyApply.vue | 1 + .../Receipt/components/MyInstallment.vue | 1 + src/views/Recycling/RecyclingList.vue | 3 +- src/views/Recycling/components/MyApply.vue | 1 + src/views/Recycling/components/MyPlan.vue | 1 + src/views/RequirePlan/RequirePlanList.vue | 3 +- .../RequirePlan/components/ProducePlan.vue | 3 + src/views/SaleContract/SaleContractList.vue | 3 +- src/views/SaleContract/components/MyApply.vue | 1 + .../components/MyInstallmentapply.vue | 1 + .../SaleContract/components/MyLnquiry.vue | 4 +- src/views/SaleContract/components/MyPlan.vue | 1 + .../SaleOpportunity/SaleOpportunityList.vue | 3 +- .../SaleOpportunity/components/MyApply.vue | 1 + src/views/SaleOrder/SaleOrderList.vue | 3 +- src/views/SaleOrder/components/MyApply.vue | 1 + src/views/SaleOut/SaleOutList.vue | 3 +- src/views/SaleOut/components/MyApply.vue | 1 + .../SaleOut/components/MyOpportunity.vue | 1 + src/views/SaleOut/components/MyOrder.vue | 1 + src/views/SaleOut/components/MyPresale.vue | 3 + src/views/SalePlan/SalePlanList.vue | 3 +- src/views/SalePlan/components/MyApply.vue | 1 + src/views/SaleReturn/SaleReturnList.vue | 3 +- src/views/SaleReturn/components/MyApply.vue | 1 + .../ShouldPayList/components/MyApply.vue | 1 + .../ShouldPayList/components/MyLnquiry.vue | 4 +- .../ShouldPayList/components/MyOrder.vue | 1 + src/views/ShouldPayList/components/MyPlan.vue | 1 + src/views/ShouldPayList/index.vue | 3 +- src/views/StockAlarm/BatchAlarm.vue | 1 - .../StockAlarm/SearchStockAlarmRules.vue | 1 - src/views/StockAlarm/StockAlarmList.vue | 1 - src/views/StockApply/StockApplyList.vue | 3 +- src/views/StockApply/components/MyOrder.vue | 1 + src/views/StockArrival/StockArrivalList.vue | 3 +- src/views/StockArrival/components/MyApply.vue | 1 + .../StockArrival/components/MyLnquiry.vue | 4 +- src/views/StockArrival/components/MyOrder.vue | 1 + src/views/StockArrival/components/MyPlan.vue | 1 + src/views/StockContract/StockContractList.vue | 3 +- .../StockContract/components/MyApply.vue | 1 + .../StockContract/components/MyLnquiry.vue | 4 +- src/views/StockContract/components/MyPlan.vue | 1 + src/views/StockInquiry/StockInquiryList.vue | 3 +- src/views/StockInquiry/components/MyApply.vue | 1 + src/views/StockInquiry/components/MyPlan.vue | 1 + src/views/StockOrder/StockOrderList.vue | 3 +- src/views/StockOrder/components/MyApply.vue | 1 + .../StockOrder/components/MyContract.vue | 1 + src/views/StockOrder/components/MyLnquiry.vue | 2 +- src/views/StockOrder/components/MyPlan.vue | 1 + src/views/StockOut/OtherStockOutList.vue | 1 - src/views/StockPlan/StockPlanList.vue | 3 +- src/views/StockPlan/components/MyApply.vue | 1 + src/views/StockQuery/ArrivalSummary.vue | 3 +- src/views/StockQuery/OnSummary.vue | 3 +- src/views/StockQuery/StockPrice.vue | 3 +- src/views/StockQuery/components/MyApply.vue | 1 + src/views/StockQuery/components/MyArrival.vue | 1 + src/views/StockQuery/components/MyLnquiry.vue | 4 +- src/views/StockQuery/components/MyOrder.vue | 1 + src/views/StockQuery/components/MyPlan.vue | 1 + src/views/StockRequire/index.vue | 3 +- src/views/StockRetreat/StockRetreatList.vue | 3 +- src/views/StockRetreat/components/MyApply.vue | 1 + .../StockRetreat/components/MyArrival.vue | 1 + .../StockRetreat/components/MyLnquiry.vue | 4 +- src/views/StockRetreat/components/MyOrder.vue | 1 + src/views/StockRetreat/components/MyPlan.vue | 1 + src/views/Stockenter/OtherEnterList.vue | 1 - src/views/Stockenter/ProduceEnterList.vue | 1 - src/views/Stockenter/Stockenterlist.vue | 3 +- src/views/Stockenter/components/MyArrival.vue | 2 +- src/views/Storagemove/StoragemoveList.vue | 3 +- src/views/TearDown/TearDownList.vue | 1 - src/views/Transfer/TransferList.vue | 3 +- src/views/Transfer/components/MyApply.vue | 1 + src/views/Transfer/components/MyPlan.vue | 1 + src/views/WarehouseAdjust/Enterlist.vue | 3 +- .../WarehouseAdjust/LocationAdjustList.vue | 3 +- .../WarehouseAdjust/inventorydetaillist.vue | 1 - src/views/income/IncomeList.vue | 3 +- src/views/income/components/MyApply.vue | 1 + src/views/income/components/MyPlan.vue | 1 + src/views/payment/components/MyApply.vue | 1 + src/views/payment/components/MyLnquiry.vue | 4 +- src/views/payment/components/MyOrder.vue | 1 + src/views/payment/components/MyPlan.vue | 1 + src/views/payment/paymentList.vue | 3 +- 205 files changed, 6377 insertions(+), 203 deletions(-) create mode 100644 src/api/DeliverGoods.js create mode 100644 src/icons/svg/peisong.svg create mode 100644 src/views/DeliverGoods/AddDeliverGoods.vue create mode 100644 src/views/DeliverGoods/DeliverGoodsList.vue create mode 100644 src/views/DeliverGoods/components/DetailList.vue create mode 100644 src/views/DeliverGoods/components/MyAccept.vue create mode 100644 src/views/DeliverGoods/components/MyAgent.vue create mode 100644 src/views/DeliverGoods/components/MyApply.vue create mode 100644 src/views/DeliverGoods/components/MyCustomer.vue create mode 100644 src/views/DeliverGoods/components/MyDelivery.vue create mode 100644 src/views/DeliverGoods/components/MyDepot.vue create mode 100644 src/views/DeliverGoods/components/MyDetail.vue create mode 100644 src/views/DeliverGoods/components/MyDialog.vue create mode 100644 src/views/DeliverGoods/components/MyEmp.vue create mode 100644 src/views/DeliverGoods/components/MyMove.vue create mode 100644 src/views/DeliverGoods/components/MyRepository.vue create mode 100644 src/views/DeliverGoods/components/MyRequire.vue create mode 100644 src/views/DeliverGoods/components/MySaleout.vue diff --git a/README.md b/README.md index 21984e94..e6b58f3a 100644 --- a/README.md +++ b/README.md @@ -266,6 +266,12 @@ const reg = /^[A-Z0-9]{2}$/ const date = new Date() date.setTime(date.getTime() + 3600 * 1000 * 24 * 7) this.getemplist.time = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() +``` +###### 当前日期 +```js + const date = new Date() + date.setTime(date.getTime()) + this.personalForm.enterDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() ``` ###### 完成进度 ```text diff --git a/src/api/Advancemanage.js b/src/api/Advancemanage.js index ad957f24..b1030512 100644 --- a/src/api/Advancemanage.js +++ b/src/api/Advancemanage.js @@ -31,6 +31,9 @@ export function advancelist(query) { if (query.productType !== '' && query.productType !== null && query.productType !== undefined) { params.append('productType', query.productType) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/api/DeliverGoods.js b/src/api/DeliverGoods.js new file mode 100644 index 00000000..9e016aa4 --- /dev/null +++ b/src/api/DeliverGoods.js @@ -0,0 +1,103 @@ +import request from '@/utils/request' + +// 新建配送单 +export function addDeliverGoods(query, query2, query4) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + params.append('deliverGoodsDetailJson', query2) // 你要传给后台的参数值 key/value + if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) { + params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value + } + if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) { + params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/deliverGoods/addDeliverGoods', + method: 'post', + data: params + }) +} + +// 配送单列表 +export function deliverGoodsList(query) { + var params = new URLSearchParams() + if (query.title !== '' && query.title !== null && query.title !== undefined) { + params.append('title', query.title) // 你要传给后台的参数值 key/value + } + if (query.deliverNumber !== '' && query.deliverNumber !== null && query.deliverNumber !== undefined) { + params.append('deliverNumber', query.deliverNumber) // 你要传给后台的参数值 key/value + } + if (query.sourceNUmber !== '' && query.sourceNUmber !== null && query.sourceNUmber !== undefined) { + params.append('sourceNUmber', query.sourceNUmber) // 你要传给后台的参数值 key/value + } + if (query.sourceType !== '' && query.sourceType !== null && query.sourceType !== undefined) { + params.append('sourceType', query.sourceType) // 你要传给后台的参数值 key/value + } + if (query.deliverPersonId !== '' && query.deliverPersonId !== null && query.deliverPersonId !== undefined) { + params.append('deliverPersonId', query.deliverPersonId) // 你要传给后台的参数值 key/value + } + if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) { + params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value + } + if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) { + params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value + } + if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) { + params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value + } + if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) { + params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/deliverGoodsList', + method: 'post', + data: params + }) +} + +// 修改配送单 +export function updateDeliverGoods(query, query2) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + params.append('deliverGoodsDetailJson', query2) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/updateDeliverGoods', + method: 'post', + data: params + }) +} + +// 删除配送单 +export function deleteDeliverGoods(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('deliverIds', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/deliverGoods/deleteDeliverGoods', + method: 'post', + data: params + }) +} + +// 审核配送单 +export function updateDeliverGoods2(query) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/updateDeliverGoods', + method: 'post', + data: params + }) +} diff --git a/src/api/ProducePlan.js b/src/api/ProducePlan.js index 7914fc0e..78b15c6f 100644 --- a/src/api/ProducePlan.js +++ b/src/api/ProducePlan.js @@ -58,6 +58,9 @@ export function produceplanlist(query) { if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/api/SaleOpportunity.js b/src/api/SaleOpportunity.js index 603bd097..8616ad50 100644 --- a/src/api/SaleOpportunity.js +++ b/src/api/SaleOpportunity.js @@ -42,6 +42,9 @@ export function saleopportunitylist(query) { if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/icons/svg/peisong.svg b/src/icons/svg/peisong.svg new file mode 100644 index 00000000..6bee68ff --- /dev/null +++ b/src/icons/svg/peisong.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/zh.js b/src/lang/zh.js index 1f481ec1..9bb4e6f0 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -268,7 +268,11 @@ export default { GroupBuyRules: '团购活动规则', AddGroupBuyRules: '新建团购活动规则', GroupBuyRulesList: '团购活动规则列表', - Getauthority: '角色权限' + Getauthority: '角色权限', + DeliverGoods: '配送单', + AddDeliverGoods: '新建配送单', + DeliverGoodsList: '配送单列表', + CarStatList: '车辆使用情况' }, navbar: { logOut: '退出登录', @@ -1727,6 +1731,19 @@ export default { createTime: '创建时间', createPersonName: '创建人' }, + DeliverGoods: { + title: '配送单主题', + sourceType: '源单类型', + sourceNumber: '源单编号', + requireArriveDate: '要求到货日期', + deliverDept: '配送部门', + deliverPersonId: '配送人', + requireType: '要货类型', + requireId: '要货方', + stat: '业务状态', + address: '地址', + deliverNumber: '配送单编号' + }, public: { cancel: '取消', save: '保存', diff --git a/src/router/index.js b/src/router/index.js index ad09ce00..7d5728a7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1975,55 +1975,81 @@ export const asyncRouterMap = [ } ] }, + // { + // path: '/SendCar', + // component: Layout, + // redirect: 'noredirect', + // name: 'SendCar', + // alwaysShow: true, + // meta: { + // title: 'SendCar', + // icon: 'paiche', + // type: 9 + // }, + // children: [ + // { + // path: 'Addsendcar', + // component: () => import('@/views/LogisticsCar/Addsendcar'), + // name: 'Addsendcar', + // meta: { title: 'Addsendcar', noCache: false } + // }, + // { + // path: 'SendcarList', + // component: () => import('@/views/LogisticsCar/SendcarList'), + // name: 'SendcarList', + // meta: { title: 'SendcarList', noCache: true } + // } + // ] + // }, + // { + // path: '/ReturnCar', + // component: Layout, + // redirect: 'noredirect', + // name: 'ReturnCar', + // alwaysShow: true, + // meta: { + // title: 'ReturnCar', + // icon: 'huiche', + // type: 9 + // }, + // children: [ + // { + // path: 'Addreturncar', + // component: () => import('@/views/LogisticsCar/Addreturncar'), + // name: 'Addreturncar', + // meta: { title: 'Addreturncar', noCache: false } + // }, + // { + // path: 'ReturncarList', + // component: () => import('@/views/LogisticsCar/ReturncarList'), + // name: 'ReturncarList', + // meta: { title: 'ReturncarList', noCache: true } + // } + // ] + // }, { - path: '/SendCar', + path: '/DeliverGoods', component: Layout, redirect: 'noredirect', - name: 'SendCar', + name: 'DeliverGoods', alwaysShow: true, meta: { - title: 'SendCar', - icon: 'paiche', + title: 'DeliverGoods', + icon: 'peisong', type: 9 }, children: [ { - path: 'Addsendcar', - component: () => import('@/views/LogisticsCar/Addsendcar'), - name: 'Addsendcar', - meta: { title: 'Addsendcar', noCache: false } + path: 'AddDeliverGoods', + component: () => import('@/views/DeliverGoods/AddDeliverGoods'), + name: 'AddDeliverGoods', + meta: { title: 'AddDeliverGoods', noCache: false } }, { - path: 'SendcarList', - component: () => import('@/views/LogisticsCar/SendcarList'), - name: 'SendcarList', - meta: { title: 'SendcarList', noCache: true } - } - ] - }, - { - path: '/ReturnCar', - component: Layout, - redirect: 'noredirect', - name: 'ReturnCar', - alwaysShow: true, - meta: { - title: 'ReturnCar', - icon: 'huiche', - type: 9 - }, - children: [ - { - path: 'Addreturncar', - component: () => import('@/views/LogisticsCar/Addreturncar'), - name: 'Addreturncar', - meta: { title: 'Addreturncar', noCache: false } - }, - { - path: 'ReturncarList', - component: () => import('@/views/LogisticsCar/ReturncarList'), - name: 'ReturncarList', - meta: { title: 'ReturncarList', noCache: true } + path: 'DeliverGoodsList', + component: () => import('@/views/DeliverGoods/DeliverGoodsList'), + name: 'DeliverGoodsList', + meta: { title: 'DeliverGoodsList', noCache: true } } ] }, diff --git a/src/views/AccessMaterials/AccessMaterialsList.vue b/src/views/AccessMaterials/AccessMaterialsList.vue index c0e44202..d94db69b 100644 --- a/src/views/AccessMaterials/AccessMaterialsList.vue +++ b/src/views/AccessMaterials/AccessMaterialsList.vue @@ -263,8 +263,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/RetreatMaterialsList.vue b/src/views/AccessMaterials/RetreatMaterialsList.vue index 45035bcf..5c8a9e8b 100644 --- a/src/views/AccessMaterials/RetreatMaterialsList.vue +++ b/src/views/AccessMaterials/RetreatMaterialsList.vue @@ -259,8 +259,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/ProduceTask.vue b/src/views/AccessMaterials/components/ProduceTask.vue index 6220c9ad..7487c7c3 100644 --- a/src/views/AccessMaterials/components/ProduceTask.vue +++ b/src/views/AccessMaterials/components/ProduceTask.vue @@ -219,7 +219,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdjustPrice/AdjustPriceList.vue b/src/views/AdjustPrice/AdjustPriceList.vue index c0bc0ace..5f199d3c 100644 --- a/src/views/AdjustPrice/AdjustPriceList.vue +++ b/src/views/AdjustPrice/AdjustPriceList.vue @@ -224,7 +224,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/AdvancePay/components/MyApply.vue b/src/views/AdvancePay/components/MyApply.vue index cbfacd97..6b85fff5 100644 --- a/src/views/AdvancePay/components/MyApply.vue +++ b/src/views/AdvancePay/components/MyApply.vue @@ -232,7 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdvancePay/components/MyLnquiry.vue b/src/views/AdvancePay/components/MyLnquiry.vue index 57b77c78..c13d8bc1 100644 --- a/src/views/AdvancePay/components/MyLnquiry.vue +++ b/src/views/AdvancePay/components/MyLnquiry.vue @@ -248,7 +248,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdvancePay/components/MyOrder.vue b/src/views/AdvancePay/components/MyOrder.vue index 85217e23..33e1fed1 100644 --- a/src/views/AdvancePay/components/MyOrder.vue +++ b/src/views/AdvancePay/components/MyOrder.vue @@ -245,7 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AdvancePay/components/MyPlan.vue b/src/views/AdvancePay/components/MyPlan.vue index 7ce7141e..865d3c8f 100644 --- a/src/views/AdvancePay/components/MyPlan.vue +++ b/src/views/AdvancePay/components/MyPlan.vue @@ -226,7 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/AdvanceOrderList.vue b/src/views/Advancemanage/AdvanceOrderList.vue index fb9948b4..12c02186 100644 --- a/src/views/Advancemanage/AdvanceOrderList.vue +++ b/src/views/Advancemanage/AdvanceOrderList.vue @@ -253,8 +253,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/AdvanceProductList.vue b/src/views/Advancemanage/AdvanceProductList.vue index 6eb32fad..33c3b3e2 100644 --- a/src/views/Advancemanage/AdvanceProductList.vue +++ b/src/views/Advancemanage/AdvanceProductList.vue @@ -224,8 +224,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/PrepReturnList.vue b/src/views/Advancemanage/PrepReturnList.vue index fd97cc2e..8b13f639 100644 --- a/src/views/Advancemanage/PrepReturnList.vue +++ b/src/views/Advancemanage/PrepReturnList.vue @@ -269,8 +269,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyApply.vue b/src/views/Advancemanage/components/MyApply.vue index cbfacd97..6b85fff5 100644 --- a/src/views/Advancemanage/components/MyApply.vue +++ b/src/views/Advancemanage/components/MyApply.vue @@ -232,7 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyArrival.vue b/src/views/Advancemanage/components/MyArrival.vue index 9d4b9bf1..05c7ea12 100644 --- a/src/views/Advancemanage/components/MyArrival.vue +++ b/src/views/Advancemanage/components/MyArrival.vue @@ -243,7 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyLnquiry.vue b/src/views/Advancemanage/components/MyLnquiry.vue index 57b77c78..c13d8bc1 100644 --- a/src/views/Advancemanage/components/MyLnquiry.vue +++ b/src/views/Advancemanage/components/MyLnquiry.vue @@ -248,7 +248,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyPlan.vue b/src/views/Advancemanage/components/MyPlan.vue index 7ce7141e..865d3c8f 100644 --- a/src/views/Advancemanage/components/MyPlan.vue +++ b/src/views/Advancemanage/components/MyPlan.vue @@ -226,7 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Advancemanage/components/MyPresale.vue b/src/views/Advancemanage/components/MyPresale.vue index f6b18be1..a427f368 100644 --- a/src/views/Advancemanage/components/MyPresale.vue +++ b/src/views/Advancemanage/components/MyPresale.vue @@ -227,7 +227,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AgentCollect/components/MyApply.vue b/src/views/AgentCollect/components/MyApply.vue index 4be46baf..f9000522 100644 --- a/src/views/AgentCollect/components/MyApply.vue +++ b/src/views/AgentCollect/components/MyApply.vue @@ -231,7 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/AgentCollect/index.vue b/src/views/AgentCollect/index.vue index ffc4828d..ff8473fd 100644 --- a/src/views/AgentCollect/index.vue +++ b/src/views/AgentCollect/index.vue @@ -250,7 +250,6 @@ export default { pageSize: 10, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, time: null }, // 传给组件的数据 diff --git a/src/views/BuildUp/BuildUpList.vue b/src/views/BuildUp/BuildUpList.vue index 4494c607..386ccc5d 100644 --- a/src/views/BuildUp/BuildUpList.vue +++ b/src/views/BuildUp/BuildUpList.vue @@ -214,7 +214,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/ChangeCount/ChangeCountList.vue b/src/views/ChangeCount/ChangeCountList.vue index 3b9bf004..23050b31 100644 --- a/src/views/ChangeCount/ChangeCountList.vue +++ b/src/views/ChangeCount/ChangeCountList.vue @@ -271,8 +271,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyApply.vue b/src/views/ChangeCount/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/ChangeCount/components/MyApply.vue +++ b/src/views/ChangeCount/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ChangeCount/components/MyInstallment.vue b/src/views/ChangeCount/components/MyInstallment.vue index f3207efd..0b56e350 100644 --- a/src/views/ChangeCount/components/MyInstallment.vue +++ b/src/views/ChangeCount/components/MyInstallment.vue @@ -216,6 +216,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckFail/CheckFailList.vue b/src/views/CheckFail/CheckFailList.vue index 736cb1f1..2ec79b0f 100644 --- a/src/views/CheckFail/CheckFailList.vue +++ b/src/views/CheckFail/CheckFailList.vue @@ -258,8 +258,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyApply.vue b/src/views/CheckFail/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/CheckFail/components/MyApply.vue +++ b/src/views/CheckFail/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckFail/components/MyArrival.vue b/src/views/CheckFail/components/MyArrival.vue index a96fc830..627cf440 100644 --- a/src/views/CheckFail/components/MyArrival.vue +++ b/src/views/CheckFail/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckFail/components/MyQuality.vue b/src/views/CheckFail/components/MyQuality.vue index 4bbb8988..91910a58 100644 --- a/src/views/CheckFail/components/MyQuality.vue +++ b/src/views/CheckFail/components/MyQuality.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckFail/components/MyReport.vue b/src/views/CheckFail/components/MyReport.vue index bb63df10..30522d50 100644 --- a/src/views/CheckFail/components/MyReport.vue +++ b/src/views/CheckFail/components/MyReport.vue @@ -255,6 +255,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckFail/components/ProduceTask.vue b/src/views/CheckFail/components/ProduceTask.vue index f01ad84e..7018bf39 100644 --- a/src/views/CheckFail/components/ProduceTask.vue +++ b/src/views/CheckFail/components/ProduceTask.vue @@ -219,6 +219,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckReport/CheckReportList.vue b/src/views/CheckReport/CheckReportList.vue index d4946695..6201b600 100644 --- a/src/views/CheckReport/CheckReportList.vue +++ b/src/views/CheckReport/CheckReportList.vue @@ -278,8 +278,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyApply.vue b/src/views/CheckReport/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/CheckReport/components/MyApply.vue +++ b/src/views/CheckReport/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckReport/components/MyArrival.vue b/src/views/CheckReport/components/MyArrival.vue index 4005a94b..c450a8cf 100644 --- a/src/views/CheckReport/components/MyArrival.vue +++ b/src/views/CheckReport/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckReport/components/MyQuality.vue b/src/views/CheckReport/components/MyQuality.vue index 5e40f868..3c396c16 100644 --- a/src/views/CheckReport/components/MyQuality.vue +++ b/src/views/CheckReport/components/MyQuality.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CheckReport/components/ProduceTask.vue b/src/views/CheckReport/components/ProduceTask.vue index 343125d3..213ef2e4 100644 --- a/src/views/CheckReport/components/ProduceTask.vue +++ b/src/views/CheckReport/components/ProduceTask.vue @@ -219,6 +219,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CollectList/components/MyApply.vue b/src/views/CollectList/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/CollectList/components/MyApply.vue +++ b/src/views/CollectList/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CollectList/index.vue b/src/views/CollectList/index.vue index 4a93a0bc..0d3387ff 100644 --- a/src/views/CollectList/index.vue +++ b/src/views/CollectList/index.vue @@ -244,7 +244,6 @@ export default { pageSize: 10, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, time: null }, // 传给组件的数据 diff --git a/src/views/Collection/CollectionList.vue b/src/views/Collection/CollectionList.vue index e3637bd2..46903da9 100644 --- a/src/views/Collection/CollectionList.vue +++ b/src/views/Collection/CollectionList.vue @@ -248,7 +248,6 @@ export default { pageSize: 10, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, stat: 4 }, // 传给组件的数据 diff --git a/src/views/Collection/RecoverVehicleList.vue b/src/views/Collection/RecoverVehicleList.vue index 6768d6e0..f502ef97 100644 --- a/src/views/Collection/RecoverVehicleList.vue +++ b/src/views/Collection/RecoverVehicleList.vue @@ -263,8 +263,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyApply.vue b/src/views/Collection/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/Collection/components/MyApply.vue +++ b/src/views/Collection/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Collection/components/MyInstallment.vue b/src/views/Collection/components/MyInstallment.vue index f3207efd..0b56e350 100644 --- a/src/views/Collection/components/MyInstallment.vue +++ b/src/views/Collection/components/MyInstallment.vue @@ -216,6 +216,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CustomerMarketing/CustomerChatList.vue b/src/views/CustomerMarketing/CustomerChatList.vue index a1d0360d..76ed7f90 100644 --- a/src/views/CustomerMarketing/CustomerChatList.vue +++ b/src/views/CustomerMarketing/CustomerChatList.vue @@ -243,8 +243,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/CustomerVisitList.vue b/src/views/CustomerMarketing/CustomerVisitList.vue index c09ac84a..2f963691 100644 --- a/src/views/CustomerMarketing/CustomerVisitList.vue +++ b/src/views/CustomerMarketing/CustomerVisitList.vue @@ -238,8 +238,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyApply.vue b/src/views/CustomerMarketing/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/CustomerMarketing/components/MyApply.vue +++ b/src/views/CustomerMarketing/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/CustomerMarketing/components/MyInstallment.vue b/src/views/CustomerMarketing/components/MyInstallment.vue index f3207efd..0b56e350 100644 --- a/src/views/CustomerMarketing/components/MyInstallment.vue +++ b/src/views/CustomerMarketing/components/MyInstallment.vue @@ -216,6 +216,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/DailyAdjust/DailyAdjustList.vue b/src/views/DailyAdjust/DailyAdjustList.vue index 6d7ac7cf..0d2d3654 100644 --- a/src/views/DailyAdjust/DailyAdjustList.vue +++ b/src/views/DailyAdjust/DailyAdjustList.vue @@ -219,7 +219,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/DeliverGoods/AddDeliverGoods.vue b/src/views/DeliverGoods/AddDeliverGoods.vue new file mode 100644 index 00000000..9c16494a --- /dev/null +++ b/src/views/DeliverGoods/AddDeliverGoods.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/views/DeliverGoods/DeliverGoodsList.vue b/src/views/DeliverGoods/DeliverGoodsList.vue new file mode 100644 index 00000000..76260fa0 --- /dev/null +++ b/src/views/DeliverGoods/DeliverGoodsList.vue @@ -0,0 +1,605 @@ + + + + + diff --git a/src/views/DeliverGoods/components/DetailList.vue b/src/views/DeliverGoods/components/DetailList.vue new file mode 100644 index 00000000..be49d71e --- /dev/null +++ b/src/views/DeliverGoods/components/DetailList.vue @@ -0,0 +1,363 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyAccept.vue b/src/views/DeliverGoods/components/MyAccept.vue new file mode 100644 index 00000000..b7f710ff --- /dev/null +++ b/src/views/DeliverGoods/components/MyAccept.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyAgent.vue b/src/views/DeliverGoods/components/MyAgent.vue new file mode 100644 index 00000000..ae2e5587 --- /dev/null +++ b/src/views/DeliverGoods/components/MyAgent.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyApply.vue b/src/views/DeliverGoods/components/MyApply.vue new file mode 100644 index 00000000..698924ee --- /dev/null +++ b/src/views/DeliverGoods/components/MyApply.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyCustomer.vue b/src/views/DeliverGoods/components/MyCustomer.vue new file mode 100644 index 00000000..af55158e --- /dev/null +++ b/src/views/DeliverGoods/components/MyCustomer.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDelivery.vue b/src/views/DeliverGoods/components/MyDelivery.vue new file mode 100644 index 00000000..8bce0364 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDelivery.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDepot.vue b/src/views/DeliverGoods/components/MyDepot.vue new file mode 100644 index 00000000..7ec066f8 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDepot.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDetail.vue b/src/views/DeliverGoods/components/MyDetail.vue new file mode 100644 index 00000000..46e2d4e7 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDetail.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDialog.vue b/src/views/DeliverGoods/components/MyDialog.vue new file mode 100644 index 00000000..15b05bf3 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDialog.vue @@ -0,0 +1,480 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyEmp.vue b/src/views/DeliverGoods/components/MyEmp.vue new file mode 100644 index 00000000..911d490a --- /dev/null +++ b/src/views/DeliverGoods/components/MyEmp.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyMove.vue b/src/views/DeliverGoods/components/MyMove.vue new file mode 100644 index 00000000..55064e8d --- /dev/null +++ b/src/views/DeliverGoods/components/MyMove.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyRepository.vue b/src/views/DeliverGoods/components/MyRepository.vue new file mode 100644 index 00000000..a58721e0 --- /dev/null +++ b/src/views/DeliverGoods/components/MyRepository.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyRequire.vue b/src/views/DeliverGoods/components/MyRequire.vue new file mode 100644 index 00000000..405bffda --- /dev/null +++ b/src/views/DeliverGoods/components/MyRequire.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MySaleout.vue b/src/views/DeliverGoods/components/MySaleout.vue new file mode 100644 index 00000000..e2978f5c --- /dev/null +++ b/src/views/DeliverGoods/components/MySaleout.vue @@ -0,0 +1,429 @@ + + + + + diff --git a/src/views/EmployeeInformation/NewEmployeeInformation.vue b/src/views/EmployeeInformation/NewEmployeeInformation.vue index 66be886c..6f1e5df4 100644 --- a/src/views/EmployeeInformation/NewEmployeeInformation.vue +++ b/src/views/EmployeeInformation/NewEmployeeInformation.vue @@ -364,7 +364,7 @@ export default { }) const list = await Promise.all(needRolesId.map(function(item) { return getDetailById(item).then(res => { - if (res.data.ret === 200) { + if (res.data.ret === 200 && res.data.data.content.length !== 0) { return res.data.data.content[0] } }) diff --git a/src/views/EmployeeInformation/components/Mydialog.vue b/src/views/EmployeeInformation/components/Mydialog.vue index 3796f066..81d73476 100644 --- a/src/views/EmployeeInformation/components/Mydialog.vue +++ b/src/views/EmployeeInformation/components/Mydialog.vue @@ -182,6 +182,7 @@ :key="index" :label="item.repositoryName" :value="item.id"/> + @@ -364,7 +365,7 @@ export default { } } }) - this.handlechange4(this.personalForm.regionId) + this.getRepository(this.personalForm.regionId) } }, created() { @@ -471,6 +472,17 @@ export default { handlechange4(val) { const finalid = val[val.length - 1] searchRepository(finalid).then(res => { + if (res.data.ret === 200) { + this.repositories = res.data.data.content.list + } else { + console.log('区域选择门店') + } + }) + console.log(this.repositories) + this.personalForm.repositoryId = '0' + }, + getRepository(val) { + searchRepository(val).then(res => { console.log(res) if (res.data.ret === 200) { this.repositories = res.data.data.content.list diff --git a/src/views/Expenses/ExpensesList.vue b/src/views/Expenses/ExpensesList.vue index 9d5217bc..4b24ea15 100644 --- a/src/views/Expenses/ExpensesList.vue +++ b/src/views/Expenses/ExpensesList.vue @@ -258,8 +258,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Expenses/components/MyApply.vue b/src/views/Expenses/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/Expenses/components/MyApply.vue +++ b/src/views/Expenses/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Expenses/components/MyPlan.vue b/src/views/Expenses/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/Expenses/components/MyPlan.vue +++ b/src/views/Expenses/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/GroupBuyRules/components/MyApply.vue b/src/views/GroupBuyRules/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/GroupBuyRules/components/MyApply.vue +++ b/src/views/GroupBuyRules/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/GroupBuyRules/components/MyInstallment.vue b/src/views/GroupBuyRules/components/MyInstallment.vue index f3207efd..0b56e350 100644 --- a/src/views/GroupBuyRules/components/MyInstallment.vue +++ b/src/views/GroupBuyRules/components/MyInstallment.vue @@ -216,6 +216,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/InstallmentApply/InstallmentApplyList.vue b/src/views/InstallmentApply/InstallmentApplyList.vue index 451434ca..3324971e 100644 --- a/src/views/InstallmentApply/InstallmentApplyList.vue +++ b/src/views/InstallmentApply/InstallmentApplyList.vue @@ -257,8 +257,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentApply/components/MyApply.vue b/src/views/InstallmentApply/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/InstallmentApply/components/MyApply.vue +++ b/src/views/InstallmentApply/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/InstallmentList/components/MyApply.vue b/src/views/InstallmentList/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/InstallmentList/components/MyApply.vue +++ b/src/views/InstallmentList/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/InstallmentList/index.vue b/src/views/InstallmentList/index.vue index 7fe67353..3288a384 100644 --- a/src/views/InstallmentList/index.vue +++ b/src/views/InstallmentList/index.vue @@ -253,8 +253,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InventoryCount/InventoryCountList.vue b/src/views/InventoryCount/InventoryCountList.vue index ddffd40b..97429b17 100644 --- a/src/views/InventoryCount/InventoryCountList.vue +++ b/src/views/InventoryCount/InventoryCountList.vue @@ -211,9 +211,8 @@ export default { getemplist: { pagenum: 1, pagesize: 10, - regionIds: 43, - repositoryId: 0, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId, + repositoryId: this.$store.getters.repositoryId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InventoryOverflow/OverflowList.vue b/src/views/InventoryOverflow/OverflowList.vue index 48bde9dd..932ba37e 100644 --- a/src/views/InventoryOverflow/OverflowList.vue +++ b/src/views/InventoryOverflow/OverflowList.vue @@ -227,7 +227,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/Inventorydamaged/InventorydamagedList.vue b/src/views/Inventorydamaged/InventorydamagedList.vue index 58b36c75..28674430 100644 --- a/src/views/Inventorydamaged/InventorydamagedList.vue +++ b/src/views/Inventorydamaged/InventorydamagedList.vue @@ -209,8 +209,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/InvoiceList.vue b/src/views/Invoice/InvoiceList.vue index 254b78e1..bcfb052b 100644 --- a/src/views/Invoice/InvoiceList.vue +++ b/src/views/Invoice/InvoiceList.vue @@ -250,8 +250,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/components/MyApply.vue b/src/views/Invoice/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/Invoice/components/MyApply.vue +++ b/src/views/Invoice/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Invoice/components/MyArrival.vue b/src/views/Invoice/components/MyArrival.vue index c815694e..05c7ea12 100644 --- a/src/views/Invoice/components/MyArrival.vue +++ b/src/views/Invoice/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Invoice/components/MyLnquiry.vue b/src/views/Invoice/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/Invoice/components/MyLnquiry.vue +++ b/src/views/Invoice/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/components/MyPlan.vue b/src/views/Invoice/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/Invoice/components/MyPlan.vue +++ b/src/views/Invoice/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/LogisticsCar/AddLogisticsCar.vue b/src/views/LogisticsCar/AddLogisticsCar.vue index 70c1ecf1..af1a9f7b 100644 --- a/src/views/LogisticsCar/AddLogisticsCar.vue +++ b/src/views/LogisticsCar/AddLogisticsCar.vue @@ -198,7 +198,7 @@ export default { this.personalForm.driverNames = val }, personIds(val) { - this.personalForm.drivers = val + this.personalForm.drivers = ',' + val + ',' }, // 创建人输入框focus事件触发 handlechoosecreateman() { diff --git a/src/views/MaterialsList/MaterialsListli.vue b/src/views/MaterialsList/MaterialsListli.vue index 781b2eea..5a993d13 100644 --- a/src/views/MaterialsList/MaterialsListli.vue +++ b/src/views/MaterialsList/MaterialsListli.vue @@ -172,8 +172,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/OutSourcing/OutSourcingList.vue b/src/views/OutSourcing/OutSourcingList.vue index cc338695..ab041187 100644 --- a/src/views/OutSourcing/OutSourcingList.vue +++ b/src/views/OutSourcing/OutSourcingList.vue @@ -225,8 +225,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/OverdueList/index.vue b/src/views/OverdueList/index.vue index 03cec3d5..3619c1b2 100644 --- a/src/views/OverdueList/index.vue +++ b/src/views/OverdueList/index.vue @@ -249,7 +249,6 @@ export default { pageSize: 10, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, stat: 3 }, // 传给组件的数据 diff --git a/src/views/PrepReceipt/PrepReceiptList.vue b/src/views/PrepReceipt/PrepReceiptList.vue index b8d97365..9f1663aa 100644 --- a/src/views/PrepReceipt/PrepReceiptList.vue +++ b/src/views/PrepReceipt/PrepReceiptList.vue @@ -251,8 +251,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/PrepReceipt/components/MyApply.vue b/src/views/PrepReceipt/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/PrepReceipt/components/MyApply.vue +++ b/src/views/PrepReceipt/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/PrepReceipt/components/MyOrder.vue b/src/views/PrepReceipt/components/MyOrder.vue index 91b8468b..76c2c133 100644 --- a/src/views/PrepReceipt/components/MyOrder.vue +++ b/src/views/PrepReceipt/components/MyOrder.vue @@ -240,6 +240,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/PrepReceipt/components/MyPlan.vue b/src/views/PrepReceipt/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/PrepReceipt/components/MyPlan.vue +++ b/src/views/PrepReceipt/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/ProcessFile/ProductionFile.vue b/src/views/ProcessFile/ProductionFile.vue index 78ad7c88..5f7bb0dc 100644 --- a/src/views/ProcessFile/ProductionFile.vue +++ b/src/views/ProcessFile/ProductionFile.vue @@ -159,8 +159,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/StandardProcess.vue b/src/views/ProcessFile/StandardProcess.vue index 0d34efaf..f7dd13ec 100644 --- a/src/views/ProcessFile/StandardProcess.vue +++ b/src/views/ProcessFile/StandardProcess.vue @@ -202,8 +202,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给修改组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/WorkCenter.vue b/src/views/ProcessFile/WorkCenter.vue index 7d565742..73cc4905 100644 --- a/src/views/ProcessFile/WorkCenter.vue +++ b/src/views/ProcessFile/WorkCenter.vue @@ -168,8 +168,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProducePlan/ProducePlanList.vue b/src/views/ProducePlan/ProducePlanList.vue index ae3bf9f3..93f4ec7b 100644 --- a/src/views/ProducePlan/ProducePlanList.vue +++ b/src/views/ProducePlan/ProducePlanList.vue @@ -214,8 +214,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyApply.vue b/src/views/ProduceRequire/components/MyApply.vue index 06cbb297..4f69e534 100644 --- a/src/views/ProduceRequire/components/MyApply.vue +++ b/src/views/ProduceRequire/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ProduceRequire/components/MyContract.vue b/src/views/ProduceRequire/components/MyContract.vue index 0081ed80..8a85d359 100644 --- a/src/views/ProduceRequire/components/MyContract.vue +++ b/src/views/ProduceRequire/components/MyContract.vue @@ -249,6 +249,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/ProduceRequire/components/MyLnquiry.vue b/src/views/ProduceRequire/components/MyLnquiry.vue index 01d6f70d..8efdf11c 100644 --- a/src/views/ProduceRequire/components/MyLnquiry.vue +++ b/src/views/ProduceRequire/components/MyLnquiry.vue @@ -252,11 +252,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyPlan.vue b/src/views/ProduceRequire/components/MyPlan.vue index 85b82745..ed10f967 100644 --- a/src/views/ProduceRequire/components/MyPlan.vue +++ b/src/views/ProduceRequire/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, supplierId: this.supp, regionIds: this.$store.getters.regionId, diff --git a/src/views/ProduceRequire/index.vue b/src/views/ProduceRequire/index.vue index e277c543..2fdbd99c 100644 --- a/src/views/ProduceRequire/index.vue +++ b/src/views/ProduceRequire/index.vue @@ -282,7 +282,6 @@ export default { pageSize: 10, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, beginTime: null, endTime: null }, diff --git a/src/views/ProduceTask/ProduceReportList.vue b/src/views/ProduceTask/ProduceReportList.vue index c5f15a1e..c0d9c0e9 100644 --- a/src/views/ProduceTask/ProduceReportList.vue +++ b/src/views/ProduceTask/ProduceReportList.vue @@ -202,8 +202,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceTask/ProduceTaskList.vue b/src/views/ProduceTask/ProduceTaskList.vue index 162481a2..d17d99ee 100644 --- a/src/views/ProduceTask/ProduceTaskList.vue +++ b/src/views/ProduceTask/ProduceTaskList.vue @@ -246,8 +246,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceTask/components/ProducePlan.vue b/src/views/ProduceTask/components/ProducePlan.vue index ec6a07fe..40bca73a 100644 --- a/src/views/ProduceTask/components/ProducePlan.vue +++ b/src/views/ProduceTask/components/ProducePlan.vue @@ -178,6 +178,7 @@ export default { getemplist: { pagenum: 1, pagesize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ProduceTask/components/ProduceTask.vue b/src/views/ProduceTask/components/ProduceTask.vue index a7bd21fa..ae4a1c05 100644 --- a/src/views/ProduceTask/components/ProduceTask.vue +++ b/src/views/ProduceTask/components/ProduceTask.vue @@ -218,6 +218,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/QualityCheck/QualityCheckList.vue b/src/views/QualityCheck/QualityCheckList.vue index bad4ca80..d87f8e5a 100644 --- a/src/views/QualityCheck/QualityCheckList.vue +++ b/src/views/QualityCheck/QualityCheckList.vue @@ -256,8 +256,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/MyApply.vue b/src/views/QualityCheck/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/QualityCheck/components/MyApply.vue +++ b/src/views/QualityCheck/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/QualityCheck/components/MyArrival.vue b/src/views/QualityCheck/components/MyArrival.vue index a0295bae..3ad053c2 100644 --- a/src/views/QualityCheck/components/MyArrival.vue +++ b/src/views/QualityCheck/components/MyArrival.vue @@ -247,6 +247,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId, diff --git a/src/views/QualityCheck/components/MyLnquiry.vue b/src/views/QualityCheck/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/QualityCheck/components/MyLnquiry.vue +++ b/src/views/QualityCheck/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/MyPlan.vue b/src/views/QualityCheck/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/QualityCheck/components/MyPlan.vue +++ b/src/views/QualityCheck/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/QualityCheck/components/ProduceTask.vue b/src/views/QualityCheck/components/ProduceTask.vue index f01ad84e..7018bf39 100644 --- a/src/views/QualityCheck/components/ProduceTask.vue +++ b/src/views/QualityCheck/components/ProduceTask.vue @@ -219,6 +219,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Receipt/ReceiptList.vue b/src/views/Receipt/ReceiptList.vue index 4b125f04..ffe8e87e 100644 --- a/src/views/Receipt/ReceiptList.vue +++ b/src/views/Receipt/ReceiptList.vue @@ -255,8 +255,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Receipt/components/MyApply.vue b/src/views/Receipt/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/Receipt/components/MyApply.vue +++ b/src/views/Receipt/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Receipt/components/MyInstallment.vue b/src/views/Receipt/components/MyInstallment.vue index 488b0e45..61b61c86 100644 --- a/src/views/Receipt/components/MyInstallment.vue +++ b/src/views/Receipt/components/MyInstallment.vue @@ -216,6 +216,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Recycling/RecyclingList.vue b/src/views/Recycling/RecyclingList.vue index a23a83dc..063eee0a 100644 --- a/src/views/Recycling/RecyclingList.vue +++ b/src/views/Recycling/RecyclingList.vue @@ -256,8 +256,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Recycling/components/MyApply.vue b/src/views/Recycling/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/Recycling/components/MyApply.vue +++ b/src/views/Recycling/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Recycling/components/MyPlan.vue b/src/views/Recycling/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/Recycling/components/MyPlan.vue +++ b/src/views/Recycling/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/RequirePlan/RequirePlanList.vue b/src/views/RequirePlan/RequirePlanList.vue index c27e2713..d0b8d8d2 100644 --- a/src/views/RequirePlan/RequirePlanList.vue +++ b/src/views/RequirePlan/RequirePlanList.vue @@ -226,8 +226,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/RequirePlan/components/ProducePlan.vue b/src/views/RequirePlan/components/ProducePlan.vue index d898d030..2c09d124 100644 --- a/src/views/RequirePlan/components/ProducePlan.vue +++ b/src/views/RequirePlan/components/ProducePlan.vue @@ -178,6 +178,9 @@ export default { getemplist: { pagenum: 1, pagesize: 10, + judgeStat: 2, + receiptStat: 2, + isUse: 1, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleContract/SaleContractList.vue b/src/views/SaleContract/SaleContractList.vue index 3e144203..e2c60721 100644 --- a/src/views/SaleContract/SaleContractList.vue +++ b/src/views/SaleContract/SaleContractList.vue @@ -266,8 +266,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleContract/components/MyApply.vue b/src/views/SaleContract/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/SaleContract/components/MyApply.vue +++ b/src/views/SaleContract/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleContract/components/MyInstallmentapply.vue b/src/views/SaleContract/components/MyInstallmentapply.vue index 6a17c221..32bf161c 100644 --- a/src/views/SaleContract/components/MyInstallmentapply.vue +++ b/src/views/SaleContract/components/MyInstallmentapply.vue @@ -229,6 +229,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleContract/components/MyLnquiry.vue b/src/views/SaleContract/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/SaleContract/components/MyLnquiry.vue +++ b/src/views/SaleContract/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleContract/components/MyPlan.vue b/src/views/SaleContract/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/SaleContract/components/MyPlan.vue +++ b/src/views/SaleContract/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOpportunity/SaleOpportunityList.vue b/src/views/SaleOpportunity/SaleOpportunityList.vue index 66741bf3..bd057bd3 100644 --- a/src/views/SaleOpportunity/SaleOpportunityList.vue +++ b/src/views/SaleOpportunity/SaleOpportunityList.vue @@ -269,8 +269,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOpportunity/components/MyApply.vue b/src/views/SaleOpportunity/components/MyApply.vue index 0975a5e4..e35da9c6 100644 --- a/src/views/SaleOpportunity/components/MyApply.vue +++ b/src/views/SaleOpportunity/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOrder/SaleOrderList.vue b/src/views/SaleOrder/SaleOrderList.vue index 7042cc0d..b9b1bf97 100644 --- a/src/views/SaleOrder/SaleOrderList.vue +++ b/src/views/SaleOrder/SaleOrderList.vue @@ -266,8 +266,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOrder/components/MyApply.vue b/src/views/SaleOrder/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/SaleOrder/components/MyApply.vue +++ b/src/views/SaleOrder/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOut/SaleOutList.vue b/src/views/SaleOut/SaleOutList.vue index 7a9e5425..dca89c63 100644 --- a/src/views/SaleOut/SaleOutList.vue +++ b/src/views/SaleOut/SaleOutList.vue @@ -259,8 +259,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyApply.vue b/src/views/SaleOut/components/MyApply.vue index b7af84b2..f9000522 100644 --- a/src/views/SaleOut/components/MyApply.vue +++ b/src/views/SaleOut/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOut/components/MyOpportunity.vue b/src/views/SaleOut/components/MyOpportunity.vue index fb2ade4e..7e924994 100644 --- a/src/views/SaleOut/components/MyOpportunity.vue +++ b/src/views/SaleOut/components/MyOpportunity.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + isUse: 1, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOut/components/MyOrder.vue b/src/views/SaleOut/components/MyOrder.vue index df2a8d40..d1ebc893 100644 --- a/src/views/SaleOut/components/MyOrder.vue +++ b/src/views/SaleOut/components/MyOrder.vue @@ -240,6 +240,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleOut/components/MyPresale.vue b/src/views/SaleOut/components/MyPresale.vue index b3b78f6b..2cb90641 100644 --- a/src/views/SaleOut/components/MyPresale.vue +++ b/src/views/SaleOut/components/MyPresale.vue @@ -225,6 +225,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, + receiptStat: 2, + isUse: 1, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SalePlan/SalePlanList.vue b/src/views/SalePlan/SalePlanList.vue index 097be9dd..46ab6433 100644 --- a/src/views/SalePlan/SalePlanList.vue +++ b/src/views/SalePlan/SalePlanList.vue @@ -259,8 +259,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SalePlan/components/MyApply.vue b/src/views/SalePlan/components/MyApply.vue index 0975a5e4..e35da9c6 100644 --- a/src/views/SalePlan/components/MyApply.vue +++ b/src/views/SalePlan/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/SaleReturn/SaleReturnList.vue b/src/views/SaleReturn/SaleReturnList.vue index 6ca9baa7..4fd2ee06 100644 --- a/src/views/SaleReturn/SaleReturnList.vue +++ b/src/views/SaleReturn/SaleReturnList.vue @@ -281,8 +281,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleReturn/components/MyApply.vue b/src/views/SaleReturn/components/MyApply.vue index 0975a5e4..e35da9c6 100644 --- a/src/views/SaleReturn/components/MyApply.vue +++ b/src/views/SaleReturn/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ShouldPayList/components/MyApply.vue b/src/views/ShouldPayList/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/ShouldPayList/components/MyApply.vue +++ b/src/views/ShouldPayList/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ShouldPayList/components/MyLnquiry.vue b/src/views/ShouldPayList/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/ShouldPayList/components/MyLnquiry.vue +++ b/src/views/ShouldPayList/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/components/MyOrder.vue b/src/views/ShouldPayList/components/MyOrder.vue index 1a1cf348..33e1fed1 100644 --- a/src/views/ShouldPayList/components/MyOrder.vue +++ b/src/views/ShouldPayList/components/MyOrder.vue @@ -245,6 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ShouldPayList/components/MyPlan.vue b/src/views/ShouldPayList/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/ShouldPayList/components/MyPlan.vue +++ b/src/views/ShouldPayList/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/ShouldPayList/index.vue b/src/views/ShouldPayList/index.vue index bae45209..d914da21 100644 --- a/src/views/ShouldPayList/index.vue +++ b/src/views/ShouldPayList/index.vue @@ -219,8 +219,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockAlarm/BatchAlarm.vue b/src/views/StockAlarm/BatchAlarm.vue index cfb82c42..96954add 100644 --- a/src/views/StockAlarm/BatchAlarm.vue +++ b/src/views/StockAlarm/BatchAlarm.vue @@ -136,7 +136,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/StockAlarm/SearchStockAlarmRules.vue b/src/views/StockAlarm/SearchStockAlarmRules.vue index d4bd94b0..9094e0d7 100644 --- a/src/views/StockAlarm/SearchStockAlarmRules.vue +++ b/src/views/StockAlarm/SearchStockAlarmRules.vue @@ -148,7 +148,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId2: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/StockAlarm/StockAlarmList.vue b/src/views/StockAlarm/StockAlarmList.vue index 9d3338e8..c32baa12 100644 --- a/src/views/StockAlarm/StockAlarmList.vue +++ b/src/views/StockAlarm/StockAlarmList.vue @@ -138,7 +138,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/StockApply/StockApplyList.vue b/src/views/StockApply/StockApplyList.vue index 53735838..b83a1707 100644 --- a/src/views/StockApply/StockApplyList.vue +++ b/src/views/StockApply/StockApplyList.vue @@ -260,8 +260,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockApply/components/MyOrder.vue b/src/views/StockApply/components/MyOrder.vue index 9e9c025b..20ad3372 100644 --- a/src/views/StockApply/components/MyOrder.vue +++ b/src/views/StockApply/components/MyOrder.vue @@ -240,6 +240,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockArrival/StockArrivalList.vue b/src/views/StockArrival/StockArrivalList.vue index ec082f43..8b152a51 100644 --- a/src/views/StockArrival/StockArrivalList.vue +++ b/src/views/StockArrival/StockArrivalList.vue @@ -261,8 +261,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/components/MyApply.vue b/src/views/StockArrival/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/StockArrival/components/MyApply.vue +++ b/src/views/StockArrival/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockArrival/components/MyLnquiry.vue b/src/views/StockArrival/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/StockArrival/components/MyLnquiry.vue +++ b/src/views/StockArrival/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/components/MyOrder.vue b/src/views/StockArrival/components/MyOrder.vue index 702153b2..d221968b 100644 --- a/src/views/StockArrival/components/MyOrder.vue +++ b/src/views/StockArrival/components/MyOrder.vue @@ -249,6 +249,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/StockArrival/components/MyPlan.vue b/src/views/StockArrival/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/StockArrival/components/MyPlan.vue +++ b/src/views/StockArrival/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockContract/StockContractList.vue b/src/views/StockContract/StockContractList.vue index 110eeacf..848abede 100644 --- a/src/views/StockContract/StockContractList.vue +++ b/src/views/StockContract/StockContractList.vue @@ -271,8 +271,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyApply.vue b/src/views/StockContract/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/StockContract/components/MyApply.vue +++ b/src/views/StockContract/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockContract/components/MyLnquiry.vue b/src/views/StockContract/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/StockContract/components/MyLnquiry.vue +++ b/src/views/StockContract/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyPlan.vue b/src/views/StockContract/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/StockContract/components/MyPlan.vue +++ b/src/views/StockContract/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockInquiry/StockInquiryList.vue b/src/views/StockInquiry/StockInquiryList.vue index 58c410ad..90caafbc 100644 --- a/src/views/StockInquiry/StockInquiryList.vue +++ b/src/views/StockInquiry/StockInquiryList.vue @@ -276,8 +276,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockInquiry/components/MyApply.vue b/src/views/StockInquiry/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/StockInquiry/components/MyApply.vue +++ b/src/views/StockInquiry/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockInquiry/components/MyPlan.vue b/src/views/StockInquiry/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/StockInquiry/components/MyPlan.vue +++ b/src/views/StockInquiry/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/StockOrder/StockOrderList.vue b/src/views/StockOrder/StockOrderList.vue index e2e2691d..b65d9db7 100644 --- a/src/views/StockOrder/StockOrderList.vue +++ b/src/views/StockOrder/StockOrderList.vue @@ -273,8 +273,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyApply.vue b/src/views/StockOrder/components/MyApply.vue index 06cbb297..4f69e534 100644 --- a/src/views/StockOrder/components/MyApply.vue +++ b/src/views/StockOrder/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockOrder/components/MyContract.vue b/src/views/StockOrder/components/MyContract.vue index 0081ed80..8a85d359 100644 --- a/src/views/StockOrder/components/MyContract.vue +++ b/src/views/StockOrder/components/MyContract.vue @@ -249,6 +249,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/StockOrder/components/MyLnquiry.vue b/src/views/StockOrder/components/MyLnquiry.vue index 01d6f70d..991b29c2 100644 --- a/src/views/StockOrder/components/MyLnquiry.vue +++ b/src/views/StockOrder/components/MyLnquiry.vue @@ -256,7 +256,7 @@ export default { regionIds: this.$store.getters.regionId, supplierId: this.supp, createPersonId: this.$store.getters.userId, - judgeStat: '' + judgeStat: 2 }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyPlan.vue b/src/views/StockOrder/components/MyPlan.vue index 85b82745..ed10f967 100644 --- a/src/views/StockOrder/components/MyPlan.vue +++ b/src/views/StockOrder/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, supplierId: this.supp, regionIds: this.$store.getters.regionId, diff --git a/src/views/StockOut/OtherStockOutList.vue b/src/views/StockOut/OtherStockOutList.vue index bf988759..80d6576e 100644 --- a/src/views/StockOut/OtherStockOutList.vue +++ b/src/views/StockOut/OtherStockOutList.vue @@ -207,7 +207,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/StockPlan/StockPlanList.vue b/src/views/StockPlan/StockPlanList.vue index 8286b3f6..68010b93 100644 --- a/src/views/StockPlan/StockPlanList.vue +++ b/src/views/StockPlan/StockPlanList.vue @@ -254,8 +254,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockPlan/components/MyApply.vue b/src/views/StockPlan/components/MyApply.vue index c1296f23..0ca91fb7 100644 --- a/src/views/StockPlan/components/MyApply.vue +++ b/src/views/StockPlan/components/MyApply.vue @@ -231,6 +231,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockQuery/ArrivalSummary.vue b/src/views/StockQuery/ArrivalSummary.vue index 4e1a9cfe..65c29ada 100644 --- a/src/views/StockQuery/ArrivalSummary.vue +++ b/src/views/StockQuery/ArrivalSummary.vue @@ -158,8 +158,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/OnSummary.vue b/src/views/StockQuery/OnSummary.vue index 6cd923e2..4fea3331 100644 --- a/src/views/StockQuery/OnSummary.vue +++ b/src/views/StockQuery/OnSummary.vue @@ -173,8 +173,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/StockPrice.vue b/src/views/StockQuery/StockPrice.vue index 0afa6004..212c92bc 100644 --- a/src/views/StockQuery/StockPrice.vue +++ b/src/views/StockQuery/StockPrice.vue @@ -133,8 +133,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyApply.vue b/src/views/StockQuery/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/StockQuery/components/MyApply.vue +++ b/src/views/StockQuery/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockQuery/components/MyArrival.vue b/src/views/StockQuery/components/MyArrival.vue index c815694e..05c7ea12 100644 --- a/src/views/StockQuery/components/MyArrival.vue +++ b/src/views/StockQuery/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockQuery/components/MyLnquiry.vue b/src/views/StockQuery/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/StockQuery/components/MyLnquiry.vue +++ b/src/views/StockQuery/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyOrder.vue b/src/views/StockQuery/components/MyOrder.vue index 1a1cf348..33e1fed1 100644 --- a/src/views/StockQuery/components/MyOrder.vue +++ b/src/views/StockQuery/components/MyOrder.vue @@ -245,6 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockQuery/components/MyPlan.vue b/src/views/StockQuery/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/StockQuery/components/MyPlan.vue +++ b/src/views/StockQuery/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockRequire/index.vue b/src/views/StockRequire/index.vue index 69895610..00ffb43b 100644 --- a/src/views/StockRequire/index.vue +++ b/src/views/StockRequire/index.vue @@ -195,8 +195,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/StockRetreatList.vue b/src/views/StockRetreat/StockRetreatList.vue index 0ef157c7..098e9fd8 100644 --- a/src/views/StockRetreat/StockRetreatList.vue +++ b/src/views/StockRetreat/StockRetreatList.vue @@ -252,8 +252,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyApply.vue b/src/views/StockRetreat/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/StockRetreat/components/MyApply.vue +++ b/src/views/StockRetreat/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockRetreat/components/MyArrival.vue b/src/views/StockRetreat/components/MyArrival.vue index 2799f5da..9ce74897 100644 --- a/src/views/StockRetreat/components/MyArrival.vue +++ b/src/views/StockRetreat/components/MyArrival.vue @@ -243,6 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockRetreat/components/MyLnquiry.vue b/src/views/StockRetreat/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/StockRetreat/components/MyLnquiry.vue +++ b/src/views/StockRetreat/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyOrder.vue b/src/views/StockRetreat/components/MyOrder.vue index 1a1cf348..33e1fed1 100644 --- a/src/views/StockRetreat/components/MyOrder.vue +++ b/src/views/StockRetreat/components/MyOrder.vue @@ -245,6 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/StockRetreat/components/MyPlan.vue b/src/views/StockRetreat/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/StockRetreat/components/MyPlan.vue +++ b/src/views/StockRetreat/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Stockenter/OtherEnterList.vue b/src/views/Stockenter/OtherEnterList.vue index 2dd52285..2c9662b9 100644 --- a/src/views/Stockenter/OtherEnterList.vue +++ b/src/views/Stockenter/OtherEnterList.vue @@ -236,7 +236,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/Stockenter/ProduceEnterList.vue b/src/views/Stockenter/ProduceEnterList.vue index e6a8cac3..ce3e3c09 100644 --- a/src/views/Stockenter/ProduceEnterList.vue +++ b/src/views/Stockenter/ProduceEnterList.vue @@ -224,7 +224,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/Stockenter/Stockenterlist.vue b/src/views/Stockenter/Stockenterlist.vue index 40b227b2..0b9edb6d 100644 --- a/src/views/Stockenter/Stockenterlist.vue +++ b/src/views/Stockenter/Stockenterlist.vue @@ -246,8 +246,7 @@ export default { pagenum: 1, pagesize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue index ac5c758e..7673718d 100644 --- a/src/views/Stockenter/components/MyArrival.vue +++ b/src/views/Stockenter/components/MyArrival.vue @@ -243,7 +243,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Storagemove/StoragemoveList.vue b/src/views/Storagemove/StoragemoveList.vue index a6d8257c..1c225501 100644 --- a/src/views/Storagemove/StoragemoveList.vue +++ b/src/views/Storagemove/StoragemoveList.vue @@ -100,7 +100,7 @@ align="center"/> @@ -238,7 +238,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/TearDown/TearDownList.vue b/src/views/TearDown/TearDownList.vue index 11f2b60a..a9864024 100644 --- a/src/views/TearDown/TearDownList.vue +++ b/src/views/TearDown/TearDownList.vue @@ -214,7 +214,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/Transfer/TransferList.vue b/src/views/Transfer/TransferList.vue index 25843d66..8df4fbbe 100644 --- a/src/views/Transfer/TransferList.vue +++ b/src/views/Transfer/TransferList.vue @@ -278,8 +278,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Transfer/components/MyApply.vue b/src/views/Transfer/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/Transfer/components/MyApply.vue +++ b/src/views/Transfer/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/Transfer/components/MyPlan.vue b/src/views/Transfer/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/Transfer/components/MyPlan.vue +++ b/src/views/Transfer/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/WarehouseAdjust/Enterlist.vue b/src/views/WarehouseAdjust/Enterlist.vue index 4930eb77..bc6cd9db 100644 --- a/src/views/WarehouseAdjust/Enterlist.vue +++ b/src/views/WarehouseAdjust/Enterlist.vue @@ -214,8 +214,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/WarehouseAdjust/LocationAdjustList.vue b/src/views/WarehouseAdjust/LocationAdjustList.vue index 69e4b1bc..4a24cd2b 100644 --- a/src/views/WarehouseAdjust/LocationAdjustList.vue +++ b/src/views/WarehouseAdjust/LocationAdjustList.vue @@ -226,8 +226,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/WarehouseAdjust/inventorydetaillist.vue b/src/views/WarehouseAdjust/inventorydetaillist.vue index c44a3a86..3c29dd4f 100644 --- a/src/views/WarehouseAdjust/inventorydetaillist.vue +++ b/src/views/WarehouseAdjust/inventorydetaillist.vue @@ -238,7 +238,6 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: this.$store.getters.userId, countryId: this.$store.getters.countryId, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId diff --git a/src/views/income/IncomeList.vue b/src/views/income/IncomeList.vue index 841258da..eb9d5990 100644 --- a/src/views/income/IncomeList.vue +++ b/src/views/income/IncomeList.vue @@ -258,8 +258,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/income/components/MyApply.vue b/src/views/income/components/MyApply.vue index 037b48bb..badd0506 100644 --- a/src/views/income/components/MyApply.vue +++ b/src/views/income/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/income/components/MyPlan.vue b/src/views/income/components/MyPlan.vue index 32663ce7..c35c41db 100644 --- a/src/views/income/components/MyPlan.vue +++ b/src/views/income/components/MyPlan.vue @@ -230,6 +230,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, diff --git a/src/views/payment/components/MyApply.vue b/src/views/payment/components/MyApply.vue index 7568572b..6b85fff5 100644 --- a/src/views/payment/components/MyApply.vue +++ b/src/views/payment/components/MyApply.vue @@ -232,6 +232,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/payment/components/MyLnquiry.vue b/src/views/payment/components/MyLnquiry.vue index de2a778d..c13d8bc1 100644 --- a/src/views/payment/components/MyLnquiry.vue +++ b/src/views/payment/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/components/MyOrder.vue b/src/views/payment/components/MyOrder.vue index 1a1cf348..33e1fed1 100644 --- a/src/views/payment/components/MyOrder.vue +++ b/src/views/payment/components/MyOrder.vue @@ -245,6 +245,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/payment/components/MyPlan.vue b/src/views/payment/components/MyPlan.vue index 90ec1b6c..865d3c8f 100644 --- a/src/views/payment/components/MyPlan.vue +++ b/src/views/payment/components/MyPlan.vue @@ -226,6 +226,7 @@ export default { getemplist: { pageNum: 1, pageSize: 10, + judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, createPersonId: this.$store.getters.userId diff --git a/src/views/payment/paymentList.vue b/src/views/payment/paymentList.vue index 4607fc0b..6a77fee6 100644 --- a/src/views/payment/paymentList.vue +++ b/src/views/payment/paymentList.vue @@ -240,8 +240,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, From daa615fb9a4d70f37cc8b414d923c59702951dac Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Tue, 21 May 2019 10:24:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/CarStatList.js | 40 + src/api/ReturnExchange.js | 105 +++ src/icons/svg/huanhuo.svg | 1 + src/icons/svg/shiyongqingkuan.svg | 1 + src/lang/zh.js | 37 +- src/router/index.js | 43 ++ .../AccessMaterials/AccessMaterialsList.vue | 4 +- .../AccessMaterials/RetreatMaterialsList.vue | 4 +- .../components/MyMaterials.vue | 3 +- .../components/ProduceTask.vue | 3 +- src/views/AdjustPrice/AdjustPriceList.vue | 4 +- src/views/AdvancePay/AdvancePayList.vue | 2 +- src/views/Advancemanage/AdvanceOrderList.vue | 4 +- src/views/Advancemanage/PrepReturnList.vue | 4 +- .../Advancemanage/components/MyPresale.vue | 3 +- src/views/AgentCollect/index.vue | 4 +- src/views/BuildUp/BuildUpList.vue | 4 +- src/views/CarStatList/index.vue | 449 +++++++++++ src/views/ChangeCount/ChangeCountList.vue | 4 +- .../ChangeCount/components/MyInstallment.vue | 3 +- src/views/CheckFail/CheckFailList.vue | 4 +- src/views/CheckFail/components/MyReport.vue | 3 +- src/views/CheckReport/CheckReportList.vue | 4 +- .../CheckReport/components/MyArrival.vue | 3 +- .../CheckReport/components/MyQuality.vue | 3 +- .../CheckReport/components/ProduceTask.vue | 3 +- src/views/CollectList/index.vue | 4 +- src/views/Collection/CollectionList.vue | 4 +- src/views/Collection/RecoverVehicleList.vue | 4 +- .../CustomerMarketing/CustomerChatList.vue | 4 +- .../CustomerMarketing/CustomerVisitList.vue | 4 +- src/views/DailyAdjust/DailyAdjustList.vue | 4 +- src/views/DeliverGoods/DeliverGoodsList.vue | 16 +- .../DeliverGoods/components/MySaleout.vue | 3 +- src/views/Expenses/ExpensesList.vue | 4 +- .../InstallmentApply/InstallmentApplyList.vue | 4 +- src/views/InstallmentList/index.vue | 4 +- .../InventoryCount/AddInventoryCount.vue | 18 +- .../InventoryCount/InventoryCountList.vue | 4 +- src/views/InventoryOverflow/OverflowList.vue | 4 +- .../Inventorydamaged/InventorydamagedList.vue | 4 +- src/views/Invoice/InvoiceList.vue | 4 +- src/views/MaterialsList/MaterialsListli.vue | 4 +- src/views/OutFactory/OutFactoryList.vue | 2 +- src/views/OutSourcing/OutSourcingList.vue | 4 +- src/views/OverdueList/index.vue | 4 +- src/views/PrepReceipt/PrepReceiptList.vue | 4 +- src/views/PrepReceipt/components/MyOrder.vue | 3 +- src/views/ProducePlan/ProducePlanList.vue | 4 +- src/views/ProduceRequire/index.vue | 2 +- src/views/ProduceTask/ProduceReportList.vue | 4 +- src/views/ProduceTask/ProduceTaskList.vue | 4 +- .../ProduceTask/components/ProducePlan.vue | 3 +- src/views/QualityCheck/QualityCheckList.vue | 4 +- .../QualityCheck/components/MyArrival.vue | 1 - .../QualityCheck/components/ProduceTask.vue | 3 +- src/views/Receipt/ReceiptList.vue | 4 +- src/views/Recycling/RecyclingList.vue | 4 +- src/views/RequirePlan/RequirePlanList.vue | 4 +- .../ReturnExchange/AddReturnExchange.vue | 715 +++++++++++++++++ .../ReturnExchange/ReturnExchangeList.vue | 583 ++++++++++++++ .../ReturnExchange/components/DetailList.vue | 415 ++++++++++ .../ReturnExchange/components/MyAccept.vue | 324 ++++++++ .../ReturnExchange/components/MyAgent.vue | 357 +++++++++ .../ReturnExchange/components/MyApply.vue | 374 +++++++++ .../ReturnExchange/components/MyCustomer.vue | 365 +++++++++ .../ReturnExchange/components/MyDelivery.vue | 326 ++++++++ .../ReturnExchange/components/MyDepot.vue | 272 +++++++ .../ReturnExchange/components/MyDetail.vue | 310 ++++++++ .../ReturnExchange/components/MyDialog.vue | 728 ++++++++++++++++++ src/views/ReturnExchange/components/MyEmp.vue | 332 ++++++++ .../ReturnExchange/components/MyMove.vue | 385 +++++++++ .../components/MyRepository.vue | 266 +++++++ .../ReturnExchange/components/MyRequire.vue | 331 ++++++++ .../ReturnExchange/components/MySaleout.vue | 439 +++++++++++ src/views/SaleContract/SaleContractList.vue | 4 +- .../SaleContract/components/MyOpportunity.vue | 3 +- .../SaleOpportunity/SaleOpportunityList.vue | 4 +- src/views/SaleOrder/SaleOrderList.vue | 4 +- src/views/SaleOut/AddSaleOut.vue | 1 + src/views/SaleOut/SaleOutList.vue | 4 +- .../SaleOut/components/MyOpportunity.vue | 3 +- src/views/SaleOut/components/MyOrder.vue | 3 +- src/views/SaleOut/components/MyPresale.vue | 3 +- src/views/SalePlan/SalePlanList.vue | 4 +- src/views/SaleReturn/SaleReturnList.vue | 4 +- src/views/ShouldPayList/index.vue | 2 +- .../SmartReplenishmentList.vue | 4 +- src/views/StockApply/StockApplyList.vue | 4 +- src/views/StockApply/components/MyOrder.vue | 3 +- src/views/StockArrival/StockArrivalList.vue | 4 +- src/views/StockArrival/components/MyOrder.vue | 3 +- src/views/StockContract/StockContractList.vue | 4 +- .../StockContract/components/MyApply.vue | 3 +- .../StockContract/components/MyLnquiry.vue | 3 +- src/views/StockContract/components/MyPlan.vue | 3 +- src/views/StockInquiry/StockInquiryList.vue | 4 +- src/views/StockInquiry/components/MyApply.vue | 3 +- src/views/StockInquiry/components/MyPlan.vue | 3 +- src/views/StockOrder/StockOrderList.vue | 4 +- src/views/StockOrder/components/MyApply.vue | 3 +- .../StockOrder/components/MyContract.vue | 3 +- src/views/StockOrder/components/MyLnquiry.vue | 1 - src/views/StockOrder/components/MyPlan.vue | 3 +- src/views/StockOut/OtherStockOutList.vue | 4 +- src/views/StockPlan/StockPlanList.vue | 4 +- src/views/StockPlan/components/MyApply.vue | 6 +- src/views/StockPlan/components/MyRequire.vue | 3 +- src/views/StockRetreat/StockRetreatList.vue | 4 +- .../StockRetreat/components/MyArrival.vue | 3 +- src/views/Stockenter/OtherEnterList.vue | 6 +- src/views/Stockenter/ProduceEnterList.vue | 6 +- src/views/Stockenter/Stockenterlist.vue | 6 +- src/views/Stockenter/components/MyArrival.vue | 3 +- src/views/Storagemove/StoragemoveList.vue | 4 +- src/views/TearDown/TearDownList.vue | 4 +- src/views/Transfer/TransferList.vue | 4 +- src/views/WarehouseAdjust/Enterlist.vue | 4 +- .../WarehouseAdjust/LocationAdjustList.vue | 4 +- src/views/income/IncomeList.vue | 4 +- src/views/payment/components/MyOrder.vue | 3 +- src/views/payment/paymentList.vue | 4 +- 122 files changed, 7380 insertions(+), 201 deletions(-) create mode 100644 src/api/CarStatList.js create mode 100644 src/api/ReturnExchange.js create mode 100644 src/icons/svg/huanhuo.svg create mode 100644 src/icons/svg/shiyongqingkuan.svg create mode 100644 src/views/CarStatList/index.vue create mode 100644 src/views/ReturnExchange/AddReturnExchange.vue create mode 100644 src/views/ReturnExchange/ReturnExchangeList.vue create mode 100644 src/views/ReturnExchange/components/DetailList.vue create mode 100644 src/views/ReturnExchange/components/MyAccept.vue create mode 100644 src/views/ReturnExchange/components/MyAgent.vue create mode 100644 src/views/ReturnExchange/components/MyApply.vue create mode 100644 src/views/ReturnExchange/components/MyCustomer.vue create mode 100644 src/views/ReturnExchange/components/MyDelivery.vue create mode 100644 src/views/ReturnExchange/components/MyDepot.vue create mode 100644 src/views/ReturnExchange/components/MyDetail.vue create mode 100644 src/views/ReturnExchange/components/MyDialog.vue create mode 100644 src/views/ReturnExchange/components/MyEmp.vue create mode 100644 src/views/ReturnExchange/components/MyMove.vue create mode 100644 src/views/ReturnExchange/components/MyRepository.vue create mode 100644 src/views/ReturnExchange/components/MyRequire.vue create mode 100644 src/views/ReturnExchange/components/MySaleout.vue diff --git a/src/api/CarStatList.js b/src/api/CarStatList.js new file mode 100644 index 00000000..710e6981 --- /dev/null +++ b/src/api/CarStatList.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 车辆使用情况 +export function carStatList(query) { + var params = new URLSearchParams() + if (query.licencenumber !== '' && query.licencenumber !== null && query.licencenumber !== undefined) { + params.append('licencenumber', query.licencenumber) // 你要传给后台的参数值 key/value + } + if (query.carnumber !== '' && query.carnumber !== null && query.carnumber !== undefined) { + params.append('carnumber', query.carnumber) // 你要传给后台的参数值 key/value + } + if (query.outPersonId !== '' && query.outPersonId !== null && query.outPersonId !== undefined) { + params.append('outPersonId', query.outPersonId) // 你要传给后台的参数值 key/value + } + if (query.carStat !== '' && query.carStat !== null && query.carStat !== undefined) { + params.append('carStat', query.carStat) // 你要传给后台的参数值 key/value + } + if (query.carType !== '' && query.carType !== null && query.carType !== undefined) { + params.append('carType', query.carType) // 你要传给后台的参数值 key/value + } + if (query.stat !== '' && query.stat !== null && query.stat !== undefined) { + params.append('stat', query.stat) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/logisticsCar/carStatList', + method: 'post', + data: params + }) +} diff --git a/src/api/ReturnExchange.js b/src/api/ReturnExchange.js new file mode 100644 index 00000000..9e093006 --- /dev/null +++ b/src/api/ReturnExchange.js @@ -0,0 +1,105 @@ +import request from '@/utils/request' + +// 新建换货单 +export function addReturnExchange(query, query2, query3, query4) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + params.append('returnExchangeOutJson', query2) // 你要传给后台的参数值 key/value + params.append('returnExchangeRetreatJson', query3) // 你要传给后台的参数值 key/value + if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) { + params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value + } + if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) { + params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/returnExchange/addReturnExchange', + method: 'post', + data: params + }) +} + +// 换货单列表 +export function exchangelist(query) { + var params = new URLSearchParams() + if (query.title !== '' && query.title !== null && query.title !== undefined) { + params.append('title', query.title) // 你要传给后台的参数值 key/value + } + if (query.exchangeNumber !== '' && query.exchangeNumber !== null && query.exchangeNumber !== undefined) { + params.append('exchangeNumber', query.exchangeNumber) // 你要传给后台的参数值 key/value + } + if (query.handlePersonId !== '' && query.handlePersonId !== null && query.handlePersonId !== undefined) { + params.append('handlePersonId', query.handlePersonId) // 你要传给后台的参数值 key/value + } + if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) { + params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) { + params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value + } + if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) { + params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value + } + if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) { + params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value + } + if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) { + params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value + } + if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) { + params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/exchangelist', + method: 'post', + data: params + }) +} + +// 修改换货单 +export function updateReturnExchange(query, query2, query3) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + params.append('returnExchangeOutJson', query2) // 你要传给后台的参数值 key/value + params.append('returnExchangeRetreatJson', query3) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/updateReturnExchange', + method: 'post', + data: params + }) +} + +// 删除换货单 +export function deleteReturnExchange(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('exchangeIds', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/returnExchange/deleteReturnExchange', + method: 'post', + data: params + }) +} + +// 审核换货单 +export function updateReturnExchange2(query) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/updateReturnExchange', + method: 'post', + data: params + }) +} diff --git a/src/icons/svg/huanhuo.svg b/src/icons/svg/huanhuo.svg new file mode 100644 index 00000000..b6c7596c --- /dev/null +++ b/src/icons/svg/huanhuo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/shiyongqingkuan.svg b/src/icons/svg/shiyongqingkuan.svg new file mode 100644 index 00000000..c194705b --- /dev/null +++ b/src/icons/svg/shiyongqingkuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/zh.js b/src/lang/zh.js index 9bb4e6f0..047498e2 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -272,7 +272,10 @@ export default { DeliverGoods: '配送单', AddDeliverGoods: '新建配送单', DeliverGoodsList: '配送单列表', - CarStatList: '车辆使用情况' + CarStatList: '车辆使用情况', + ReturnExchange: '换货单', + AddReturnExchange: '新建换货单', + ReturnExchangeList: '换货单列表' }, navbar: { logOut: '退出登录', @@ -1744,6 +1747,38 @@ export default { address: '地址', deliverNumber: '配送单编号' }, + CarStatList: { + carnumber: '车辆编号', + licencenumber: '车牌号', + carName: '车辆名称', + carStat: '车辆状态', + carType: '车辆型号', + outPersonId: '出车人', + stat: '状态', + driverNames: '驾驶员', + outTime: '最近一次出车时间', + returnTime: '最近一次返回时间', + orderType: '订单类型', + orderNumber: '订单编号', + address: '送货地址', + outTime2: '出车时间', + outPersonPhone: '电话' + }, + ReturnExchange: { + title: '换货单主题', + sourceType: '源单类型', + sourceNumber: '源单编号', + customerType: '客户类型', + customerId: '客户姓名', + customerPhone: '客户电话', + sourceMoney: '源单车辆金额', + diffMoney: '差异金额', + applyNumber: '分期申请编号', + handlePersonId: '换货人', + exchangeDate: '换货时间', + repositoryId: '仓库', + exchangeNumber: '换货单编号' + }, public: { cancel: '取消', save: '保存', diff --git a/src/router/index.js b/src/router/index.js index 7d5728a7..8431a19c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1730,6 +1730,32 @@ export const asyncRouterMap = [ } ] }, + { + path: '/ReturnExchange', + component: Layout, + redirect: 'noredirect', + name: 'ReturnExchange', + alwaysShow: true, + meta: { + title: 'ReturnExchange', + icon: 'huanhuo', + type: 3 + }, + children: [ + { + path: 'AddReturnExchange', + component: () => import('@/views/ReturnExchange/AddReturnExchange'), + name: 'AddReturnExchange', + meta: { title: 'AddReturnExchange', noCache: false } + }, + { + path: 'ReturnExchangeList', + component: () => import('@/views/ReturnExchange/ReturnExchangeList'), + name: 'ReturnExchangeList', + meta: { title: 'ReturnExchangeList', noCache: true } + } + ] + }, { path: '/Recycling', component: Layout, @@ -2053,6 +2079,23 @@ export const asyncRouterMap = [ } ] }, + { + path: '/CarStatList', + component: Layout, + redirect: 'noredirect', + meta: { + icon: 'shiyongqingkuan', + type: 9 + }, + children: [ + { + path: 'index', + component: () => import('@/views/CarStatList/index'), + name: 'CarStatList', + meta: { title: 'CarStatList', noCache: true } + } + ] + }, { path: '/InstallmentApply', component: Layout, diff --git a/src/views/AccessMaterials/AccessMaterialsList.vue b/src/views/AccessMaterials/AccessMaterialsList.vue index d94db69b..1cd27a82 100644 --- a/src/views/AccessMaterials/AccessMaterialsList.vue +++ b/src/views/AccessMaterials/AccessMaterialsList.vue @@ -378,7 +378,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -386,7 +386,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AccessMaterials/RetreatMaterialsList.vue b/src/views/AccessMaterials/RetreatMaterialsList.vue index 5c8a9e8b..c5317d95 100644 --- a/src/views/AccessMaterials/RetreatMaterialsList.vue +++ b/src/views/AccessMaterials/RetreatMaterialsList.vue @@ -377,7 +377,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -385,7 +385,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AccessMaterials/components/MyMaterials.vue b/src/views/AccessMaterials/components/MyMaterials.vue index 9cb126c7..eef0dfcb 100644 --- a/src/views/AccessMaterials/components/MyMaterials.vue +++ b/src/views/AccessMaterials/components/MyMaterials.vue @@ -240,8 +240,7 @@ export default { pageSize: 10, judgeStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/ProduceTask.vue b/src/views/AccessMaterials/components/ProduceTask.vue index 7487c7c3..575d2ca9 100644 --- a/src/views/AccessMaterials/components/ProduceTask.vue +++ b/src/views/AccessMaterials/components/ProduceTask.vue @@ -221,8 +221,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdjustPrice/AdjustPriceList.vue b/src/views/AdjustPrice/AdjustPriceList.vue index 5f199d3c..c4d52bc0 100644 --- a/src/views/AdjustPrice/AdjustPriceList.vue +++ b/src/views/AdjustPrice/AdjustPriceList.vue @@ -369,7 +369,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -377,7 +377,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AdvancePay/AdvancePayList.vue b/src/views/AdvancePay/AdvancePayList.vue index 9c8423ed..88a6ba5e 100644 --- a/src/views/AdvancePay/AdvancePayList.vue +++ b/src/views/AdvancePay/AdvancePayList.vue @@ -365,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Advancemanage/AdvanceOrderList.vue b/src/views/Advancemanage/AdvanceOrderList.vue index 12c02186..f8b2d29b 100644 --- a/src/views/Advancemanage/AdvanceOrderList.vue +++ b/src/views/Advancemanage/AdvanceOrderList.vue @@ -372,7 +372,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -380,7 +380,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Advancemanage/PrepReturnList.vue b/src/views/Advancemanage/PrepReturnList.vue index 8b13f639..08c9ce82 100644 --- a/src/views/Advancemanage/PrepReturnList.vue +++ b/src/views/Advancemanage/PrepReturnList.vue @@ -423,7 +423,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -431,7 +431,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Advancemanage/components/MyPresale.vue b/src/views/Advancemanage/components/MyPresale.vue index a427f368..83adaf67 100644 --- a/src/views/Advancemanage/components/MyPresale.vue +++ b/src/views/Advancemanage/components/MyPresale.vue @@ -229,8 +229,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/index.vue b/src/views/AgentCollect/index.vue index ff8473fd..507584e8 100644 --- a/src/views/AgentCollect/index.vue +++ b/src/views/AgentCollect/index.vue @@ -412,7 +412,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -420,7 +420,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/BuildUp/BuildUpList.vue b/src/views/BuildUp/BuildUpList.vue index 386ccc5d..c4c0042f 100644 --- a/src/views/BuildUp/BuildUpList.vue +++ b/src/views/BuildUp/BuildUpList.vue @@ -344,7 +344,7 @@ export default { isReview(row) { if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -352,7 +352,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CarStatList/index.vue b/src/views/CarStatList/index.vue new file mode 100644 index 00000000..172f3f0d --- /dev/null +++ b/src/views/CarStatList/index.vue @@ -0,0 +1,449 @@ + + + + + diff --git a/src/views/ChangeCount/ChangeCountList.vue b/src/views/ChangeCount/ChangeCountList.vue index 23050b31..e1eee970 100644 --- a/src/views/ChangeCount/ChangeCountList.vue +++ b/src/views/ChangeCount/ChangeCountList.vue @@ -423,7 +423,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -431,7 +431,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ChangeCount/components/MyInstallment.vue b/src/views/ChangeCount/components/MyInstallment.vue index 0b56e350..7f330935 100644 --- a/src/views/ChangeCount/components/MyInstallment.vue +++ b/src/views/ChangeCount/components/MyInstallment.vue @@ -218,8 +218,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/CheckFailList.vue b/src/views/CheckFail/CheckFailList.vue index 2ec79b0f..427747ed 100644 --- a/src/views/CheckFail/CheckFailList.vue +++ b/src/views/CheckFail/CheckFailList.vue @@ -378,7 +378,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -386,7 +386,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CheckFail/components/MyReport.vue b/src/views/CheckFail/components/MyReport.vue index 30522d50..a16d940a 100644 --- a/src/views/CheckFail/components/MyReport.vue +++ b/src/views/CheckFail/components/MyReport.vue @@ -257,8 +257,7 @@ export default { pageSize: 10, judgeStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/CheckReportList.vue b/src/views/CheckReport/CheckReportList.vue index 6201b600..a8098249 100644 --- a/src/views/CheckReport/CheckReportList.vue +++ b/src/views/CheckReport/CheckReportList.vue @@ -398,7 +398,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -406,7 +406,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CheckReport/components/MyArrival.vue b/src/views/CheckReport/components/MyArrival.vue index c450a8cf..39678903 100644 --- a/src/views/CheckReport/components/MyArrival.vue +++ b/src/views/CheckReport/components/MyArrival.vue @@ -245,8 +245,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyQuality.vue b/src/views/CheckReport/components/MyQuality.vue index 3c396c16..79e91617 100644 --- a/src/views/CheckReport/components/MyQuality.vue +++ b/src/views/CheckReport/components/MyQuality.vue @@ -233,8 +233,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/ProduceTask.vue b/src/views/CheckReport/components/ProduceTask.vue index 213ef2e4..7d05851a 100644 --- a/src/views/CheckReport/components/ProduceTask.vue +++ b/src/views/CheckReport/components/ProduceTask.vue @@ -221,8 +221,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/index.vue b/src/views/CollectList/index.vue index 0d3387ff..ebac462f 100644 --- a/src/views/CollectList/index.vue +++ b/src/views/CollectList/index.vue @@ -401,7 +401,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -409,7 +409,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/Collection/CollectionList.vue b/src/views/Collection/CollectionList.vue index 46903da9..4be9d213 100644 --- a/src/views/Collection/CollectionList.vue +++ b/src/views/Collection/CollectionList.vue @@ -400,7 +400,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -408,7 +408,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/Collection/RecoverVehicleList.vue b/src/views/Collection/RecoverVehicleList.vue index f502ef97..05c0ab0d 100644 --- a/src/views/Collection/RecoverVehicleList.vue +++ b/src/views/Collection/RecoverVehicleList.vue @@ -415,7 +415,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -423,7 +423,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CustomerMarketing/CustomerChatList.vue b/src/views/CustomerMarketing/CustomerChatList.vue index 76ed7f90..1f7966d0 100644 --- a/src/views/CustomerMarketing/CustomerChatList.vue +++ b/src/views/CustomerMarketing/CustomerChatList.vue @@ -381,7 +381,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -389,7 +389,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/CustomerMarketing/CustomerVisitList.vue b/src/views/CustomerMarketing/CustomerVisitList.vue index 2f963691..ba0c32c5 100644 --- a/src/views/CustomerMarketing/CustomerVisitList.vue +++ b/src/views/CustomerMarketing/CustomerVisitList.vue @@ -376,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -384,7 +384,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/DailyAdjust/DailyAdjustList.vue b/src/views/DailyAdjust/DailyAdjustList.vue index 0d2d3654..7af32b72 100644 --- a/src/views/DailyAdjust/DailyAdjustList.vue +++ b/src/views/DailyAdjust/DailyAdjustList.vue @@ -351,7 +351,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -359,7 +359,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/DeliverGoods/DeliverGoodsList.vue b/src/views/DeliverGoods/DeliverGoodsList.vue index 76260fa0..0e6b78b3 100644 --- a/src/views/DeliverGoods/DeliverGoodsList.vue +++ b/src/views/DeliverGoods/DeliverGoodsList.vue @@ -68,15 +68,15 @@ {{ $t('public.batchoperation') }} - {{ $t('public.delete') }} + {{ $t('public.delete') }} - {{ $t('public.export') }} + {{ $t('public.export') }} - {{ $t('public.print') }} + {{ $t('public.print') }} - {{ $t('public.add') }} + {{ $t('public.add') }} @@ -143,9 +143,9 @@ @@ -407,7 +407,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -415,7 +415,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/DeliverGoods/components/MySaleout.vue b/src/views/DeliverGoods/components/MySaleout.vue index e2978f5c..2ad80202 100644 --- a/src/views/DeliverGoods/components/MySaleout.vue +++ b/src/views/DeliverGoods/components/MySaleout.vue @@ -234,8 +234,7 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Expenses/ExpensesList.vue b/src/views/Expenses/ExpensesList.vue index 4b24ea15..68443ac5 100644 --- a/src/views/Expenses/ExpensesList.vue +++ b/src/views/Expenses/ExpensesList.vue @@ -360,7 +360,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -368,7 +368,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InstallmentApply/InstallmentApplyList.vue b/src/views/InstallmentApply/InstallmentApplyList.vue index 3324971e..5865a7f0 100644 --- a/src/views/InstallmentApply/InstallmentApplyList.vue +++ b/src/views/InstallmentApply/InstallmentApplyList.vue @@ -409,7 +409,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -417,7 +417,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InstallmentList/index.vue b/src/views/InstallmentList/index.vue index 3288a384..dbcd981d 100644 --- a/src/views/InstallmentList/index.vue +++ b/src/views/InstallmentList/index.vue @@ -405,7 +405,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -413,7 +413,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/InventoryCount/AddInventoryCount.vue b/src/views/InventoryCount/AddInventoryCount.vue index a0245426..92afa187 100644 --- a/src/views/InventoryCount/AddInventoryCount.vue +++ b/src/views/InventoryCount/AddInventoryCount.vue @@ -141,6 +141,20 @@ export default { name: 'AddInventoryCount', components: { MyCreate, MyRepository, MyDetail }, data() { + const validatePass = (rule, value, callback) => { + if (this.handlePersonId === undefined || this.handlePersonId === null || this.handlePersonId === '') { + callback(new Error('请选择经办人')) + } else { + callback() + } + } + const validatePass2 = (rule, value, callback) => { + if (this.countRepositoryId === undefined || this.countRepositoryId === null || this.countRepositoryId === '') { + callback(new Error('请选择盘点仓库')) + } else { + callback() + } + } return { // 库存数量 out: '', @@ -187,10 +201,10 @@ export default { // 库存盘点单规则数据 personalrules: { handlePersonId: [ - { required: true, message: '请选择经办人', trigger: 'blue' } + { required: true, validator: validatePass, trigger: 'change' } ], countRepositoryId: [ - { required: true, message: '请选择盘点仓库', trigger: 'blue' } + { required: true, validator: validatePass2, trigger: 'change' } ] } } diff --git a/src/views/InventoryCount/InventoryCountList.vue b/src/views/InventoryCount/InventoryCountList.vue index 97429b17..073b98cf 100644 --- a/src/views/InventoryCount/InventoryCountList.vue +++ b/src/views/InventoryCount/InventoryCountList.vue @@ -333,7 +333,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -341,7 +341,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InventoryOverflow/OverflowList.vue b/src/views/InventoryOverflow/OverflowList.vue index 932ba37e..5a9ea876 100644 --- a/src/views/InventoryOverflow/OverflowList.vue +++ b/src/views/InventoryOverflow/OverflowList.vue @@ -361,7 +361,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -369,7 +369,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Inventorydamaged/InventorydamagedList.vue b/src/views/Inventorydamaged/InventorydamagedList.vue index 28674430..64eea1c9 100644 --- a/src/views/Inventorydamaged/InventorydamagedList.vue +++ b/src/views/Inventorydamaged/InventorydamagedList.vue @@ -315,7 +315,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -323,7 +323,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Invoice/InvoiceList.vue b/src/views/Invoice/InvoiceList.vue index bcfb052b..01606616 100644 --- a/src/views/Invoice/InvoiceList.vue +++ b/src/views/Invoice/InvoiceList.vue @@ -372,7 +372,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -380,7 +380,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/MaterialsList/MaterialsListli.vue b/src/views/MaterialsList/MaterialsListli.vue index 5a993d13..55665ce2 100644 --- a/src/views/MaterialsList/MaterialsListli.vue +++ b/src/views/MaterialsList/MaterialsListli.vue @@ -257,7 +257,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -265,7 +265,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/OutFactory/OutFactoryList.vue b/src/views/OutFactory/OutFactoryList.vue index 0b97bae2..67b1587c 100644 --- a/src/views/OutFactory/OutFactoryList.vue +++ b/src/views/OutFactory/OutFactoryList.vue @@ -248,7 +248,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/OutSourcing/OutSourcingList.vue b/src/views/OutSourcing/OutSourcingList.vue index ab041187..6d38f87e 100644 --- a/src/views/OutSourcing/OutSourcingList.vue +++ b/src/views/OutSourcing/OutSourcingList.vue @@ -332,7 +332,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -340,7 +340,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/OverdueList/index.vue b/src/views/OverdueList/index.vue index 3619c1b2..4c009418 100644 --- a/src/views/OverdueList/index.vue +++ b/src/views/OverdueList/index.vue @@ -401,7 +401,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -409,7 +409,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/PrepReceipt/PrepReceiptList.vue b/src/views/PrepReceipt/PrepReceiptList.vue index 9f1663aa..27ecc7ed 100644 --- a/src/views/PrepReceipt/PrepReceiptList.vue +++ b/src/views/PrepReceipt/PrepReceiptList.vue @@ -352,7 +352,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -360,7 +360,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/PrepReceipt/components/MyOrder.vue b/src/views/PrepReceipt/components/MyOrder.vue index 76c2c133..7ae47c1d 100644 --- a/src/views/PrepReceipt/components/MyOrder.vue +++ b/src/views/PrepReceipt/components/MyOrder.vue @@ -242,8 +242,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProducePlan/ProducePlanList.vue b/src/views/ProducePlan/ProducePlanList.vue index 93f4ec7b..d0423b24 100644 --- a/src/views/ProducePlan/ProducePlanList.vue +++ b/src/views/ProducePlan/ProducePlanList.vue @@ -313,7 +313,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -321,7 +321,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProduceRequire/index.vue b/src/views/ProduceRequire/index.vue index 2fdbd99c..8da2105d 100644 --- a/src/views/ProduceRequire/index.vue +++ b/src/views/ProduceRequire/index.vue @@ -416,7 +416,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/ProduceTask/ProduceReportList.vue b/src/views/ProduceTask/ProduceReportList.vue index c0d9c0e9..4acdad93 100644 --- a/src/views/ProduceTask/ProduceReportList.vue +++ b/src/views/ProduceTask/ProduceReportList.vue @@ -306,7 +306,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -314,7 +314,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProduceTask/ProduceTaskList.vue b/src/views/ProduceTask/ProduceTaskList.vue index d17d99ee..8a4bea01 100644 --- a/src/views/ProduceTask/ProduceTaskList.vue +++ b/src/views/ProduceTask/ProduceTaskList.vue @@ -354,7 +354,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -362,7 +362,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProduceTask/components/ProducePlan.vue b/src/views/ProduceTask/components/ProducePlan.vue index 40bca73a..57c65036 100644 --- a/src/views/ProduceTask/components/ProducePlan.vue +++ b/src/views/ProduceTask/components/ProducePlan.vue @@ -180,8 +180,7 @@ export default { pagesize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 开始时间到结束时间 date: [] diff --git a/src/views/QualityCheck/QualityCheckList.vue b/src/views/QualityCheck/QualityCheckList.vue index d87f8e5a..9db94a91 100644 --- a/src/views/QualityCheck/QualityCheckList.vue +++ b/src/views/QualityCheck/QualityCheckList.vue @@ -376,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -384,7 +384,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/QualityCheck/components/MyArrival.vue b/src/views/QualityCheck/components/MyArrival.vue index 3ad053c2..c64be53d 100644 --- a/src/views/QualityCheck/components/MyArrival.vue +++ b/src/views/QualityCheck/components/MyArrival.vue @@ -250,7 +250,6 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId, supplierId: this.supp }, // 传给组件的数据 diff --git a/src/views/QualityCheck/components/ProduceTask.vue b/src/views/QualityCheck/components/ProduceTask.vue index 7018bf39..b793b20a 100644 --- a/src/views/QualityCheck/components/ProduceTask.vue +++ b/src/views/QualityCheck/components/ProduceTask.vue @@ -221,8 +221,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Receipt/ReceiptList.vue b/src/views/Receipt/ReceiptList.vue index ffe8e87e..a1657e15 100644 --- a/src/views/Receipt/ReceiptList.vue +++ b/src/views/Receipt/ReceiptList.vue @@ -407,7 +407,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -415,7 +415,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Recycling/RecyclingList.vue b/src/views/Recycling/RecyclingList.vue index 063eee0a..147c7166 100644 --- a/src/views/Recycling/RecyclingList.vue +++ b/src/views/Recycling/RecyclingList.vue @@ -357,7 +357,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -365,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/RequirePlan/RequirePlanList.vue b/src/views/RequirePlan/RequirePlanList.vue index d0b8d8d2..ed520710 100644 --- a/src/views/RequirePlan/RequirePlanList.vue +++ b/src/views/RequirePlan/RequirePlanList.vue @@ -336,7 +336,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -344,7 +344,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ReturnExchange/AddReturnExchange.vue b/src/views/ReturnExchange/AddReturnExchange.vue new file mode 100644 index 00000000..9ea61a0e --- /dev/null +++ b/src/views/ReturnExchange/AddReturnExchange.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/views/ReturnExchange/ReturnExchangeList.vue b/src/views/ReturnExchange/ReturnExchangeList.vue new file mode 100644 index 00000000..1b8d3621 --- /dev/null +++ b/src/views/ReturnExchange/ReturnExchangeList.vue @@ -0,0 +1,583 @@ + + + + + diff --git a/src/views/ReturnExchange/components/DetailList.vue b/src/views/ReturnExchange/components/DetailList.vue new file mode 100644 index 00000000..2ff32e51 --- /dev/null +++ b/src/views/ReturnExchange/components/DetailList.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyAccept.vue b/src/views/ReturnExchange/components/MyAccept.vue new file mode 100644 index 00000000..b7f710ff --- /dev/null +++ b/src/views/ReturnExchange/components/MyAccept.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyAgent.vue b/src/views/ReturnExchange/components/MyAgent.vue new file mode 100644 index 00000000..ae2e5587 --- /dev/null +++ b/src/views/ReturnExchange/components/MyAgent.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyApply.vue b/src/views/ReturnExchange/components/MyApply.vue new file mode 100644 index 00000000..698924ee --- /dev/null +++ b/src/views/ReturnExchange/components/MyApply.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyCustomer.vue b/src/views/ReturnExchange/components/MyCustomer.vue new file mode 100644 index 00000000..af55158e --- /dev/null +++ b/src/views/ReturnExchange/components/MyCustomer.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDelivery.vue b/src/views/ReturnExchange/components/MyDelivery.vue new file mode 100644 index 00000000..8bce0364 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDelivery.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDepot.vue b/src/views/ReturnExchange/components/MyDepot.vue new file mode 100644 index 00000000..7ec066f8 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDepot.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDetail.vue b/src/views/ReturnExchange/components/MyDetail.vue new file mode 100644 index 00000000..75515498 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDetail.vue @@ -0,0 +1,310 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDialog.vue b/src/views/ReturnExchange/components/MyDialog.vue new file mode 100644 index 00000000..063cc81f --- /dev/null +++ b/src/views/ReturnExchange/components/MyDialog.vue @@ -0,0 +1,728 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyEmp.vue b/src/views/ReturnExchange/components/MyEmp.vue new file mode 100644 index 00000000..911d490a --- /dev/null +++ b/src/views/ReturnExchange/components/MyEmp.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyMove.vue b/src/views/ReturnExchange/components/MyMove.vue new file mode 100644 index 00000000..55064e8d --- /dev/null +++ b/src/views/ReturnExchange/components/MyMove.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyRepository.vue b/src/views/ReturnExchange/components/MyRepository.vue new file mode 100644 index 00000000..a58721e0 --- /dev/null +++ b/src/views/ReturnExchange/components/MyRepository.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyRequire.vue b/src/views/ReturnExchange/components/MyRequire.vue new file mode 100644 index 00000000..405bffda --- /dev/null +++ b/src/views/ReturnExchange/components/MyRequire.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MySaleout.vue b/src/views/ReturnExchange/components/MySaleout.vue new file mode 100644 index 00000000..91f2b5e2 --- /dev/null +++ b/src/views/ReturnExchange/components/MySaleout.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/src/views/SaleContract/SaleContractList.vue b/src/views/SaleContract/SaleContractList.vue index e2c60721..14f7be35 100644 --- a/src/views/SaleContract/SaleContractList.vue +++ b/src/views/SaleContract/SaleContractList.vue @@ -420,7 +420,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -428,7 +428,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleContract/components/MyOpportunity.vue b/src/views/SaleContract/components/MyOpportunity.vue index 0b795144..63dca506 100644 --- a/src/views/SaleContract/components/MyOpportunity.vue +++ b/src/views/SaleContract/components/MyOpportunity.vue @@ -233,8 +233,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOpportunity/SaleOpportunityList.vue b/src/views/SaleOpportunity/SaleOpportunityList.vue index bd057bd3..64e99397 100644 --- a/src/views/SaleOpportunity/SaleOpportunityList.vue +++ b/src/views/SaleOpportunity/SaleOpportunityList.vue @@ -414,7 +414,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -422,7 +422,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/SaleOrder/SaleOrderList.vue b/src/views/SaleOrder/SaleOrderList.vue index b9b1bf97..359207f8 100644 --- a/src/views/SaleOrder/SaleOrderList.vue +++ b/src/views/SaleOrder/SaleOrderList.vue @@ -420,7 +420,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -428,7 +428,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleOut/AddSaleOut.vue b/src/views/SaleOut/AddSaleOut.vue index 5e2bb171..f96debee 100644 --- a/src/views/SaleOut/AddSaleOut.vue +++ b/src/views/SaleOut/AddSaleOut.vue @@ -917,6 +917,7 @@ export default { } }, opportunity(val) { + console.log(val) if (val.customerType !== null && val.customerType !== undefined && val.customerType !== '') { this.personalForm.customerType = String(val.customerType) } diff --git a/src/views/SaleOut/SaleOutList.vue b/src/views/SaleOut/SaleOutList.vue index dca89c63..fd549be7 100644 --- a/src/views/SaleOut/SaleOutList.vue +++ b/src/views/SaleOut/SaleOutList.vue @@ -436,7 +436,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -444,7 +444,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleOut/components/MyOpportunity.vue b/src/views/SaleOut/components/MyOpportunity.vue index 7e924994..b8be0ef8 100644 --- a/src/views/SaleOut/components/MyOpportunity.vue +++ b/src/views/SaleOut/components/MyOpportunity.vue @@ -234,8 +234,7 @@ export default { pageSize: 10, isUse: 1, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyOrder.vue b/src/views/SaleOut/components/MyOrder.vue index d1ebc893..c7e563ff 100644 --- a/src/views/SaleOut/components/MyOrder.vue +++ b/src/views/SaleOut/components/MyOrder.vue @@ -242,8 +242,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyPresale.vue b/src/views/SaleOut/components/MyPresale.vue index 2cb90641..28313957 100644 --- a/src/views/SaleOut/components/MyPresale.vue +++ b/src/views/SaleOut/components/MyPresale.vue @@ -229,8 +229,7 @@ export default { receiptStat: 2, isUse: 1, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SalePlan/SalePlanList.vue b/src/views/SalePlan/SalePlanList.vue index 46ab6433..5fd507be 100644 --- a/src/views/SalePlan/SalePlanList.vue +++ b/src/views/SalePlan/SalePlanList.vue @@ -416,7 +416,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -424,7 +424,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleReturn/SaleReturnList.vue b/src/views/SaleReturn/SaleReturnList.vue index 4fd2ee06..5cb97781 100644 --- a/src/views/SaleReturn/SaleReturnList.vue +++ b/src/views/SaleReturn/SaleReturnList.vue @@ -432,7 +432,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -440,7 +440,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ShouldPayList/index.vue b/src/views/ShouldPayList/index.vue index d914da21..c68909ab 100644 --- a/src/views/ShouldPayList/index.vue +++ b/src/views/ShouldPayList/index.vue @@ -341,7 +341,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/SmartReplenishment/SmartReplenishmentList.vue b/src/views/SmartReplenishment/SmartReplenishmentList.vue index 8e940afd..bd5eb63b 100644 --- a/src/views/SmartReplenishment/SmartReplenishmentList.vue +++ b/src/views/SmartReplenishment/SmartReplenishmentList.vue @@ -359,7 +359,7 @@ export default { // console.log(row) // if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { // const approvalUse = row.approvalUseVos - // if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + // if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { // return true // } // } @@ -367,7 +367,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/StockApply/StockApplyList.vue b/src/views/StockApply/StockApplyList.vue index b83a1707..8a2f2de5 100644 --- a/src/views/StockApply/StockApplyList.vue +++ b/src/views/StockApply/StockApplyList.vue @@ -363,7 +363,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -371,7 +371,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockApply/components/MyOrder.vue b/src/views/StockApply/components/MyOrder.vue index 20ad3372..6c266f6e 100644 --- a/src/views/StockApply/components/MyOrder.vue +++ b/src/views/StockApply/components/MyOrder.vue @@ -242,8 +242,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/StockArrivalList.vue b/src/views/StockArrival/StockArrivalList.vue index 8b152a51..10098c2a 100644 --- a/src/views/StockArrival/StockArrivalList.vue +++ b/src/views/StockArrival/StockArrivalList.vue @@ -382,7 +382,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -390,7 +390,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockArrival/components/MyOrder.vue b/src/views/StockArrival/components/MyOrder.vue index d221968b..5cbd7a61 100644 --- a/src/views/StockArrival/components/MyOrder.vue +++ b/src/views/StockArrival/components/MyOrder.vue @@ -252,8 +252,7 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - supplierId: this.supp, - createPersonId: this.$store.getters.userId + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/StockContractList.vue b/src/views/StockContract/StockContractList.vue index 848abede..b0c35354 100644 --- a/src/views/StockContract/StockContractList.vue +++ b/src/views/StockContract/StockContractList.vue @@ -389,7 +389,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -397,7 +397,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockContract/components/MyApply.vue b/src/views/StockContract/components/MyApply.vue index 6b85fff5..12310b8f 100644 --- a/src/views/StockContract/components/MyApply.vue +++ b/src/views/StockContract/components/MyApply.vue @@ -234,8 +234,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyLnquiry.vue b/src/views/StockContract/components/MyLnquiry.vue index c13d8bc1..e82e1fbd 100644 --- a/src/views/StockContract/components/MyLnquiry.vue +++ b/src/views/StockContract/components/MyLnquiry.vue @@ -250,8 +250,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyPlan.vue b/src/views/StockContract/components/MyPlan.vue index 865d3c8f..8ca72951 100644 --- a/src/views/StockContract/components/MyPlan.vue +++ b/src/views/StockContract/components/MyPlan.vue @@ -228,8 +228,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockInquiry/StockInquiryList.vue b/src/views/StockInquiry/StockInquiryList.vue index 90caafbc..3aad8824 100644 --- a/src/views/StockInquiry/StockInquiryList.vue +++ b/src/views/StockInquiry/StockInquiryList.vue @@ -394,7 +394,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -402,7 +402,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockInquiry/components/MyApply.vue b/src/views/StockInquiry/components/MyApply.vue index badd0506..a0bff7a0 100644 --- a/src/views/StockInquiry/components/MyApply.vue +++ b/src/views/StockInquiry/components/MyApply.vue @@ -234,8 +234,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockInquiry/components/MyPlan.vue b/src/views/StockInquiry/components/MyPlan.vue index c35c41db..3c61709c 100644 --- a/src/views/StockInquiry/components/MyPlan.vue +++ b/src/views/StockInquiry/components/MyPlan.vue @@ -233,8 +233,7 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - supplierId: this.supp, - createPersonId: this.$store.getters.userId + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/StockOrderList.vue b/src/views/StockOrder/StockOrderList.vue index b65d9db7..1431e216 100644 --- a/src/views/StockOrder/StockOrderList.vue +++ b/src/views/StockOrder/StockOrderList.vue @@ -394,7 +394,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -402,7 +402,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockOrder/components/MyApply.vue b/src/views/StockOrder/components/MyApply.vue index 4f69e534..13c6bd54 100644 --- a/src/views/StockOrder/components/MyApply.vue +++ b/src/views/StockOrder/components/MyApply.vue @@ -234,8 +234,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyContract.vue b/src/views/StockOrder/components/MyContract.vue index 8a85d359..e4b75d5d 100644 --- a/src/views/StockOrder/components/MyContract.vue +++ b/src/views/StockOrder/components/MyContract.vue @@ -252,8 +252,7 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, - supplierId: this.supp, - createPersonId: this.$store.getters.userId + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyLnquiry.vue b/src/views/StockOrder/components/MyLnquiry.vue index 991b29c2..b9c08228 100644 --- a/src/views/StockOrder/components/MyLnquiry.vue +++ b/src/views/StockOrder/components/MyLnquiry.vue @@ -255,7 +255,6 @@ export default { repositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: this.$store.getters.userId, judgeStat: 2 }, // 传给组件的数据 diff --git a/src/views/StockOrder/components/MyPlan.vue b/src/views/StockOrder/components/MyPlan.vue index ed10f967..6ad03ed8 100644 --- a/src/views/StockOrder/components/MyPlan.vue +++ b/src/views/StockOrder/components/MyPlan.vue @@ -233,8 +233,7 @@ export default { judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, supplierId: this.supp, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOut/OtherStockOutList.vue b/src/views/StockOut/OtherStockOutList.vue index 80d6576e..5be1bfd9 100644 --- a/src/views/StockOut/OtherStockOutList.vue +++ b/src/views/StockOut/OtherStockOutList.vue @@ -325,7 +325,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -333,7 +333,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockPlan/StockPlanList.vue b/src/views/StockPlan/StockPlanList.vue index 68010b93..542a780b 100644 --- a/src/views/StockPlan/StockPlanList.vue +++ b/src/views/StockPlan/StockPlanList.vue @@ -357,7 +357,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -365,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockPlan/components/MyApply.vue b/src/views/StockPlan/components/MyApply.vue index 0ca91fb7..da405880 100644 --- a/src/views/StockPlan/components/MyApply.vue +++ b/src/views/StockPlan/components/MyApply.vue @@ -231,10 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - judgeStat: 2, receiptStat: 2, + judgeStat: 2, + receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockPlan/components/MyRequire.vue b/src/views/StockPlan/components/MyRequire.vue index 57539d5d..447b1073 100644 --- a/src/views/StockPlan/components/MyRequire.vue +++ b/src/views/StockPlan/components/MyRequire.vue @@ -198,8 +198,7 @@ export default { pageNum: 1, pageSize: 10, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/StockRetreatList.vue b/src/views/StockRetreat/StockRetreatList.vue index 098e9fd8..bd14a11a 100644 --- a/src/views/StockRetreat/StockRetreatList.vue +++ b/src/views/StockRetreat/StockRetreatList.vue @@ -373,7 +373,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -381,7 +381,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockRetreat/components/MyArrival.vue b/src/views/StockRetreat/components/MyArrival.vue index 9ce74897..9e719dc6 100644 --- a/src/views/StockRetreat/components/MyArrival.vue +++ b/src/views/StockRetreat/components/MyArrival.vue @@ -245,8 +245,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Stockenter/OtherEnterList.vue b/src/views/Stockenter/OtherEnterList.vue index 2c9662b9..48fbac55 100644 --- a/src/views/Stockenter/OtherEnterList.vue +++ b/src/views/Stockenter/OtherEnterList.vue @@ -390,7 +390,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -403,7 +403,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updateotherenter5(row, 2, this.getemplist.createPersonId).then(res => { + updateotherenter5(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -414,7 +414,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updateotherenter5(row, 1, this.getemplist.createPersonId).then(res => { + updateotherenter5(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/ProduceEnterList.vue b/src/views/Stockenter/ProduceEnterList.vue index ce3e3c09..d4706579 100644 --- a/src/views/Stockenter/ProduceEnterList.vue +++ b/src/views/Stockenter/ProduceEnterList.vue @@ -373,7 +373,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -386,7 +386,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updatestockenter4(row, 2, this.getemplist.createPersonId).then(res => { + updatestockenter4(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -397,7 +397,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updatestockenter4(row, 1, this.getemplist.createPersonId).then(res => { + updatestockenter4(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/Stockenterlist.vue b/src/views/Stockenter/Stockenterlist.vue index 0b9edb6d..12cd8c46 100644 --- a/src/views/Stockenter/Stockenterlist.vue +++ b/src/views/Stockenter/Stockenterlist.vue @@ -335,7 +335,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -348,7 +348,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updatestockenter3(row, 2, this.getemplist.createPersonId).then(res => { + updatestockenter3(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -359,7 +359,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updatestockenter3(row, 1, this.getemplist.createPersonId).then(res => { + updatestockenter3(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue index 7673718d..604418b6 100644 --- a/src/views/Stockenter/components/MyArrival.vue +++ b/src/views/Stockenter/components/MyArrival.vue @@ -245,8 +245,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Storagemove/StoragemoveList.vue b/src/views/Storagemove/StoragemoveList.vue index 1c225501..3d86a6c5 100644 --- a/src/views/Storagemove/StoragemoveList.vue +++ b/src/views/Storagemove/StoragemoveList.vue @@ -384,7 +384,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -392,7 +392,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/TearDown/TearDownList.vue b/src/views/TearDown/TearDownList.vue index a9864024..ee15f3d4 100644 --- a/src/views/TearDown/TearDownList.vue +++ b/src/views/TearDown/TearDownList.vue @@ -345,7 +345,7 @@ export default { isReview(row) { if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -353,7 +353,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Transfer/TransferList.vue b/src/views/Transfer/TransferList.vue index 8df4fbbe..c6c9c8df 100644 --- a/src/views/Transfer/TransferList.vue +++ b/src/views/Transfer/TransferList.vue @@ -376,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -384,7 +384,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/WarehouseAdjust/Enterlist.vue b/src/views/WarehouseAdjust/Enterlist.vue index bc6cd9db..9eae2638 100644 --- a/src/views/WarehouseAdjust/Enterlist.vue +++ b/src/views/WarehouseAdjust/Enterlist.vue @@ -314,7 +314,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -322,7 +322,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/WarehouseAdjust/LocationAdjustList.vue b/src/views/WarehouseAdjust/LocationAdjustList.vue index 4a24cd2b..3e60b673 100644 --- a/src/views/WarehouseAdjust/LocationAdjustList.vue +++ b/src/views/WarehouseAdjust/LocationAdjustList.vue @@ -339,7 +339,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -347,7 +347,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/income/IncomeList.vue b/src/views/income/IncomeList.vue index eb9d5990..bc0bb761 100644 --- a/src/views/income/IncomeList.vue +++ b/src/views/income/IncomeList.vue @@ -360,7 +360,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -368,7 +368,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/payment/components/MyOrder.vue b/src/views/payment/components/MyOrder.vue index 33e1fed1..d0f3167f 100644 --- a/src/views/payment/components/MyOrder.vue +++ b/src/views/payment/components/MyOrder.vue @@ -247,8 +247,7 @@ export default { pageSize: 10, judgeStat: 2, receiptStat: 2, repositoryId: this.$store.getters.repositoryId, - regionIds: this.$store.getters.regionId, - createPersonId: this.$store.getters.userId + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/paymentList.vue b/src/views/payment/paymentList.vue index 6a77fee6..f15a2736 100644 --- a/src/views/payment/paymentList.vue +++ b/src/views/payment/paymentList.vue @@ -364,7 +364,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -372,7 +372,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过',