diff --git a/src/views/modules/ecss/hsCode.vue b/src/views/modules/ecss/hsCode.vue
index 4638ed2..f45b316 100644
--- a/src/views/modules/ecss/hsCode.vue
+++ b/src/views/modules/ecss/hsCode.vue
@@ -69,39 +69,8 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"   type="border-card" @tab-click="tabClick" >
-      <el-tab-pane label="属性" name="detail">
-        <el-table
-          :height="height"
-          :data="dataList2"
-          border
-          style="width: 100%;">
-          <el-table-column
-            v-for="(item,index) in columnList2" :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="left"-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            width="100"-->
-<!--            label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <a  v-if="currentRow.notifyStatus==='已计划'" type="text" size="small" @click="openUpdateDetailModel(scope.row)">修改</a>-->
-<!--              <a v-if="currentRow.notifyStatus==='已计划'" type="text" size="small" @click="deleteDelDetail(scope.row)">删除</a>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-        </el-table>
+      <el-tab-pane label="基本信息" name="attribute">
+        <order-attribute ref="dialogAttribute" :site="currentRow.site" :buNo="currentRow.buNo" :order-no="currentRow.hsCode" :code-no="currentRow.codeNo" :function-type="'ECSS'"></order-attribute>
       </el-tab-pane>
 
     </el-tabs>
@@ -111,7 +80,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item :label="'BU:'">
-              <el-select v-model="addModel.buNo" placeholder="请选择" :disabled="addModel.addFlag===0"  style="width: 100%">
+              <el-select v-model="addModel.buNo" placeholder="请选择" :disabled="addModel.addFlag!==0"  style="width: 100%">
                 <el-option
                   v-for = "i in buList"
                   :key = "i.buNo"
@@ -123,7 +92,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="'HS Code'" >
-              <el-input v-model="addModel.hsCode" :disabled="addDisabledFlag" ></el-input>
+              <el-input v-model="addModel.hsCode" :disabled="addModel.addFlag!==0" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -151,6 +120,7 @@
 </template>
 
 <script>
+  import orderAttribute from "./orderProperties"
   import {} from "@/api/sysLanguage.js"
   import {
     searchHsCodeData,
@@ -160,6 +130,7 @@
   export default {
     name: "null",
     components:{
+      orderAttribute,
 
     },
     data() {
@@ -340,422 +311,6 @@
             columnWidth: 300
           },
         ],
-        columnList2: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2ItemNo',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "itemNo",
-            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: 801003,
-            serialNumber: '801003Table2PartNo',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "partNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "PN",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2PartDescription',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "partDescription",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Description",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Qty',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "qty",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "Qty (pcs)",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2SalesOrder',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "salesOrder",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "销售订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2CustomerPO',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "customerPO",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "客户采购单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Version',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "version",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Version",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Status',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Status",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Family',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "family",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Family",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Lt',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "lt",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "LT (wks)",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2CmcComment',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "cmcComment",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "CMC Comment",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2SaleType',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "saleType",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "内外销方式",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2AwbBl',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "awbBl",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "AWB/ BL#",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2ShippingNumber',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "shippingNumber",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "ShippingNumber",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2ForwarderInfo',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "forwarderInfo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Forwarder Info",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Currency',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "currency",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "Currency",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Tp',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "tp",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "TP",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2TtlAmount',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "ttlAmount",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "TTL Amount",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2SumPrice',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "sumPrice",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "价税合计",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2So',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "so",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "SO",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Upc',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "upc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "UPC",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 801003,
-          //   serialNumber: '801003Table2ErpDelItemNo',
-          //   tableId: "801003Table2",
-          //   tableName: "关务系统发货通知单明细",
-          //   columnProp: "erpDelItemNo",
-          //   headerAlign: "center",
-          //   align: "right",
-          //   columnLabel: "ERP发货单行号",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 60
-          // },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 801003,
-            serialNumber: '801003Table2Remark',
-            tableId: "801003Table2",
-            tableName: "关务系统发货通知单明细",
-            columnProp: "remark",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "备注",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 300
-          },
-        ],
         currentRow:{},
       }
     },
@@ -804,7 +359,7 @@
       },
       refreshCurrentTabTable(){
         if(this.currentRow===''||this.currentRow===null){
-          this.currentRow={site:'',hsCode:''}
+          this.currentRow={site:'',hsCode:'',buNo:'',recordType:'',codeNo:''}
         }
         if(this.activeName==='detail'){
           // searchEcssCoDelNotifyDetail(this.currentRow).then(({data}) => {
diff --git a/src/views/modules/ecss/orderProperties.vue b/src/views/modules/ecss/orderProperties.vue
new file mode 100644
index 0000000..da544b3
--- /dev/null
+++ b/src/views/modules/ecss/orderProperties.vue
@@ -0,0 +1,444 @@
+<template>
+  <div>
+    <div style="margin-top: 5px">
+      <template >
+        <el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
+      </template>
+      <template >
+        <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+      </template>
+    </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>
+
+
+
+<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:{
+      site:{
+        type:String,
+      },
+      buNo:{
+        type:String,
+      },
+      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:{
+
+      getProperties(){
+        let params = {
+          site:this.site,
+          buNo:this.buNo,
+          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('操作成功');
+            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('操作成功');
+            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('操作成功');
+            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,
+          codeNo: this.codeNo,
+        }
+        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)
+        })
+      },
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight - 240)/2;
+      })
+    },
+    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>