luobang 2 years ago
parent
commit
3c48922c43

+ 2 - 1
build/utils.js

@@ -16,7 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['index', 'statisticalReport', 'appoint', 'ADMINISTRATORS']
+// let devModules = ['all']
+// let devModules = ['index', 'appoint']
 let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

+ 5 - 6
src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -265,14 +265,13 @@
 </template>
 <script>
 import { getCookie } from '@/utils/util.js'
-import { sjTime } from '@/utils/sharedJsFile'
-import { isNumber } from '../../../ADMINISTRATORS/app'
-import ExcelSaleOrder from '../saleContract/importExcelSaleOrder.vue'
+import { sjTime, isNumber } from '@/utils/sharedJsFile'
+// import ExcelSaleOrder from '../saleContract/importExcelSaleOrder.vue'
 export default {
   name: 'saleOrder',
-  components: {
-    ExcelSaleOrder
-  },
+  // components: {
+  //   ExcelSaleOrder
+  // },
   data() {
     return {
       dialogTableVisible: false,

+ 111 - 69
src/views/appoint/router/index.js

@@ -4,77 +4,119 @@ import routerBefore from '@/config/routerBefore.js'
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
-const addCargoResult = () => import( '../components/ship/addCargoResult.vue')
-const addDeliveryAttorney = () => import( '../components/ship/addDeliveryAttorney.vue')
-const addDeliveryNotice = () => import( '../components/ship/addDeliveryNotice.vue')
-const attorneytext = () => import( '../components/ship/attorneytext.vue')
-const cargoResult = () => import( '../components/ship/cargoResult.vue')
-const deliveryAttorney = () => import( '../components/ship/deliveryAttorney.vue')
-const deliveryNotice = () => import( '../components/ship/deliveryNotice.vue')
-const modifyCargoResult = () => import( '../components/ship/modifyCargoResult.vue')
-const modifyDeliveryAttroney = () => import( '../components/ship/modifyDeliveryAttroney.vue')
-const modifyDeliveryNotice = () => import( '../components/ship/modifyDeliveryNotice.vue')
-const addBreach = () => import( '../components/purchase/addBreach.vue')
-const addOtherPrice = () => import( '../components/purchase/addOtherPrice.vue')
-const addShipPrice = () => import( '../components/purchase/addShipPrice.vue')
-const addTrainPrice = () => import( '../components/purchase/addTrainPrice.vue')
-const addTruckPrice = () => import( '../components/purchase/addTruckPrice.vue')
-const breach = () => import( '../components/purchase/breach.vue')
-const otherPrice = () => import( '../components/purchase/otherPrice.vue')
-const purchaseOrder = () => import( '../components/purchase/purchaseOrder.vue')
-const shipPrice = () => import( '../components/purchase/shipPrice.vue')
-const trainPrice = () => import( '../components/purchase/trainPrice.vue')
-const truckPrice = () => import( '../components/purchase/truckPrice.vue')
-const updateBreach = () => import( '../components/purchase/updateBreach.vue')
-const updateOtherPrice = () => import( '../components/purchase/updateOtherPrice.vue')
-const updateShipPrice = () => import( '../components/purchase/updateShipPrice.vue')
-const updateTrainPrice = () => import( '../components/purchase/updateTrainPrice.vue')
-const updateTruckPrice = () => import( '../components/purchase/updateTruckPrice.vue')
-const addSaleCokeSend = () => import( '../components/saleContract/addSaleCokeSend.vue')
-const addSaleOrder = () => import( '../components/saleContract/addSaleOrder.vue')
-const addSaleOrderArrange = () => import( '../components/saleContract/addSaleOrderArrange.vue')
-const addSaleOrderSend = () => import( '../components/saleContract/addSaleOrderSend.vue')
-const addSaleOrderCoproductSend = () => import( '../components/saleContract/addSaleOrderCoproductSend.vue')
-const addSaleOrderCoproductSendCarrier = () => import( '../components/saleContract/addSaleOrderCoproductSendCarrier.vue')
-const addSaleOrderSteelSend = () => import( '../components/saleContract/addSaleOrderSteelSend.vue')
-const addSaleOrderSteelSendCarrier = () => import( '../components/saleContract/addSaleOrderSteelSendCarrier.vue')
-const addSalePlan = () => import( '../components/saleContract/addSalePlan.vue')
-const addSalePlanDetail = () => import( '../components/saleContract/addSalePlanDetail.vue')
-const addTransportPrice = () => import( '../components/saleContract/addTransportPrice.vue')
-const addTransportPriceNew = () => import( '../components/saleContract/addTransportPriceNew.vue')
-const addTruckNoDetail = () => import( '../components/saleContract/addTruckNoDetail.vue')
-const editaddress = () => import( '../components/saleContract/editaddress.vue')
-const editSaleOrder = () => import( '../components/saleContract/editSaleOrder.vue')
-const editSaleOrderDetail = () => import( '../components/saleContract/editSaleOrderDetail.vue')
-const editSalePalnDetail = () => import( '../components/saleContract/editSalePalnDetail.vue')
-const editSalePlan = () => import( '../components/saleContract/editSalePlan.vue')
-const editTransportPrice = () => import( '../components/saleContract/editTransportPrice.vue')
-const editTruckNoDetail = () => import( '../components/saleContract/editTruckNoDetail.vue')
-const saleCokeInward = () => import( '../components/saleContract/saleCokeInward.vue')
-const saleOrder = () => import( '../components/saleContract/saleOrder.vue')
-const saleOrderArrange = () => import( '../components/saleContract/saleOrderArrange.vue')
-const saleOrderCoproduct = () => import( '../components/saleContract/saleOrderCoproduct.vue')
-const saleOrderCoproductCarrier = () => import( '../components/saleContract/saleOrderCoproductCarrier.vue')
-const saleOrderDetail = () => import( '../components/saleContract/saleOrderDetail.vue')
-const saleOrderDetailApproved = () => import( '../components/saleContract/saleOrderDetailApproved.vue')
-const saleOrderMaterial = () => import( '../components/saleContract/saleOrderMaterial.vue')
-const dispacherSwitch = () => import( '../components/saleContract/dispacherSwitch.vue')
-// const saleOrderSteel = () => import( "../components/saleContract/saleOrderSteel.vue";
+const addCargoResult = () => import('../components/ship/addCargoResult.vue')
+const addDeliveryAttorney = () =>
+  import('../components/ship/addDeliveryAttorney.vue')
+const addDeliveryNotice = () =>
+  import('../components/ship/addDeliveryNotice.vue')
+const attorneytext = () => import('../components/ship/attorneytext.vue')
+const cargoResult = () => import('../components/ship/cargoResult.vue')
+const deliveryAttorney = () => import('../components/ship/deliveryAttorney.vue')
+const deliveryNotice = () => import('../components/ship/deliveryNotice.vue')
+const modifyCargoResult = () =>
+  import('../components/ship/modifyCargoResult.vue')
+const modifyDeliveryAttroney = () =>
+  import('../components/ship/modifyDeliveryAttroney.vue')
+const modifyDeliveryNotice = () =>
+  import('../components/ship/modifyDeliveryNotice.vue')
+const addBreach = () => import('../components/purchase/addBreach.vue')
+const addOtherPrice = () => import('../components/purchase/addOtherPrice.vue')
+const addShipPrice = () => import('../components/purchase/addShipPrice.vue')
+const addTrainPrice = () => import('../components/purchase/addTrainPrice.vue')
+const addTruckPrice = () => import('../components/purchase/addTruckPrice.vue')
+const breach = () => import('../components/purchase/breach.vue')
+const otherPrice = () => import('../components/purchase/otherPrice.vue')
+const purchaseOrder = () => import('../components/purchase/purchaseOrder.vue')
+const shipPrice = () => import('../components/purchase/shipPrice.vue')
+const trainPrice = () => import('../components/purchase/trainPrice.vue')
+const truckPrice = () => import('../components/purchase/truckPrice.vue')
+const updateBreach = () => import('../components/purchase/updateBreach.vue')
+const updateOtherPrice = () =>
+  import('../components/purchase/updateOtherPrice.vue')
+const updateShipPrice = () =>
+  import('../components/purchase/updateShipPrice.vue')
+const updateTrainPrice = () =>
+  import('../components/purchase/updateTrainPrice.vue')
+const updateTruckPrice = () =>
+  import('../components/purchase/updateTruckPrice.vue')
+const addSaleCokeSend = () =>
+  import('../components/saleContract/addSaleCokeSend.vue')
+const addSaleOrder = () => import('../components/saleContract/addSaleOrder.vue')
+const addSaleOrderArrange = () =>
+  import('../components/saleContract/addSaleOrderArrange.vue')
+const addSaleOrderSend = () =>
+  import('../components/saleContract/addSaleOrderSend.vue')
+const addSaleOrderCoproductSend = () =>
+  import('../components/saleContract/addSaleOrderCoproductSend.vue')
+const addSaleOrderCoproductSendCarrier = () =>
+  import('../components/saleContract/addSaleOrderCoproductSendCarrier.vue')
+const addSaleOrderSteelSend = () =>
+  import('../components/saleContract/addSaleOrderSteelSend.vue')
+const addSaleOrderSteelSendCarrier = () =>
+  import('../components/saleContract/addSaleOrderSteelSendCarrier.vue')
+const addSalePlan = () => import('../components/saleContract/addSalePlan.vue')
+const addSalePlanDetail = () =>
+  import('../components/saleContract/addSalePlanDetail.vue')
+const addTransportPrice = () =>
+  import('../components/saleContract/addTransportPrice.vue')
+const addTransportPriceNew = () =>
+  import('../components/saleContract/addTransportPriceNew.vue')
+const addTruckNoDetail = () =>
+  import('../components/saleContract/addTruckNoDetail.vue')
+const editaddress = () => import('../components/saleContract/editaddress.vue')
+const editSaleOrder = () =>
+  import('../components/saleContract/editSaleOrder.vue')
+const editSaleOrderDetail = () =>
+  import('../components/saleContract/editSaleOrderDetail.vue')
+const editSalePalnDetail = () =>
+  import('../components/saleContract/editSalePalnDetail.vue')
+const editSalePlan = () => import('../components/saleContract/editSalePlan.vue')
+const editTransportPrice = () =>
+  import('../components/saleContract/editTransportPrice.vue')
+const editTruckNoDetail = () =>
+  import('../components/saleContract/editTruckNoDetail.vue')
+const saleCokeInward = () =>
+  import('../components/saleContract/saleCokeInward.vue')
+const saleOrder = () => import('../components/saleContract/saleOrder.vue')
+const saleOrderArrange = () =>
+  import('../components/saleContract/saleOrderArrange.vue')
+const saleOrderCoproduct = () =>
+  import('../components/saleContract/saleOrderCoproduct.vue')
+const saleOrderCoproductCarrier = () =>
+  import('../components/saleContract/saleOrderCoproductCarrier.vue')
+const saleOrderDetail = () =>
+  import('../components/saleContract/saleOrderDetail.vue')
+const saleOrderDetailApproved = () =>
+  import('../components/saleContract/saleOrderDetailApproved.vue')
+const saleOrderMaterial = () =>
+  import('../components/saleContract/saleOrderMaterial.vue')
+const dispacherSwitch = () =>
+  import('../components/saleContract/dispacherSwitch.vue')
 const saleOrderSteel = () =>
   import('../components/saleContract/saleOrderSteel.vue')
-const saleOrderSteelCar = () => import( '../components/saleContract/saleOrderSteelCar.vue')
-const saleOrderSteelCarrier = () => import( '../components/saleContract/saleOrderSteelCarrier.vue')
-const saleOrderSteelEmpower = () => import( '../components/saleContract/saleOrderSteelEmpower.vue')
-const saleOrderUpdateLog = () => import( '../components/saleContract/saleOrderUpdateLog.vue')
-const salePlan = () => import( '../components/saleContract/salePlan.vue')
-const transportPrice = () => import( '../components/saleContract/transportPrice.vue')
-const inwardTransPrice = () => import( '../components/inward/transPrice.vue')
-const inwardAddTransPrice = () => import( '../components/inward/addTransPrice.vue')
-const saleOrderOODetails = () => import( '../components/saleContract/saleOrderOODetails.vue')
-const updateSaleOrderSteel = () => import( '../components/saleContract/updateSaleOrderSteel.vue')
-const copySteelOrder = () => import( '../components/saleContract/copySteelOrder.vue')
-const rangeValuePoint = () => import( '../components/inward/rangePoint.vue')
-const updateTransPrice = () => import( '../components/inward/updateTransPrice.vue')
+const saleOrderSteelCar = () =>
+  import('../components/saleContract/saleOrderSteelCar.vue')
+const saleOrderSteelCarrier = () =>
+  import('../components/saleContract/saleOrderSteelCarrier.vue')
+const saleOrderSteelEmpower = () =>
+  import('../components/saleContract/saleOrderSteelEmpower.vue')
+const saleOrderUpdateLog = () =>
+  import('../components/saleContract/saleOrderUpdateLog.vue')
+const salePlan = () => import('../components/saleContract/salePlan.vue')
+const transportPrice = () =>
+  import('../components/saleContract/transportPrice.vue')
+const inwardTransPrice = () => import('../components/inward/transPrice.vue')
+const inwardAddTransPrice = () =>
+  import('../components/inward/addTransPrice.vue')
+const saleOrderOODetails = () =>
+  import('../components/saleContract/saleOrderOODetails.vue')
+const updateSaleOrderSteel = () =>
+  import('../components/saleContract/updateSaleOrderSteel.vue')
+const copySteelOrder = () =>
+  import('../components/saleContract/copySteelOrder.vue')
+const rangeValuePoint = () => import('../components/inward/rangePoint.vue')
+const updateTransPrice = () =>
+  import('../components/inward/updateTransPrice.vue')
 Vue.use(Router)
 
 const constantRouterMap = [

+ 1 - 1
src/views/inward/components/inwardBillet/addInwardBillet.vue

@@ -288,7 +288,7 @@
 import PageTitle from '@/components/Page/Title'
 import { sjTime } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
-import { isNumber } from '../../../ADMINISTRATORS/app'
+import { isNumber } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -108,7 +108,7 @@
 
 <script>
 import { getCookie } from '@/utils/util.js'
-import { sjTime } from '../../../../ADMINISTRATORS/app'
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {

File diff suppressed because it is too large
+ 496 - 433
src/views/statisticalReport/components/Ship_dynamic_table.vue


Some files were not shown because too many files changed in this diff