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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

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

@@ -7,8 +7,7 @@
            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planCloseType">
              <j-dict-select-tag :readOnly="disableSubmit" placeholder="请选择类型"
                                 :triggerChange="true" dictCode="mdc_plan_type   "
                                 v-model="model.planCloseType" allow-clear/>

                                 v-model="model.planCloseType" allow-clear />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
@@ -70,6 +69,15 @@
        },
        confirmLoading: false,
        validatorRules: {
          planCloseType:[
            {required: true,message:'请选择类型!'}
          ],
          planCloseTimeType:[
            {required: true,message:'请选择时间类型!'}
          ],
          planCloseTimeLong:[
            {required: true,message:'请输入时长!'}
          ],
        },
        url: {
          add: "/mdc/mdcPlanClose/add",