Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-07 f79bb27a83f3de364b586d7a2a515f92ef9e29dd

Merge remote-tracking branch 'origin/master'

 src/components/tools/EquipmentSelection.vue

@@ -38,7 +38,7 @@
      </div>
      <a-row :gutter="24">
        <a-col :md="16" :sm="12">
          <a-table ref="table" :scroll="{ x: true, y: true }" size="middle" rowKey="id" bordered :columns="columns"
          <a-table ref="table" size="middle" rowKey="id" bordered :columns="columns"
            :dataSource="dataSource" :pagination="false" :rowSelection="rowSelection" :loading="loading"
            @change="handleTableChange">
            <template slot="equipmentPhoto" slot-scope="text,record">

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -488,6 +488,8 @@
                style='width: 100%;'
                v-model='model.acceptanceCheckDate'
                @change='dateChange'
                valueFormat="YYYY-MM-DD"
                format="YYYY-MM-DD"
              />
            </a-form-model-item>
          </a-col>
@@ -1209,12 +1211,13 @@
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
              that.close()
            } else {
              that.$message.warning(res.message)
              that.$message.error(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
            // that.close()
          })
        } else {
          return false