From 439e66b13fb47c83047c54568590f4aebbd68e42 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 19 Aug 2024 12:15:28 +0800
Subject: [PATCH] =?UTF-8?q?20240819=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/property/propertyItem.js              |   11 +
 src/api/property/propertyItemAvailable.js     |   10 +
 src/api/property/template.js                  |   11 +
 src/api/property/templateDetail.js            |   13 +
 src/views/modules/property/available.vue      |  794 +++++++++++++
 .../modules/property/propertyTemplate.vue     | 1041 +++++++++++++++++
 .../quote/detail/primary/quoteDetailBom.vue   |    7 +
 .../quote/detail/primary/quoteDetailOther.vue |   48 +
 .../detail/primary/quoteDetailRouting.vue     |   63 +
 .../modules/quote/detail/quoteDetail.vue      |   14 +-
 src/views/modules/quote/index.vue             |    1 -
 11 files changed, 2008 insertions(+), 5 deletions(-)
 create mode 100644 src/api/property/propertyItem.js
 create mode 100644 src/api/property/propertyItemAvailable.js
 create mode 100644 src/api/property/template.js
 create mode 100644 src/api/property/templateDetail.js
 create mode 100644 src/views/modules/property/available.vue
 create mode 100644 src/views/modules/property/propertyTemplate.vue
 create mode 100644 src/views/modules/quote/detail/primary/quoteDetailOther.vue
 create mode 100644 src/views/modules/quote/detail/primary/quoteDetailRouting.vue

