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

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

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

@@ -57,13 +57,13 @@
const editFormOptions = ref([
  // ç¬¬ä¸€è¡Œï¼šå…³é”®ä¿¡æ¯
  [
    {
      title: "物料编号",
      field: "materielCode",
      type: "string",
      span: 12,
      required: true,
    },
  //   {
  //     title: "物料编号",
  //     field: "materielCode",
  //     type: "string",
  //     span: 12,
  //     required: true,
  //   },
    {
      title: "物料名称",
      field: "materielName",
@@ -123,16 +123,26 @@
      type: "number",
      span: 8,
      required: true,
      validate: [
        {
          required: true,
          message: "箱规不能为空"
        },
        {
          validator: (value) => value > 0,
          message: "箱规必须大于0"
        }
      ]
    },
    {
      title: "物料状态",
      field: "materielState",
      type: "select",
      dataKey: "materielState",
      data: [],
      span: 8,
      required: true,
    }
    // {
    //   title: "物料状态",
    //   field: "materielState",
    //   type: "select",
    //   dataKey: "materielState",
    //   data: [],
    //   span: 8,
    //   required: true,
    // }
  ],
  // ç¬¬äº”行：库存信息
  [
@@ -225,27 +235,20 @@

    const searchFormOptions = ref([
      [
        { 
          title: "仓库编号", 
          field: "warehouseCode", 
          type: "string" 
        },
        // { 
        //   title: "仓库编号", 
        //   field: "warehouseCode", 
        //   type: "string" 
        // },
        { 
          title: "物料编号", 
          field: "materielCode", 
          type: "like" 
        },
      ],
      [
        { 
          { 
          title: "物料名称", 
          field: "materielName", 
          type: "like" 
        },
        {
          title: "品名/通用名",
          field: "item",
          type: "like",
        },
        {
          title: "药剂",
@@ -268,22 +271,22 @@
          dataKey: "materielType",
          data: [],
        },
      ],
      [
        {
         {
          title: "物料属性分类",
          field: "materielSourceType",
          type: "select",
          dataKey: "materialCode",
          data: [],
        },
        {
          title: "物料状态",
          field: "materielState",
          type: "select",
          dataKey: "materielState",
          data: [],
        },
      ],
      [
        // {
        //   title: "物料状态",
        //   field: "materielState",
        //   type: "select",
        //   dataKey: "materielState",
        //   data: [],
        // },
      ],
      // [
      //   {
@@ -424,15 +427,15 @@
        width: 100,
        align: "left",
      },
      {
        field: "materielState",
        title: "物料状态",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "materielState", data: [] },
        require: true,
      },
      // {
      //   field: "materielState",
      //   title: "物料状态",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      //   bind: { key: "materielState", data: [] },
      //   require: true,
      // },
      {
        field: "goodStatusState",
        title: "下发状态",
@@ -449,13 +452,13 @@
        width: 150,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      // {
      //   field: "creater",
      //   title: "创建人",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "createDate",
        title: "创建时间",
@@ -463,13 +466,13 @@
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      // {
      //   field: "modifier",
      //   title: "修改人",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
      {
        field: "modifyDate",
        title: "修改时间",