给所有的单据加上可自定义展示的字段

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -75,18 +75,18 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="8">
-                  <a-form-item label="扩展1" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <a-form-item :label="queryTitle.mp1" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                    <a-input placeholder="请输入扩展1" v-model="queryParam.otherField1"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp1" v-model="queryParam.otherField1"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="8">
-                  <a-form-item label="扩展2" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <a-form-item :label="queryTitle.mp2" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                    <a-input placeholder="请输入扩展2" v-model="queryParam.otherField2"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp2" v-model="queryParam.otherField2"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="8">
-                  <a-form-item label="扩展3" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <a-form-item :label="queryTitle.mp3" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                    <a-input placeholder="请输入扩展3" v-model="queryParam.otherField3"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp3" v-model="queryParam.otherField3"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -162,6 +162,11 @@
     data() {
       return {
         modalWidth: 1450,
+        queryTitle: {
+          mp1: '扩展1',
+          mp2: '扩展2',
+          mp3: '扩展3'
+        },
         queryParam: {
           q: '',
           standardOrModel: '',
@@ -248,6 +253,7 @@
     created() {
       // 该方法触发屏幕自适应
       this.resetScreenSize()
+      this.handleChangeOtherField()
     },
     methods: {
       initBarCode() {
@@ -310,6 +316,29 @@
           this.scrollTrigger = {};
         }
       },
+      //动态替换扩展字段
+      handleChangeOtherField() {
+        let mpStr = getMpListShort(Vue.ls.get('materialPropertyList'))
+        if(mpStr) {
+          let mpArr = mpStr.split(',')
+          if(mpArr.length ===3) {
+            this.queryTitle.mp1 = mpArr[0]
+            this.queryTitle.mp2 = mpArr[1]
+            this.queryTitle.mp3 = mpArr[2]
+            for (let i = 0; i < this.columns.length; i++) {
+              if(this.columns[i].dataIndex === 'otherField1') {
+                this.columns[i].title = mpArr[0]
+              }
+              if(this.columns[i].dataIndex === 'otherField2') {
+                this.columns[i].title = mpArr[1]
+              }
+              if(this.columns[i].dataIndex === 'otherField3') {
+                this.columns[i].title = mpArr[2]
+              }
+            }
+          }
+        }
+      },
       showModal(barCode) {
         this.visible = true;
         this.title = '选择商品'

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -1236,6 +1236,8 @@
           detailList: '/depotItem/getDetailList',
           batchSetStatusUrl: "/depotHead/batchSetStatus"
         },
+        //扩展信息标题
+        otherFieldTitle: '',
         //表头
         columns:[],
         //列定义
@@ -1249,7 +1251,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1272,7 +1276,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1294,7 +1300,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
           { title: '数量', dataIndex: 'operNumber'},
@@ -1309,7 +1317,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
@@ -1331,7 +1341,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1358,7 +1370,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1384,7 +1398,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
@@ -1406,7 +1422,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1433,7 +1451,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1460,7 +1480,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1483,7 +1505,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '序列号', dataIndex: 'snList', width:300},
@@ -1506,7 +1530,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '调入仓库', dataIndex: 'anotherDepotName'},
           { title: '单位', dataIndex: 'unit'},
@@ -1528,7 +1554,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
@@ -1547,7 +1575,9 @@
           { title: '颜色', dataIndex: 'color'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
@@ -1564,7 +1594,9 @@
           { title: '型号', dataIndex: 'model'},
           { title: '品牌', dataIndex: 'brand'},
           { title: '制造商', dataIndex: 'mfrs'},
-          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '扩展1', dataIndex: 'otherField1'},
+          { title: '扩展2', dataIndex: 'otherField2'},
+          { title: '扩展3', dataIndex: 'otherField3'},
           { title: '库存', dataIndex: 'stock'},
           { title: '单位', dataIndex: 'unit'},
           { title: '多属性', dataIndex: 'sku'},
@@ -1618,6 +1650,8 @@
         } else if (type === '盘点复盘') {
           this.defColumns = this.stockCheckReplayColumns
         }
+        //动态替换扩展字段
+        this.handleChangeOtherField()
         //判断序列号、批号、有效期、多属性、重量、仓位货架是否有值
         let needAddkeywords = []
         for (let i = 0; i < ds.length; i++) {
@@ -1701,6 +1735,27 @@
           this.columns = currentCol
         }
       },
