فهرست منبع

异常管理bug

cz 1 سال پیش
والد
کامیت
fdd6f44f23
2فایلهای تغییر یافته به همراه31 افزوده شده و 3 حذف شده
  1. 12 1
      src/views/WDLY/outInBound/abnormal/index.vue
  2. 19 2
      src/views/WDLY/purchaseManage/arrival/index.vue

+ 12 - 1
src/views/WDLY/outInBound/abnormal/index.vue

@@ -136,6 +136,10 @@ const typeData = [
     label: "到货异常",
     value: "40",
   },
+  {
+    label: "待入库手动结束",
+    value: "50",
+  },
 ];
 const statusData = [
   {
@@ -170,7 +174,7 @@ const config = computed(() => {
       attrs: {
         label: "异常来源",
         prop: "type",
-        width: 100,
+        width: 140,
       },
       render(status) {
         const current = typeData.find((x) => x.value == status);
@@ -203,6 +207,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "创建人",
+        prop: "createUserName",
+        width: 120,
+      },
+    },
+    {
+      attrs: {
         label: "创建时间",
         prop: "createTime",
         width: 160,

+ 19 - 2
src/views/WDLY/purchaseManage/arrival/index.vue

@@ -60,10 +60,16 @@
                       : ''
                 "
               />
-              <el-table-column prop="productCode" label="物品编码" />
+              <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productSpec" label="规格型号" />
-              <el-table-column prop="productUnit" label="单位" />
+              <el-table-column
+                prop="productUnit"
+                label="单位"
+                :formatter="
+                  (row) => dictValueLabel(row.productUnit, productUnit)
+                "
+              />
               <el-table-column prop="quantity" label="到货数量" />
               <el-table-column prop="qualityQuantity" label="已质检" />
               <el-table-column
@@ -383,6 +389,17 @@ const getDtl = (row) => {
 };
 
 getList();
+const productUnit = ref([]);
+const getDict = () => {
+  proxy.getDictOne(["unit"]).then((res) => {
+    productUnit.value = res["unit"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
+};
+getDict();
+
 const selectData = ref([]);
 const selectDataOne = ref([]);