售后管理

src/views/JXSK/production/workOrder/index.vue

@@ -293,7 +293,7 @@ const workOrderSource = ref([]);
 const selectConfig = computed(() => [
   {
     label: "工单来源",
-    prop: "type",
+    prop: "source",
     data: workOrderSource.value,
   },
 ]);
@@ -333,13 +333,18 @@ const config = computed(() => {
     {
       attrs: {
         label: "已计划数量",
-        prop: "remark",
+        prop: "arrangedQuantity",
       },
     },
     {
       attrs: {
         label: "完成率",
-        prop: "aa",
+        prop: "completionRate",
+      },
+      render(completionRate) {
+        if (completionRate !== undefined && completionRate !== "") {
+          return completionRate + "%";
+        }
       },
     },
     {
@@ -414,14 +419,15 @@ const formConfigOne = reactive([
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/workOrder/page", sourceList.value.pagination).then((message) => {
-    console.log(message);
-    sourceList.value.data = message.rows;
-    sourceList.value.pagination.total = message.total;
-    setTimeout(() => {
-      loading.value = false;
-    }, 200);
-  });
+  proxy
+    .post("/workOrder/pageByJxst", sourceList.value.pagination)
+    .then((message) => {
+      sourceList.value.data = message.rows;
+      sourceList.value.pagination.total = message.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
 };
 const openModal = () => {
   dialogVisible.value = true;

src/views/JXSK/warehouseConfig/warehouse/index.vue

@@ -427,10 +427,15 @@ const getDtl = (row) => {
 };
 const getDtlOne = (row) => {
   modalType.value = "edit";
+  proxy
+    .post("/warehouseLocationInfo/list", { warehouseId: row.id })
+    .then((res) => {
+      console.log(res, "ada");
+    });
   formData.dataOne = {
     name: row.name,
     keeperId: row.keeperId,
-    list:[]
+    list: [],
   };
   dialogVisibleOne.value = true;
 };

src/views/WDLY/salesMange/afterSale/index.vue

@@ -197,6 +197,7 @@
       title="跟进记录"
       width="500"
       append-to-body
+      destroy-on-close
     >
       <div style="padding-left: 40px; margin-bottom: 20px">
         <el-button size="mini" @click="openModal('edit')">
@@ -214,7 +215,9 @@
             <div>
               跟进人：{{ activity.handleUserName }}
               <span
-                >（{{ dictDataEcho(activity.status, afterSalesStatus) }}）</span
+                >（{{
+                  dictValueLabel(activity.status, afterSalesStatus)
+                }}）</span
               >
             </div>
             <div style="margin-top: 5px">跟进记录： {{ activity.remark }}</div>
@@ -300,16 +303,18 @@ let rules = ref({
   ],
 });
 const { proxy } = getCurrentInstance();
-const selectConfig = reactive([
+const afterSalesType = ref([]);
+const afterSalesStatus = ref([]);
+const selectConfig = computed(() => [
   {
     label: "售后类型",
     prop: "type",
-    data: [],
+    data: afterSalesType.value,
   },
   {
     label: "售后状态",
     prop: "status",
-    data: [],
+    data: afterSalesStatus.value,
   },
 ]);
 const config = computed(() => {
@@ -320,7 +325,7 @@ const config = computed(() => {
         prop: "type",
       },
       render(type) {
-        return proxy.dictDataEcho(type, afterSalesType.value);
+        return proxy.dictValueLabel(type, afterSalesType.value);
       },
     },
     {
@@ -353,8 +358,8 @@ const config = computed(() => {
         label: "售后状态",
         prop: "status",
       },
-      render(type) {
-        return proxy.dictDataEcho(type, afterSalesStatus.value);
+      render(status) {
+        return proxy.dictValueLabel(status, afterSalesStatus.value);
       },
     },
 
@@ -475,6 +480,7 @@ const configData = [
       label: "售后状态",
       required: true,
       itemWidth: 51,
+      data: [],
     },
     {
       type: "select",
@@ -740,29 +746,19 @@ const handleRemove = (index) => {
     type: "success",
   });
 };
-const afterSalesType = ref([]);
-const afterSalesStatus = ref([]);
 
 const getDict = () => {
   proxy.getDict(["after_sale_type", "after_sale_status"]).then((res) => {
-    afterSalesType.value = res["after_sale_type"];
-    configData[0][0].data = afterSalesType.value.map((x) => ({
-      label: x.dictValue,
-      value: x.dictKey,
-    }));
-    selectConfig[0].data = afterSalesType.value.map((x) => ({
-      label: x.dictValue,
-      value: x.dictKey,
-    }));
-    afterSalesStatus.value = res["after_sale_status"];
-    configData[1][0].data = afterSalesStatus.value.map((x) => ({
+    afterSalesType.value = res["after_sale_type"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));
-    selectConfig[1].data = afterSalesStatus.value.map((x) => ({
+    configData[0][1].data = afterSalesType.value;
+    afterSalesStatus.value = res["after_sale_status"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));
+    configData[1][0].data = afterSalesStatus.value;
   });
 };
 getCityData("0");

src/views/WDLY/stockManage/query/index.vue

@@ -188,6 +188,9 @@ const configData = [
         label: "单位",
         prop: "productUnit",
       },
+      render(unit) {
+        return proxy.dictValueLabel(unit, productUnit.value);
+      },
     },
     {
       attrs: {
@@ -272,6 +275,9 @@ const configData = [
         label: "单位",
         prop: "productUnit",
       },
+      render(unit) {
+        return proxy.dictValueLabel(unit, productUnit.value);
+      },
     },
     {
       attrs: {
@@ -461,8 +467,14 @@ const handleChange = () => {
 };
 
 const warehouseList = ref([]);
-const warehouseListData = () => {
-  // // 币种数据
+const productUnit = ref([]);
+const getDict = () => {
+  proxy.getDictOne(["unit"]).then((res) => {
+    productUnit.value = res["unit"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
   proxy
     .post("/warehouse/page", {
       pageNum: 1,
@@ -477,7 +489,7 @@ const warehouseListData = () => {
       }));
     });
 };
-warehouseListData();
+getDict();
 </script>
   
 <style lang="scss" scoped>

src/views/purchaseSales/stockManage/inventory/index.vue

@@ -59,7 +59,13 @@
             <el-table :data="formData.data.list" :row-class-name="changeClass">
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" 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="checkQuantity"
@@ -369,6 +375,16 @@ const getDtl = (row) => {
   });
 };
 
+const productUnit = ref([]);
+const getDict = () => {
+  proxy.getDictOne(["unit"]).then((res) => {
+    productUnit.value = res["unit"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
+};
+getDict();
 getList();
 
 const handleSelect = (row) => {