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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue

@@ -5,7 +5,9 @@
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planCloseType">
              <a-input v-model="model.planCloseType" placeholder="请输入类型"  ></a-input>
              <j-dict-select-tag :readOnly="disableSubmit" placeholder="请选择类型"
                                 :triggerChange="true" dictCode="mdc_plan_type   "
                                 v-model="model.planCloseType" allow-clear />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
@@ -20,12 +22,12 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="时长（分钟）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planCloseTimeLong">
              <a-input v-model="model.planCloseTimeLong" placeholder="请输入时长（分钟）"  ></a-input>
              <a-input-number :min="0" v-model="model.planCloseTimeLong" placeholder="请输入时长（分钟）"  ></a-input-number>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-textarea v-model="model.remark" placeholder="请输入备注"  ></a-textarea>
              <a-textarea :maxLength="20" v-model="model.remark" placeholder="请输入备注"  ></a-textarea>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -67,6 +69,15 @@
        },
        confirmLoading: false,
        validatorRules: {
          planCloseType:[
            {required: true,message:'请选择类型!'}
          ],
          planCloseTimeType:[
            {required: true,message:'请选择时间类型!'}
          ],
          planCloseTimeLong:[
            {required: true,message:'请输入时长!'}
          ],
        },
        url: {
          add: "/mdc/mdcPlanClose/add",
@@ -108,10 +119,18 @@
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                // that.$message.success(res.message);
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
                // that.$message.warning(res.message);
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false;
@@ -122,4 +141,9 @@
      },
    }
  }
</script>
</script>
<style scoped lang="less">
  /deep/ .ant-input-number{
    width: 100%!important;
  }
</style>