前端bug修改

src/api/quality/income.js

@@ -162,3 +162,11 @@ export function getWorkOrder(query) {
 	  params: query
 	});
   }
+// 查询入库订单列表
+export function getProductWorkOrder(query) {
+	return request({
+	  url: '/quality/qcIncome/getProductWorkOrder',
+	  method: 'get',
+	  params: query
+	});
+  }

src/views/mes/reportWork/index.vue

@@ -643,7 +643,8 @@ export default {
 				attr3: null,
 				attr4: null,
 				workorderCode: null,
-				parentOrder:null
+				parentOrder:null,
+				uploadStatus:"0"
 			},
 			// 表单参数
 			form: {
@@ -940,15 +941,16 @@ export default {
 		},
 		/** 报工详情按钮操作 */
 		handleReportHz(row) {
+ 
 			this.reset();
-			let sr = this.selectRow[0];
+			let sr = row;
 
             if(sr.uploadStatus =='sap报工成功'){
 				this.optType = 'view'
 			}else{
 				this.optType = ''
 			}
-
+     
 			this.queryParams.workorderCode = sr.workorderCode;
 			//查询母工单报工记录列表
 			this.queryParams.parentOrder = '0';
@@ -964,7 +966,7 @@ export default {
 				this.sOrderTableList = response;
 				this.openReport = true;
 				this.titleReport = "工单报工详情";
-
+               this.queryParams.workorderCode = '';
 			});
 		},
 		handleEdit(index, row) {
@@ -993,7 +995,7 @@ export default {
 		/** 报工损耗按钮操作 */
 		handleConsumeHz(row) {
 			this.reset();
-			let sr = this.selectRow[0];
+			let sr = row;
 
             if(sr.uploadStatus =='sap报工成功'){
 				this.optType = 'view'
@@ -1016,6 +1018,8 @@ export default {
 				this.sConsumeTableList = response;
 				this.openConsume = true;
 				this.titleConsume = "工单报工物料损耗详情";
+
+				this.queryParams.workorderCode = '';
 			});
 		},
 		// 多选框选中数据

src/views/plan/order/index.vue

@@ -130,7 +130,7 @@
     >
 
       <el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
-      <el-table-column width="180" label="物料号" align="center" prop="prodCode"
+      <el-table-column width="130" label="物料号" align="center" prop="prodCode"
         :formatter="productCodeFormate"
       />
       <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>

src/views/plan/whiteOrder/index.vue

@@ -121,8 +121,8 @@
     >
       <el-table-column width="100" label="计划工厂编码" prop="factoryCode"/>
       <el-table-column width="" label="订单类型" align="center" prop="orderType" v-if="false"/>
-      <el-table-column width="200" label="订单号" align="center" prop="orderCode"/>
-      <el-table-column width="180" label="物料号" align="center" prop="prodCode"/>
+      <el-table-column width="130" label="订单号" align="center" prop="orderCode"/>
+      <el-table-column width="130" label="物料号" align="center" prop="prodCode"/>
       <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
       <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
       <el-table-column width="90" label="已拆分数量" align="center" prop="quantitySplit"/>

src/views/plan/workorder/index.vue

@@ -181,18 +181,18 @@
 
       </el-table-column>
       <el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
-      <el-table-column width="150" label="子工单编号" align="center" prop="workorderCode"/>
+      <el-table-column width="130" label="母订单新编码" align="center" prop="pworkorderCodeSap"/>
+      <el-table-column width="130" label="母产品编码" align="center" prop="pproductCode" :formatter="productCodeFormate"/>
+      <el-table-column width="300" label="母产品名称" align="center" prop="pproductName" :show-overflow-tooltip="true"/>
+      <el-table-column width="130" label="子工单编号" align="center" prop="workorderCode"/>
       <el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
-      <el-table-column width="150" label="子订单旧编码" align="center" prop="orderCode"/>
-      <el-table-column width="150" label="子订单新编码" align="center" prop="workorderCodeSap"/>
+      <el-table-column width="130" label="子订单旧编码" align="center" prop="orderCode"/>
+      <el-table-column width="130" label="子订单新编码" align="center" prop="workorderCodeSap"/>
       <el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
-      <el-table-column width="180" label="子产品编码" align="center" prop="productCode"
+      <el-table-column width="130" label="子产品编码" align="center" prop="productCode"
       :formatter="productCodeFormate"
       />
-      <el-table-column width="300" label="子产品名称" align="center" prop="productName"/>
-
-      <el-table-column width="150" label="母订单新编码" align="center" prop="pworkorderCodeSap"/>
-      <el-table-column width="300" label="母产品名称" align="center" prop="pproductName"/>
+      <el-table-column width="300" label="子产品名称" align="center" prop="productName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
       <el-table-column width="50" label="单位" align="center" prop="unit"/>
       <!--
@@ -227,7 +227,7 @@
         </template>
       </el-table-column>
       <!--			<el-table-column label="备注" align="center" prop="remark" />-->
-      <el-table-column label="产品类型" align="center" prop="prodType">
+      <el-table-column label="产品类型" align="center" prop="prodType" v-if="false">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
         </template>

src/views/quality/qcWarehousing/index.vue

@@ -397,7 +397,7 @@
 import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
 import { getBatchList} from "@/api/quality/qcProduce";
 import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectWorkOrder from "./selectWorkOrder.vue";
+import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
 import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
 import ItemSelectLoc from "./selectLoc.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";