Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue

@@ -121,6 +121,38 @@
              },
            ],
          },
          partsCode:{
            rules:[
              {
                required:true,
                message: "请输入零件号"
              },
            ],
          },
          batchCode:{
            rules:[
              {
                required:true,
                message: "请输入批次号"
              },
            ],
          },
          sequenceNumber:{
            rules:[
              {
                required:true,
                message: "请输入程序号"
              },
            ],
          },
          duration:{
            rules:[
              {
                required:true,
                message: "请输入时长"
              },
            ],
          },
        },

        url: {
@@ -256,11 +288,19 @@
                }
                obj.then((res) => {
                  if (res.success) {
                    that.$message.success("添加成功")
                    // that.$message.success("添加成功")
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });
                    // that.$message.success(res.message)
                    that.$emit('ok', res.result)
                  } else {
                    that.$message.warning(res.message)
                    // that.$message.warning(res.message)
                    that.$notification.warning({
                      message:'消息',
                      description:res.message
                    });
                  }
                }).finally(() => {
                  that.confirmLoading = false