zhangherong
2025-05-14 01c6094a8ed357ebb8a147c6af798e43fbac93ea
art: 设备管理-周保-增加终验收抽检标记字段
已修改2个文件
60 ■■■■ 文件已修改
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -28,16 +28,28 @@
                                 v-model="queryParam.maintenanceStatus"/>
            </a-form-item>
          </a-col>
          <a-col :xl="3" :lg="4" :md="8" :sm="24">
            <a-form-item label="抽检标记">
              <j-dict-select-tag placeholder="请选择抽检标记" dict-code="yn"
                                 v-model="queryParam.randomInspectionFlag"/>
            </a-form-item>
          </a-col>
          <a-col :xl="3" :lg="4" :md="8" :sm="24">
          <template v-if="toggleSearchStatus">
            <a-col :xl="4" :lg="4" :md="8" :sm="24">
              <a-form-item label="初验收抽检">
                <j-dict-select-tag placeholder="请选择抽检标记" dict-code="yn"
                                   v-model="queryParam.randomInspectionFlag"/>
              </a-form-item>
            </a-col>
            <a-col :xl="4" :lg="4" :md="8" :sm="24">
              <a-form-item label="终验收抽检">
                <j-dict-select-tag placeholder="请选择抽检标记" dict-code="yn"
                                   v-model="queryParam.finalRandomInspectionFlag"/>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="4" :lg="4" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>
@@ -86,7 +98,12 @@
        :scroll="{x:'max-content'}"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        <span slot="randomInspectionFlag" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="是" un-checked-children="否"/>
        </span>
        <span slot="finalRandomInspectionFlag" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="是" un-checked-children="否"/>
        </span>
        <span slot="action" slot-scope="text, record">
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:edit')">
          <a @click="handleEdit(record)">编辑</a>
@@ -269,6 +286,13 @@
            width: 60
          },
          {
            title: '初验收抽检',
            align: 'center',
            dataIndex: 'randomInspectionFlag',
            width: 60,
            scopedSlots: { customRender: 'randomInspectionFlag' }
          },
          {
            title: '终验收人',
            align: 'center',
            dataIndex: 'finalAcceptanceUser_dictText',
@@ -287,6 +311,13 @@
            width: 60
          },
          {
            title: '终验收抽检',
            align: 'center',
            dataIndex: 'finalRandomInspectionFlag',
            width: 60,
            scopedSlots: { customRender: 'finalRandomInspectionFlag' }
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'remark',
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -197,7 +197,7 @@
                            :disabled="disableSubmit || completionDisable"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
            <a-col :span="6">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult"
                                 label="终验收附件">
                <lx-upload :returnUrl="false"
@@ -206,6 +206,17 @@
                           v-model="model.finalAcceptanceFilesResult"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="6">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalRandomInspectionFlag"
                                 label="抽检标记">
                <lx-switch
                  checked-children='是'
                  un-checked-children='否'
                  v-model="model.finalRandomInspectionFlag"
                  :disabled="disableSubmit || completionDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
      </a-form-model>