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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

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

@@ -31,14 +31,16 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="时长（分钟）" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入时长"  v-decorator="['duration', validatorRules.duration]"></a-input>
              <a-input-number :min="0" placeholder="请输入时长"  v-decorator="['duration', validatorRules.duration]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea   v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
@@ -116,6 +118,38 @@
              {
                required:true,
                message: "请选择设备"
              },
            ],
          },
          partsCode:{
            rules:[
              {
                required:true,
                message: "请输入零件号"
              },
            ],
          },
          batchCode:{
            rules:[
              {
                required:true,
                message: "请输入批次号"
              },
            ],
          },
          sequenceNumber:{
            rules:[
              {
                required:true,
                message: "请输入程序号"
              },
            ],
          },
          duration:{
            rules:[
              {
                required:true,
                message: "请输入时长"
              },
            ],
          },
@@ -254,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
@@ -311,7 +353,7 @@
  }
</script>

<style scoped>
<style scoped lang="less">
  .ant-btn {
    padding: 0 10px;
    margin-left: 3px;
@@ -330,4 +372,7 @@
  .ant-tabs-content .ant-form-item {
    margin-bottom: 0px;
  }
  /deep/ .ant-input-number{
    width: 100%!important;
  }
</style>