Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/views/purchase/inventory-list/InventoryList.vue

@@ -139,6 +139,33 @@ export default {
             return this.unitMap[text]
           }
         },
+        {
+          title: '成本默认计量单位编码',
+          checked: true,
+          width: '100px',
+          dataIndex: 'caComUnitCode',
+          customRender: (text) => {
+            return this.unitMap[text]
+          }
+        },
+        {
+          title: '计划方法',
+          checked: true,
+          width: '100px',
+          dataIndex: 'planMethod',
+          customRender: (text) => {
+            return this.planMap[text]
+          }
+        },
+        {
+          title: '供需政策',
+          checked: true,
+          width: '100px',
+          dataIndex: 'srpolicy',
+          customRender: (text) => {
+            return this.policyMap[text]
+          }
+        },
         {
           title: '备注',
           checked: true,
@@ -205,6 +232,8 @@ export default {
     // 下拉框map
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.ADD_SPARE_STATUS)
     this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_ADD_UNIT)
+    this.policyMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CSR_POLICY)
+    this.planMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PLAN_METHOD)
     // this.tableOption()
   },
   methods: {

src/views/purchase/purchase-order-page/PurchaseOrderPage.vue

@@ -192,6 +192,12 @@ export default {
           width: 100,
           dataIndex: 'remark'
         },
+        {
+          title: '错误消息',
+          checked: true,
+          width: 100,
+          dataIndex: 'errorMessage'
+        },
 
         {
           title: '状态',