Merge branch 'develop'

qushaowei

2023-11-22 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681

 src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue

@@ -10,8 +10,8 @@
<!--&lt;!&ndash;              </a-form-item>&ndash;&gt;-->
<!--&lt;!&ndash;              </a-col>&ndash;&gt;-->
<!--              <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!--              <a-form-item label="设备编码">-->
<!--                <a-input placeholder="请输入设备编码" v-model="queryParam.equipmentNum"></a-input>-->
<!--              <a-form-item label="统一编码">-->
<!--                <a-input placeholder="请输入统一编码" v-model="queryParam.equipmentNum"></a-input>-->
<!--              </a-form-item>-->
<!--              </a-col>-->
<!--          <template v-if="toggleSearchStatus">-->
@@ -168,7 +168,7 @@
          //   dataIndex: 'equipmentId_dictText',
          // },
          {
            title:'设备编码',
            title:'统一编码',
            align:"center",
            dataIndex: 'equipmentNum'
          },