Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 6670fda2939518181d60c6254f2bcb37917f0e2f

Merge remote-tracking branch 'origin/master'

 src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue

@@ -22,10 +22,10 @@
                :sm="8"
              >
                <a-form-item label="标准编码">
                  <j-input
                  <a-input
                    placeholder="请输入标准编码检索"
                    v-model="queryParam.num"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col
@@ -33,10 +33,10 @@
                :sm="8"
              >
                <a-form-item label="设备编号">
                  <j-input
                  <a-input
                    placeholder="请输入标准编号检索"
                    v-model="queryParam.equipmentNum"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>

@@ -45,10 +45,10 @@
                :sm="8"
              >
                <a-form-item label="设备名称">
                  <j-input
                  <a-input
                    placeholder="请输入设备名称检索"
                    v-model="queryParam.equipmentName"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col

 src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue

@@ -21,10 +21,10 @@
              :md='8'
              :sm='6'
            >
              <a-form-item label='点检项目名称'>
                <a-input
                  placeholder='请输入点检项目名称'
                  v-model='queryParam.num'
              <a-form-item label='点检项目'>
                <j-input
                  placeholder='请输入点检项目'
                  v-model='queryParam.name'
                />
              </a-form-item>
            </a-col>

 src/views/eam/modules/inspectionProject/InspectionProjectRight.vue

@@ -56,7 +56,7 @@
        icon="plus"
      >新增</a-button>
      <!-- :hidden="disabled" -->
      <a-upload
      <!-- <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
@@ -73,7 +73,7 @@
        type="primary"
        icon="download"
        @click="handleExportXls('原因')"
      >导出</a-button>
      >导出</a-button> -->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作

 src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue

@@ -207,13 +207,21 @@
              :wrapperCol="wrapperCol"
              prop="maintenanceType"
            >
              <j-dict-select-tag
              <!-- <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选保养类型'"
                :triggerChange="true"
                dictCode="maintenance_type"
                v-model="model.maintenanceType"
                
              /> -->

              <j-dict-select-tag
                placeholder="请选保养类型"
                :triggerChange="true"
                dictCode="maintenance_type"
                v-model="model.maintenanceType"
              />
            </a-form-item>
          </a-col>