diff --git a/src/views/system/device/components/DeviceTable.vue b/src/views/system/device/components/DeviceTable.vue index b796b10..64b0c17 100644 --- a/src/views/system/device/components/DeviceTable.vue +++ b/src/views/system/device/components/DeviceTable.vue @@ -56,7 +56,10 @@ <el-table-column label="归属信息" align="center" width="180" > <template slot-scope="d"> <template v-if="d.row.userId != null" > - 商户:<user-link :id="d.row.userId" :name="d.row.userName"/><br/> + 商户: + <user-link v-if="!isEmpty(d.row.userMobile)" :id="d.row.userId" :name="d.row.userMobile"/> + <user-link v-else :id="d.row.userId" :name="d.row.userName"/> + <br/> </template> <template v-if="d.row.storeId != null"> 店铺:<store-link :id="d.row.storeId" :name="d.row.storeName"/><br/> diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue index 701bdb8..b105608 100644 --- a/src/views/system/model/index.vue +++ b/src/views/system/model/index.vue @@ -17,6 +17,14 @@ @keyup.enter.native="handleQuery" /> </el-form-item> + <el-form-item label="SN前缀" prop="snPrefix"> + <el-input + v-model="queryParams.snPrefix" + placeholder="请输入SN前缀" + clearable + @keyup.enter.native="handleQuery" + /> + </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @@ -118,6 +126,9 @@ <form-col :span="span" label="产品ID" prop="productId"> <el-input v-model="form.productId" placeholder="请输入OneNet产品ID"/> </form-col> + <form-col :span="span" label="SN前缀" prop="snPrefix"> + <el-input v-model="form.snPrefix" placeholder="请输入SN前缀"/> + </form-col> <form-col :span="span * 2" label="型号功能" prop="tags"> <el-checkbox-group v-model="form.tags"> <el-checkbox v-for="option of dict.type.sm_model_tag" :label="option.value" :key="option.value">{{option.label}}</el-checkbox>