bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1399 基础管理新增页面存在错乱字符

This commit is contained in:
binbin_pan 2024-04-29 13:21:34 +08:00
parent bad5c11bdc
commit 860b95d5dd
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-ui/src/views/base/assetAttributeManagement/index.vue
View File

@ -81,12 +81,6 @@
<el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60" />
</el-form-item>
<el-form-item label="所属上级" prop="deptId">
<<<<<<< HEAD
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select" />
</el-form-item>
<el-form-item label="资产编码" prop="code">
<el-input v-model="form.code" placeholder="请输入资产编码" maxlength="60" />
=======
<treeselect
v-model="form.deptId"
:options="deptOptions"
@ -96,7 +90,9 @@
placeholder="请选择所属上级"
@select="select"
/>
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
</el-form-item>
<el-form-item label="资产编码" prop="code">
<el-input v-model="form.code" placeholder="请输入资产编码" maxlength="60" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

14
sgzb-ui/src/views/base/section/index.vue
View File

@ -30,15 +30,6 @@
<el-table v-loading="loading" :data="projectLot" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="标段工程名称" align="center" prop="lotName" :show-overflow-tooltip="true" />
<el-table-column label="工程类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="所属工程项目" align="center" prop="ownPro" :show-overflow-tooltip="true" />
<el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
=======
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
@ -50,7 +41,6 @@
<el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
<el-table-column label="状态" align="center" prop="status" width="180">
<template slot-scope="scope">
<el-switch
@ -117,9 +107,6 @@
</el-select>
</el-form-item>
<el-form-item label="所属上级" prop="deptId">
<<<<<<< HEAD
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select" />
=======
<treeselect
v-model="form.deptId"
:options="deptOptions"
@ -129,7 +116,6 @@
placeholder="请选择所属上级"
@select="select"
/>
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
</el-form-item>
<el-form-item label="联系人" prop="linkMan">
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" />

5
sgzb-ui/src/views/base/unit/index.vue
View File

@ -31,17 +31,12 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="单位类型" align="center" prop="name" :show-overflow-tooltip="true" />
=======
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="单位类型" align="center" prop="name" :show-overflow-tooltip="true" />
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
<el-table-column label="状态" align="center" prop="status" width="180">
<template slot-scope="scope">
<el-switch