Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

zhongrj

2022-07-29 b318a8bb90e3333bd93a6aadf3be7eaa4b7d38a6

Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

 src/views/stock/stockmanage.vue

@@ -637,7 +637,7 @@
            ],
          },
          {
            label: "入库时间",
            label: "出库时间",
            prop: "time1",
            type: "date",
            format: "yyyy-MM-dd",
@@ -646,7 +646,7 @@
            rules: [
              {
                required: true,
                message: "请输入入库时间",
                message: "请输入出库时间",
                trigger: "blur",
              },
            ],

 src/views/stock/stockout.vue

@@ -128,7 +128,7 @@
        dialogClickModal: false,
        column: [
          {
            label: "农资id",
            label: "农资库存id",
            span: 20,
            display: true,
            prop: "sid",