安灯模块，相关功能表单页面样式调整

Houjie

昨天 28f1104e32c40273778eed24392bbf14ce03e7fe

安灯模块，相关功能表单页面样式调整

 src/views/andon/modules/AndonButtonConfigForm.vue

@@ -1,46 +1,59 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-button-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
        <!-- 第一行：安灯名称 + 安灯编码 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonName">
              <a-input v-model="model.buttonName" placeholder="请输入安灯名称"  ></a-input>
              <a-input v-model="model.buttonName" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonCode">
              <a-input v-model="model.buttonCode" placeholder="请输入安灯编码"  ></a-input>
              <a-input v-model="model.buttonCode" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第二行：升级响应时长 + 升级处理时长 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="升级响应" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeResponseDuration">
              <a-input-number v-model="model.upgradeResponseDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="升级响应时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeResponseDuration">
              <a-input-number v-model="model.upgradeResponseDuration" placeholder="请输入升级响应时长(分钟)" style="width: 100%" />
            <a-form-model-item label="升级处理" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeProcessDuration">
              <a-input-number v-model="model.upgradeProcessDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第三行：二次升级响应时长 + 二次升级处理时长 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="二次升级响应" :labelCol="labelColWide" :wrapperCol="wrapperColNarrow" prop="secondUpgradeResponseDuration">
              <a-input-number v-model="model.secondUpgradeResponseDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="升级处理时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upgradeProcessDuration">
              <a-input-number v-model="model.upgradeProcessDuration" placeholder="请输入升级处理时长(分钟)" style="width: 100%" />
            <a-form-model-item label="二次升级处理" :labelCol="labelColWide" :wrapperCol="wrapperColNarrow" prop="secondUpgradeProcessDuration">
              <a-input-number v-model="model.secondUpgradeProcessDuration" placeholder="请输入" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第四行：安灯按钮状态 + 备注 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="二次升级响应时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondUpgradeResponseDuration">
              <a-input-number v-model="model.secondUpgradeResponseDuration" placeholder="请输入二次升级响应时长(分钟)" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="二次升级处理时长(分钟)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondUpgradeProcessDuration">
              <a-input-number v-model="model.secondUpgradeProcessDuration" placeholder="请输入二次升级处理时长(分钟)" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯按钮状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonStatus">
              <j-dict-select-tag type="list" v-model="model.buttonStatus" dictCode="button_status" placeholder="请选择安灯按钮状态" />
            <a-form-model-item label="按钮状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonStatus">
              <j-dict-select-tag type="list" v-model="model.buttonStatus" dictCode="button_status" placeholder="请选择" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
              <a-input v-model="model.remark" placeholder="请输入" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -50,16 +63,13 @@
</template>

<script>

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'

  export default {
    name: 'AndonButtonConfigForm',
    components: {
    },
  components: {},
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
@@ -68,15 +78,25 @@
    },
    data () {
      return {
        model:{
         },
      model: {},
      // 普通标签列宽度
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        sm: { span: 6 },
      },
      // 宽标签列（用于“二次升级响应”等长标签）
      labelColWide: {
        xs: { span: 24 },
        sm: { span: 8 }, // 增加标签宽度
      },
      // 窄输入框列（配合宽标签，保持布局平衡）
      wrapperColNarrow: {
        xs: { span: 24 },
        sm: { span: 16 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        sm: { span: 18 },
        },
        confirmLoading: false,
        validatorRules: {
@@ -103,9 +123,9 @@
          ],
        },
        url: {
          add: "/andonbuttonconfig/andonButtonConfig/add",
          edit: "/andonbuttonconfig/andonButtonConfig/edit",
          queryById: "/andonbuttonconfig/andonButtonConfig/queryById"
        add: '/andonbuttonconfig/andonButtonConfig/add',
        edit: '/andonbuttonconfig/andonButtonConfig/edit',
        queryById: '/andonbuttonconfig/andonButtonConfig/queryById'
        }
      }
    },
@@ -115,7 +135,6 @@
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
@@ -128,7 +147,6 @@
      },
      submitForm () {
        const that = this;
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
@@ -152,9 +170,66 @@
              that.confirmLoading = false;
            })
          }

        })
      },
    }
  }
</script>

<style scoped>
.andon-button-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}

/* 统一表单项垂直间距 */
.a-form-model-item {
  margin-bottom: 16px !important;
}

/* 标签与输入框水平间距（解决文字拥挤） */
.a-form-model-item-label {
  margin-right: 12px !important;
}

/* 输入框 & 数字输入框 占位符样式优化 */
.a-input::placeholder,
.a-input-number::placeholder {
  color: #ccc;
  font-style: italic;
}

/* 必选标签的红色星号强调 */
.a-form-model-item-label > span:first-child {
  color: #f5222d;
  margin-right: 2px;
}

