diff --git a/src/styles/index.scss b/src/styles/index.scss index dac52248..c8385a27 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -223,12 +223,23 @@ el-card{ background: #8ff4ea !important; color: black; } - tr.el-table__row td { background-color: #d8e5f6 !important; } - tr.el-table__row.el-table__row--striped td { background: #e9f0f9 !important; } } + +h3 { + height: 10px !important; + margin: 0px !important; +} +.el-table__footer { + height: 37px; +} +.el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td { + background-color: rgb(126,172,237); + font-weight:bold; + color: black; +} diff --git a/src/utils/request.js b/src/utils/request.js index 8eaacaf2..f9d3fd3e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8005/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index ecf9f1ff..99a7f1b1 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -25,7 +25,7 @@ - 总装调试 + 总装调试 @@ -37,12 +37,12 @@ {{ scope.row.机床图号 }} - + {{ scope.row.机床名称 }} - + {{ scope.row.机床数量 }} @@ -67,7 +67,7 @@ {{ scope.row.调试结束时间 }} - + 开始装配 结束装配 @@ -84,7 +84,7 @@ - 部装 + 部装 diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue index 78643f0a..ad0cd019 100644 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ b/src/views/Assembly/MakeAssemblyPlan/index.vue @@ -57,7 +57,7 @@ - 增加 + 增加装配计划 diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue index 7123edef..785a18cb 100644 --- a/src/views/Assembly/MakeColdWorkPlan/index.vue +++ b/src/views/Assembly/MakeColdWorkPlan/index.vue @@ -57,7 +57,7 @@ - 增加 + 增加冷作计划 diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue index 74f7c566..fbe5f185 100644 --- a/src/views/Assembly/MakeElectricalAssembly/index.vue +++ b/src/views/Assembly/MakeElectricalAssembly/index.vue @@ -57,7 +57,7 @@ - 增加 + 增加电气计划 diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue index 92bc2249..63e291d4 100644 --- a/src/views/Assembly/MakePaintPlan/index.vue +++ b/src/views/Assembly/MakePaintPlan/index.vue @@ -57,7 +57,7 @@ - 增加 + 增加油漆计划 diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index d612721c..931821e2 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -42,17 +42,17 @@ - + {{ scope.row.物料名称 }} - + {{ scope.row.物料型号 }} - + {{ scope.row.物料规格 }} @@ -72,7 +72,7 @@ {{ scope.row.货位名称 }} - + diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 85a0cd31..d8918027 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -5,22 +5,22 @@ 新建仓库 - + {{ scope.row.仓库编号 }} - + {{ scope.row.仓库名称 }} - + {{ scope.row.仓库描述 }} - + {{ scope.row.地址 }} @@ -30,7 +30,7 @@ {{ scope.row.联系人 }} - + {{ scope.row.备注 }} @@ -40,11 +40,13 @@ 修改 删除 增加货位 @@ -54,12 +56,12 @@ - + {{ scope.row.货位名称 }} - + {{ scope.row.工作中心 }} diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 6eb21187..0864cf7e 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -36,16 +36,13 @@ - - - 领料单明细:{{ pickingListNumberShow }} - - + + 备料确认 领料确认 - + + + + 领料单明细:{{ pickingListNumberShow }} + + @@ -100,7 +102,7 @@ {{ scope.row.出库数量 }} - + @@ -117,9 +119,9 @@ 未确认 - + - 归还 + 归还 @@ -185,7 +187,7 @@ - + @@ -236,7 +238,7 @@ - + @@ -251,7 +253,7 @@ - + @@ -266,7 +268,7 @@ - + @@ -823,14 +825,11 @@ export default { + diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue index f651786e..5d11108e 100644 --- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue +++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue @@ -36,11 +36,6 @@ {{ scope.row.采购合同流水号 }} - - - {{ scope.row.采购合同流水号 }} - - {{ scope.row.采购合同编号 }} diff --git a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue index 64b47dc9..1b3137ba 100644 --- a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue +++ b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue @@ -57,7 +57,7 @@ {{ scope.row.操作时间 }} - + 关联物料 diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue index 74e3c374..12faf6c8 100644 --- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue +++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue @@ -164,7 +164,6 @@ export default { this.machineValue ? check2 = 1 : check2 = 0 this.groupValue ? check3 = 1 : check3 = 0 searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => { - console.log(response.data) this.tableData1 = response.data }) } else {