Merge branch 'master' into 测试

src/views/production/warehouse/outbound/index.vue

@@ -133,7 +133,7 @@ const searchConfigTwo = computed(() => {
     {
       type: "input",
       prop: "purchaseCode",
-      label: "采购",
+      label: "采购单号",
     },
     {
       type: "input",
@@ -262,14 +262,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "仓库类型",
         prop: "warehouseType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["warehouse_type"]);
@@ -279,14 +279,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "仓库名称",
         prop: "warehouseName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "出库类型",
         prop: "detailType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["come_stock_type"]);
@@ -296,7 +296,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 160,
+        width: 150,
       },
     },
     {
@@ -310,7 +310,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "数量",
         prop: "quantity",
-        width: 120,
+        width: 80,
+      },
+    },
+    {
+      attrs: {
+        label: "备注",
+        prop: "remark",
+        width: 180,
       },
     },
     {
@@ -325,7 +332,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "出库申请人",
         prop: "applicant",
-        width: 160,
+        width: 150,
         align: "center",
       },
     },

src/views/production/warehouse/putInStorage/index.vue

@@ -128,7 +128,7 @@ const searchConfigTwo = computed(() => {
     {
       type: "input",
       prop: "purchaseCode",
-      label: "采购",
+      label: "采购单号",
     },
     {
       type: "input",
@@ -257,14 +257,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 100,
       },
     },
     {
       attrs: {
         label: "仓库类型",
         prop: "warehouseType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["warehouse_type"]);
@@ -274,14 +274,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "仓库名称",
         prop: "warehouseName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "入库类型",
         prop: "detailType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["put_stock_type"]);
@@ -291,12 +291,12 @@ const configTwo = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 160,
+        width: 140,
       },
     },
     {
       attrs: {
-        label: "品品名",
+        label: "品名",
         prop: "bomSpecName",
         "min-width": 240,
       },
@@ -305,7 +305,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "数量",
         prop: "quantity",
-        width: 120,
+        width: 80,
+      },
+    },
+    {
+      attrs: {
+        label: "备注",
+        prop: "remark",
+        width: 180,
       },
     },
     {
@@ -320,7 +327,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "入库申请人",
         prop: "applicant",
-        width: 160,
+        width: 150,
         align: "center",
       },
     },

src/views/subsidiary/warehouse/outbound/index.vue

@@ -105,7 +105,7 @@ const searchConfigTwo = computed(() => {
     {
       type: "input",
       prop: "purchaseCode",
-      label: "采购",
+      label: "采购单号",
     },
     {
       type: "input",
@@ -210,7 +210,7 @@ const config = computed(() => {
 });
 const configTwo = computed(() => {
   return [
-    {
+  {
       attrs: {
         label: "出库单号",
         prop: "code",
@@ -228,14 +228,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "仓库类型",
         prop: "warehouseType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["warehouse_type"]);
@@ -245,14 +245,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "仓库名称",
         prop: "warehouseName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "出库类型",
         prop: "detailType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["come_stock_type"]);
@@ -262,7 +262,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 160,
+        width: 150,
       },
     },
     {
@@ -276,7 +276,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "数量",
         prop: "quantity",
-        width: 120,
+        width: 80,
+      },
+    },
+    {
+      attrs: {
+        label: "备注",
+        prop: "remark",
+        width: 180,
       },
     },
     {
@@ -291,7 +298,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "出库申请人",
         prop: "applicant",
-        width: 160,
+        width: 150,
         align: "center",
       },
     },

src/views/subsidiary/warehouse/putInStorage/index.vue

@@ -105,7 +105,7 @@ const searchConfigTwo = computed(() => {
     {
       type: "input",
       prop: "purchaseCode",
-      label: "采购",
+      label: "采购单号",
     },
     {
       type: "input",
@@ -210,7 +210,7 @@ const config = computed(() => {
 });
 const configTwo = computed(() => {
   return [
-    {
+  {
       attrs: {
         label: "入库单号",
         prop: "code",
@@ -228,14 +228,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 100,
       },
     },
     {
       attrs: {
         label: "仓库类型",
         prop: "warehouseType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["warehouse_type"]);
@@ -245,14 +245,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "仓库名称",
         prop: "warehouseName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "入库类型",
         prop: "detailType",
-        width: 140,
+        width: 100,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["put_stock_type"]);
@@ -262,12 +262,12 @@ const configTwo = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 160,
+        width: 140,
       },
     },
     {
       attrs: {
-        label: "品品名",
+        label: "品名",
         prop: "bomSpecName",
         "min-width": 240,
       },
@@ -276,7 +276,14 @@ const configTwo = computed(() => {
       attrs: {
         label: "数量",
         prop: "quantity",
-        width: 120,
+        width: 80,
+      },
+    },
+    {
+      attrs: {
+        label: "备注",
+        prop: "remark",
+        width: 180,
       },
     },
     {
@@ -291,7 +298,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "入库申请人",
         prop: "applicant",
-        width: 160,
+        width: 150,
         align: "center",
       },
     },