+      //动态替换扩展字段
+      handleChangeOtherField() {
+        let mpStr = getMpListShort(Vue.ls.get('materialPropertyList'))
+        if(mpStr) {
+          let mpArr = mpStr.split(',')
+          if(mpArr.length ===3) {
+            this.otherFieldTitle = mpStr
+            for (let i = 0; i < this.defColumns.length; i++) {
+              if(this.defColumns[i].dataIndex === 'otherField1') {
+                this.defColumns[i].title = mpArr[0]
+              }
+              if(this.defColumns[i].dataIndex === 'otherField2') {
+                this.defColumns[i].title = mpArr[1]
+              }
+              if(this.defColumns[i].dataIndex === 'otherField3') {
+                this.defColumns[i].title = mpArr[2]
+              }
+            }
+          }
+        }
+      },
       initPlatform() {
         getPlatformConfigByKey({"platformKey": "bill_print_flag"}).then((res)=> {
           if (res && res.code === 200) {
@@ -1882,11 +1937,11 @@
       //零售出库|零售退货入库
       retailExportExcel() {
         let list = []
-        let head = '仓库名称,条码,名称,规格,型号,颜色,扩展信息,库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,备注'
+        let head = '仓库名称,条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.unit,
+          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit,
             ds.snList, ds.batchNumber, ds.expirationDate, ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.remark)
           list.push(item)
         }
@@ -1897,11 +1952,11 @@
       //请购单
       applyExportExcel() {
         let list = []
-        let head = '条码,名称,规格,型号,颜色,扩展信息,单位,多属性,原数量,已采购,数量,备注'
+        let head = '条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',单位,多属性,原数量,已采购,数量,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.unit, ds.sku,
+          item.push(ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.unit, ds.sku,
             ds.preNumber, ds.finishNumber, ds.operNumber, ds.remark)
           list.push(item)
         }
@@ -1920,11 +1975,11 @@
           finishType = '已出库'
           organType = '客户：'
         }
-        let head = '条码,名称,规格,型号,颜色,扩展信息,库存,单位,多属性,数量,' + finishType + ',单价,金额,税率(%),税额,价税合计,备注'
+        let head = '条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,单位,多属性,数量,' + finishType + ',单价,金额,税率(%),税额,价税合计,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.unit, ds.sku,
+          item.push(ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit, ds.sku,
             ds.operNumber, ds.finishNumber, ds.unitPrice, ds.allPrice, ds.taxRate, ds.taxMoney, ds.taxLastMoney, ds.remark)
           list.push(item)
         }
@@ -1941,11 +1996,11 @@
         } else if(this.billType === '销售出库' || this.billType === '销售退货入库') {
           organType = '客户：'
         }
-        let head = '仓库名称,条码,名称,规格,型号,颜色,扩展信息,库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注'
+        let head = '仓库名称,条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.unit,
+          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit,
             ds.snList, ds.batchNumber, ds.expirationDate, ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.taxRate, ds.taxMoney, ds.taxLastMoney, ds.weight, ds.remark)
           list.push(item)
         }
@@ -1964,11 +2019,11 @@
         } else if(this.billType === '其它出库') {
           organType = '客户：'
         }
-        let head = '仓库名称,条码,名称,规格,型号,颜色,扩展信息,库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,备注'
+        let head = '仓库名称,条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,单位,序列号,批号,有效期,多属性,数量,单价,金额,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.unit,
+          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit,
             ds.snList, ds.batchNumber, ds.expirationDate, ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.remark)
           list.push(item)
         }
@@ -1979,11 +2034,11 @@
       //调拨出库
       allocationOutExportExcel() {
         let list = []
-        let head = '仓库名称,条码,名称,规格,型号,颜色,扩展信息,库存,调入仓库,单位,多属性,数量,单价,金额,备注'
+        let head = '仓库名称,条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,调入仓库,单位,多属性,数量,单价,金额,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.anotherDepotName, ds.unit,
+          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.anotherDepotName, ds.unit,
             ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.remark)
           list.push(item)
         }
@@ -1993,11 +2048,11 @@
       //组装单|拆卸单
       assembleExportExcel() {
         let list = []
-        let head = ['商品类型,仓库名称,条码,名称,规格,型号,颜色,扩展信息,库存,单位,多属性,数量,单价,金额,备注']
+        let head = ['商品类型,仓库名称,条码,名称,规格,型号,颜色,' + this.otherFieldTitle + ',库存,单位,多属性,数量,单价,金额,备注']
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.mType, ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.stock, ds.unit,
+          item.push(ds.mType, ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit,
             ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.remark)
           list.push(item)
         }
