|
|
|
@ -7,6 +7,13 @@ |
|
|
|
<el-form-item :label="'属性模板名称'"> |
|
|
|
<el-input v-model="searchData.codeDesc" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'属性模板类型'" > |
|
|
|
<el-select filterable v-model="searchData.functionType" style="width: 120px"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="A" value="A"></el-option> |
|
|
|
<el-option label="B" value="B"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'在用'"> |
|
|
|
<el-select filterable v-model="searchData.active" style="width: 130px"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
@ -39,6 +46,32 @@ |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- prop="codeNo"--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- label="属性模板编码">--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- prop="codeDesc"--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- label="属性模板名称">--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- prop="active"--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- label="在用">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <div v-if="scope.row.active === 'Y'">--> |
|
|
|
<!-- 是--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- <div v-if="scope.row.active === 'N'">--> |
|
|
|
<!-- 否--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -76,7 +109,7 @@ |
|
|
|
:total="totalPage" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
<el-dialog title="属性模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px"> |
|
|
|
<el-dialog title="属性模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="300px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="属性模板编码:" prop="codeNo" :rules="rules.codeNoType"> |
|
|
|
<el-input v-model="modalData.codeNo" :disabled="modalDisableFlag" style="width: 120px"></el-input> |
|
|
|
@ -84,6 +117,14 @@ |
|
|
|
<el-form-item label="属性模板名称:" prop="codeDesc" :rules="rules.codeDescType"> |
|
|
|
<el-input v-model="modalData.codeDesc" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item :label="'属性模板类型'" > |
|
|
|
<el-select filterable v-model="modalData.functionType" style="width: 120px"> |
|
|
|
<el-option label="A" value="A"></el-option> |
|
|
|
<el-option label="B" value="B"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="是否在用:" prop="active" :rules="rules.activeType"> |
|
|
|
<el-select filterable v-model="modalData.active" style="width: 120px"> |
|
|
|
<el-option label="是" value="Y"></el-option> |
|
|
|
@ -106,7 +147,7 @@ |
|
|
|
<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<!-- <el-button type="primary" @click="addDetailModal()">新增</el-button>--> |
|
|
|
<!-- <el-button type="primary" @click="addDetailModal()">新增</el-button>--> |
|
|
|
<el-button type="primary" @click="addFastModal()">新增</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
@ -139,40 +180,40 @@ |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="scope.row.valueChooseFlag === 'Y'" @click="chooseModal(scope.row)">可选值</a> |
|
|
|
<a type="text" size="small" @click="deleteModalDetails(scope.row)">删除项目</a> |
|
|
|
<a type="text" size="small" @click="deleteModalDetails(scope.row)">删除属性</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="detailModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="detailModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- <el-dialog title="添加项目" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">--> |
|
|
|
<!-- <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">--> |
|
|
|
<!-- <el-form-item >--> |
|
|
|
<!-- <span slot="label" style="" @click="getBaseList(1024)"><a herf="#">属性项目编码</a></span>--> |
|
|
|
<!-- <el-input v-model="detailData.itemNo" @blur="itemNoBlur" style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item label="属性项目名称:">--> |
|
|
|
<!-- <el-input v-model="detailData.itemDesc" disabled style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- <el-footer style="height:40px;margin-top: 10px;text-align:center">--> |
|
|
|
<!-- <el-button type="primary" @click="saveModalDetails()">保存</el-button>--> |
|
|
|
<!-- <el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>--> |
|
|
|
<!-- </el-footer>--> |
|
|
|
<!-- </el-dialog>--> |
|
|
|
<!-- <el-dialog title="添加属性" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">--> |
|
|
|
<!-- <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">--> |
|
|
|
<!-- <el-form-item >--> |
|
|
|
<!-- <span slot="label" style="" @click="getBaseList(1024)"><a herf="#">属性属性编码</a></span>--> |
|
|
|
<!-- <el-input v-model="detailData.itemNo" @blur="itemNoBlur" style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item label="属性项目名称:">--> |
|
|
|
<!-- <el-input v-model="detailData.itemDesc" disabled style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- <el-footer style="height:40px;margin-top: 10px;text-align:center">--> |
|
|
|
<!-- <el-button type="primary" @click="saveModalDetails()">保存</el-button>--> |
|
|
|
<!-- <el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>--> |
|
|
|
<!-- </el-footer>--> |
|
|
|
<!-- </el-dialog>--> |
|
|
|
|
|
|
|
<el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1200px"> |
|
|
|
<el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px"> |
|
|
|
<div style="font-size: 12px"> |
|
|
|
<!-- 属性模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>--> |
|
|
|
<!-- 属性模板名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>--> |
|
|
|
<!-- 属性模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>--> |
|
|
|
<!-- 属性模板名称：<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-form-item :label="'属性编码'"> |
|
|
|
<el-input v-model="detailData.itemNo" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'项目名称'"> |
|
|
|
<el-form-item :label="'属性名称'"> |
|
|
|
<el-input v-model="detailData.itemDesc" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
@ -181,8 +222,8 @@ |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<el-container style="margin-top: 0px;"> |
|
|
|
<el-main style="width: 450px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >可选项目：</span> |
|
|
|
<el-main style="width: 350px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >可选属性：</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="itemList1" |
|
|
|
@ -205,21 +246,14 @@ |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="项目编码"> |
|
|
|
label="属性编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemDesc" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="项目名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemRemark" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="方法说明"> |
|
|
|
label="属性名称"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
@ -231,8 +265,8 @@ |
|
|
|
<el-button type="primary" @click="deleteItem()">删除<<</el-button> |
|
|
|
</div> |
|
|
|
</el-main> |
|
|
|
<el-main style="width: 450px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >已有项目：</span> |
|
|
|
<el-main style="width: 350px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >已有属性：</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="itemList2" |
|
|
|
@ -255,21 +289,14 @@ |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="项目编码"> |
|
|
|
label="属性编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemDesc" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="项目名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemRemark" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="方法说明"> |
|
|
|
label="属性名称"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
@ -284,7 +311,7 @@ |
|
|
|
<el-form-item label="属性项目名称:"> |
|
|
|
<el-input v-model="chooseModalData.itemDesc" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'检测值类型'"> |
|
|
|
<el-form-item :label="'属性值类型'"> |
|
|
|
<el-select filterable v-model="chooseModalData.valueTypeDb" disabled style="width: 120px"> |
|
|
|
<el-option label="文本" value="T"></el-option> |
|
|
|
<el-option label="数字" value="N"></el-option> |
|
|
|
@ -322,11 +349,11 @@ |
|
|
|
searchModalDetails, |
|
|
|
saveModalDetails, |
|
|
|
deleteModalDetails, // 多选删除 |
|
|
|
propertiesItemSearch, |
|
|
|
getItemLists, |
|
|
|
deleteModalDetail, // 单删 |
|
|
|
deleteModalDetail // 单删 |
|
|
|
} from "@/api/base/properties.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
export default { |
|
|
|
components: { |
|
|
|
Chooselist |
|
|
|
@ -361,20 +388,22 @@ |
|
|
|
}, |
|
|
|
data () { |
|
|
|
return { |
|
|
|
|
|
|
|
// 是否收藏 |
|
|
|
favorite: false, |
|
|
|
// 导出 start |
|
|
|
exportData: [], |
|
|
|
exportName: "属性模板" + this.dayjs().format('YYYYMMDDHHmmss'), |
|
|
|
exportHeader: ["属性模板"], |
|
|
|
exportFooter: [], |
|
|
|
exportList:[], |
|
|
|
// 导出 end |
|
|
|
// 导出 end |
|
|
|
tagNo:'', |
|
|
|
searchData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
codeNo: '', |
|
|
|
codeDesc: '', |
|
|
|
active:'Y', |
|
|
|
functionType:'A', |
|
|
|
functionType:'', |
|
|
|
page: 1, |
|
|
|
limit: 10, |
|
|
|
}, |
|
|
|
@ -390,26 +419,44 @@ |
|
|
|
codeNo:'', |
|
|
|
codeDesc:'', |
|
|
|
active:'', |
|
|
|
functionType:'A', |
|
|
|
functionType:'', |
|
|
|
userId:this.$store.state.user.name, |
|
|
|
createdBy: this.$store.state.user.name, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
}, |
|
|
|
detailData:{ |
|
|
|
site: this.$store.state.user.site, |
|
|
|
codeNo:'', |
|
|
|
codeDesc:'', |
|
|
|
functionType:'A', |
|
|
|
functionType:'', |
|
|
|
itemNo:'', |
|
|
|
itemDesc:'', |
|
|
|
itemType:'A', |
|
|
|
itemType:'', |
|
|
|
userId:this.$store.state.user.name |
|
|
|
}, |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableFunctionType', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'functionType', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '属性模板类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableCodeNo', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'codeNo', |
|
|
|
headerAlign: "center", |
|
|
|
@ -424,9 +471,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableCodeDesc', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'codeDesc', |
|
|
|
headerAlign: "center", |
|
|
|
@ -441,9 +488,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableActive', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'active', |
|
|
|
headerAlign: "center", |
|
|
|
@ -458,9 +505,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableCreatedDate', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'createdDate', |
|
|
|
headerAlign: "center", |
|
|
|
@ -475,9 +522,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableCreatedBy', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'createdBy', |
|
|
|
headerAlign: "center", |
|
|
|
@ -492,9 +539,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableUpdateDate', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'updateDate', |
|
|
|
headerAlign: "center", |
|
|
|
@ -509,9 +556,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableActive', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableUpdateBy', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "属性模板表", |
|
|
|
columnProp: 'updateBy', |
|
|
|
headerAlign: "center", |
|
|
|
@ -537,7 +584,7 @@ |
|
|
|
itemNo:'', |
|
|
|
valueNo:'', |
|
|
|
availableValue:'', |
|
|
|
itemType:'A', |
|
|
|
itemType:'', |
|
|
|
createdBy: this.$store.state.user.name |
|
|
|
}, |
|
|
|
dataList:[], |
|
|
|
@ -546,9 +593,9 @@ |
|
|
|
columnDetailList: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2PropertiesItemID', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2PropertiesItemID', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'itemNo', |
|
|
|
headerAlign: "center", |
|
|
|
@ -563,9 +610,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2PropertiesItemDesc', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2PropertiesItemDesc', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'itemDesc', |
|
|
|
headerAlign: "center", |
|
|
|
@ -580,31 +627,14 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2PropertiesItemRemark', |
|
|
|
tableId: "100002002Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'itemRemark', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '属性方法说明', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2ValueType', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2ValueType', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'valueType', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '检测值类型', |
|
|
|
columnLabel: '属性值类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -614,9 +644,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2DefaultValue', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2DefaultValue', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'defaultValue', |
|
|
|
headerAlign: "center", |
|
|
|
@ -631,9 +661,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2MaxValue', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2MaxValue', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'maxValue', |
|
|
|
headerAlign: "center", |
|
|
|
@ -648,9 +678,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002Table2MinValue', |
|
|
|
tableId: "100002002Table2", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001Table2MinValue', |
|
|
|
tableId: "100002001Table2", |
|
|
|
tableName: "属性项目表", |
|
|
|
columnProp: 'minValue', |
|
|
|
headerAlign: "center", |
|
|
|
@ -665,9 +695,9 @@ |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 100002002, |
|
|
|
serialNumber: '100002002TableValueChooseFlag', |
|
|
|
tableId: "100002002Table", |
|
|
|
functionId: 100002001, |
|
|
|
serialNumber: '100002001TableValueChooseFlag', |
|
|
|
tableId: "100002001Table", |
|
|
|
tableName: "common", |
|
|
|
columnProp: 'valueChooseFlag', |
|
|
|
headerAlign: "center", |
|
|
|
@ -683,9 +713,10 @@ |
|
|
|
], |
|
|
|
levelList:[], |
|
|
|
chooseModalData:{ |
|
|
|
site: '', |
|
|
|
itemNo: '', |
|
|
|
itemDesc: '', |
|
|
|
itemType:'A', |
|
|
|
itemType:'', |
|
|
|
valueTypeDb:'', |
|
|
|
}, |
|
|
|
//---------快速添加---------- |
|
|
|
@ -727,13 +758,10 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
created () { |
|
|
|
|
|
|
|
this.getDataList(); |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取基础数据列表S |
|
|
|
getBaseList (val,type) { |
|
|
|
this.tagNo = val |
|
|
|
@ -808,7 +836,8 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
addModal(){ |
|
|
|
this.modalData={ |
|
|
|
this.modalData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
flag:'1', |
|
|
|
codeNo:'', |
|
|
|
codeDesc:'', |
|
|
|
@ -818,17 +847,18 @@ |
|
|
|
createdBy: this.$store.state.user.name, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
}; |
|
|
|
this.modalDisableFlag=false; |
|
|
|
this.modalFlag=true; |
|
|
|
this.modalDisableFlag = false; |
|
|
|
this.modalFlag = true; |
|
|
|
}, |
|
|
|
|
|
|
|
updateModal(row){ |
|
|
|
this.modalData={ |
|
|
|
this.modalData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
flag:'2', |
|
|
|
codeNo:row.codeNo, |
|
|
|
codeDesc:row.codeDesc, |
|
|
|
active:row.active, |
|
|
|
functionType:'A', |
|
|
|
functionType:row.functionType, |
|
|
|
userId:this.$store.state.user.name, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
}; |
|
|
|
@ -882,11 +912,11 @@ |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if(this.modalData.flag=='1'){ |
|
|
|
if(this.modalData.flag == '1'){ |
|
|
|
propertiesModelSave(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.modalFlag=false |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
@ -920,63 +950,18 @@ |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
//打开项目清单 |
|
|
|
//打开属性清单 |
|
|
|
detailModal(row){ |
|
|
|
this.detailData.codeNo = row.codeNo |
|
|
|
this.detailData.codeDesc = row.codeDesc |
|
|
|
this.detailData.functionType = row.functionType |
|
|
|
searchModalDetails(this.detailData).then(({data}) => { |
|
|
|
this.detailList = data.rows |
|
|
|
}) |
|
|
|
this.detailModelFlag = true; |
|
|
|
}, |
|
|
|
|
|
|
|
// addDetailModal(){ |
|
|
|
// this.detailData.itemNo = ''; |
|
|
|
// this.detailData.itemDesc = ''; |
|
|
|
// this.addDetailModalFlag = true; |
|
|
|
// }, |
|
|
|
//保存项目明细 |
|
|
|
// saveModalDetails(){ |
|
|
|
// if(this.detailData.itemNo==""||this.detailData.itemNo==null){ |
|
|
|
// this.$alert('请选择属性项目编码！', '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// return false |
|
|
|
// } |
|
|
|
// saveModalDetails(this.detailData).then(({data}) => { |
|
|
|
// if (data && data.code == 0) { |
|
|
|
// searchModalDetails(this.detailData).then(({data}) => { |
|
|
|
// this.detailList = data.rows |
|
|
|
// }) |
|
|
|
// this.addDetailModalFlag=false; |
|
|
|
// this.$message({ |
|
|
|
// message: '操作成功', |
|
|
|
// type: 'success', |
|
|
|
// duration: 1500, |
|
|
|
// onClose: () => { |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// }, |
|
|
|
|
|
|
|
itemNoBlur(){ |
|
|
|
let inData={ |
|
|
|
itemType:'A', |
|
|
|
itemNo:this.detailData.itemNo |
|
|
|
} |
|
|
|
propertiesItemSearch(inData).then(({data}) => { |
|
|
|
if(data.rows.length>0){ |
|
|
|
this.detailData.itemDesc=data.rows[0].itemDesc |
|
|
|
}else { |
|
|
|
this.detailData.itemDesc='' |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
deleteModalDetails(row){ |
|
|
|
this.$confirm(`是否删除这个属性项目?`, '提示', { |
|
|
|
@ -1005,15 +990,15 @@ |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
chooseModal(row){ |
|
|
|
this.chooseModalData.itemNo=row.itemNo; |
|
|
|
this.chooseModalData.itemDesc=row.itemDesc; |
|
|
|
this.chooseModalData.valueTypeDb=row.valueTypeDb; |
|
|
|
this.chooseModalData.site = row.site; |
|
|
|
this.chooseModalData.itemNo = row.itemNo; |
|
|
|
this.chooseModalData.itemDesc = row.itemDesc; |
|
|
|
this.chooseModalData.valueTypeDb = row.valueTypeDb; |
|
|
|
searchItemAvailable(this.chooseModalData).then(({data}) => { |
|
|
|
this.chooseTableData = data.rows |
|
|
|
}) |
|
|
|
this.chooseModalFlag=true; |
|
|
|
this.chooseModalFlag = true; |
|
|
|
}, |
|
|
|
//---------快速添加---------- |
|
|
|
|
|
|
|
@ -1033,11 +1018,11 @@ |
|
|
|
}) |
|
|
|
this.fastAddFlag = true; |
|
|
|
}, |
|
|
|
// 可选项目 |
|
|
|
// 可选属性 |
|
|
|
itemClickRow1(row){ |
|
|
|
this.$refs.itemTable1.toggleRowSelection(row); |
|
|
|
}, |
|
|
|
// 已有项目 |
|
|
|
// 已有属性 |
|
|
|
itemClickRow2(row){ |
|
|
|
this.$refs.itemTable2.toggleRowSelection(row); |
|
|
|
}, |
|
|
|
@ -1052,12 +1037,13 @@ |
|
|
|
}, |
|
|
|
addItem(){ |
|
|
|
if(this.itemSelections1 == null || this.itemSelections1.length == 0){ |
|
|
|
this.$alert("请选择可选项目！", '提示', { |
|
|
|
this.$alert("请选择可选属性！", '提示', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false; |
|
|
|
} |
|
|
|
let inData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
codeNo: this.detailData.codeNo, |
|
|
|
codeDesc: this.detailData.codeDesc, |
|
|
|
functionType: this.detailData.functionType, |
|
|
|
@ -1083,12 +1069,13 @@ |
|
|
|
}, |
|
|
|
deleteItem(){ |
|
|
|
if(this.itemSelections2 == null || this.itemSelections2.length == 0){ |
|
|
|
this.$alert("请选择已有项目！", '提示', { |
|
|
|
this.$alert("请选择已有属性！", '提示', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false; |
|
|
|
} |
|
|
|
let inData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
codeNo:this.detailData.codeNo, |
|
|
|
codeDesc:this.detailData.codeDesc, |
|
|
|
functionType:this.detailData.functionType, |
|
|
|
|
