Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

zhangwencui

10 天以前 a54ac80a89efee9823a9f4b9e1f66bec1a0d3eac

 src/views/equipmentManagement/measurementEquipment/components/formDia.vue

@@ -64,7 +64,9 @@
                        v-model="form.userId"
                        placeholder="请选择"
                        clearable
                        disabled
                filterable
                default-first-option
                :reserve-keyword="false"
                     >
                        <el-option
                           v-for="item in userList"
@@ -83,7 +85,6 @@
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="date"
                        disabled
                        placeholder="请选择"
                        clearable
                     />