浏览代码

采购订单-子表物料医药属性展示错误

002390 1 年之前
父节点
当前提交
5a8176deb2

+ 9 - 0
src/components/popover-select/components/MATERIAL_PARAM.js

@@ -29,6 +29,15 @@ export default [
     },
   },
   {
+    item: { key: "isMedicineYN", title: "医药物料", width: "auto" },
+    attr: {
+      type:'ComputedInput',
+      formatter: (prop) => {
+        return prop.isMedicine == "0" ? "Y" : "N";
+      },
+    },
+  },
+  {
     item: { key: "isDrug", title: "物料药品属性", width: "auto" },
     attr: {
       type:'ComputedInput',

+ 13 - 0
src/views/material/requisition/columns.js

@@ -116,6 +116,19 @@
         clearable: true,
       },
     },
+    // { 
+    //   item: { key: "createName", title: "创建人" ,width:150, }, 
+    //   attr: {
+    //     is: "el-popover-select-v2",
+    //     referName: "CONTACTS_PARAM",
+    //     valueKey: "name",
+    //     dataMapping: {
+    //       create: "code",
+    //     },
+    //     clearable: true,
+    //   } 
+    // },
+    
     // {
     //   item: { key: "createTimeString", title: "申请时间" },
     //   attr: {

+ 23 - 0
src/views/purchase/purchase-order/add/column copy.js

@@ -0,0 +1,23 @@
+
+// 集采中心
+const PurColumns =[];
+const PurchaseTabColumns =[];
+
+// 事业发展部
+const CauseColumns =[];
+const CauseTabColumns =[];
+// export const initTabColumns = () => tabColumns;
+
+export const Columns = [];
+export const TabColumns = [];
+
+const judgeColumns = () =>{
+
+  const { deptName, deptId, name, nickName, roles } = this.$store.state.user;
+
+  if(roles.length && roles.find(role => role === '')){
+
+  }
+
+
+}

+ 1 - 1
src/views/purchase/purchase-order/add/column.js

@@ -557,7 +557,7 @@ export const TabColumns = [
           materialManufacturersCode:'manufacturersMaterialCode',
           specification:'specification',
           model:'model',
-          isMedcine:'isMedicine',
+          isMedcine:'isMedicineYN',
           manufacturer:'manufacturerId',
           manufacturerName:'manufacturerIdName',
           unit:'unitId',