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

chenlu

2024-05-21 18fb477ea840e3dd4b19ff63f68f994d31fab43b

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

@@ -393,13 +393,13 @@
    custom: true
  },
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['deliveryDetail.quantity','quantity']
    //let footList=['deliveryDetail.quantity','quantity']
    let footList=[]
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        console.log(column.field)
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
@@ -464,13 +464,16 @@

          })
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200){
             if(res.code==200 && res.data===true){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else{
               ElMessage.warning(res.msg)
               ElMessage.warning("保存失败")
               router.push("/login")
             }
           }).catch((err)=>{
             ElMessage.error('系统错误')
             router.push("/login")
           })
          break
        }
@@ -481,13 +484,16 @@

          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
@@ -498,13 +504,16 @@

          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }