diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 4c1525da..13525ee8 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -57,8 +57,11 @@ const devWebpackConfig = merge(baseWebpackConfig, { template: 'index.html', inject: true, favicon: resolve('favicon.ico'), - title: 'vue-admin-template' - }) + title: 'vue-element-admin', + templateParameters: { + BASE_URL: config.dev.assetsPublicPath + config.dev.assetsSubDirectory, + }, + }), ] }) @@ -78,7 +81,9 @@ module.exports = new Promise((resolve, reject) => { new FriendlyErrorsPlugin({ compilationSuccessInfo: { messages: [ - `Your application is running here: http://${devWebpackConfig.devServer.host}:${port}` + `Your application is running here: http://${ + devWebpackConfig.devServer.host + }:${port}` ] }, onErrors: config.dev.notifyOnErrors diff --git a/index.html b/index.html index deed4af4..7d978087 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ 高精机电装备有限公司数字化工厂 +
diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/api/ManufacturingCenter/QuotaFormulation.js index 04062dbc..939492c8 100644 --- a/src/api/ManufacturingCenter/QuotaFormulation.js +++ b/src/api/ManufacturingCenter/QuotaFormulation.js @@ -33,7 +33,6 @@ export function getPerson() { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', param: '考核部门编号=9' - } }) } diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index 1dea4f95..f5019a57 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -48,7 +48,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新', + name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int', pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js new file mode 100644 index 00000000..a3e503c1 --- /dev/null +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 查询询价单列表 表1 +export function searchInquirySheet(check1, value1, check2, value2, check3, id) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_询价单_查询数据', + param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}` + } + }) +} +// 根据询价单流水号查询物料详情 +export function searchSheetContract(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_询价单明细_查询数据_根据询价单', + param: '询价单流水号=' + num1 + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index a3ff15f7..7d5119dc 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -1,5 +1,28 @@ import request from '@/utils/request' - +// 物料类别 +export function initMaterialCategory(check, DepartmentValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料类别编号_查询数据_根据物料部门编号', + param: '物料部门流水号_check=' + check + '=int&物料部门流水号=' + DepartmentValue + } + }) +} +// 物料品种 +export function initMaterialVariety(MaterialCategoryValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料品种编号_查询数据', + param: '物料类别流水号=' + MaterialCategoryValue + } + }) +} // 初始化项目（车间传递来的） export function initProject() { return request({ @@ -24,15 +47,15 @@ export function initBuyer() { }) } // 查询表1 -export function searchTable1(pageCurrent, pageSize, check1, num1, check2, name, state) { +export function searchTable1(...params) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料', - param: `项目流水号_check=${check1}&项目流水号=${num1}&物料名称_check=${check2}&物料名称=${name}&分配状态=${state}`, - Pagination: pageCurrent + '&' + pageSize + param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&分配状态=${params[10]}`, + Pagination: params[0] + '&' + params[1] } }) } diff --git a/src/components/Tinymce/components/editorImage.vue b/src/components/Tinymce/components/editorImage.vue new file mode 100644 index 00000000..bcd82099 --- /dev/null +++ b/src/components/Tinymce/components/editorImage.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue new file mode 100644 index 00000000..b8d03287 --- /dev/null +++ b/src/components/Tinymce/index.vue @@ -0,0 +1,204 @@ +