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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue

@@ -21,7 +21,7 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="扭矩值" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" placeholder="请输入扭矩值"
              <a-input-number :min="0" :disabled="disableSubmit" placeholder="请输入扭矩值"
                       v-decorator="['torqueValue', validatorRules.torqueValue]"/>
            </a-form-item>
          </a-col>
@@ -35,7 +35,7 @@
        </a-row>
        <a-row :gutter="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea  :disabled="disableSubmit"  v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20" :disabled="disableSubmit"  v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
        </a-row>
      </a-form>
@@ -125,6 +125,22 @@
              },
            ],
          },
          torqueDate:{
            rules:[
              {
                required:true,
                message: "请选择时间"
              },
            ],
          },
          torqueValue:{
            rules:[
              {
                required:true,
                message: "请输入扭矩值"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -138,7 +154,7 @@

        url: {
          add: '/mdc/mdcEquipmentRepair/add',
          edit: '/mdc/mdcEquipmentRepair/edit'
          edit: '/mdc/MdcTorqueConfig/editMdcTorqueConfig'
        },

        disableSubmit: true,
@@ -245,44 +261,46 @@
            that.confirmLoading = true
            let formData = Object.assign(this.model, values)
            let obj
                if (!this.model.id) {
                  obj = postAction(this.url.add, formData)
                } else {

                  obj = requestPut(this.url.edit, formData, {
                    id: this.model.id
                  })
                  let shijian = startOne
                }
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("修改成功")
                    that.$message.success(res.message)
                    that.$emit('ok', res.result)
                  } else {
                    that.$message.warning(res.message)
                  }
                }).finally(() => {
                  that.confirmLoading = false
                  that.close()
                })
            if (!this.model.id) {
              obj = postAction(this.url.add, formData)
            } else {
              obj = requestPut(this.url.edit, formData, {
                id: this.model.id
              })
            }
            obj.then((res) => {
              if (res.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.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            // }


          // }
            }).finally(() => {
              that.confirmLoading = false
              that.close()
            })
          }
        })
      },
      handleCancel() {
        this.close()
      },
      loadCascade() {
        getAction(this.url.loadCascadeData).then((res) => {
          if (res.success) {
            this.partCategoryCascade = res.result
          }
        })
      },
      // loadCascade() {
      //   getAction(this.url.loadCascadeData).then((res) => {
      //     if (res.success) {
      //       this.partCategoryCascade = res.result
      //     }
      //   })
      // },
      onCascadeChange(value, selectedOptions) {
        this.cascadeDefaultValue = [...value]
      },
@@ -314,7 +332,7 @@
  }
</script>

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