diff --git a/src/views/modules/tooling/components/com_tool_property_show.vue b/src/views/modules/tooling/components/com_tool_property_show.vue
index 8fc73e8..e8804e8 100644
--- a/src/views/modules/tooling/components/com_tool_property_show.vue
+++ b/src/views/modules/tooling/components/com_tool_property_show.vue
@@ -35,7 +35,7 @@
 
 <script>
 
-import propertyTable from "@/views/modules/demoComponents/orderProperties"
+import propertyTable from "./orderProperties"
 
 var functionId = 'C106003005';
 export default {
diff --git a/src/views/modules/tooling/components/orderProperties.vue b/src/views/modules/tooling/components/orderProperties.vue
new file mode 100644
index 0000000..bfa630c
--- /dev/null
+++ b/src/views/modules/tooling/components/orderProperties.vue
@@ -0,0 +1,470 @@
+<template>
+  <div>
+    <div style="margin-top: 5px">
+      <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+      <el-button type="primary" @click="refreshPropertiesModal"  :disabled="disabled" v-if="attributeDialog">刷新属性模板</el-button>
+    </div>
+    <div class="rq " v-if="attributeDialog">
+      <el-table
+        :height="height"
+        :data="dataList"
+        border
+        style="width: 100%;margin-top: 5px">
+        <el-table-column
+          v-for="(item,index) in productColumnList" :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">
+            <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+              <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>
+            </div>
+            <div v-else>
+              {{scope.row.valueTypeDb==='T'?scope.row.textValue:scope.row.numValue}}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="rq " v-else>
+      <el-table
+        :height="height"
+        :data="copyAttributeList"
+        border
+        style="width: 100%;margin-top: 5px">
+        <el-table-column
+          v-for="(item,index) in productColumnList" :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">
+            <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
+              <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>
+            </div>
+            <div v-else>
+              <div v-if="scope.row.valueChooseFlag !== 'Y'">
+                <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueType === '数字'" :controls="false"></el-input-number>
+                <el-input v-model="scope.row.textValue" v-else></el-input>
+              </div>
+              <div v-else>
+                <el-select style="width: 100%;" v-if="scope.row.valueType === '文本'" v-model="scope.row.textValue">
+                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                </el-select>
+                <el-select style="width: 100%;" v-else v-model="scope.row.numValue">
+                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
+                </el-select>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog title="属性项目" v-drag :visible.sync="attributeSaveDialog" append-to-body>
+      <transfer-table v-if="attributeSaveDialog"
+                      v-model="dataList2"
+                      :data-list="searchDataList"
+                      @add="saveTestPropertiesItem"
+                      @delete="removeTestPropertiesItem"
+                      @search="searchAttributeList"></transfer-table>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="attributeSaveDialog = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>dataList2
+
+
+
+<script>
+import {propertiesList,refreshPropertiesModal,updatePropertiesList,getPropertiesListByPartAndCodeNo
+,searchPropertiesItemList,saveSubPropertiesValueForAlone,deleteSubPropertiesValueForAlone
+
+} from "@/api/base/properties.js";
+import {
+  removeTestPropertiesItem,
+  saveTestPropertiesItem, searchTestPropertiesItemList,
+  updateTestPropertiesList
+} from "@/api/test/testProperties.js";
+import TransferTable from "../../common/transferTable.vue";
+
+
+export default {
+  name: "orderAttribute",
+  components: {TransferTable},
+  props:{
+    orderNo:{
+      type:String,
+    },
+    codeNo:{
+      type:String,
+    },
+    functionType:{
+      type:String,
+    },
+    disabled:{
+      type:Boolean,
+      default:false,
+    }
+  },
+  data(){
+    return{
+      height:320,
+      loading:false,
+      attributeDialog:true,
+      copyAttributeList:[],
+      attributeSaveDialog:false,
+      productColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100002001,
+          serialNumber: '100002001TablePropertiesItemNo',
+          tableId: "100002001Table",
+          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: 100002001,
+          serialNumber: '100002001TableItemDesc',
+          tableId: "100002001Table",
+          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: 100002001,
+          serialNumber: '100002001TableValueType',
+          tableId: "100002001Table",
+          tableName: "属性表",
+          columnProp: 'valueType',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '值类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth:80,
+        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 100002001,
+        //   serialNumber: '100002001TableMinValue',
+        //   tableId: "100002001Table",
+        //   tableName: "属性表",
+        //   columnProp: 'minValue',
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: '最小值',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth:80,
+        // },{
+        //   userId: this.$store.state.user.name,
+        //   functionId: 100002001,
+        //   serialNumber: '100002001TableMaxValue',
+        //   tableId: "100002001Table",
+        //   tableName: "属性表",
+        //   columnProp: 'maxValue',
+        //   headerAlign: "center",
+        //   align: "center",
+        //   columnLabel: '最大值',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth:80,
+        // },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 100002001,
+          serialNumber: '100002001TableMaxValue',
+          tableId: "100002001Table",
+          tableName: "属性表",
+          columnProp: 'textValue',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '属性值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth:120,
+        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 100002001,
+        //   serialNumber: '100002001TableMinValue',
+        //   tableId: "100002001Table",
+        //   tableName: "属性表",
+        //   columnProp: 'numValue',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '数字值',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth:120,
+        // },
+        // {
+        //   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: '',
+        // },
+      ],
+      searchDataList:[],
+      dataList:[],
+      dataList2:[],
+    }
+  },
+  watch:{
+    orderNo(newValue,oldValue){
+      if (newValue){
+        this.getProperties();
+      }
+    },
+  },
+  methods:{
+
+    refreshPropertiesModal(){
+      this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          site: this.$store.state.user.site,
+          partNo: this.orderNo,
+          codeNo: this.codeNo,
+          recordType: this.functionType,
+        }
+        refreshPropertiesModal(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg);
+            this.getProperties();
+            this.attributeDialog = true;
+          } else {
+            this.$message.warning(data.msg);
+          }
+          this.loading = false
+        }).catch((error) => {
+          this.$message.error(error)
+          this.loading = false
+        })
+      })
+    },
+    getProperties(){
+      let params = {
+        site:this.$store.state.user.site,
+        partNo: this.orderNo,
+        codeNo: this.codeNo,
+        recordType: this.functionType,
+      }
+      getPropertiesListByPartAndCodeNo(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataList = data.rows;
+          this.dataList2 = JSON.parse(JSON.stringify(data.rows));
+          for (let i = 0; i <this.dataList2.length ; i++) {
+            this.dataList2[i].itemNo=  this.dataList2[i].propertiesItemNo
+          }
+          this.searchAttributeList({})
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    clickSave(){
+      if(this.dataList.length==0){
+        return false
+      }
+      if (!this.attributeDialog){
+        this.updateTestPropertiesList();
+      }else {
+        this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList))
+        this.attributeDialog = false;
+      }
+    },
+    updateTestPropertiesList(){
+      this.loading = true
+      updatePropertiesList(this.copyAttributeList).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.getProperties();
+          this.attributeDialog = true;
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.loading = false
+      }).catch((error)=>{
+        this.$message.error(error)
+        this.loading = false
+      })
+    },
+    clickSaveBtn(){
+      if (!this.attributeDialog) {
+        this.$message.warning('请保存更改！')
+        return
+      }
+      //查询 属性模板
+      this.searchAttributeList({})
+      this.attributeSaveDialog = true;
+    },
+    saveTestPropertiesItem(params){
+      let i = 0;
+      let arr = params.searchTableList.map(item=>{
+        item.partNo = this.orderNo;
+        item.site = this.$store.state.user.site;
+        item.codeNo = this.codeNo;
+        item.recordType = this.functionType;
+        return item
+      })
+      for (let j = 0; j <arr.length ; j++) {
+        arr[j].propertiesItemNo= arr[j].itemNo
+        arr[j].itemNo=999
+      }
+      saveSubPropertiesValueForAlone(arr).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.getProperties(params)
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    removeTestPropertiesItem(params){
+      for (let i = 0; i <params.dataTableList.length ; i++) {
+        params.dataTableList[i].propertiesItemNo= params.dataTableList[i].itemNo
+        params.dataTableList[i].itemNo=999
+      }
+      deleteSubPropertiesValueForAlone(params.dataTableList).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.getProperties(params)
+
+        }else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    searchAttributeList(data){
+      let params= JSON.parse(JSON.stringify(data))
+      params.site=this.$store.state.user.site;
+      params.list = this.dataList;
+      if (!this.attributeSaveDialog){
+        this.searchDataList = [];
+      }
+      let inData={
+        site:this.$store.state.user.site,
+        functionType: this.functionType,
+        list :this.dataList,
+      }
+      searchPropertiesItemList(inData).then(({data}) => {
+        if (data && data.code === 0){
+          this.searchDataList = data.rows;
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+
+    },
+    // getPartProperties(){
+    //   let params = {
+    //     site:this.$store.state.user.site,
+    //     partNo: this.orderNo,
+    //     codeNo: this.codeNo,
+    //     functionType: this.functionType,
+    //   }
+    //   getItemListsForPartAndCode(params).then(({data})=>{
+    //     if (data && data.code === 0){
+    //       this.dataList2 = data.rows;
+    //     }else {
+    //       this.$message.warning(data.msg)
+    //     }
+    //   }).catch((error)=>{
+    //     this.$message.error(error)
+    //   })
+    // },
+  },
+
+  created() {
+    this.getProperties();
+  },
+}
+</script>
+
+
+<style scoped>
+  .el-input-number /deep/ .el-input__inner {
+    text-align: right;
+    padding-right: 5px !important;
+  }
+
+  /deep/ .el-input .el-input--medium{
+    line-height: 20px;
+  }
+  /deep/ .el-input-number .el-input--medium{
+    line-height: 20px;
+  }
+</style>