From 5b7b8b80cdee8710baaba42de29289bfddbcfcbd Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 8 Dec 2018 11:02:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/StatusQuery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } From 39a0b8ef13d9751ad8caa96e924ad523f9cc5c50 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 8 Dec 2018 14:17:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/webpack.dev.conf.js | 11 +- index.html | 1 + .../CreatePurchaseContract.js | 26 + .../Tinymce/components/editorImage.vue | 103 ++++ src/components/Tinymce/index.vue | 204 +++++++ src/components/Tinymce/plugins.js | 7 + src/components/Tinymce/toolbar.js | 6 + .../CreatePurchaseContract/index.vue | 532 ++++++++++++++++++ static/tinymce4.7.5/langs/zh_CN.js | 230 ++++++++ .../plugins/codesample/css/prism.css | 138 +++++ .../plugins/emoticons/img/smiley-cool.gif | Bin 0 -> 354 bytes .../plugins/emoticons/img/smiley-cry.gif | Bin 0 -> 329 bytes .../emoticons/img/smiley-embarassed.gif | Bin 0 -> 331 bytes .../emoticons/img/smiley-foot-in-mouth.gif | Bin 0 -> 342 bytes .../plugins/emoticons/img/smiley-frown.gif | Bin 0 -> 340 bytes .../plugins/emoticons/img/smiley-innocent.gif | Bin 0 -> 336 bytes .../plugins/emoticons/img/smiley-kiss.gif | Bin 0 -> 338 bytes .../plugins/emoticons/img/smiley-laughing.gif | Bin 0 -> 343 bytes .../emoticons/img/smiley-money-mouth.gif | Bin 0 -> 321 bytes .../plugins/emoticons/img/smiley-sealed.gif | Bin 0 -> 323 bytes .../plugins/emoticons/img/smiley-smile.gif | Bin 0 -> 344 bytes .../emoticons/img/smiley-surprised.gif | Bin 0 -> 338 bytes .../emoticons/img/smiley-tongue-out.gif | Bin 0 -> 328 bytes .../emoticons/img/smiley-undecided.gif | Bin 0 -> 337 bytes .../plugins/emoticons/img/smiley-wink.gif | Bin 0 -> 350 bytes .../plugins/emoticons/img/smiley-yell.gif | Bin 0 -> 336 bytes .../plugins/visualblocks/css/visualblocks.css | 154 +++++ .../skins/lightgray/content.inline.min.css | 1 + .../skins/lightgray/content.min.css | 1 + .../skins/lightgray/fonts/tinymce-mobile.woff | Bin 0 -> 4624 bytes .../skins/lightgray/fonts/tinymce-small.eot | Bin 0 -> 9492 bytes .../skins/lightgray/fonts/tinymce-small.svg | 63 +++ .../skins/lightgray/fonts/tinymce-small.ttf | Bin 0 -> 9304 bytes .../skins/lightgray/fonts/tinymce-small.woff | Bin 0 -> 9380 bytes .../skins/lightgray/fonts/tinymce.eot | Bin 0 -> 18808 bytes .../skins/lightgray/fonts/tinymce.svg | 131 +++++ .../skins/lightgray/fonts/tinymce.ttf | Bin 0 -> 18644 bytes .../skins/lightgray/fonts/tinymce.woff | Bin 0 -> 18720 bytes .../skins/lightgray/img/anchor.gif | Bin 0 -> 53 bytes .../skins/lightgray/img/loader.gif | Bin 0 -> 2608 bytes .../skins/lightgray/img/object.gif | Bin 0 -> 152 bytes .../skins/lightgray/img/trans.gif | Bin 0 -> 43 bytes .../tinymce4.7.5/skins/lightgray/skin.min.css | 1 + .../skins/lightgray/skin.min.css.map | 1 + static/tinymce4.7.5/tinymce.min.js | 2 + 45 files changed, 1609 insertions(+), 3 deletions(-) create mode 100644 src/api/PurchasingCenter/CreatePurchaseContract.js create mode 100644 src/components/Tinymce/components/editorImage.vue create mode 100644 src/components/Tinymce/index.vue create mode 100644 src/components/Tinymce/plugins.js create mode 100644 src/components/Tinymce/toolbar.js create mode 100644 src/views/PurchasingCenter/CreatePurchaseContract/index.vue create mode 100644 static/tinymce4.7.5/langs/zh_CN.js create mode 100644 static/tinymce4.7.5/plugins/codesample/css/prism.css create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif create mode 100644 static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif create mode 100644 static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css create mode 100644 static/tinymce4.7.5/skins/lightgray/content.inline.min.css create mode 100644 static/tinymce4.7.5/skins/lightgray/content.min.css create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf create mode 100644 static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff create mode 100644 static/tinymce4.7.5/skins/lightgray/img/anchor.gif create mode 100644 static/tinymce4.7.5/skins/lightgray/img/loader.gif create mode 100644 static/tinymce4.7.5/skins/lightgray/img/object.gif create mode 100644 static/tinymce4.7.5/skins/lightgray/img/trans.gif create mode 100644 static/tinymce4.7.5/skins/lightgray/skin.min.css create mode 100644 static/tinymce4.7.5/skins/lightgray/skin.min.css.map create mode 100644 static/tinymce4.7.5/tinymce.min.js 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 @@ +