Browse Source

Merge remote-tracking branch 'origin/master'

master
[li_she] 4 years ago
parent
commit
7df0f5071d
  1. 56
      src/views/modules/schedule/order_schedule.vue
  2. 54
      src/views/modules/schedule/order_schedule_expand.vue
  3. 80
      src/views/modules/schedule/order_schedule_fqc.vue

56
src/views/modules/schedule/order_schedule.vue

@ -447,10 +447,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "订单号",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -465,10 +465,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "工序号",
columnWidth: 60,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -501,10 +501,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "要求完工日期",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -519,10 +519,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "产品编码",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -555,10 +555,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "客户产品料号",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -591,10 +591,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "订单量",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -609,10 +609,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "待排产数量",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -627,10 +627,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "已排产数量",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -645,10 +645,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "已报工数量",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -699,10 +699,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "加工中心",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -717,10 +717,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -753,10 +753,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序已排产",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -771,10 +771,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "上道工序",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -807,10 +807,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "上道工序已排产",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false

54
src/views/modules/schedule/order_schedule_expand.vue

@ -198,7 +198,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -213,10 +213,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "工序号",
columnWidth: 60,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -231,10 +231,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "工序名称",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -249,10 +249,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "要求完工日期",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -267,10 +267,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "产品编码",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -288,7 +288,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -303,10 +303,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "客户产品料号",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -342,7 +342,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -357,10 +357,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "待排产数量",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -375,10 +375,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "已排产数量",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -393,10 +393,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "已报工数量",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -447,10 +447,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "加工中心",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -465,10 +465,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -501,10 +501,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序已排产",
columnWidth: 80,
columnWidth: 150,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -522,7 +522,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -576,7 +576,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false

80
src/views/modules/schedule/order_schedule_fqc.vue

@ -445,10 +445,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "订单号",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -463,10 +463,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "工序号",
columnWidth: 60,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -499,10 +499,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "要求完工日期",
columnWidth: 85,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -517,10 +517,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "产成品编码",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -589,10 +589,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "加工中心",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -607,10 +607,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -643,10 +643,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "下道工序已排产",
columnWidth: 80,
columnWidth: 150,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -661,10 +661,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "上道工序",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -697,10 +697,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "上道工序已排产",
columnWidth: 80,
columnWidth: 150,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1059,10 +1059,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "员工编号",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1077,10 +1077,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "员工姓名",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1098,7 +1098,7 @@ export default {
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1116,7 +1116,7 @@ export default {
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1131,10 +1131,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "排产数量",
columnWidth: 80,
columnWidth: 100,
columnHidden: true,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1187,10 +1187,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "排产序号",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1205,10 +1205,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "待生产数量",
columnWidth: 80,
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1226,7 +1226,7 @@ export default {
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1244,7 +1244,7 @@ export default {
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1259,10 +1259,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "订单号",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1277,10 +1277,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "工序号",
columnWidth: 80,
columnWidth: 90,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1313,10 +1313,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "产品编码",
columnWidth: 80,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1349,10 +1349,10 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "客户产品料号",
columnWidth: 80,
columnWidth: 140,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false

Loading…
Cancel
Save