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

guoyuji

2024-09-06 1e9a52cf65f364b4332a008210700adbaea0c35e

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -14,6 +14,7 @@
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
import companyInfo from "@/stores/sd/companyInfo";
import {multiply} from "@/utils/decimal";

//语言获取
const { t } = useI18n()
@@ -211,7 +212,6 @@
        pageTotal.value=res.data.total
        titleUploadData.value=deepClone(res.data.delivery)
        titleUploadData.value.deliveryId=str
        console.log(titleUploadData.value)

        //根据审核状态显示审核按钮或者是反审按钮

@@ -298,6 +298,7 @@
  customConfig: {
    storage: true
  },
  checkboxConfig:{checkAll:true},
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
  editConfig: {
@@ -423,14 +424,14 @@
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200 && res.data==="true"){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
               /*if(titleUploadData.value.deliveryId.trim()===""){
               //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
               if(titleUploadData.value.deliveryId.trim()===""){
                 router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
               }else{
                 router.push({path:'/main/delivery/createDelivery',query:{
                     deliveryID:titleUploadData.value.deliveryId,
                     random:Math.random()}})
               }*/
               }
             }else if(res.data==="false1"){
               ElMessage.warning(t('delivery.pleaseMsg1'))
             }else if(res.data==="false2"){
@@ -455,10 +456,10 @@
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
              /*router.push({path:'/main/delivery/createDelivery',query:{
              //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
              router.push({path:'/main/delivery/createDelivery',query:{
                  deliveryID:titleUploadData.value.deliveryId,
                  random:Math.random()}})*/
                  random:Math.random()}})
            } else {
              ElMessage.warning(t('basicData.msg.reviewFail'))
            }
@@ -477,10 +478,10 @@
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
              /*router.push({path:'/main/delivery/createDelivery',query:{
              //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
              router.push({path:'/main/delivery/createDelivery',query:{
                  deliveryID:titleUploadData.value.deliveryId,
                  random:Math.random()}})*/
                  random:Math.random()}})
            } else {
              ElMessage.warning(t('basicData.msg.reviewFail'))
            }
@@ -585,6 +586,16 @@

})

const editClosedEvent = ({ row, column }) => {

  if (['deliveryDetail.quantity'].includes(column.property)) {
    if(parseInt(row.deliveryDetail.quantity)===0){
      xGrid.value.setCheckboxRow(row, false);
    }
  }

}


</script>

@@ -678,6 +689,7 @@
          v-bind="gridOptions"
          v-on="gridEvents"
          :edit-rules="validRules"
          @edit-closed="editClosedEvent"

      >
        <template #num1_filter="{ column, $panel }">