领料单+质量看板接口

src/views/mes/prepare/index.vue

@@ -9,9 +9,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="订单编码" prop="orderCode">
+			<el-form-item label="订单编码" prop="workorderCodeSap">
 				<el-input
-					v-model="queryParams.orderCode"
+					v-model="queryParams.workorderCodeSap"
 					placeholder="请输入订单编码"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -51,17 +51,18 @@
 					>
 				</el-date-picker>
 			</el-form-item>
+			<!--
 			<el-form-item label="单据状态" prop="status">
-        <el-select
+				<el-select
-          v-model="queryParams.status"
+				v-model="queryParams.status"
-          placeholder="请选择单据状态"
+				placeholder="请选择单据状态"
-          @change="$forceUpdate()"
+				@change="$forceUpdate()"
-          clearable
+				clearable
-          style="width:205px"
+				style="width:205px"
-          @keyup.enter.native="handleQuery">
+				@keyup.enter.native="handleQuery">
-          <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+				<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select>
+				</el-select>
-			</el-form-item>
+			</el-form-item>-->
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -128,41 +129,24 @@
 		<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
-      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+            <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
-			<el-table-column label="工单编码" align="center" prop="workorderCode" width="220" fixed/>
+			<el-table-column label="工单编码" align="center" prop="workorderCode" width="200" fixed/>
-			<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> -->
+			<el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="200" fixed/>
-			<el-table-column label="订单编码" align="center" prop="orderCode" width="220"/>
 			<el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
-			<!-- <el-table-column label="产品类型" align="center" prop="prodType" /> -->
+			<el-table-column label="产品名称" align="center" prop="productName" width="180" :show-overflow-tooltip="true"/>
-			<el-table-column label="产品名称" align="center" prop="productName" width="180"/>
-			<!-- <el-table-column label="规格型号" align="center" prop="productSpc" /> -->
 			<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<!-- <el-table-column label="班次" align="center" prop="shiftId" /> -->
+			<!--
 			<el-table-column label="单据状态" align="center" prop="status">
 			  <template slot-scope="scope">
-          {{ scope.row.status == "L0" ? "待确认" : "已确认" }}
+				{{ scope.row.status == "L0" ? "待确认" : "已确认" }}
-        </template>
-      </el-table-column>
-			<el-table-column label="物料编号" align="center" prop="materialCode"  width="180"/>
-			<el-table-column label="物料名称" align="center" prop="materialName"  width="250"/>
-			<el-table-column label="物料规格型号" align="center" prop="materialSpc" />
-			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="生产数量" align="center" prop="quantity" />
-			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						@click="handlePrepareDetail(scope.row)"
-						v-hasPermi="['mes:prepareDetail:list']"
-					>查看备料单</el-button>
-					<Detail ref="detail"> </Detail>
 				</template>
-			</el-table-column> -->
+			</el-table-column>-->
+			<el-table-column label="生产数量" align="center" prop="quantity" />
+			<el-table-column label="单位" align="center" prop="unit" />
 		</el-table>
 
 		<pagination
@@ -263,19 +247,21 @@
             <el-table-column
               prop="materialCode"
               label="料号"
-              width="180">
+              width="170">
             </el-table-column>
             <el-table-column
-              prop="materailName"
+              prop="materialName"
               label="物料描述"
-              width="300">
+              width="320">
             </el-table-column>
             <el-table-column
               prop="unit"
+			  width="50"
               label="单位">
             </el-table-column>
             <el-table-column
-              prop="orderCode"
+              prop="workorderCode"
+			  width="120"
               label="生产订单">
             </el-table-column>
             <el-table-column
@@ -454,7 +440,7 @@ export default {
       printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => {
         console.log(response.data)
         this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
-        this.printData.productDate = response.data.mesPrepare.productDate
+        this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
         this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
         this.printData.workTable = response.data.mesPrepareDetailList
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格

src/views/mes/reportWork/index.vue

@@ -935,7 +935,7 @@ export default {
 				return reportSap(code);
 			}).then(() => {
 				this.getList();
-				this.$modal.msgSuccess("报工成功");
+				//this.$modal.msgSuccess("报工成功");
 			}).catch(() => {});
 		},
 		/** 报工详情按钮操作 */