瀏覽代碼

维多利亚bug修改

cz 2 年之前
父節點
當前提交
a49c812f68

+ 16 - 11
src/views/WDLY/basic/product/index.vue

@@ -394,6 +394,9 @@ const config = computed(() => {
         label: "单位",
         prop: "unit",
       },
+      render(unit) {
+        return proxy.dictDataEcho(unit, productUnit.value);
+      },
     },
     {
       attrs: {
@@ -564,16 +567,10 @@ const formConfig = computed(() => {
       prop: "unit",
       label: "单位",
       required: true,
-      data: [
-        {
-          label: "个",
-          id: "个",
-        },
-        {
-          label: "双",
-          id: "双",
-        },
-      ],
+      data: productUnit.value.map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      })),
     },
     {
       type: "slot",
@@ -840,7 +837,7 @@ const getDtl = (row) => {
 };
 getTreeList();
 getDept();
-
+// getDict()
 getList();
 const handleBeforeUpload = async (file) => {
   const res = await proxy.post("/fileInfo/getSing", { fileName: file.name });
@@ -956,6 +953,14 @@ const submitMove = () => {
       moveDept.value = false;
     });
 };
+
+const productUnit = ref([]);
+const getDict = () => {
+  proxy.getDict(["unit"]).then((res) => {
+    productUnit.value = res["unit"];
+  });
+};
+getDict();
 </script>
   
 <style lang="scss" scoped>

+ 2 - 5
src/views/WDLY/outInBound/logistics/index.vue

@@ -478,6 +478,7 @@ const getDtl = (row) => {
   proxy.post("/logisticsInfos/detail", { id: row.id }).then((res) => {
     formConfig[0].disabled = true;
     formData.data = {
+      id: res.id,
       businessType: res.businessType + "",
       logisticsCompanyCode: res.logisticsCompanyCode,
       code: res.code,
@@ -520,13 +521,9 @@ const getLogisticsData = (row) => {
 };
 
 const handleClickCode = (row) => {
-  // ElMessage({
-  //   message: "数据请求中,请稍后!",
-  //   type: "success",
-  // });
   let id = row.id;
   proxy.post("/logisticsInfos/getLogistics", { id }).then((res) => {
-    console.log(res, "wss");
+    activities.value = res.data ? res.data : [];
     openRecord.value = true;
   });
 };

+ 1 - 2
src/views/purchaseSales/warehouseConfig/warehouse/index.vue

@@ -267,9 +267,8 @@ const getDtl = (row) => {
   modalType.value = "edit";
   proxy.post("/warehouse/detail", { id: row.id }).then((res) => {
     res.type = res.type + "";
-    formData.data = res;
-    console.log(formData);
     dialogVisible.value = true;
+    formData.data = res;
   });
 };
 const warehouseType = ref([]);