Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/basic/materielInfo.vue

@@ -1,4 +1,3 @@

<template>
  <view-grid
    ref="grid"
@@ -9,12 +8,13 @@
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
    :extend="extend"   
  >
  </view-grid>
</template>
    <script>
import extend from "@/extension/basic/materielInfo.js";

<script>
import extend from "@/extension/basic/Dt_MaterielInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
@@ -22,64 +22,283 @@
      key: "id",
      footer: "Foots",
      cnName: "物料信息",
      name: "materielInfo",
      name: "MaterielInfo",
      url: "/MaterielInfo/",
      sortName: "id",
    });

    const editFormFields = ref({
      warehouseId: "",
      warehouseCode: "",
      materielCode: "",
      materielErpType: "",
      materielName: "",
      materielDes: "",
      isMixBatch: "",
      isMixMateriel: "",
      item: "",
      materielSpec: "",
      materielType: "",
      materielSourceType: "",
      factory: "",
      materielUnit: "",
      materielLength: "",
      materielWide: "",
      materielHeight: "",
      materielVolume: "",
      materielWeight: "",
      materielStoragecondition: "",
      boxQty: "",
      minQty: "",
      business_qty: "",
      maxQty: "",
      materielModel: "",
      materielState: "",
      goodStatusState: "",
      remark: "",
    });
    const editFormOptions = ref([
      [

const editFormOptions = ref([
  // ç¬¬ä¸€è¡Œï¼šå…³é”®ä¿¡æ¯
  [
  //   {
  //     title: "物料编号",
  //     field: "materielCode",
  //     type: "string",
  //     span: 12,
  //     required: true,
  //   },
    {
      title: "物料名称",
      field: "materielName",
      type: "string",
      span: 12,
      required: true,
    }
  ],
  // ç¬¬äºŒè¡Œï¼šåˆ†ç±»ä¿¡æ¯
  [
    {
      title: "物料基本分类",
      field: "materielType",
      type: "select",
      dataKey: "materielType",
      data: [],
      span: 12,
      required: true,
    },
    {
      title: "物料属性分类",
      field: "materielSourceType",
      type: "select",
      dataKey: "materialCode",
      data: [],
      span: 12,
      required: true,
    }
  ],
  // ç¬¬ä¸‰è¡Œï¼šä¸Šæ¸¸ä¿¡æ¯
  [
    {
      title: "上游物料类型",
      field: "materielErpType",
      type: "string",
      span: 12,
    },
    {
      title: "生产厂家",
      field: "factory",
      type: "string",
      span: 12,
    }
  ],
  // ç¬¬å››è¡Œï¼šå•ä½ä¿¡æ¯
  [
    {
      title: "基本单位",
      field: "materielUnit",
      type: "string",
      span: 8,
      required: true,
    },
    {
      title: "箱规",
      field: "boxQty",
      type: "number",
      span: 8,
      required: true,
      validate: [
        {
          title: "仓库",
          required: true,
          field: "warehouseId",
          type: "string",
          message: "箱规不能为空"
        },
        {
          title: "物料编号",
          required: true,
          field: "materielCode",
          type: "string",
        },
        {
          title: "物料名称",
          required: true,
          field: "materielName",
          type: "string",
        },
        {
          title: "计量单位",
          required: true,
          field: "unit",
          type: "string",
        },
      ],
      [
        
        {
          title: "物料描述",
          field: "materielDes",
          type: "textarea",
        },
      ],
    ]);
          validator: (value) => value > 0,
          message: "箱规必须大于0"
        }
      ]
    },
    // {
    //   title: "物料状态",
    //   field: "materielState",
    //   type: "select",
    //   dataKey: "materielState",
    //   data: [],
    //   span: 8,
    //   required: true,
    // }
  ],
  // ç¬¬äº”行：库存信息
  [
    {
      title: "立库最低库存数",
      field: "minQty",
      type: "number",
      span: 12,
      required: true,
    },
    {
      title: "立库最高库存数",
      field: "maxQty",
      type: "number",
      align: "right",
      span: 12,
    }
  ],
  // ç¬¬å…­è¡Œï¼šå°ºå¯¸ä¿¡æ¯
  [
    {
      title: "长度(mm)",
      field: "materielLength",
      type: "number",
      span: 8,
    },
    {
      title: "宽度(mm)",
      field: "materielWide",
      type: "number",
      span: 8,
    },
    {
      title: "高度(mm)",
      field: "materielHeight",
      type: "number",
      span: 8,
    }
  ],
  // ç¬¬ä¸ƒè¡Œï¼šç‰©ç†å±žæ€§
  [
    {
      title: "体积(mm³)",
      field: "materielVolume",
      type: "number",
      span: 12,
    },
    {
      title: "重量(g)",
      field: "materielWeight",
      type: "number",
      span: 12,
    }
  ],
  // ç¬¬å…«è¡Œï¼šå­˜å‚¨æ¡ä»¶ï¼ˆå•ç‹¬ä¸€è¡Œï¼‰
  [
    {
      title: "存储条件",
      field: "materielStoragecondition",
      type: "textarea",
      span: 24,
      rows: 2,
      placeholder: "请输入存储条件"
    }
  ],
  // ç¬¬ä¹è¡Œï¼šå¤‡æ³¨ï¼ˆå•ç‹¬ä¸€è¡Œï¼‰
  [
    {
      title: "备注",
      field: "remark",
      type: "textarea",
      span: 24,
      rows: 2,
      placeholder: "请输入备注信息"
    }
  ],
]);
    const searchFormFields = ref({
      warehouseCode: "",
      materielCode: "",
      materielName: "",
      item: "",
      materielSpec: "",
      materielType: "",
      materielSourceType: "",
      materielState: "",
      goodStatusState: "",
      Dosage_form:''
    });

    const searchFormOptions = ref([
      [
        { title: "物料编号", field: "materielCode", type: "like" },
        { title: "物料名称", field: "materielName", type: "like" },
        // { 
        //   title: "仓库编号", 
        //   field: "warehouseCode", 
        //   type: "string" 
        // },
        { 
          title: "物料编号", 
          field: "materielCode", 
          type: "like" 
        },
          { 
          title: "物料名称", 
          field: "materielName", 
          type: "like" 
        },
        {
          title: "药剂",
          field: "Dosage_form",
          type: "string",
          width: 200,
          required: true,
        },
      ],
      [
        {
          title: "物料规格",
          field: "materielSpec",
          type: "like",
        },
        {
          title: "物料基本分类",
          field: "materielType",
          type: "select",
          dataKey: "materielType",
          data: [],
        },
         {
          title: "物料属性分类",
          field: "materielSourceType",
          type: "select",
          dataKey: "materialCode",
          data: [],
        },
      ],
      [
        // {
        //   title: "物料状态",
        //   field: "materielState",
        //   type: "select",
        //   dataKey: "materielState",
        //   data: [],
        // },
      ],
      // [
      //   {
      //     title: "下发状态",
      //     field: "goodStatusState",
      //     type: "select",
      //     dataKey: "goodStatusState",
      //     data: [],
      //   },
      // ],
    ]);

    const columns = ref([
      {
        field: "id",
@@ -92,12 +311,11 @@
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        field: "warehouseCode",
        title: "仓库编号",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "warehouses", data: [] },
      },
      {
        field: "materielCode",
@@ -105,74 +323,142 @@
        type: "string",
        width: 150,
        align: "left",
        link: true,
        require: true,
      },
      {
        field: "materielName",
        title: "物料名称",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "materielDes",
        title: "物料描述",
        type: "decimal",
        width: 90,
        align: "left",
      },
      {
        field: "cotainerType",
        title: "容器类型",
        type: "string",
        width: 90,
        align: "left",
        hidden:true
      },
      {
        field: "packspes",
        title: "包装规格",
        type: "int",
        width: 120,
        align: "left",
        hidden:true
      },
      {
        field: "attribute",
        title: "物料属性",
        type: "string",
        width: 200,
        align: "left",
        hidden:true
        require: true,
      },
      {
        field: "unit",
        title: "计量单位",
        field: "item",
        title: "品名/通用名",
        type: "string",
        width: 180,
        align: "left",
      },
      {
        field: "validity",
        title: "有效期",
        field: "materielSpec",
        title: "物料规格",
        type: "string",
        width: 120,
        width: 200,
        align: "left",
        require: true,
      },
      {
          title: "药剂类型",
          field: "dosage_form",
          type: "string",
          width: 200,
          required: true,
        },
      {
        field: "materielModel",
        title: "物料型号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "safetyStock",
        title: "安全库存",
        field: "materielType",
        title: "物料基本分类",
        type: "string",
        width: 120,
        align: "left",
        hidden:true
        bind: { key: "materielType", data: [] },
        require: true,
      },
      {
        field: "creater",
        title: "创建人",
        field: "materielSourceType",
        title: "物料属性分类",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "materialCode", data: [] },
        require: true,
      },
      {
        field: "factory",
        title: "生产厂家",
        type: "string",
        width: 200,
        align: "left",
      },
      {
        field: "materielUnit",
        title: "基本单位",
        type: "string",
        width: 100,
        align: "left",
        require: true,
      },
      {
        field: "boxQty",
        title: "箱规",
        type: "number",
        width: 80,
        align: "left",
        require: true,
      },
      {
        field: "minQty",
        title: "最低库存数",
        type: "number",
        width: 100,
        align: "left",
        require: true,
      },
      {
        field: "business_qty",
        title: "业务库存数",
        type: "number",
        width: 100,
        align: "left",
        // require: true,
      },
      {
        field: "maxQty",
        title: "最高库存数",
        type: "number",
        width: 100,
        align: "left",
      },
      // {
      //   field: "materielState",
      //   title: "物料状态",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      //   bind: { key: "materielState", data: [] },
      //   require: true,
      // },
      {
        field: "goodStatusState",
        title: "下发状态",
        type: "string",
        width: 120,
        align: "left",
        bind: { key: "goodStatusState", data: [] },
        // require: true,
      },
      {
        field: "materielErpType",
        title: "上游物料类型",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
      //   field: "creater",
      //   title: "创建人",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "createDate",
        title: "创建时间",
@@ -180,36 +466,30 @@
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
        hidden:true
      },
      // {
      //   field: "modifier",
      //   title: "修改人",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
        hidden:true
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
    ]);

    const detail = ref({
      cnName: "#detailCnName",
      table: "",
      table: "#detailTable",
      columns: [],
      sortName: "",
      key: ""
    });

    return {
      table,
      extend,
@@ -222,5 +502,4 @@
    };
  },
});
</script>
    
</script>