修改bug

pages/pda/by_product_recovery/index/index.vue

@@ -420,10 +420,14 @@ export default {
         taskId: this.formData.taskId,
       };
 
-      await getPage(param).then((res) => {
-        // this.list = res.list;
-        this.list.push(...res.list);
-      });
+      // await getPage(param).then((res) => {
+      //   // this.list = res.list;
+      //   this.list.push(...res.list);
+      // });
+
+      const res = await getPage(param);
+
+      this.list.push(...res.list);
 
       isEnd = this.list.length >= res.count;
 

pages/pda/common.js

@@ -1,240 +1,220 @@
-export const tableHeader = selectEquiType => {
-	
-	// singleReport 批量0  单个1
-
-	// 1：物料；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
-	switch (+selectEquiType) {
-		case 1:
-			return [{
-					label: '型号',
-					prop: 'modelType'
-				},
-				{
-					label: '规格',
-					prop: 'specification'
-				},
-
-				{
-					label: '牌号',
-					prop: 'brandNum'
-				},
-
-				// {
-				// 	label: '包装库存',
-				// 	prop: '',
-				// 	formatter(row) {
-				// 		return `${row.packingCountBase || '0'}/${row.minUnit || ''}`
-				// 	}
-				// },
-
-				// {
-				// 	label: '计量库存数量',
-				// 	prop: '',
-				// 	formatter(row) {
-				// 		return `${row.availableCountBase || '0'}/${row.measuringUnit || ''}`
-				// 	}
-				// }
-			]
-
-
-
-		case 4:
-			return [{
-					label: '规格',
-					prop: 'specification'
-				},
-
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-
-				{
-					label: '工位',
-					prop: 'workstationName'
-				},
-
-
-
-			]
-
-
-		case 5:
-			return [{
-					label: '牌号',
-					prop: 'brandNum'
-				},
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-				{
-					label: '模孔数量',
-					prop: 'dieHoleNum'
-				},
-
-				{
-					label: '芯棒直径',
-					prop: 'mandrelDiameter',
-
-				},
-				{
-					label: '收缩系数',
-					prop: 'shrinkEffictive',
-				},
-				{
-					label: '已压制次数',
-					prop: '',
-					formatter(row) {
-						return row.extInfo.startCyTimes || 0
-					}
-				},
-
-				{
-					label: '最大压制次数',
-					prop: '',
-					formatter(row) {
-						return row.extInfo.maxCyTimes
-					}
-				}
-			]
-
-
-		case 7:
-			return [
-				{
-						label: '编号', 
-						prop: 'codeNumber'
-				},
-				{
-					label: '规格',
-					prop: 'modelType'
-				},
-				{
-					label: '材质',
-					prop: 'materialQuality',
-
-				},
-				{
-					label: '长宽高',
-					prop: '',
-					formatter(row) {
-						if (!row?.extInfo) return ''
-						const extendField = row.extInfo
-						return `${extendField.vehicleLen || '-'}*${extendField.wilde || '-'}*${
-											  extendField.hight || '-'
-											}`
-
-					}
-				}
-			]
-
-
-		case 8: //'舟皿'
-			return [{
-					label: '规格',
-					prop: 'specification'
-				},
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-				
-				{
-					label: '槽数',
-					prop: '',
-					formatter(row) {
-						return row.extInfo.slotNum
-					}
-				},
-				
-			
-
-
-			]
-		case 10:
-			return []
-
-		case 11:
-			return [
-
-
-			]
-
-		case 13:
-			return [
-
-				{
-					label: '规格',
-					prop: 'specification'
-				},
-
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-
-			]
-
-
-		case 14:
-			return []
-
-		case 23:
-			return [
-
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-				{
-					label: '规格',
-					prop: 'specification'
-				},
-				{
-					label: '牌号',
-					prop: 'brandNum'
-				},
-
-			]
-
-		case 9:
-			return [
-
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-				{
-					label: '规格',
-					prop: 'specification'
-				},
-				{
-					label: '牌号',
-					prop: 'brandNum'
-				},
-
-			]
-
-		case 28:
-			return [
-
-				{
-					label: '型号',
-					prop: 'modelType'
-				},
-				{
-					label: '规格',
-					prop: 'specification'
-				},
-				{
-					label: '牌号',
-					prop: 'brandNum'
-				},
-
-			]
-
-	}
-
-	return []
-}
+export const tableHeader = (selectEquiType) => {
+  // singleReport 批量0  单个1
+
+  // 1：物料；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
+  switch (+selectEquiType) {
+    case 1:
+      return [
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+        {
+          label: "规格",
+          prop: "specification",
+        },
+
+        {
+          label: "牌号",
+          prop: "brandNum",
+        },
+
+        // {
+        // 	label: '包装库存',
+        // 	prop: '',
+        // 	formatter(row) {
+        // 		return `${row.packingCountBase || '0'}/${row.minUnit || ''}`
+        // 	}
+        // },
+
+        // {
+        // 	label: '计量库存数量',
+        // 	prop: '',
+        // 	formatter(row) {
+        // 		return `${row.availableCountBase || '0'}/${row.measuringUnit || ''}`
+        // 	}
+        // }
+      ];
+
+    case 4:
+      return [
+        {
+          label: "规格",
+          prop: "specification",
+        },
+
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+
+        {
+          label: "编码",
+          prop: "code",
+        },
+
+        {
+          label: "工位",
+          prop: "workstationName",
+        },
+      ];
+
+    case 5:
+      return [
+        {
+          label: "牌号",
+          prop: "brandNum",
+        },
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+        {
+          label: "模孔数量",
+          prop: "dieHoleNum",
+        },
+
+        {
+          label: "芯棒直径",
+          prop: "mandrelDiameter",
+        },
+        {
+          label: "收缩系数",
+          prop: "shrinkEffictive",
+        },
+        {
+          label: "已压制次数",
+          prop: "",
+          formatter(row) {
+            return row.extInfo.startCyTimes || 0;
+          },
+        },
+
+        {
+          label: "最大压制次数",
+          prop: "",
+          formatter(row) {
+            return row.extInfo.maxCyTimes;
+          },
+        },
+      ];
+
+    case 7:
+      return [
+        {
+          label: "编号",
+          prop: "codeNumber",
+        },
+        {
+          label: "规格",
+          prop: "modelType",
+        },
+        {
+          label: "材质",
+          prop: "materialQuality",
+        },
+        {
+          label: "长宽高",
+          prop: "",
+          formatter(row) {
+            if (!row?.extInfo) return "";
+            const extendField = row.extInfo;
+            return `${extendField.vehicleLen || "-"}*${
+              extendField.wilde || "-"
+            }*${extendField.hight || "-"}`;
+          },
+        },
+      ];
+
+    case 8: //'舟皿'
+      return [
+        {
+          label: "规格",
+          prop: "specification",
+        },
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+
+        {
+          label: "槽数",
+          prop: "",
+          formatter(row) {
+            return row.extInfo.slotNum;
+          },
+        },
+      ];
+    case 10:
+      return [];
+
+    case 11:
+      return [];
+
+    case 13:
+      return [
+        {
+          label: "规格",
+          prop: "specification",
+        },
+
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+      ];
+
+    case 14:
+      return [];
+
+    case 23:
+      return [
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+        {
+          label: "规格",
+          prop: "specification",
+        },
+        {
+          label: "牌号",
+          prop: "brandNum",
+        },
+      ];
+
+    case 9:
+      return [
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+        {
+          label: "规格",
+          prop: "specification",
+        },
+        {
+          label: "牌号",
+          prop: "brandNum",
+        },
+      ];
+
+    case 28:
+      return [
+        {
+          label: "型号",
+          prop: "modelType",
+        },
+        {
+          label: "规格",
+          prop: "specification",
+        },
+        {
+          label: "牌号",
+          prop: "brandNum",
+        },
+      ];
+  }
+
+  return [];
+};

pages/pda/workOrder/search/index.vue

@@ -511,7 +511,12 @@ export default {
         // params.ids = [1, 5, 7, 8, 10, 13, 14, 23, 26, 9, 28]
         params.ids = [9, 23, 2, 1, 4, 14, 5, 8, 16, 13, 15, 6, 10, 22];
       } else if (this.isType == "job") {
-        params["ids"] = [4, 7];
+        // params["ids"] = [4, 7];
+        if (this.clientEnvironmentId == 2) {
+          params["ids"] = [7];
+        } else {
+          params["ids"] = [4, 7];
+        }
       } else if (this.isType == "zdy") {
         params["ids"] = JSON.parse(this.classIds);
       } else if (this.isType == "weiwai") {