|
|
@ -110,17 +110,6 @@ |
|
|
border |
|
|
border |
|
|
v-loading="dataListLoading" |
|
|
v-loading="dataListLoading" |
|
|
style="width: 100%;"> |
|
|
style="width: 100%;"> |
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- fixed="left"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- width="70"--> |
|
|
|
|
|
<!-- label="排序">--> |
|
|
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
|
|
<!-- <a type="text" size="small" @click="goUp(scope.row)">上移</a>--> |
|
|
|
|
|
<!-- <a type="text" size="small" @click="goDown(scope.row)"> 下移</a>--> |
|
|
|
|
|
<!-- </template>--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnDetailList" :key="index" |
|
|
v-for="(item,index) in columnDetailList" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
@ -182,106 +171,6 @@ |
|
|
</el-footer> |
|
|
</el-footer> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px">--> |
|
|
|
|
|
<!-- <div style="font-size: 12px">--> |
|
|
|
|
|
<!-- <!– BM模块编码:<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>–>--> |
|
|
|
|
|
<!-- <!– BM模块名称:<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>–>--> |
|
|
|
|
|
<!-- <el-form :inline="true" label-position="top" :model="detailData">--> |
|
|
|
|
|
<!-- <el-form-item :label="'属性编码'">--> |
|
|
|
|
|
<!-- <el-input v-model="detailData.itemNo" style="width: 120px"></el-input>--> |
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
<!-- <el-form-item :label="'属性名称'">--> |
|
|
|
|
|
<!-- <el-input v-model="detailData.itemDesc" style="width: 120px"></el-input>--> |
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
<!-- <el-form-item :label="' '">--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="queryTemplateItem()">查询</el-button>--> |
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
<!-- <el-container style="margin-top: 0px;">--> |
|
|
|
|
|
<!-- <el-main style="width: 350px;padding: 1px">--> |
|
|
|
|
|
<!-- <span style="font-size: 12px" >可选属性:</span>--> |
|
|
|
|
|
<!-- <el-table--> |
|
|
|
|
|
<!-- height="400px"--> |
|
|
|
|
|
<!-- :data="itemList1"--> |
|
|
|
|
|
<!-- border--> |
|
|
|
|
|
<!-- ref="itemTable1"--> |
|
|
|
|
|
<!-- @row-click="itemClickRow1"--> |
|
|
|
|
|
<!-- @selection-change="selectionItem1"--> |
|
|
|
|
|
<!-- highlight-current-row--> |
|
|
|
|
|
<!-- v-loading="dataListLoading"--> |
|
|
|
|
|
<!-- style="width: 100%">--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- type="selection"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- :selectable="selectFlag"--> |
|
|
|
|
|
<!-- width="50">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- prop="itemNo"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- min-width="80"--> |
|
|
|
|
|
<!-- label="属性编码">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- prop="itemDesc"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- min-width="200"--> |
|
|
|
|
|
<!-- label="属性名称">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- </el-table>--> |
|
|
|
|
|
<!-- </el-main>--> |
|
|
|
|
|
<!-- <el-main style="width: 10px;padding: 1px">--> |
|
|
|
|
|
<!-- <div style="margin-top: 200px;margin-left: 18px">--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="addItem()">添加>></el-button>--> |
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
<!-- <div style="margin-top: 15px;margin-left: 18px">--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="deleteItem()">删除<<</el-button>--> |
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
<!-- </el-main>--> |
|
|
|
|
|
<!-- <el-main style="width: 350px;padding: 1px">--> |
|
|
|
|
|
<!-- <span style="font-size: 12px" >已有属性:</span>--> |
|
|
|
|
|
<!-- <el-table--> |
|
|
|
|
|
<!-- height="400px"--> |
|
|
|
|
|
<!-- :data="itemList2"--> |
|
|
|
|
|
<!-- border--> |
|
|
|
|
|
<!-- ref="itemTable2"--> |
|
|
|
|
|
<!-- @row-click="itemClickRow2"--> |
|
|
|
|
|
<!-- @selection-change="selectionItem2"--> |
|
|
|
|
|
<!-- highlight-current-row--> |
|
|
|
|
|
<!-- v-loading="dataListLoading"--> |
|
|
|
|
|
<!-- style="width: 100%">--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- type="selection"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- :selectable="selectFlag"--> |
|
|
|
|
|
<!-- width="50">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- prop="itemNo"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- min-width="80"--> |
|
|
|
|
|
<!-- label="属性编码">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- <el-table-column--> |
|
|
|
|
|
<!-- prop="itemDesc"--> |
|
|
|
|
|
<!-- header-align="center"--> |
|
|
|
|
|
<!-- align="center"--> |
|
|
|
|
|
<!-- min-width="200"--> |
|
|
|
|
|
<!-- label="属性名称">--> |
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
|
<!-- </el-table>--> |
|
|
|
|
|
<!-- </el-main>--> |
|
|
|
|
|
<!-- </el-container>--> |
|
|
|
|
|
<!-- <el-footer style="height:40px;margin-top: 20px;text-align:center">--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>--> |
|
|
|
|
|
<!-- </el-footer>--> |
|
|
|
|
|
<!-- </el-dialog>--> |
|
|
|
|
|
|
|
|
|
|
|
<el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="350px"> |
|
|
<el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="350px"> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
@ -324,13 +213,9 @@ |
|
|
saveModalDetailsForBM, |
|
|
saveModalDetailsForBM, |
|
|
deleteModalDetailsForBM, // 多选删除 |
|
|
deleteModalDetailsForBM, // 多选删除 |
|
|
getItemListsForBM, |
|
|
getItemListsForBM, |
|
|
deleteModalDetailForBM, // 单删 |
|
|
|
|
|
goUpItemForBM, |
|
|
|
|
|
goDownForBM, |
|
|
|
|
|
updateBMModal, |
|
|
updateBMModal, |
|
|
} from "@/api/base/properties.js" |
|
|
} from "@/api/base/properties.js" |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
|
|
import { |
|
|
import { |
|
|
getBUList, |
|
|
getBUList, |
|
|
} from "@/api/base/site.js" |
|
|
} from "@/api/base/site.js" |
|
|
@ -536,7 +421,7 @@ |
|
|
columnProp: 'editFlag', |
|
|
columnProp: 'editFlag', |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "center", |
|
|
align: "center", |
|
|
columnLabel: '是否可编辑', |
|
|
|
|
|
|
|
|
columnLabel: '是否可配置', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -805,53 +690,8 @@ |
|
|
}) |
|
|
}) |
|
|
this.detailModelFlag = true; |
|
|
this.detailModelFlag = true; |
|
|
}, |
|
|
}, |
|
|
goUp(row) { |
|
|
|
|
|
goUpItemForBM(row).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
searchModalDetailsForBM(this.detailData).then(({data}) => { |
|
|
|
|
|
this.detailList = data.rows |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
goDown(row) { |
|
|
|
|
|
goDownForBM(row).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
searchModalDetailsForBM(this.detailData).then(({data}) => { |
|
|
|
|
|
this.detailList = data.rows |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
deleteModalDetailForBM(row){ |
|
|
|
|
|
this.$confirm(`是否删除这个属性项目?`, '提示', { |
|
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
|
type: 'warning' |
|
|
|
|
|
}).then(() => { |
|
|
|
|
|
deleteModalDetailForBM(row).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
searchModalDetailsForBM(this.detailData).then(({data}) => { |
|
|
|
|
|
this.detailList = data.rows |
|
|
|
|
|
}) |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
message: '操作成功', |
|
|
|
|
|
type: 'success', |
|
|
|
|
|
duration: 1500, |
|
|
|
|
|
onClose: () => { |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
|
|
confirmButtonText: '确定' |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
|
|
|
chooseModal(row){ |
|
|
chooseModal(row){ |
|
|
this.chooseModalData.site = row.site; |
|
|
this.chooseModalData.site = row.site; |
|
|
this.chooseModalData.itemNo = row.itemNo; |
|
|
this.chooseModalData.itemNo = row.itemNo; |
|
|
|