diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index 7568a16e..b5bf7702 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -142,6 +142,18 @@ export function pickingSubmit(...params) { } }) } +// 备注 +export function updateRemark(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单明细_编辑数据', + param: `领料单明细流水号=${params[0]}&备注=${params[1]}` + } + }) +} // 归还 export function sendBack(...params) { return request({ diff --git a/src/api/ManufacturingCenter/ActualTimeSupplement.js b/src/api/ManufacturingCenter/ActualTimeSupplement.js index 1e282db5..576b1b45 100644 --- a/src/api/ManufacturingCenter/ActualTimeSupplement.js +++ b/src/api/ManufacturingCenter/ActualTimeSupplement.js @@ -72,14 +72,14 @@ export function getParts(stepNumber, a, b, c, d, e, f, g) { }) } // 提交新增 -export function submitAdd(num1, time, num2, person) { +export function submitAdd(num1, time, num2, person, num3) { return request({ url: '', method: 'post', data: { type: '2', name: '车间生产管理_修补工时_增加数据', - param: `工序流水号=${num1}&修补工时=${time}&数量=${num2}&修补人员编号=${person}` + param: `工序流水号=${num1}&修补工时=${time}&数量=${num2}&修补人员编号=${person}&操作者编号=${num3}` } }) } diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 4a53883d..0b6f5291 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -25,14 +25,14 @@ export function searchParts(pageCurrent, pageSize, check1, num) { }) } // 保存 -export function Preservation(id, num, num1) { +export function Preservation(id, num) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_核算总额_编辑数据', - param: `请购单明细流水号组=${id}&核算总额组=${num}&核算单价组=${num1}` + param: `采购合同明细流水号=${id}&单价=${num}` } }) } diff --git a/src/assets/img/img10.png b/src/assets/img/img10.png new file mode 100644 index 00000000..1bc4d5ab Binary files /dev/null and b/src/assets/img/img10.png differ diff --git a/src/assets/img/img5.png b/src/assets/img/img5.png new file mode 100644 index 00000000..0bf96cce Binary files /dev/null and b/src/assets/img/img5.png differ diff --git a/src/assets/img/img6.png b/src/assets/img/img6.png new file mode 100644 index 00000000..ffdfea84 Binary files /dev/null and b/src/assets/img/img6.png differ diff --git a/src/assets/img/img7.png b/src/assets/img/img7.png new file mode 100644 index 00000000..1c25048c Binary files /dev/null and b/src/assets/img/img7.png differ diff --git a/src/assets/img/img8.png b/src/assets/img/img8.png new file mode 100644 index 00000000..9429e31b Binary files /dev/null and b/src/assets/img/img8.png differ diff --git a/src/assets/img/img9.png b/src/assets/img/img9.png new file mode 100644 index 00000000..f76fbd44 Binary files /dev/null and b/src/assets/img/img9.png differ diff --git a/src/styles/index.scss b/src/styles/index.scss index eb7eb436..b407c7e0 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -109,7 +109,7 @@ el-form-item__content{ //background-color: #2e296a!important; } .el-card__body{ - padding: 0px !important; + padding: 10px !important; margin: 0px !important; } .app-container{ @@ -167,3 +167,10 @@ el-card{ border-color: #ff9759; } } +.el-input__inner:focus { + border: 1px solid #1b55a0!important; + height: 29px; +} +.el-input--small .el-input__inner { + height: 29px; +} diff --git a/src/utils/request.js b/src/utils/request.js index 327c917c..8eaacaf2 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://123.56.95.229:8023/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 7f415c0c..a36ab107 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -3,7 +3,7 @@ 机床编号: - + {{ item.name }} - 组号: + 组号: - 零件图号: + 零件图号: - 时间区间: + 时间区间: - 查询 + 查询 - +