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/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/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 @@ +