/* 按钮区域右对齐 & 按钮样式优化 */
.a-form-footer {
  text-align: right;
  margin-top: 32px;
}

.a-button-primary {
  background-color: #1890ff;
  border-color: #1890ff;
  transition: all 0.3s ease;
}

.a-button-primary:hover {
  background-color: #40a9ff;
  border-color: #40a9ff;
}

.a-button-default {
  border-color: #d9d9d9;
  transition: all 0.3s ease;
}

.a-button-default:hover {
  border-color: #bfbfbf;
}
</style>

 src/views/andon/modules/AndonOrderForm.vue

@@ -1,17 +1,11 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-order-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
        <!-- 第一行：产线 + 安灯类型 -->
              <a-row :gutter="24">
                <a-col :span="24">
                  <a-form-item
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    label=""
                  >
          <a-col :span="12">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
                    <j-select-factory
                      :disabled="disabled"
                      v-model="model.factoryId"
@@ -20,20 +14,20 @@
                      :backProduction="true"
                      :treeProductOpera="true"
                    ></j-select-factory>
                  </a-form-item>
                </a-col>
              </a-row>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="安灯类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonId">
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型"
                                   dict="andon_button_config,button_name,id"></j-search-select-tag>
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型" dict="andon_button_config,button_name,id"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第二行：安灯人 + 安灯时间 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator">
              <j-select-user-by-dep :multi="false" v-model="model.operator" placeholder="请输入安灯人"  ></j-select-user-by-dep>
              <j-select-user-by-dep :multi="false" v-model="model.operator" placeholder="请选择安灯人"></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -41,36 +35,24 @@
              <j-date placeholder="请选择安灯时间"  v-model="model.operateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第三行：安灯等级 + 安灯状态 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="andonLevel">
              <j-dict-select-tag type="list" v-model="model.andonLevel" dictCode="andon_level" placeholder="请选择安灯等级" />
            </a-form-model-item>
          </a-col>
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="响应人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responder">-->
<!--              <j-select-user-by-dep v-model="model.responder" placeholder="请输入响应人"  ></j-select-user-by-dep>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="响应时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responseTime">-->
<!--              <j-date placeholder="请选择响应时间"  v-model="model.responseTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="处理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processor">-->
<!--              <j-select-user-by-dep v-model="model.processor" placeholder="请输入处理人"  ></j-select-user-by-dep>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="处理完成时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTime">-->
<!--              <j-date placeholder="请选择处理完成时间"  v-model="model.processTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
          <a-col :span="12">
            <a-form-model-item label="安灯状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus">
              <j-dict-select-tag type="list" v-model="model.orderStatus" dictCode="order_status" placeholder="请选择安灯状态" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第四行：问题描述 + 处理结果描述 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="问题描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="problemDescreption">
              <a-textarea v-model="model.problemDescreption" rows="4" placeholder="请输入问题描述" />
@@ -81,6 +63,10 @@
              <a-textarea v-model="model.resolutionDescreption" rows="4" placeholder="请输入处理结果描述" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 第五行：处理结果图片 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="处理结果图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFiles">
              <j-image-upload isMultiple  v-model="model.imageFiles" ></j-image-upload>
@@ -93,7 +79,6 @@
</template>

<script>

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
  import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'
@@ -104,7 +89,6 @@
      JSelectFactory
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
@@ -113,11 +97,10 @@
    },
    data () {
      return {
        model:{
         },
      model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        sm: { span: 6 }, // 调整标签宽度，更紧凑
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -125,29 +108,17 @@
        },
        confirmLoading: false,
        validatorRules: {
          factoryId: [
            { required: true, message: '产线是必选项', trigger: 'change' }
          ],
          buttonId: [
            { required: true, message: '安灯类型是必选项', trigger: 'change' }
          ],
          operator: [
            { required: true, message: '安灯人是必选项', trigger: 'change' }
          ],
          operateTime: [
            { required: true, message: '安灯时间是必选项', trigger: 'change' }
          ],
          andonLevel: [
            { required: true, message: '安灯等级是必选项', trigger: 'change' }
          ],
          orderStatus: [
            { required: true, message: '安灯状态是必选项', trigger: 'change' }
          ],
        factoryId: [{ required: true, message: '产线是必选项', trigger: 'change' }],
        buttonId: [{ required: true, message: '安灯类型是必选项', trigger: 'change' }],
        operator: [{ required: true, message: '安灯人是必选项', trigger: 'change' }],
        operateTime: [{ required: true, message: '安灯时间是必选项', trigger: 'change' }],
        andonLevel: [{ required: true, message: '安灯等级是必选项', trigger: 'change' }],
        orderStatus: [{ required: true, message: '安灯状态是必选项', trigger: 'change' }],
        },
        url: {
          add: "/andonorder/andonOrder/add",
          edit: "/andonorder/andonOrder/edit",
          queryById: "/andonorder/andonOrder/queryById"
        add: '/andonorder/andonOrder/add',
        edit: '/andonorder/andonOrder/edit',
        queryById: '/andonorder/andonOrder/queryById'
        }
      }
    },
