Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-15 dbec8a881baf27254a13f1f9c7b0167b9f064ab5

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -202,7 +202,6 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: '60'},
    { type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {title: t('basicData.operate'), width: '80', slots: { default: 'button_slot' },fixed:"left"},
    {field: 'deliveryDetail.deliveryId', width:'150', title:  t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'deliveryDetail.orderNumber', width:'150', title:  t('delivery.deliveryNoteNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'deliveryDetail.orderId', width: '150',title:  t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -210,7 +209,7 @@
    {field: 'order.project', width: '120',title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productId', width: '100',title: t('order.productId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productName',width: '200', title: t('order.product'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'deliveryNum',width: '100', title: t('delivery.deliveryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'deliveryDetail.quantity',width: '100', title: t('delivery.deliveryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseNum',width: '140', title: t('productStock.inventoryQuantity'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'delivery.customerName',width: '200', title: t('customer.customerName'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'width', width: '100',title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -223,9 +222,11 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [{
      'name': t('productStock.confirmOutbound'),
      status: 'primary',
      'name': t('productStock.confirmOutbound'), status: 'primary',
      'code':'ver'
      },{
      'name': t('productStock.outboundRecords'),status: 'primary',
      'code':'jump'
    }],
    /*import: false,
   export: true,
@@ -253,7 +254,7 @@
const remark = ref(null);
const  xGrid = ref();
const gridEvents = {
  toolbarButtonClick ({ code }) {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    if ($grid) {
      switch (code) {
@@ -266,18 +267,23 @@
              ElMessage.warning(t('productStock.unselectedData'))
              return
            }
            const errMap = await $grid.validate(selectRecords)
            if (errMap) {
              ElMessage.warning(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
              return
            }

            let orderDetailData = ref({
              userId:userid,
              userName:username,
              orderDetail:selectRecords
              userId: userid,
              userName: username,
              orderDetail: selectRecords
            })

            request.post("/FinishedGoodsInventory/addDeliveryDetail",orderDetailData.value).then((res) => {
              if(res.code==200){
            console.log(orderDetailData)
            request.post("/FinishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success(t('productStock.deliverySuccessful'))
                router.push({path:'/main/productStock/FinishedProductOut',query:{random:Math.random()}})
              }else{
                router.push({path: '/main/productStock/FinishedProductOut', query: {random: Math.random()}})
              } else {
                ElMessage.warning(res.msg)
                router.push("/login")
              }
@@ -288,12 +294,30 @@


        }
        case 'jump': {
          router.push({path: '/main/productStock/storageRecord', query: {storageType: '出库'}})
          return;

        }

      }
    }
  },

}

/*数据校验*/
const validRules = ref({
  "deliveryDetail.quantity": [{
    validator (e) {
      if (e.row.deliveryDetail.quantity > e.row.warehouseNum) {
        return new Error("")
      }

    }

  }]
})



@@ -308,6 +332,7 @@
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
        :edit-rules="validRules"
    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->