diff --git a/src/api/base/properties.js b/src/api/base/properties.js
new file mode 100644
index 0000000..c6e405e
--- /dev/null
+++ b/src/api/base/properties.js
@@ -0,0 +1,18 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+export const propertiesItemSearch = data => createAPI(`/properties/propertiesItemSearch`,'post',data)
+export const propertiesItemSave = data => createAPI(`/properties/propertiesItemSave`,'post',data)
+export const propertiesItemEdit = data => createAPI(`/properties/propertiesItemEdit`,'post',data)
+export const propertiesItemDelete = data => createAPI(`/properties/propertiesItemDelete`,'post',data)
+export const searchItemAvailable = data => createAPI(`/properties/searchItemAvailable`,'post',data)
+export const propertiesModelSearch = data => createAPI(`/properties/propertiesModelSearch`,'post',data)
+export const propertiesModelSave = data => createAPI(`/properties/propertiesModelSave`,'post',data)
+export const propertiesModelEdit = data => createAPI(`/properties/propertiesModelEdit`,'post',data)
+export const propertiesModelDelete = data => createAPI(`/properties/propertiesModelDelete`,'post',data)
+export const searchModalDetails = data => createAPI(`/properties/searchModalDetails`,'post',data)
+export const saveModalDetails = data => createAPI(`/properties/saveModalDetails`,'post',data)
+export const deleteModalDetails = data => createAPI(`/properties/deleteModalDetails`,'post',data) // 多选删除
+export const getItemLists = data => createAPI(`/properties/getItemLists`,'post',data)
+export const deleteModalDetail = data => createAPI(`/properties/deleteModalDetail`,'post',data)
+export const saveItemAvailable = data => createAPI(`/properties/saveItemAvailable`,'post',data)
+export const deleteItemAvailable = data => createAPI(`/properties/deleteItemAvailable`,'post',data)
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
new file mode 100644
index 0000000..ee47b95
--- /dev/null
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -0,0 +1,797 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'属性编码'">
+        <el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'属性名称'">
+        <el-input v-model="searchData.itemDesc" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'属性类型'" >
+        <el-select filterable v-model="searchData.itemType" 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="' '">
+        <el-button type="primary" @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addModal()">新增</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="160"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" v-if="scope.row.valueChooseFlag=='Y'" @click="chooseModal(scope.row)">可选值</a>
+          <a type="text" size="small" @click="deletePropertiesItem(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页栏 -->
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :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-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="属性编码:" prop="itemNo" :rules="rules.itemNoType">
+          <el-input v-model="modalData.itemNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="属性名称:" prop="itemDesc" :rules="rules.itemDescType">
+          <el-input v-model="modalData.itemDesc" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'值类型'" prop="valueTypeDb" :rules="rules.valueTypeDbType">
+          <el-select filterable v-model="modalData.valueTypeDb" style="width: 120px">
+            <el-option label="文本" value="T"></el-option>
+            <el-option label="数字" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="参照值:">
+          <el-input v-model="modalData.defaultValue" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="最大值:">
+          <el-input v-model="modalData.maxValue" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="最小值:">
+          <el-input v-model="modalData.minValue" type="number" 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="'属性类型'" prop="itemType" :rules="rules.itemType">
+          <el-select filterable v-model="modalData.itemType" :disabled="modalDisableFlag" 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="valueChooseFlag" :rules="rules.valueChooseFlagType">
+          <el-select v-model="modalData.valueChooseFlag" style="width: 80px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="属性名称:">
+          <el-input v-model="chooseModalData.itemDesc" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <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>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button  type="primary" @click="addChooseModal()">新增</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="chooseTableData"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="availableValue"
+          header-align="center"
+          align="left"
+          min-width="200"
+          label="属性值">
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="updateChooseModal(scope.row)">修改</a>
+            <a type="text" size="small" @click="deleteItemAvailable(scope.row)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog title="可选值维护" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="215px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
+        <el-form-item :label="'可选值：'">
+          <el-input v-model="itemData.availableValue"  :type="itemFlag" style="width: 130px;"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveItemAvailable()">保存</el-button>
+        <el-button type="primary" @click="itemModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    propertiesItemSearch,
+    propertiesItemSave,
+    propertiesItemEdit,
+    propertiesItemDelete,
+    searchItemAvailable,
+    saveItemAvailable,
+    deleteItemAvailable,
+  } from "@/api/base/properties.js"
+
+  export default {
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.itemNo = this.searchData.itemNo.toUpperCase()
+        }
+      },
+      itemData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.itemData.itemNo = this.itemData.itemNo.toUpperCase()
+        }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.itemNo = this.modalData.itemNo.toUpperCase()
+        }
+      },
+      chooseModalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.chooseModalData.itemNo = this.chooseModalData.itemNo.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+
+        // 导出 start
+        exportData: [],
+        exportName: "属性" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["属性"],
+        exportFooter: [],
+        exportList:[],
+        // 导出 end
+        searchData: {
+          site: this.$store.state.user.site,
+          itemNo: '',
+          itemDesc: '',
+          itemType:'',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 50,
+        totalPage: 0,
+        dataList: [],
+        chooseTableData:[],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        chooseModalFlag:false,
+        itemModalFlag:false,
+        itemFlag:'text',
+        itemData:{
+          site: this.$store.state.user.site,
+          itemNo:'',
+          valueNo:'',
+          availableValue:'',
+          itemType:'',
+          createdBy: this.$store.state.user.name
+        },
+        modalData:{
+          site: this.$store.state.user.site,
+          flag: '',
+          itemNo: '',
+          itemDesc: '',
+          valueTypeDb: '',
+          defaultValue: '',
+          valueChooseFlag: '',
+          createdBy: this.$store.state.user.name,
+          maxValue: '',
+          minValue: '',
+          itemType: '',
+          updateBy: this.$store.state.user.name,
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002001,
+            serialNumber: '100002001TableValueType',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'itemType',
+            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: '100002001TableValueType',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'itemNo',
+            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: '100002001TableValueType',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'itemDesc',
+            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: '100002001TableValueType',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'valueType',
+            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: '100002001TableDefaultValue',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'defaultValue',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '参照值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002001,
+            serialNumber: '100002001TableMaxValue',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'maxValue',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '最大值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002001,
+            serialNumber: '100002001TableMinValue',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'minValue',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '最小值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002001,
+            serialNumber: '100002001TableValueChooseFlag',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'valueChooseFlag',
+            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: '100002001TableValueChooseFlag',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'createdDate',
+            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: '100002001TableValueChooseFlag',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'createdBy',
+            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: '100002001TableValueChooseFlag',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'updateDate',
+            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: '100002001TableValueChooseFlag',
+            tableId: "100002001Table",
+            tableName: "属性表",
+            columnProp: 'updateBy',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
+        levelList:[],
+        chooseModalData:{
+          site: this.$store.state.user.site,
+          itemNo: '',
+          itemDesc: '',
+          itemType:'',
+          valueTypeDb:'',
+        },
+        rules:{
+          itemNoType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          itemType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          itemDescType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          valueTypeDbType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          valueChooseFlagType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 180
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      //导出excel
+      async createExportData() {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await propertiesItemSearch(this.searchData).then(({data}) => {
+          this.exportList= data.rows;
+        })
+        return this.exportList;
+      },
+      startDownload() {
+
+      },
+      finishDownload() {
+
+      },
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      // 导出 end
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        propertiesItemSearch(this.searchData).then(({data}) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+
+      addModal(){
+        this.modalData = {
+          site: this.$store.state.user.site,
+          flag:'1',
+          itemNo:'',
+          itemDesc:'',
+          valueTypeDb:'T',
+          defaultValue:'',
+          valueChooseFlag:'N',
+          createdBy:this.$store.state.user.name,
+          maxValue:'',
+          minValue:'',
+          itemType:'A',
+          updateBy: this.$store.state.user.name,
+        };
+        this.modalDisableFlag = false;
+        this.modalFlag = true;
+      },
+      chooseModal(row){
+        this.chooseModalData.itemNo=row.itemNo;
+        this.chooseModalData.itemDesc=row.itemDesc;
+        this.chooseModalData.valueTypeDb=row.valueTypeDb;
+        this.chooseModalData.itemType=row.itemType;
+        searchItemAvailable(this.chooseModalData).then(({data}) => {
+          this.chooseTableData = data.rows
+        })
+        this.chooseModalFlag=true;
+      },
+      updateModal(row){
+        this.modalData = {
+          flag: '2',
+          site: this.$store.state.user.site,
+          itemNo: row.itemNo,
+          itemDesc: row.itemDesc,
+          valueTypeDb: row.valueTypeDb,
+          defaultValue: row.defaultValue,
+          valueChooseFlag: row.valueChooseFlag,
+          createdBy: this.$store.state.user.name,
+          maxValue: row.maxValue,
+          minValue: row.minValue,
+          itemType: row.itemType,
+          updateBy: this.$store.state.user.name,
+        };
+        this.modalDisableFlag = true;
+        this.modalFlag = true;
+      },
+      // 删除
+      deletePropertiesItem (row) {
+        this.$confirm(`是否删除这个属性?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          propertiesItemDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
+          this.$alert('请输入属性编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
+          this.$alert('请输入属性名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag === '1'){
+          propertiesItemSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          propertiesItemEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+      addChooseModal(){
+        this.itemFlag = this.chooseModalData.valueTypeDb === 'T'?'text':'number';
+        this.itemData = {
+          site: this.$store.state.user.site,
+            itemNo:this.chooseModalData.itemNo,
+            valueNo:0,
+            availableValue:'',
+            itemType:this.chooseModalData.itemType,
+            createdBy: this.$store.state.user.name
+          }
+        this.itemModalFlag = true;
+      },
+      updateChooseModal(row){
+        this.itemFlag= this.chooseModalData.valueTypeDb === 'T'?'text':'number';
+        this.itemData={
+          site: this.$store.state.user.site,
+          itemNo:this.chooseModalData.itemNo,
+          valueNo:row.valueNo,
+          availableValue:row.availableValue,
+          itemType:this.chooseModalData.itemType,
+          createdBy: row.createdBy
+        }
+        this.itemModalFlag=true;
+      },
+      saveItemAvailable(){
+        if(this.itemData.availableValue==''||this.itemData.availableValue==null){
+          this.$alert("请输入可选值！",'错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        saveItemAvailable(this.itemData).then(({data}) => {
+          if (data && data.code === 0) {
+            searchItemAvailable(this.chooseModalData).then(({data}) => {
+              this.chooseTableData = data.rows
+            })
+            this.itemModalFlag=false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      deleteItemAvailable(row){
+        this.$confirm(`是否删除这个可选值?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          deleteItemAvailable(row).then(({data}) => {
+            if (data && data.code === 0) {
+              searchItemAvailable(this.chooseModalData).then(({data}) => {
+                this.chooseTableData = data.rows
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue
new file mode 100644
index 0000000..f96338d
--- /dev/null
+++ b/src/views/modules/base/propertiesItem/propertiesModel.vue
@@ -0,0 +1,1122 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'属性模板编码'">
+        <el-input v-model="searchData.codeNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <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.active" style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addModal()">新增</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="160"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="detailModal(scope.row)">属性项目</a>
+          <a type="text" size="small" @click="deletePropertiesModel(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :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-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>
+        </el-form-item>
+        <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-item label="是否在用:" prop="active" :rules="rules.activeType">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="属性项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
+        <el-form-item :label="'属性模板编码'">
+          <el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'属性模板名称'">
+          <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="addFastModal()">新增</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="detailList"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnDetailList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed==''?false:item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="130"
+          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>
+          </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-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">
+      <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-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: 450px;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-column
+              prop="itemRemark"
+              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: 450px;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-column
+              prop="itemRemark"
+              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-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="属性项目名称:">
+          <el-input v-model="chooseModalData.itemDesc"  disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <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>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="chooseTableData"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="availableValue"
+          header-align="center"
+          align="left"
+          min-width="200"
+          label="属性值">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="chooseModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    propertiesModelSearch,
+    propertiesModelSave,
+    propertiesModelEdit,
+    propertiesModelDelete,
+    searchItemAvailable,
+    searchModalDetails,
+    saveModalDetails,
+    deleteModalDetails, // 多选删除
+    propertiesItemSearch,
+    getItemLists,
+    deleteModalDetail, // 单删
+  } from "@/api/base/properties.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.codeNo = this.searchData.codeNo.toUpperCase()
+        }
+      },
+
+      itemData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.itemData.itemNo = this.itemData.itemNo.toUpperCase()
+        }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.codeNo = this.modalData.codeNo.toUpperCase()
+        }
+      },
+      detailData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.detailData.codeNo = this.detailData.codeNo.toUpperCase()
+          this.detailData.itemNo = this.detailData.itemNo.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+
+        // 导出 start
+        exportData: [],
+        exportName: "属性模板" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["属性模板"],
+        exportFooter: [],
+        exportList:[],
+      // 导出 end
+        tagNo:'',
+        searchData: {
+          codeNo: '',
+          codeDesc: '',
+          active:'Y',
+          functionType:'A',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 50,
+        totalPage: 0,
+        // addDetailModalFlag:false,
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          codeNo:'',
+          codeDesc:'',
+          active:'',
+          functionType:'A',
+          userId:this.$store.state.user.name,
+          createdBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+        },
+        detailData:{
+          codeNo:'',
+          codeDesc:'',
+          functionType:'A',
+          itemNo:'',
+          itemDesc:'',
+          itemType:'A',
+          userId:this.$store.state.user.name
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002002,
+            serialNumber: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'codeNo',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'codeDesc',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'active',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'createdDate',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'createdBy',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'updateDate',
+            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: '100002002TableActive',
+            tableId: "100002002Table",
+            tableName: "属性模板表",
+            columnProp: 'updateBy',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
+        detailModelFlag:false,
+        detailList: [],
+        chooseTableData:[],
+        dataListLoading: false,
+        dataListSelections: [],
+        // modalDisableFlag:false,
+        chooseModalFlag:false,
+        itemFlag:'text',
+        itemData:{
+          itemNo:'',
+          valueNo:'',
+          availableValue:'',
+          itemType:'A',
+          createdBy: this.$store.state.user.name
+        },
+        dataList:[],
+        departmentList:[],
+        // 展示列集
+        columnDetailList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100002002,
+            serialNumber: '100002002Table2PropertiesItemID',
+            tableId: "100002002Table2",
+            tableName: "属性项目表",
+            columnProp: 'itemNo',
+            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: '100002002Table2PropertiesItemDesc',
+            tableId: "100002002Table2",
+            tableName: "属性项目表",
+            columnProp: 'itemDesc',
+            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: '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",
+            tableName: "属性项目表",
+            columnProp: 'valueType',
+            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: '100002002Table2DefaultValue',
+            tableId: "100002002Table2",
+            tableName: "属性项目表",
+            columnProp: 'defaultValue',
+            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: '100002002Table2MaxValue',
+            tableId: "100002002Table2",
+            tableName: "属性项目表",
+            columnProp: 'maxValue',
+            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: '100002002Table2MinValue',
+            tableId: "100002002Table2",
+            tableName: "属性项目表",
+            columnProp: 'minValue',
+            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: '100002002TableValueChooseFlag',
+            tableId: "100002002Table",
+            tableName: "common",
+            columnProp: 'valueChooseFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '是否值可选',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
+        levelList:[],
+        chooseModalData:{
+          itemNo: '',
+          itemDesc: '',
+          itemType:'A',
+          valueTypeDb:'',
+        },
+        //---------快速添加----------
+        fastAddFlag:false,
+        itemList1:[],
+        itemList2:[],
+        itemListRow1:{},
+        itemListRow2:{},
+        itemSelections1: [],
+        itemSelections2: [],
+        rules:{
+          codeNoType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          codeDescType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          activeType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+
+      this.getDataList();
+    },
+    methods: {
+
+
+
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1024) {
+            strVal = this.detailData.itemNo
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1024) {
+          this.detailData.itemNo = val.ItemNo
+          this.detailData.itemDesc = val.ItemDesc
+        }
+      },
+      //导出excel
+      async createExportData() {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await propertiesModelSearch(this.searchData).then(({data}) => {
+          this.exportList= data.page.list;
+        })
+        return this.exportList;
+      },
+      startDownload() {
+
+      },
+      finishDownload() {
+
+      },
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      // 导出 end
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        propertiesModelSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      addModal(){
+        this.modalData={
+          flag:'1',
+          codeNo:'',
+          codeDesc:'',
+          active:'Y',
+          functionType:'A',
+          userId:this.$store.state.user.name,
+          createdBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          codeNo:row.codeNo,
+          codeDesc:row.codeDesc,
+          active:row.active,
+          functionType:'A',
+          userId:this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+
+      // 删除
+      deletePropertiesModel (row) {
+        this.$confirm(`是否删除这个属性模板?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          propertiesModelDelete(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      saveData(){
+        if (this.modalData.codeNo == '' || this.modalData.codeNo == null) {
+          this.$alert('请输入属性模板编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.codeDesc == '' || this.modalData.codeDesc == null) {
+          this.$alert('请输入属性模板名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          propertiesModelSave(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          propertiesModelEdit(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+      //打开项目清单
+      detailModal(row){
+        this.detailData.codeNo = row.codeNo
+        this.detailData.codeDesc = row.codeDesc
+        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(`是否删除这个属性项目?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteModalDetail(row).then(({data}) => {
+            if (data && data.code === 0) {
+              searchModalDetails(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){
+        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;
+      },
+      //---------快速添加----------
+
+      queryTemplateItem(){
+        getItemLists(this.detailData).then(({data}) => {
+          this.itemList1 = data.row1;
+          this.itemList2 = data.row2;
+        })
+      },
+
+      addFastModal(){
+        this.itemSelections1 = null
+        this.itemSelections2 = null
+        getItemLists(this.detailData).then(({data}) => {
+          this.itemList1 = data.row1;
+          this.itemList2 = data.row2;
+        })
+        this.fastAddFlag = true;
+      },
+      // 可选项目
+      itemClickRow1(row){
+        this.$refs.itemTable1.toggleRowSelection(row);
+      },
+      // 已有项目
+      itemClickRow2(row){
+        this.$refs.itemTable2.toggleRowSelection(row);
+      },
+      selectFlag(){
+        return true;
+      },
+      selectionItem1(val){
+        this.itemSelections1 = val
+      },
+      selectionItem2(val){
+        this.itemSelections2 = val
+      },
+      addItem(){
+        if(this.itemSelections1 == null || this.itemSelections1.length == 0){
+          this.$alert("请选择可选项目！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData = {
+          codeNo: this.detailData.codeNo,
+          codeDesc: this.detailData.codeDesc,
+          functionType: this.detailData.functionType,
+          // itemNo: this.itemListRow1.itemNo,
+          // itemDesc: this.itemListRow1.itemDesc,
+          itemList: this.itemSelections1,
+          itemType: this.detailData.itemType,
+          userId: this.$store.state.user.name
+        }
+        saveModalDetails(inData).then(({data}) => {
+          if (data && data.code == 0) {
+            getItemLists(this.detailData).then(({data}) => {
+              this.itemList1 = data.row1;
+              this.itemList2 = data.row2;
+            })
+            this.itemSelections1 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      deleteItem(){
+        if(this.itemSelections2 == null || this.itemSelections2.length == 0){
+          this.$alert("请选择已有项目！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData = {
+          codeNo:this.detailData.codeNo,
+          codeDesc:this.detailData.codeDesc,
+          functionType:this.detailData.functionType,
+          // itemNo: this.itemListRow2.itemNo,
+          // itemDesc:this.itemListRow2.itemDesc,
+          itemList: this.itemSelections2,
+          itemType:this.detailData.itemType,
+          userId:this.$store.state.user.name
+        }
+        deleteModalDetails(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemLists(this.detailData).then(({data}) => {
+              this.itemList1 = data.row1;
+              this.itemList2 = data.row2;
+            })
+            this.itemSelections2 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      refreshDetailList(){
+        searchModalDetails(this.detailData).then(({data}) => {
+          this.detailList = data.rows
+        })
+      },
+    }
+  }
+</script>