@@ -157,7 +128,6 @@
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
@@ -177,7 +147,6 @@
      },
      submitForm () {
        const that = this;
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
@@ -201,9 +170,33 @@
              that.confirmLoading = false;
            })
          }

        })
      },
    }
  }
</script>

<style scoped>
.andon-order-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
/* 统一表单项间距 */
.a-form-model-item {
  margin-bottom: 16px !important;
}
/* 调整文本域高度和占位符样式 */
.a-textarea {
  resize: vertical;
}
.a-textarea::placeholder {
  color: #ccc;
}
/* 按钮区域右对齐 */
.a-form-footer {
  text-align: right;
  margin-top: 24px;
}
</style>

 src/views/andon/modules/AndonResponseConfigForm.vue

@@ -1,17 +1,11 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
    <j-form-container :disabled="formDisabled" class="andon-response-form">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">

              <a-row :gutter="24">
                <a-col :span="24">
                  <a-form-item
                    :labelCol="labelCol"
                    :wrapperCol="wrapperCol"
                    label=""
                  >
          <a-col :span="12">
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
                    <j-select-factory
                      :disabled="disabled"
                      v-model="model.factoryId"
@@ -20,30 +14,60 @@
                      :backProduction="true"
                      :treeProductOpera="true"
                    ></j-select-factory>
                  </a-form-item>
                </a-col>
              </a-row>
            </a-form-model-item>
          </a-col>
        </a-row>


        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="安灯类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buttonId">
              <j-search-select-tag v-model="model.buttonId" placeholder="请输入安灯类型"
                                   dict="andon_button_config,button_name,id"></j-search-select-tag>
              <j-search-select-tag
                v-model="model.buttonId"
                placeholder="请选择"
                dict="andon_button_config,button_name,id"
              ></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="初始响应人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="firsterResponder">
              <j-select-user-by-dep :multi="false" v-model="model.firsterResponder" placeholder="请输入初始响应人"  ></j-select-user-by-dep>
              <j-select-user-by-dep
                :multi="false"
                v-model="model.firsterResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- 二级响应人 + 三级响应人 -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item
              label="二级响应人"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="secondResponder"
            >
              <j-select-user-by-dep
                :multi="false"
                v-model="model.secondResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="二级响应人(升级一次)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="secondResponder">
              <j-select-user-by-dep :multi="false" v-model="model.secondResponder" placeholder="请输入二级响应人(升级一次)"  ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="三级响应人(升级两次)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thirdResponder">
              <j-select-user-by-dep :multi="false" v-model="model.thirdResponder" placeholder="请输入三级响应人(升级两次)"  ></j-select-user-by-dep>
            <a-form-model-item
              label="三级响应人"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="thirdResponder"
            >
              <j-select-user-by-dep
                :multi="false"
                v-model="model.thirdResponder"
                placeholder="请选择"
              ></j-select-user-by-dep>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -53,17 +77,15 @@
</template>

<script>

  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
import { httpAction } from '@/api/manage'
  import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'

  export default {
    name: 'AndonResponseConfigForm',
    components: {
      JSelectFactory
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
@@ -72,15 +94,16 @@
    },
    data () {
      return {
        model:{
         },
      model: {},
      // 统一标签列宽度（产线、安灯类型等共用）
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        sm: { span: 6 },
        },
      // 统一输入框列宽度
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        sm: { span: 18 },
        },
        confirmLoading: false,
        validatorRules: {
@@ -113,7 +136,6 @@
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
@@ -133,7 +155,6 @@
      },
      submitForm () {
        const that = this;
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
@@ -157,9 +178,52 @@
              that.confirmLoading = false;
            })
          }

        })
      },
    }
  }
</script>

<style scoped>
.andon-response-form {
  padding: 24px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
.a-form-model-item {
  margin-bottom: 20px !important;
}
.a-form-model-item-label {
  margin-right: 16px !important;
}
.a-input::placeholder,
.a-select-selection-placeholder {
  color: #ccc;
  font-style: italic;
}
.a-form-model-item-label > span:first-child {
  color: #f5222d;
  margin-right: 4px;
}
.a-form-footer {
  text-align: right;
  margin-top: 36px;
}
.a-button-primary {
  background-color: #1890ff;
  border-color: #1890ff;
  transition: all 0.3s ease;
}
.a-button-primary:hover {
  background-color: #40a9ff;
  border-color: #40a9ff;
}
.a-button-default {
  border-color: #d9d9d9;
  transition: all 0.3s ease;
}
.a-button-default:hover {
  border-color: #bfbfbf;
}
</style>