1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

zhuzhuanzhuan

2023-09-21 a1ff69f228b7a0d08959e6b25eff2dac6085df8d

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

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
              <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
                              @search="deviceSearch" enter-button/>
            </a-form-item>
          </a-col>
@@ -20,15 +20,17 @@
          </a-col>
          <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>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-input   v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-input>
            <a-textarea :maxLength="20"  v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
@@ -101,31 +103,30 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId:{
          equipmentIds:{
            rules:[
              {
                required:true,
                message: ""
                message: "请选择设备"
              },
            ],
          },
          equipmentName:{
          torqueDate:{
            rules:[
              {
                required:true,
                message: ""
                message: "请选择时间"
              },
            ],
          },
          mdcRepairType:{
          torqueValue:{
            rules:[
              {
                required:true,
                message: ""
                message: "请输入扭矩值"
              },
            ],
            initialValue: 1
          }
          },
        },

        url: {
@@ -161,17 +162,17 @@
        this.endTime = dateStrings[0];
      },
      getDeviceRows(val) {
        var equipmentId;
        var equipmentIds;
        for(var i = 0;i<val.length;i++){
          if (i == 0) {
            equipmentId =  val[i].equipmentId;
            equipmentIds =  val[i].equipmentId;
          } else {
            equipmentId = equipmentId + "," + val[i].equipmentId;
            equipmentIds = equipmentIds + "," + val[i].equipmentId;
          }
        }
        // console.log("========",equipmentIds);
        this.form.setFieldsValue({
          equipmentId: equipmentId,
          equipmentIds: equipmentIds,
        })
        //   this.form.setFieldsValue({
        // equipmentId: val.equipmentId,
@@ -261,11 +262,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
@@ -280,13 +289,13 @@
      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]
      },
@@ -318,7 +327,7 @@
  }
</script>

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