diff --git a/src/api/property/propertyItem.js b/src/api/property/propertyItem.js
new file mode 100644
index 0000000..807a58c
--- /dev/null
+++ b/src/api/property/propertyItem.js
@@ -0,0 +1,11 @@
+import {createAPI} from "../../utils/httpRequest";
+
+export const queryPropertyItem = (data) => createAPI("/property/item", "post", data);
+
+export const queryPropertyItemByPage = (data) => createAPI(`/property/item/${data.no}/${data.size}`, "post", data);
+
+export const savePropertyItem = (data) => createAPI("/property/item/save", "post", data);
+
+export const updatePropertyItem = (data) => createAPI("/property/item/update", "post", data);
+
+export const removePropertyItem = (data) => createAPI(`/property/item/remove/${data.id}`, "post", data);
diff --git a/src/api/property/propertyItemAvailable.js b/src/api/property/propertyItemAvailable.js
new file mode 100644
index 0000000..b4f1d24
--- /dev/null
+++ b/src/api/property/propertyItemAvailable.js
@@ -0,0 +1,10 @@
+import {createAPI} from "../../utils/httpRequest";
+import {data} from "autoprefixer";
+
+export const queryPropertyItemAvailable = (data) => createAPI(`/property/item/available`,'post',data)
+
+export const savePropertyItemAvailable = (data) => createAPI(`/property/item/available/save`,'post',data)
+
+export const removePropertyItemAvailable = (data) => createAPI(`/property/item/available/remove`,'post',data)
+
+export const updatePropertyItemAvailable = (data) => createAPI(`/property/item/available/update`,'post',data)
diff --git a/src/api/property/template.js b/src/api/property/template.js
new file mode 100644
index 0000000..7f607b8
--- /dev/null
+++ b/src/api/property/template.js
@@ -0,0 +1,11 @@
+import {createAPI} from "../../utils/httpRequest";
+
+export const queryPropertyTemplate = (data) => createAPI(`/property/template`, "post", data);
+export const queryPropertyTemplateType = (data) => createAPI(`/property/template/type`, "post", data);
+export const queryPropertyTemplateByPage = (data) => createAPI(`/property/template/${data.no}/${data.size}`, "post", data);
+
+export const savePropertyTemplate = (data) => createAPI(`/property/template/save`, "post", data);
+
+export const removePropertyTemplate = (data) => createAPI(`/property/template/remove/${data.id}`, "post", data);
+
+export const updatePropertyTemplate = (data) => createAPI(`/property/template/update`, "post", data);
diff --git a/src/api/property/templateDetail.js b/src/api/property/templateDetail.js
new file mode 100644
index 0000000..1554e4b
--- /dev/null
+++ b/src/api/property/templateDetail.js
@@ -0,0 +1,13 @@
+import {createAPI} from "../../utils/httpRequest";
+
+
+export const queryPropertyTemplateDetail = (data) => createAPI('/property/template/detail','post',data)
+export const queryPropertyTemplateDetailItem = (data) => createAPI('/property/template/detail/item','post',data)
+
+
+export const batchSavePropertyTemplateDetail = (data) => createAPI('/property/template/detail/batch/save','post',data)
+
+export const removePropertyTemplateDetail = (data) => createAPI('/property/template/detail/remove','post',data)
+export const removeBatchPropertyTemplateDetail = (data) => createAPI('/property/template/detail/batch/remove','post',data)
+
+export const batchUpdatePropertyTemplateDetail = (data) => createAPI('/property/template/detail/batch/update','post',data)
diff --git a/src/views/modules/property/available.vue b/src/views/modules/property/available.vue
new file mode 100644
index 0000000..cee19eb
--- /dev/null
+++ b/src/views/modules/property/available.vue
@@ -0,0 +1,794 @@
+<script>
+import {queryPropertyTemplateType} from "../../../api/property/template";
+import {
+  queryPropertyItemByPage,
+  removePropertyItem,
+  savePropertyItem,
+  updatePropertyItem
+} from "../../../api/property/propertyItem";
+import BuSelect from "../../../components/selector/select/BuSelect.vue";
+import {getSiteAndBuByUserName} from "../../../api/eam/eam";
+import {
+  queryPropertyItemAvailable, removePropertyItemAvailable,
+  savePropertyItemAvailable,
+  updatePropertyItemAvailable
+} from "../../../api/property/propertyItemAvailable";
+
+export default {
+  name: "available",
+  components: {BuSelect},
+  data(){
+    return{
+      no:1,
+      size:20,
+      total:0,
+      menuId:180003,
+      dataList: [],
+      queryLoading: false,
+      templateItem:{
+        id:null,
+        itemNo:'',
+        itemDesc:'',
+        itemType:'',
+        buId:null,
+        valueType:'',
+        valueTypeDb:'',
+        defaultValue:'',
+        maxValue:undefined,
+        minValue:undefined,
+        valueChooseFlag:'',
+      },
+      dataTypeList: [],
+      queryForm: {
+
+      },
+      columns: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableBuDesc',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableItemTypeDesc',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'itemTypeDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '属性类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 120,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableValueType',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'itemNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '属性编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 100,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableValueType',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'itemDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '属性名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 120,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableValueType',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'valueType',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '值类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableDefaultValue',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'defaultValue',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '参照值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableMaxValue',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'maxValue',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最大值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableMinValue',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'minValue',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最小值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableValueChooseFlag',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'valueChooseFlag',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '是否值可选',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableCreateDate',
+          tableId: '180003Table',
+          tableName: '属性表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 100,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableCreateBy',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'createBy',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableUpdateDate',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'updateDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 100,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180003,
+          serialNumber: '180003TableUpdateBy',
+          tableId: "180003Table",
+          tableName: "属性表",
+          columnProp: 'updateBy',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          columnWidth: 80,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+      ],
+      saveVisible:false,
+      saveLoading:false,
+      saveForm:{
+
+      },
+      rules:{
+        buId: [
+          { required: true, message: '请选择BU', trigger: 'change' }
+        ],
+        itemNo: [
+          { required: true, message: '请输入属性编码', trigger: 'blur' }
+        ],
+        itemDesc: [
+          { required: true, message: '请输入属性描述', trigger: 'blur' }
+        ],
+        itemType: [
+          { required: true, message: '请选择属性类型', trigger: 'change' }
+        ],
+        valueType: [
+          { required: true, message: '请选择值类型', trigger: 'change' }
+        ],
+      },
+      availableVisible:false,
+      availableLoading:false,
+      availableForm:{
+
+      },
+      availableList:[],
+      availableValueVisible:false,
+      availableValue:{
+
+      }
+    }
+  },
+  methods:{
+    handleQueryPropertyTemplateType(){
+      let params = {
+
+      }
+      queryPropertyTemplateType(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataTypeList = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    handleQueryByPage(){
+      let params = {
+        ...this.templateItem,
+        no:this.no,
+        size:this.size,
+        createBy: this.$store.state.user.name,
+      }
+      this.queryLoading = true;
+      queryPropertyItemByPage(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataList = data.rows;
+          this.total = data.total;
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.queryLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.queryLoading = false;
+      })
+    },
+    handleSizeChange(val){
+      this.size = val;
+      this.handleQueryByPage();
+    },
+    handlePageChange(val){
+      this.no = val;
+      this.handleQueryByPage();
+    },
+    handleSave(row){
+      this.$nextTick(()=>{
+        if (this.$refs.saveForm){
+          this.$refs.saveForm.clearValidate();
+        }
+      })
+      if (row){
+        this.saveForm = {...row}
+      }else {
+        this.saveForm = {...this.templateItem}
+        this.saveForm.valueChooseFlag = 'N';
+        this.saveForm.valueType = 'text';
+        if (this.queryForm.itemType){
+          this.saveForm.itemType = this.queryForm.itemType;
+        }
+        this.saveForm.buId = this.userBuList.length > 0 ? this.userBuList[0].id : ''
+      }
+      this.saveVisible = true;
+    },
+    handleSaveOrUpdate(){
+      this.$refs.saveForm.validate((valid,obj) => {
+        if (valid){
+          if (this.saveForm.id){
+            this.handleUpdateItem();
+          }else {
+            this.handleSaveItem();
+          }
+        }else {
+          let i = 1
+          for (let key in obj) {
+            if (i === 1){
+              this.$message.error(obj[key][0].message);
+              break
+            }
+            i++
+          }
+        }
+      })
+    },
+    handleSaveItem(){
+      let params = {
+        ...this.saveForm,
+        createBy: this.$store.state.user.name,
+      }
+      if (!this.saveForm.minValue){
+        params.minValue = '';
+      }
+      if (!this.saveForm.maxValue){
+        params.maxValue = '';
+      }
+      this.saveLoading = true;
+      savePropertyItem(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.saveVisible = false;
+          this.handleQueryByPage();
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.saveLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.saveLoading = false;
+      })
+    },
+    handleUpdateItem(){
+      let params = {
+        ...this.saveForm,
+        updateBy: this.$store.state.user.name,
+      }
+      if (!this.saveForm.minValue){
+        params.minValue = '';
+      }
+      if (!this.saveForm.maxValue){
+        params.maxValue = '';
+      }
+      this.saveLoading = true;
+      updatePropertyItem(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.saveVisible = false;
+          this.handleQueryByPage();
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.saveLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.saveLoading = false;
+      })
+    },
+    handleQueryBu(){
+      let params = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userBuList = data.rows
+        }else {
+          this.$message.warning(data.message)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleRemove(row){
+      this.$alert('确认删除该属性吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          id: row.id,
+        }
+        this.saveLoading = true;
+        removePropertyItem(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.handleQueryByPage()
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.saveLoading = false
+        }).catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    handleSaveAvailable(row){
+      this.availableForm = {...row}
+      this.availableForm.itemId = this.availableForm.id
+      this.availableForm.id = null
+      this.handleQueryPropertyItemAvailable();
+      this.availableVisible = true;
+    },
+    handleSaveAvailableValue(row){
+      if (row){
+        this.availableValue = {...row}
+      }else {
+        this.availableValue = {
+          ...this.availableForm,
+          availableValue:undefined,
+        }
+      }
+      this.availableValueVisible = true;
+    },
+    handleQueryPropertyItemAvailable(){
+      let params = {
+        itemId: this.availableForm.itemId,
+      }
+      queryPropertyItemAvailable(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.availableList = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    handleSaveItemAvailableValue(){
+      if (this.availableValue.id){
+        this.availableValue.updateBy = this.$store.state.user.name
+        updatePropertyItemAvailable(this.availableValue).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.availableValueVisible = false;
+            this.handleQueryPropertyItemAvailable();
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      }else {
+        this.availableValue.createBy = this.$store.state.user.name
+        savePropertyItemAvailable(this.availableValue).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.availableValueVisible = false;
+            this.handleQueryPropertyItemAvailable();
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      }
+    },
+    handleRemoveAvailableValue(row){
+      this.$confirm('确认删除该可选值吗？', '提示', {}).then(() => {
+        removePropertyItemAvailable(row).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.availableValueVisible = false;
+            this.handleQueryPropertyItemAvailable();
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      })
+    },
+    changeValueType(val){
+      this.saveForm.minValue = undefined;
+      this.saveForm.maxValue = undefined;
+    }
+  },
+  created() {
+    this.queryForm = {...this.templateItem}
+    this.handleQueryPropertyTemplateType();
+    this.handleQueryByPage();
+    this.handleQueryBu();
+  },
+  watch:{
+    'saveForm.itemNo'(newVal, oldVal){
+      this.saveForm.itemNo = newVal.toUpperCase();
+    },
+    'templateItem.itemNo'(newVal, oldVal){
+      this.templateItem.itemNo = newVal.toUpperCase();
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <div style="width: 1000px">
+      <el-form :model="templateItem" label-position="top">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-form-item label="属性编码">
+              <el-input v-model="templateItem.itemNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="属性描述">
+              <el-input v-model="templateItem.itemDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="属性类型">
+              <el-select v-model="templateItem.itemType" style="width: 100%;">
+                <el-option label="全部" value=""></el-option>
+                <el-option :label="item.functionTypeDesc" :value="item.functionType" v-for="item in dataTypeList" :key="item.functionType"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="handleQueryByPage">查询</el-button>
+              <el-button type="primary" @click="handleSave(null)">新增</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <el-table :data="dataList" style="width: 100%" border v-loading="queryLoading" height="80vh">
+      <el-table-column
+        v-for="(item,index) in columns" :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">
+            <template v-if="item.columnProp==='valueType'">{{ scope.row[item.columnProp] === 'text' ? '文本' : '数字' }}</template>
+            <template v-else-if="item.columnProp==='valueChooseFlag'">{{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}</template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </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 @click="handleSave(scope.row)">编辑</a>
+          <a @click="handleRemove(scope.row)">删除</a>
+          <a v-if="scope.row.valueChooseFlag === 'Y'" @click="handleSaveAvailable(scope.row)">可选值</a>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination @size-change="handleSizeChange"
+                   @current-change="handlePageChange"
+                   :current-page="no"
+                   :page-sizes="[20, 50, 100, 200, 500]"
+                   :page-size="size"
+                   :total="total"
+                   layout="total,sizes, prev, pager, next, jumper">
+
+    </el-pagination>
+
+    <el-dialog title="属性信息" :close-on-click-modal="false" v-drag :visible.sync="saveVisible" width="500px">
+      <el-form :model="saveForm" ref="saveForm" :rules="rules" label-position="top" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="16">
+            <el-form-item label="BU" prop="buId" :show-message="false">
+              <bu-select v-model="saveForm.buId" :disabled="saveForm.id > 0"></bu-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="属性编码" prop="itemNo" :show-message="false">
+              <el-input v-model="saveForm.itemNo" :disabled="saveForm.id"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="属性描述" prop="itemDesc" :show-message="false">
+              <el-input v-model="saveForm.itemDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="值类型" prop="valueType" :show-message="false">
+              <el-select v-model="saveForm.valueType" style="width: 100%;" @change="changeValueType">
+                <el-option label="文本" value="text"></el-option>
+                <el-option label="数字" value="num"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="参照值" prop="defaultValue" :show-message="false">
+              <el-input v-model="saveForm.defaultValue"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-if="saveForm.valueType !== 'text'">
+            <el-form-item label="最大值" prop="maxValue" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false" :step="0" v-model="saveForm.maxValue"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-else>
+            <el-form-item label="最大值" prop="maxValue" :show-message="false">
+              <el-input v-model="saveForm.maxValue"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-if="saveForm.valueType !== 'text'">
+            <el-form-item label="最小值" prop="minValue" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false" :step="0" :disabled="saveForm.valueType === 'text'" v-model="saveForm.minValue"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-else>
+            <el-form-item label="最小值" prop="minValue" :show-message="false">
+              <el-input v-model="saveForm.minValue"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="属性类型" prop="itemType" :show-message="false">
+              <el-select v-model="saveForm.itemType" style="width: 100%;">
+                <el-option :label="item.functionTypeDesc" :value="item.functionType" v-for="item in dataTypeList" :key="item.functionType"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label=" " prop="valueChooseFlag" :show-message="false">
+              <el-checkbox v-model="saveForm.valueChooseFlag" :true-label="'Y'" :false-label="'N'">是否值可选</el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" :loading="saveLoading" @click="handleSaveOrUpdate">确 定</el-button>
+        <el-button @click="saveVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="availableVisible" width="500px">
+      <el-form :model="availableForm" label-position="top" >
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="属性编码" prop="itemNo" :show-message="false">
+              <el-input v-model="availableForm.itemNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="属性描述" prop="itemDesc" :show-message="false">
+              <el-input v-model="availableForm.itemDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" " >
+              <el-button type="primary" @click="handleSaveAvailableValue(null)">新增</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :data="availableList" border style="width: 100%" :height="300">
+        <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 @click="handleSaveAvailableValue(scope.row)">修改</a>
+            <a @click="handleRemoveAvailableValue(scope.row)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog title="可选值信息" :close-on-click-modal="false" v-drag :visible.sync="availableValueVisible" width="300px">
+      <el-form :model="availableValue" label-position="top">
+        <el-form-item label="可选值" required>
+          <el-input v-model="availableValue.availableValue" v-if="availableForm.valueType === 'text'"></el-input>
+          <el-input-number style="width: 100%;" :controls="false" :step="0" v-model="availableForm.availableValue" v-if="availableForm.valueType === 'num'"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" :loading="saveLoading" @click="handleSaveItemAvailableValue">确 定</el-button>
+        <el-button @click="availableValueVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/property/propertyTemplate.vue b/src/views/modules/property/propertyTemplate.vue
new file mode 100644
index 0000000..641a3d6
--- /dev/null
+++ b/src/views/modules/property/propertyTemplate.vue
@@ -0,0 +1,1041 @@
+<script>
+import {
+  queryPropertyTemplateByPage,
+  queryPropertyTemplateType, removePropertyTemplate,
+  savePropertyTemplate, updatePropertyTemplate
+} from "../../../api/property/template";
+import {getSiteAndBuByUserName} from "../../../api/eam/eam";
+import BuSelect from "../../../components/selector/select/BuSelect.vue";
+import {queryPropertyItemByPage} from "../../../api/property/propertyItem";
+import {
+  batchSavePropertyTemplateDetail, batchUpdatePropertyTemplateDetail,
+  queryPropertyTemplateDetail,
+  queryPropertyTemplateDetailItem, removeBatchPropertyTemplateDetail, removePropertyTemplateDetail
+} from "../../../api/property/templateDetail";
+import {queryPropertyItemAvailable} from "../../../api/property/propertyItemAvailable";
+
+export default {
+  name: "propertyTemplate",
+  components: {BuSelect},
+  data(){
+    return{
+      no:1,
+      size:10,
+      total:0,
+      menuId:180002,
+      dataList: [],
+      dataTypeList:[],
+      queryLoading: false,
+      templateQuery:{
+        codeNo:'',
+        codeDesc:'',
+        functionType:'',
+        active:'',
+      },
+      saveVisible: false,
+      saveLoading: false,
+      columns:[
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002TableBUDesc',
+          tableId: "180002Table",
+          tableName: "属性项目表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002TableFunctionTypeDesc',
+          tableId: "180002Table",
+          tableName: "属性项目表",
+          columnProp: 'functionTypeDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '模板分组',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002TableCodeNo',
+          tableId: "180002Table",
+          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: 180002,
+          serialNumber: '180002TableCodeDesc',
+          tableId: "180002Table",
+          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: 180002,
+          serialNumber: '180002TableActive',
+          tableId: "180002Table",
+          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: 180002,
+          serialNumber: '180002TableCreateDate',
+          tableId: "180002Table",
+          tableName: "属性模板表",
+          columnProp: 'createDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002TableCreateBy',
+          tableId: "180002Table",
+          tableName: "属性模板表",
+          columnProp: 'createBy',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002TableUpdateDate',
+          tableId: "180002Table",
+          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: 180002,
+          serialNumber: '180002TableUpdateBy',
+          tableId: "180002Table",
+          tableName: "属性模板表",
+          columnProp: 'updateBy',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      saveForm:{
+        buId:'',
+        codeNo:'',
+        codeDesc:'',
+        functionType:'',
+        active:'Y',
+      },
+      rules:{
+        buId: [
+          { required: true, message: '请选择BU', trigger: 'change' },
+        ],
+        codeNo: [
+          { required: true, message: '请输入模板编码', trigger: 'blur' },
+        ],
+        codeDesc: [
+          { required: true, message: '请输入模板描述', trigger: 'blur' },
+        ],
+        functionType: [
+          { required: true, message: '请选择模板分组', trigger: 'change' },
+        ],
+      },
+      userBuList:[],
+      propertyTemplateItem:{
+
+      },
+      itemVisible: false,
+      detailList:[],
+      columnDetailList:[
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002Table2PropertiesItemNo',
+          tableId: "180002Table2",
+          tableName: "属性项目表",
+          columnProp: 'propertiesItemNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '属性项目编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002Table2ItemDesc',
+          tableId: "180002Table2",
+          tableName: "属性项目表",
+          columnProp: 'itemDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '属性项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 180002,
+          serialNumber: '180002Table2ValueType',
+          tableId: "180002Table2",
+          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: 180002,
+          serialNumber: '180002Table2DefaultValue',
+          tableId: "180002Table2",
+          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: 180002,
+          serialNumber: '180002Table2MaxValue',
+          tableId: "180002Table2",
+          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: 180002,
+          serialNumber: '180002Table2MinValue',
+          tableId: "180002Table2",
+          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: 180002,
+          serialNumber: '180002TableValueChooseFlag',
+          tableId: "180002Table",
+          tableName: "common",
+          columnProp: 'valueChooseFlag',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '是否值可选',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+      ],
+      itemSaveVisible: false,
+      item:{
+
+      },
+      selectionList1:[],
+      selectionList2:[],
+      itemList1:[],
+      itemList2:[],
+      valueChooseFlagVisible:false,
+      availableForm:{
+
+      },
+      availableList:[],
+    }
+  },
+  methods:{
+    handleQueryByPage(){
+      let params = {
+        ...this.templateQuery,
+        no: this.no,
+        size: this.size,
+        createBy: this.$store.state.user.name,
+      }
+      this.queryLoading = true;
+      queryPropertyTemplateByPage(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataList = data.rows;
+          this.total = data.total;
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.queryLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.queryLoading = false;
+      })
+    },
+    handleQueryPropertyTemplateType(){
+      let params = {
+
+      }
+      queryPropertyTemplateType(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataTypeList = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    handleSave(row){
+      this.$nextTick(()=>{
+        if (this.$refs.saveForm){
+          this.$refs.saveForm.clearValidate();
+        }
+      })
+      if (row){
+        this.saveForm = {
+          ...row,
+        }
+      }else {
+        this.saveForm = {
+          codeNo:'',
+          codeDesc:'',
+          functionType:'',
+          active:'Y',
+        }
+        this.saveForm.buId = this.userBuList.length > 0 ? this.userBuList[0].id : ''
+        if (this.templateQuery.functionType){
+          this.saveForm.functionType = this.templateQuery.functionType
+        }
+      }
+      this.saveVisible = true;
+    },
+    handleSizeChange(val){
+      this.size = val;
+      this.handleQueryByPage();
+    },
+    handlePageChange(val){
+      this.no = val;
+      this.handleQueryByPage();
+    },
+    handleQueryBu(){
+      let params = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userBuList = data.rows
+        }else {
+          this.$message.warning(data.message)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleSaveOrUpdate(){
+      this.$refs.saveForm.validate((valid,obj) => {
+        if (valid) {
+          if (this.saveForm.id){
+            this.handleTemplateUpdate();
+          }else {
+            this.handleTemplateSave();
+          }
+        }else {
+          let i = 1
+          for (let key in obj) {
+            if (i === 1){
+              this.$message.error(obj[key][0].message);
+              break
+            }
+            i++
+          }
+        }
+      })
+    },
+    handleTemplateUpdate(){
+      let params = {
+        ...this.saveForm,
+        updateBy: this.$store.state.user.name,
+      }
+      this.saveLoading = true;
+      updatePropertyTemplate(params).then(({data})=>{
+        this.saveLoading = false;
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.handleQueryByPage();
+          this.saveVisible = false;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.saveLoading = false;
+        this.$message.error(error);
+      })
+    },
+    handleTemplateSave(){
+      let params = {
+        ...this.saveForm,
+        createBy: this.$store.state.user.name,
+      }
+      this.saveLoading = true;
+      savePropertyTemplate(params).then(({data})=>{
+        this.saveLoading = false;
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.handleQueryByPage();
+          this.saveVisible = false;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.saveLoading = false;
+        this.$message.error(error);
+      })
+    },
+    handleRemove(row){
+      this.$alert('确认删除该属性模板吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {...row,}
+        removePropertyTemplate(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg);
+            this.handleQueryByPage();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        }).catch((error)=>{
+          this.$message.error(error);
+        })
+      }).catch(()=>{
+
+      })
+    },
+    handleItem(row){
+      this.propertyTemplateItem = {...row};
+      this.handleQueryPropertyTemplateDetail();
+      this.itemVisible = true;
+    },
+    handleSaveItem(row){
+      this.item = {
+        itemNo: '',
+        itemDesc: '',
+        site:this.propertyTemplateItem.site,
+        buNo:this.propertyTemplateItem.buNo,
+        itemType:this.propertyTemplateItem.functionType,
+        headerId:this.propertyTemplateItem.id,
+      }
+      this.handleQueryItem();
+    },
+    handleQueryItem(){
+      let params = {
+        ...this.item
+      }
+      queryPropertyTemplateDetailItem(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.itemList1 = data.rows;
+          this.itemSaveVisible = true;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    handleRowClick1(row){
+      this.$refs.itemTable1.toggleRowSelection(row,true);
+    },
+    handleRowClick2(row){
+      this.$refs.itemTable2.toggleRowSelection(row,true);
+    },
+    selectionItem1(val){
+      this.selectionList1 = val;
+    },
+    selectionItem2(val){
+      this.selectionList2 = val;
+    },
+    handleAddItem(){
+      if(this.selectionList1.length === 0){
+        this.$message.warning('请选择属性项目');
+        return;
+      }
+      let params = this.selectionList1.map(item => {
+        return{
+          site:this.propertyTemplateItem.site,
+          buNo:this.propertyTemplateItem.buNo,
+          functionType:this.propertyTemplateItem.functionType,
+          codeNo:this.propertyTemplateItem.codeNo,
+          propertiesItemNo:item.propertiesItemNo,
+          createBy:this.$store.state.user.name,
+          headerId:this.propertyTemplateItem.id,
+        }
+      })
+      batchSavePropertyTemplateDetail(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg)
+          this.handleQueryItem();
+          this.handleQueryPropertyTemplateDetail();
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleRemoveBatchItem(){
+      if (this.selectionList2.length === 0){
+        this.$message.warning('请选择属性项目');
+        return
+      }
+      this.$confirm('确认删除该属性项目吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = this.selectionList2.map(item => {
+          return{
+            id:item.id,
+          }
+        })
+        removeBatchPropertyTemplateDetail(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.handleQueryItem();
+            this.handleQueryPropertyTemplateDetail();
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      }).catch(() => {})
+    },
+    handleQueryPropertyTemplateDetail(){
+      let params = {
+        headerId:this.propertyTemplateItem.id,
+      }
+      queryPropertyTemplateDetail(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.itemList2 = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    handleRemoveItem(row){
+      this.$confirm('确认删除该属性项目吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          id:row.id,
+        }
+        removePropertyTemplateDetail(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.handleQueryPropertyTemplateDetail();
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      }).catch(() => {})
+    },
+    updateItemSort(row, index, type){
+      let currentSort = row.orderId;
+      console.log(index + type)
+      let nexRow = {...this.itemList2[index + type]}
+      let current = {...row}
+      current.orderId = nexRow.orderId;
+      nexRow.orderId = currentSort;
+      let params = [current, nexRow];
+      batchUpdatePropertyTemplateDetail(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg)
+          this.handleQueryPropertyTemplateDetail();
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=> {
+        this.$message.error(error)
+      })
+    },
+    handleChooseValue(row){
+      this.availableForm = {
+        itemNo: row.itemNo,
+        itemDesc: row.itemDesc,
+        itemId: row.itemId,
+      }
+      this.handleQueryPropertyItemAvailable();
+      this.valueChooseFlagVisible = true;
+    },
+    handleQueryPropertyItemAvailable(){
+      let params = {
+        itemId: this.availableForm.itemId,
+      }
+      queryPropertyItemAvailable(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.availableList = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    }
+  },
+  created() {
+    this.handleQueryBu();
+    this.handleQueryPropertyTemplateType();
+    this.handleQueryByPage();
+  },
+  watch:{
+    'saveForm.codeNo'(newVal, oldVal){
+      this.saveForm.codeNo = newVal.toUpperCase();
+    },
+    'templateQuery.codeNo'(newVal, oldVal){
+      this.templateQuery.codeNo = newVal.toUpperCase();
+    }
+  }
+}
+</script>
+
+<template>
+<div>
+  <div style="width: 1000px">
+    <el-form :model="templateQuery" label-position="top">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-form-item label="模板编码">
+            <el-input v-model="templateQuery.codeNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="模板描述">
+            <el-input v-model="templateQuery.codeDesc"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="模板分组">
+            <el-select v-model="templateQuery.functionType" style="width: 100%;">
+              <el-option label="全部" value=""></el-option>
+              <el-option :label="item.functionTypeDesc" :value="item.functionType" v-for="item in dataTypeList" :key="item.functionType"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="templateQuery.active">
+              <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-col>
+        <el-col :span="4">
+          <el-form-item label=" ">
+            <el-button type="primary" @click="handleQueryByPage">查询</el-button>
+            <el-button type="primary" @click="handleSave(null)">新增</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+  <el-table :data="dataList" v-loading="queryLoading" border style="width: 100%;margin-top: 5px" height="80vh">
+    <el-table-column
+      v-for="(item,index) in columns" :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="{row,$index}">
+        <div v-if="item.columnProp !== 'active'">
+          <span v-if="!item.columnHidden">{{ row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </div>
+        <span v-else
+              :style="{color:row.active === 'Y'?'#67C23A':'red'}">{{ row.active === 'Y' ? '启用' : '停用' }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      header-align="center"
+      align="center"
+      width="160"
+      label="操作">
+      <template slot-scope="{row,$index}">
+        <a @click="handleSave(row)">编辑</a>
+        <a @click="handleRemove(row)">删除</a>
+        <a @click="handleItem(row)">属性项目</a>
+      </template>
+    </el-table-column>
+  </el-table>
+
+  <el-pagination @size-change="handleSizeChange"
+                 @current-change="handlePageChange"
+                 :current-page="no"
+                 :page-sizes="[20, 50, 100, 200, 500]"
+                 :page-size="size"
+                 :total="total"
+                 layout="total,sizes, prev, pager, next, jumper">
+
+  </el-pagination>
+
+  <el-dialog title="属性模板" :close-on-click-modal="false" v-drag :visible.sync="saveVisible" width="400px">
+    <el-form :model="saveForm" ref="saveForm" :rules="rules" label-position="top" label-width="100px">
+      <el-row :gutter="10">
+        <el-col :span="16">
+          <el-form-item label="BU" prop="buId" :show-message="false">
+            <bu-select v-model="saveForm.buId" :disabled="saveForm.id > 0"></bu-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="10">
+          <el-form-item label="模板编码" prop="codeNo" :show-message="false">
+            <el-input v-model="saveForm.codeNo" :disabled="saveForm.id > 0"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-form-item label="模板描述" prop="codeDesc" :show-message="false">
+            <el-input v-model="saveForm.codeDesc"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="模板分组" prop="functionType" :show-message="false">
+            <el-select v-model="saveForm.functionType" style="width: 100%;">
+              <el-option :label="item.functionTypeDesc" :value="item.functionType" v-for="item in dataTypeList" :key="item.functionType"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-form-item label=" " :show-message="false" prop="active">
+            <el-checkbox v-model="saveForm.active" true-label="Y" false-label="N">状态</el-checkbox>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" :loading="saveLoading" @click="handleSaveOrUpdate">确 定</el-button>
+      <el-button @click="saveVisible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+
+  <el-dialog title="属性项目清单" :close-on-click-modal="false" v-drag :visible.sync="itemVisible" width="830px">
+    <el-form :model="propertyTemplateItem" label-position="top">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-form-item label="属性模板编码">
+            <el-input v-model="propertyTemplateItem.codeNo" disabled ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="属性模板名称">
+            <el-input v-model="propertyTemplateItem.codeDesc" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label=" ">
+            <el-button type="primary" @click="handleSaveItem(null)">新增</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      :height="300"
+      :data="itemList2"
+      border
+      style="width: 100%;">
+      <el-table-column
+        header-align="center"
+        align="left"
+        width="70"
+        label="排序">
+        <template slot-scope="scope">
+          <a @click="updateItemSort(scope.row,scope.$index,-1)" v-if="scope.$index !== 0">上移</a>
+          <a @click="updateItemSort(scope.row,scope.$index,1)" v-if="scope.$index < itemList2.length-1">下移</a>
+        </template>
+      </el-table-column>
+      <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">
+            <template v-if="item.columnProp==='valueType'">{{ scope.row[item.columnProp] === 'text' ? '文本' : '数字' }}</template>
+            <template v-else-if="item.columnProp==='valueChooseFlag'">{{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}</template>
+            <template v-else>{{ scope.row[item.columnProp] }}</template>
+          </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
+        header-align="center"
+        align="center"
+        width="130"
+        label="操作">
+        <template slot-scope="scope">
+          <a v-if="scope.row.valueChooseFlag === 'Y'" @click="handleChooseValue(scope.row)">可选值</a>
+          <a @click="handleRemoveItem(scope.row)">删除属性</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="itemVisible = false">关 闭</el-button>
+    </div>
+  </el-dialog>
+
+  <el-dialog title="新增属性" :close-on-click-modal="false" v-drag :visible.sync="itemSaveVisible"
+             width="1000px">
+    <div style="font-size: 12px">
+      <el-form label-position="top" :model="item">
+        <el-row :gutter="10">
+          <el-col :span="3">
+            <el-form-item label="属性编码">
+              <el-input v-model="item.itemNo" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="属性名称">
+              <el-input v-model="item.itemDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="handleQueryItem">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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
+          @selection-change="selectionItem1"
+          @row-click="handleRowClick1"
+          ref="itemTable1"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            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="handleAddItem">添加>></el-button>
+        </div>
+        <div style="margin-top: 15px;margin-left: 18px">
+          <el-button type="primary" @click="handleRemoveBatchItem">删除<<</el-button>
+        </div>
+      </el-main>
+      <el-main style="width: 350px;padding: 1px">
+        <span style="font-size: 12px">已有属性：</span>
+        <el-table
+          height="400px"
+          border
+          ref="itemTable2"
+          @selection-change="selectionItem2"
+          @row-click="handleRowClick2"
+          :data="itemList2"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            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="itemSaveVisible = false">关闭</el-button>
+    </el-footer>
+  </el-dialog>
+
+  <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="valueChooseFlagVisible" width="500px">
+    <el-form :model="availableForm" label-position="top" >
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="属性编码" prop="itemNo" :show-message="false">
+            <el-input v-model="availableForm.itemNo" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="属性描述" prop="itemDesc" :show-message="false">
+            <el-input v-model="availableForm.itemDesc" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table :data="availableList" border style="width: 100%" :height="200">
+      <el-table-column
+        prop="availableValue"
+        header-align="center"
+        align="left"
+        min-width="200"
+        label="属性值">
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</div>
+</template>
+
+<style scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/quote/detail/primary/quoteDetailBom.vue b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
index df91ad3..3359bb4 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailBom.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
@@ -14,6 +14,8 @@ export default {
   data(){
     return{
       isAllBom:false,
+      dataList:[],
+      treeData:[],
     }
   },
   methods:{
@@ -42,10 +44,15 @@ export default {
   </div>
   <el-container>
     <el-aside width="300px">
+      <el-tree
+        :data="treeData">
 
+      </el-tree>
     </el-aside>
     <el-main style="padding: 0">
+      <el-table :data="dataList" border style="width: 100%" :height="420">
 
+      </el-table>
     </el-main>
   </el-container>
 </div>
diff --git a/src/views/modules/quote/detail/primary/quoteDetailOther.vue b/src/views/modules/quote/detail/primary/quoteDetailOther.vue
new file mode 100644
index 0000000..7209a17
--- /dev/null
+++ b/src/views/modules/quote/detail/primary/quoteDetailOther.vue
@@ -0,0 +1,48 @@
+<script>
+export default {
+  name: "quoteDetailOther",
+  props:{
+    quoteDetail: {
+      type: Object,
+      required: true
+    }
+  },
+  model:{
+    prop: "quoteDetail",
+    event: "update"
+  },
+  data(){
+    return{
+      dataList:[],
+    }
+  },
+  methods:{
+    handleQueryOther(){
+      console.log(this.quoteDetail.id)
+    }
+  },
+  created() {
+    if (this.quoteDetail && this.quoteDetail.id){
+      this.handleQueryOther()
+    }
+  },
+  watch:{
+    'quoteDetail.id'(newVal, oldVal){
+      this.handleQueryOther()
+    },
+  }
+}
+</script>
+
+<template>
+<div>
+  <el-button type="primary">新增</el-button>
+  <el-table :data="dataList" style="width: 100%" border :height="420">
+
+  </el-table>
+</div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
new file mode 100644
index 0000000..522f5d7
--- /dev/null
+++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
@@ -0,0 +1,63 @@
+<script>
+export default {
+  name: "quoteDetailRouting",
+  props:{
+    quoteDetail:{
+      type:Object,
+      required:true
+    },
+  },
+  model:{
+    prop: "quoteDetail",
+    event: "update"
+  },
+  data(){
+    return{
+      isAllBom:false,
+      dataList:[],
+      treeData:[],
+    }
+  },
+  methods:{
+    handleQueryQuoteDetailRouting(){
+      console.log(this.quoteDetail.id)
+    },
+  },
+  created() {
+    if (this.quoteDetail && this.quoteDetail.id){
+      this.handleQueryQuoteDetailRouting();
+    }
+  },
+  watch:{
+    'quoteDetail.id'(newVal,oldVal){
+      this.handleQueryQuoteDetailRouting();
+    },
+  }
+}
+</script>
+
+<template>
+  <div>
+    <div style="margin-bottom: 10px">
+      <el-link style="margin-right: 20px">切换版本</el-link>
+      <el-checkbox v-model="isAllBom">全级Routing结构</el-checkbox>
+    </div>
+    <el-container>
+      <el-aside width="300px">
+        <el-tree
+          :data="treeData">
+
+        </el-tree>
+      </el-aside>
+      <el-main style="padding: 0">
+        <el-table :data="dataList" border style="width: 100%" :height="420">
+
+        </el-table>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index d9e8dea..d8f00ba 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -10,10 +10,12 @@ import {
 import QuoteDetailCost from "./primary/quoteDetailCost.vue";
 import QuoteDetailTool from "./primary/quoteDetailTool.vue";
 import QuoteDetailBom from "./primary/quoteDetailBom.vue";
+import QuoteDetailRouting from "./primary/quoteDetailRouting.vue";
+import QuoteDetailOther from "./primary/quoteDetailOther.vue";
 
 export default {
   name: "quoteDetail",
-  components: {QuoteDetailBom, QuoteDetailTool, QuoteDetailCost, ProjectPartTable},
+  components: {QuoteDetailOther, QuoteDetailRouting, QuoteDetailBom, QuoteDetailTool, QuoteDetailCost, ProjectPartTable},
   props:{
     quote:{
       type:Object,
@@ -856,7 +858,7 @@ export default {
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="24">
+        <el-col :span="16">
           <el-form-item label="备注" class="auto" :show-message="false">
             <el-input type="textarea" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="saveQuoteDetail.remark" disabled></el-input>
           </el-form-item>
@@ -868,11 +870,15 @@ export default {
       <el-tab-pane label="材料" name="bom">
         <quote-detail-bom v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-bom>
       </el-tab-pane>
-      <el-tab-pane label="工艺" name="routing"></el-tab-pane>
+      <el-tab-pane label="工艺" name="routing">
+        <quote-detail-routing v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-routing>
+      </el-tab-pane>
       <el-tab-pane label="工具" name="tool">
         <quote-detail-tool v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-tool>
       </el-tab-pane>
-      <el-tab-pane label="其他成本" name="other"></el-tab-pane>
+      <el-tab-pane label="其他成本" name="other">
+        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
+      </el-tab-pane>
       <el-tab-pane label="成本&价格" name="cost">
         <quote-detail-cost v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index 63be9d4..dda2fd1 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -439,7 +439,6 @@ export default {
           this.$refs.saveForm.clearValidate();
         }
       })
-      console.log(row)
       if (row){
         this.saveQuote = {
           ...row