廖井涛
2024-03-01 0ba225b5a668c5cc66997fb58f5ada2e3768af6f
去掉表格右上角的标签
15个文件已修改
80 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -221,9 +221,9 @@
      'code':'add'
    }
      ],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  }
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
@@ -306,9 +306,9 @@
    },{
      'name': '领出记录','code':'out',
    }],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -224,9 +224,9 @@
      status: 'primary',
      'code':'ver'
    }],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
@@ -306,9 +306,9 @@
      'name': '返工记录',
        'code':'rework'
    }],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
@@ -222,9 +222,9 @@
        {'name': '确认调拨',status: 'primary','code':'edit'},
        {'name': '调拨记录','code':'record'}
    ],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue
@@ -214,9 +214,9 @@
      { 'code' :'rework','name':'成品返工',status: 'primary'},
    ],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
@@ -209,9 +209,9 @@
      'name': '反审',status: 'primary',
      'code':'add'
    }],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -212,9 +212,9 @@
        'name': '反审',status: 'primary',
        'code':'rework'
      }],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -1,12 +1,12 @@
<script setup>
import {reactive, ref} from "vue";
import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import deepClone from "@/utils/deepClone";
import {changeFilterEvent,filterChanged} from "@/hook"
import {toolbarButtonClickEvent} from "@/hook/mouseMove";
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
let router = useRouter()
@@ -17,6 +17,7 @@
//定义当前页数
let pageNum=$ref(1)
const  xGrid = ref();
let cellArea = ref()
let filterData = ref({
@@ -72,6 +73,15 @@
  exportConfig: {},
  scrollY: {enabled: true},//开启虚拟滚动
  showOverflow: true,
  menuConfig: {
    body: {
      options: [
        [
          { code: 'copyChecked', name: '选中相同', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
        ]
      ]
    }
  },
  columnConfig: {
    resizable: true,
    useKey: true
@@ -267,6 +277,11 @@
})
onMounted(()=>{
  //启用表格拖动选中
  addListener(xGrid.value,gridOptions,cellArea.value)
})
@@ -325,6 +340,11 @@
    </vxe-grid>
  </div>
  <div class="vxe-table--cell-area" ref="cellArea" >
    <span  class="vxe-table--cell-main-area"  ></span>
    <span class="vxe-table--cell-active-area"  ></span>
  </div>
</template>
<style scoped>
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -154,9 +154,9 @@
      'name': '审核',status: 'primary',
      'code':'add'
    }],
    import: false,
    /*import: false,
    export: true,
    print: true,
    print: true,*/
    zoom: true,
    custom: true
  },
@@ -188,7 +188,7 @@
          //gridOptions.columns.unshift(a)
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            console.log(selectRecords)
            let flowData = ref({
              userId:userid,
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -196,9 +196,9 @@
      ],//表头按钮
  toolbarConfig: {
    buttons: [],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -361,9 +361,9 @@
      {'code': 'toExamine', 'name': '审核',status: 'primary'},
      {'code': 'CounterExamination', 'name': '反审',status: 'primary'}
    ],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -195,9 +195,9 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -207,9 +207,9 @@
    buttons: [
      {'code': 'add', 'name': '发货',status: 'primary',icon: 'vxe-icon-add'}
    ],
    import: false,
    /*import: false,
    export: true,
    print: true,
   print: true,*/
    zoom: true,
    custom: true
  },
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -50,7 +50,6 @@
            }
            item.put("basicCategory",basicCategory);
            listMap.add(item);
           System.out.println(listMap);
        }
        return listMap;
    }
@@ -94,7 +93,6 @@
            List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
            if (!reworklist.isEmpty()){
                for (Rework rework : reworklist) {
                    System.out.println(rework);
                    //获取单号
                    String oddNumber= orderNumberSetting("返工");
                    //添加出入库记录