报工优化

default - 副本.conf

@@ -0,0 +1,21 @@
+server {
+	listen 80;
+	server_name localhost;
+	default_type 'text/html';
+	charset utf-8;
+	
+	location @fallback{
+	rewrite .* /index.html break;
+	}
+	
+	location / {
+		root /usr/share/nginx/html;
+		index  index.html index.htm;
+		try_files $uri /index.html;
+	}
+	
+	error_page   500 502 503 504  /50x.html;
+	location = /50x.html {
+		root   /usr/share/nginx/html;
+	}
+}

src/views/mes/reportWork/index.vue

@@ -177,7 +177,7 @@
 			<el-table-column label="生产时间" align="center" prop="productDate" width="100"/>
 			<el-table-column label="SAP报工状态" align="center" prop="uploadStatus" width="150"/>
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
-
+			<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150" :show-overflow-tooltip="true"/>
 		</el-table>
 
 		<pagination
@@ -1039,7 +1039,7 @@ export default {
 		},
 		/** 报工按钮操作 */
 		handleReport(row) {
-
+            this.loading = true;
 			let sr = this.selectRow[0];
             if(sr.uploadStatus =='sap报工成功'){
 				this.$modal.msgError(`上报sap已完成,不能重复报工`);
@@ -1047,12 +1047,19 @@ export default {
 			}
 
 			const code = sr.workorderCode;
+			let _this = this;
 			this.$modal.confirm('是否确认工单"' + code + '"的数据项向sap报工？').then(function() {
-				return reportSap(code);
+				reportSap(code).then(response => {
+					if(response.code ==200){
+                      _this.$modal.msgSuccess("报工成功");
+					}
+					_this.loading = false;
+				});
 			}).then(() => {
-				this.getList();
+
-				//this.$modal.msgSuccess("报工成功");
+			}).catch(() => {
-			}).catch(() => {});
+				
+			});
 		},
 		/** 报工详情按钮操作 */
 		handleReportHz(row) {

src/views/quality/qcProduce/index.vue

@@ -196,6 +196,11 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="检验节点" align="center" prop="checkName" />
+			<el-table-column label="创建时间" align="center" prop="createTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+				</template>
+			</el-table-column>
 			<el-table-column label="检验结果" align="center" prop="checkResult" />
 			<el-table-column label="是否启用" align="center" width="100" v-if="false">
 				<template slot-scope="scope">