yangfeng
2024-03-29 00d1a771adb136642f67ce281c09d7c32cb1f697
发货数量限制大于0
2个文件已修改
58 ■■■■■ 已修改文件
src/views/orderManageModule/orderManage/components/DeliveryDialog.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/login/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/orderManageModule/orderManage/components/DeliveryDialog.vue
@@ -173,26 +173,37 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.ruleForm, "保存内容处理", this.tableData)
          let deliveryList = this.tableData.map((item) => {
            return {
              outsourcingOrderProductID: item.id,
              sendAmount: item.deliveryAmount
          let isDeliveryCount = false
          this.tableData.map((item) => {
            if (item.deliveryAmount == 0) {
              isDeliveryCount = true
              return
            }
          })
          let params = {
            carrier: this.ruleForm.carrier,
            deliveryList: deliveryList,
            number: this.ruleForm.number,
            outsourcingOrderID: this.editRow.infomation.id,
            waybillNumber: this.ruleForm.waybillNumber
          if (isDeliveryCount) {
            this.$message.error("发货数量必须大于0")
          } else {
            let deliveryList = this.tableData.map((item) => {
              return {
                outsourcingOrderProductID: item.id,
                sendAmount: item.deliveryAmount
              }
            })
            let params = {
              carrier: this.ruleForm.carrier,
              deliveryList: deliveryList,
              number: this.ruleForm.number,
              outsourcingOrderID: this.editRow.infomation.id,
              waybillNumber: this.ruleForm.waybillNumber
            }
            saveDelivery(params).then((res) => {
              if (res.code == 200) {
                this.handleClose()
                this.$message.success("发货成功")
                this.$emit("reRreshData")
              }
            })
          }
          saveDelivery(params).then((res) => {
            if (res.code == 200) {
              this.handleClose()
              this.$message.success("发货成功")
              this.$emit("reRreshData")
            }
          })
        }
      })
    },
src/views/other/login/index.vue
@@ -145,10 +145,10 @@
     */
    // 提交登录信息
    submit() {
      this.$refs.loginForm.validate(async (valid) => {
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          // 登录
          await login({
          login({
            username: this.formLogin.username,
            password: this.formLogin.password,
            captcha: this.formLogin.code,
@@ -159,9 +159,12 @@
              localStorage.setItem("token", res.data.token)
              localStorage.setItem("username", res.data.user.username)
              localStorage.setItem("uuid", res.data.user.id)
              setTimeout(() => {
                this.$router.push({ path: "/orderManageModule/orderManage" })
              }, 1000)
              this.$router.push({ path: "/orderManageModule/orderManage" })
              // if (Object.keys(res.data).length > 0) {
              //   setTimeout(() => {
              //     this.$router.push({ path: "/orderManageModule/orderManage" })
              //   }, 1000)
              // }
            } else {
              this.$message.warning(res.msg)
              if (res.msg == "验证码错误") {