diff --git a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
index 033f798..8009819 100644
--- a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
+++ b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
@@ -32,7 +32,7 @@
-
+
{{labels.workCenterNo}}
@@ -206,7 +206,7 @@ import {
selectList: [],
searchData: {
site: '',
- orderNo: '',
+ orderNo: '8888',
workCenterNo: '',
user: this.$store.state.user.name
},
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 2886778..189946e 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -92,24 +92,35 @@
{{ labels.primaryMenu }}
- {{ labels.shopOrderLabel }}
+
+ {{ labels.shopOrderLabel }}
- {{ labels.closeLabel }}
+ {{
+ labels.closeLabel
+ }}
+
{{ labels.openLabel }}
- {{ labels.pauseLabel }}
- {{ labels.reopenLabel }}
+ {{
+ labels.pauseLabel
+ }}
+
+
+ {{ labels.reopenLabel }}
- {{ labels.createReCheckSeqNo }}
+
+ {{ labels.createReCheckSeqNo }}
- {{ labels.cancelAllScheduleOperations }}
+
+ {{ labels.cancelAllScheduleOperations }}
- {{ labels.prodIssued }}
+
+ {{ labels.prodIssued }}
{{ labels.cancelProdIssued }}
@@ -118,20 +129,39 @@
:disabled="menuButton.partStockFlag">{{ labels.viewPartStock }}
- {{ labels.toolIssued }}
+
+ {{ labels.toolIssued }}
- {{ labels.cancelToolIssued }}
+
+ {{ labels.cancelToolIssued }}
- {{ labels.printIssued }}
+
+ {{ labels.printIssued }}
- {{ labels.cancelPrintIssued }}
+
+ {{ labels.cancelPrintIssued }}
{{ buttons.settingTable }}
{{ buttons.defaultTable }}
+
+ {{ buttons.download||'导出' }}
+
@@ -1241,6 +1271,13 @@ export default {
languageCode: this.$i18n.locale,
objectType: 'label'
},
+ // 导出 start
+ exportData: [],
+ exportName: "生产工单",
+ exportHeader: [],
+ exportFooter: [],
+ exportDefaultValue: "这一行这一列没有数据",
+ // 导出 end
}
},
components: {
@@ -2202,10 +2239,10 @@ export default {
},
//获取按钮的权限数据
- getButtonAuthData(){
- let updateFlag = this.isAuth(this.menuId+":revise");
- let fullControFlag = this.isAuth(this.menuId+":fullContro");
- let deleteFlag = this.isAuth(this.menuId+":remove");
+ getButtonAuthData() {
+ let updateFlag = this.isAuth(this.menuId + ":revise");
+ let fullControFlag = this.isAuth(this.menuId + ":fullContro");
+ let deleteFlag = this.isAuth(this.menuId + ":remove");
//处理页面的权限数据
this.authEdit = !updateFlag && !fullControFlag;
this.authAdd = !fullControFlag;
@@ -2217,7 +2254,7 @@ export default {
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
- if (data && data.code == 0 ) {
+ if (data && data.code == 0) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
@@ -2226,7 +2263,7 @@ export default {
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
- if (data && data.code == 0 ) {
+ if (data && data.code == 0) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
@@ -2234,6 +2271,30 @@ export default {
}
});
},
+ fields() {
+ let json = "{"
+ this.columnList.forEach((item, index) => {
+ if (index == this.columnList.length - 1) {
+ json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+ } else {
+ json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+ }
+ })
+ json += "}"
+ let s = eval("(" + json + ")")
+ return s
+ },
+ createExportData() {
+ // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+ return this.produceScheduleList;
+ },
+ startDownload() {
+ // this.exportData = this.dataList
+
+ },
+ finishDownload() {
+
+ },
},
created() {