@@ -2007,11 +2062,11 @@
       //盘点复盘
       stockCheckReplayExportExcel() {
         let list = []
-        let head = '仓库名称,条码,名称,规格,型号,扩展信息,库存,单位,多属性,数量,单价,金额,备注'
+        let head = '仓库名称,条码,名称,规格,型号,' + this.otherFieldTitle + ',库存,单位,多属性,数量,单价,金额,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.materialOther, ds.stock, ds.unit,
+          item.push(ds.depotName, ds.barCode, ds.name, ds.standard, ds.model, ds.otherField1, ds.otherField2, ds.otherField3, ds.stock, ds.unit,
             ds.sku, ds.operNumber, ds.unitPrice, ds.allPrice, ds.remark)
           list.push(item)
         }

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -634,7 +634,9 @@ export const BillModalMixin = {
         color: mInfo.color,
         brand: mInfo.brand,
         mfrs: mInfo.mfrs,
-        materialOther: mInfo.materialOther,
+        otherField1: mInfo.otherField1,
+        otherField2: mInfo.otherField2,
+        otherField3: mInfo.otherField3,
         unit: mInfo.commodityUnit,
         sku: mInfo.sku,
         operNumber: 1,
@@ -651,10 +653,9 @@ export const BillModalMixin = {
       this.changeFormTypes(this.materialTable.columns, 'color', 0)
       this.changeFormTypes(this.materialTable.columns, 'brand', 0)
       this.changeFormTypes(this.materialTable.columns, 'mfrs', 0)
-      this.changeFormTypes(this.materialTable.columns, 'materialOther', 0)
-      this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
-      this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
       this.changeFormTypes(this.materialTable.columns, 'otherField1', 0)
+      this.changeFormTypes(this.materialTable.columns, 'otherField2', 0)
+      this.changeFormTypes(this.materialTable.columns, 'otherField3', 0)
       this.changeFormTypes(this.materialTable.columns, 'sku', 0)
     },
     //使得sku、序列号、批号、到期日等为显示
@@ -671,9 +672,6 @@ export const BillModalMixin = {
       if(info.mfrs) {
         this.changeFormTypes(this.materialTable.columns, 'mfrs', 1)
       }
-      if(info.materialOther) {
-        this.changeFormTypes(this.materialTable.columns, 'materialOther', 1)
-      }
       if(info.otherField1) {
         this.changeFormTypes(this.materialTable.columns, 'otherField1', 1)
       }
@@ -1087,6 +1085,26 @@ export const BillModalMixin = {
           }
         }
       }
+    },
+    //动态替换扩展字段
+    handleChangeOtherField() {
+      let mpStr = getMpListShort(Vue.ls.get('materialPropertyList'))
+      if(mpStr) {
+        let mpArr = mpStr.split(',')
+        if(mpArr.length ===3) {
+          for (let i = 0; i < this.materialTable.columns.length; i++) {
+            if(this.materialTable.columns[i].key === 'otherField1') {
+              this.materialTable.columns[i].title = mpArr[0]
+            }
+            if(this.materialTable.columns[i].key === 'otherField2') {
+              this.materialTable.columns[i].title = mpArr[1]
+            }
+            if(this.materialTable.columns[i].key === 'otherField3') {
+              this.materialTable.columns[i].title = mpArr[2]
+            }
+          }
+        }
+      }
     }
   }
 }

jshERP-web/src/views/bill/modules/AllocationOutModal.vue

@@ -155,7 +155,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '调入仓库', key: 'anotherDepotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
@@ -228,6 +230,7 @@
         this.initDepot()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/AssembleModal.vue

@@ -156,7 +156,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
@@ -226,6 +228,7 @@
         this.initDepot()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/DisassembleModal.vue

@@ -156,7 +156,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
@@ -225,6 +227,7 @@
         this.initDepot()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -193,7 +193,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },
@@ -280,6 +282,7 @@
         this.initDepot()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -193,7 +193,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
@@ -280,6 +282,7 @@
         this.initDepot()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue

@@ -168,7 +168,9 @@
             { title: '颜色', key: 'color', width: '6%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '6%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '10%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true,
@@ -245,6 +247,7 @@
         this.initSystemConfig()
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       /** 整理成formData */
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -247,7 +247,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
@@ -353,6 +355,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -401,6 +401,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -261,7 +261,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal },
@@ -357,6 +359,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       /** 整理成formData */
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/RetailBackModal.vue

@@ -236,7 +236,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },
@@ -334,6 +336,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/RetailOutModal.vue

@@ -246,7 +246,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
@@ -342,6 +344,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -252,7 +252,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },
@@ -360,6 +362,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -246,7 +246,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
@@ -333,6 +335,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -293,7 +293,9 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
             { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '扩展1', key: 'otherField1', width: '4%', type: FormTypes.normal },
+            { title: '扩展2', key: 'otherField2', width: '4%', type: FormTypes.normal },
+            { title: '扩展3', key: 'otherField3', width: '4%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
@@ -417,6 +419,7 @@
         this.initAccount(0)
         this.initPlatform()
         this.initQuickBtn()
+        this.handleChangeOtherField()
       },
       //提交单据时整理成formData
       classifyIntoFormData(allValues) {

jshERP-web/src/views/material/MaterialList.vue

@@ -60,17 +60,17 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item :label="queryTitle.mp1" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入扩展1查询" v-model="queryParam.otherField1"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp1 +'查询'" v-model="queryParam.otherField1"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item :label="queryTitle.mp2" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入扩展2查询" v-model="queryParam.otherField2"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp2 +'查询'" v-model="queryParam.otherField2"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item :label="queryTitle.mp3" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入扩展3查询" v-model="queryParam.otherField3"></a-input>
+                    <a-input :placeholder="'请输入'+ queryTitle.mp3 +'查询'" v-model="queryParam.otherField3"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">