新需求

src/components/process/SF/ReturnGood.vue

@@ -4,8 +4,8 @@
       <template #btn>
         <div style="width:100%;display:flex">
           <div style="width:calc(100% - 105px)">
-            <el-form-item label="订单号" prop="code" class="margin-b-0">
-              <el-input disabled v-model="formData.data.code" placeholder="请选择"></el-input>
+            <el-form-item label="订单号" prop="purchaseCode" class="margin-b-0">
+              <el-input disabled v-model="formData.data.purchaseCode" placeholder="请选择"></el-input>
             </el-form-item>
           </div>
           <el-button type="primary" style="width:88px;margin-left:15px" @click="openMaterial = true" plain>选择订单</el-button>
@@ -118,7 +118,7 @@ const formConfig = computed(() => {
     {
       type: "slot",
       slotName: "btn",
-      // prop: "code",
+      // prop: "purchaseCode",
       label: "",
       itemWidth: 50,
       disabled: true,
@@ -176,7 +176,9 @@ const formConfig = computed(() => {
 });
 
 const rules = ref({
-  code: [{ required: true, message: "请选择采购订单", trigger: "blur" }],
+  purchaseCode: [
+    { required: true, message: "请选择采购订单", trigger: "blur" },
+  ],
   // quantity: [{ required: true, message: "请输入退货数量", trigger: "blur" }],
   remark: [{ required: true, message: "请输入退货原因", trigger: "blur" }],
   companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
@@ -218,7 +220,7 @@ const totalAmount = () => {
 const handleSelect = (row) => {
   formData.data = {
     companyId: proxy.useUserStore().user.companyId,
-    code: row.code,
+    purchaseCode: row.purchaseCode,
     supplierName: row.supplyName,
     purchaseAmount: row.amount,
     payAmount: row.sumPayMoney,
@@ -294,6 +296,7 @@ const handleSubmit = async () => {
 const getAllData = (businessId) => {
   if (businessId) {
     proxy.post("/purchaseBack/detail", { id: businessId }).then((res) => {
+      res.payAmount = res.payAmount || 0;
       formData.data = res;
       getAllFileData();
       totalAmount();

src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -269,7 +269,7 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "采购金额 (￥)",
+        label: "采购金额",
         prop: "amount",
         width: 110,
       },

src/views/EHSD/procurement/returnGood/index.vue

@@ -78,6 +78,7 @@
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import SelectPurchased from "@/views/EHSD/procurement/purchasedEHSD/selectPurchased.vue";
+import $bus from "@/bus/index.js";
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const submitLoading = ref(false);
@@ -377,6 +378,17 @@ const handleClickCode = (row) => {
     },
   });
 };
+
+onMounted(() => {
+  $bus.on("refreshTableData", () => {
+    getList();
+  });
+});
+
+onBeforeUnmount(() => {
+  // 取消订阅特定事件
+  $bus.off("refreshTableData");
+});
 </script>
   
 <style lang="scss" scoped>

src/views/EHSD/saleContract/priceSheetForeign/index.vue

@@ -387,7 +387,7 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "报价单号",
+        label: "对外报价单号",
         slot: "code",
         width: 180,
       },

src/views/MES/productionBoard/workshop/index.vue

@@ -4,7 +4,7 @@
       <div style="display: flex;overflow: auto;">
         <template v-for="(item,index) in processesData" :key="item.id">
           <div style="display:flex;align-items:center;width:calc(100% / 7);padding:3px 0" v-if="index<=6">
-            <el-progress type="circle" :percentage="(Number(item.finishQuantity) / Number(item.quantity))*100" width="60"
+            <el-progress type="circle" :percentage="item.percentage" width="60"
                          :status="(Number(item.finishQuantity) / Number(item.quantity))*100 == 100 ? 'success' : ''" />
             <div style="margin-left:20px">
               <div>
@@ -24,7 +24,7 @@
       <div style="display: flex;overflow: auto;margin-top:15px" v-if="processesData.length>6">
         <template v-for="(item,index) in processesData" :key="item.id">
           <div style="display:flex;align-items:center;width:calc(100% / 7);padding:3px 0" v-if="index>6">
-            <el-progress type="circle" :percentage="(Number(item.finishQuantity) / Number(item.quantity))*100" width="60"
+            <el-progress type="circle" :percentage="item.percentage" width="60"
                          :status="(Number(item.finishQuantity) / Number(item.quantity))*100 == 100 ? 'success' : ''" />
             <div style="margin-left:20px">
               <div>
@@ -323,7 +323,12 @@ const handlePageChange = (val) => {
 const processesData = ref([]);
 const getProcesses = () => {
   proxy.post("/productionTaskProgress/workshopReportStatistics").then((res) => {
-    processesData.value = res;
+    processesData.value = res.map((x) => ({
+      ...x,
+      percentage: parseFloat(
+        (Number(x.finishQuantity) / Number(x.quantity)) * 100
+      ).toFixed(2),
+    }));
   });
 };
 getProcesses();

src/views/purchaseManage/purchasePayment/payment/index.vue

@@ -30,7 +30,7 @@ import { computed, ref } from "vue";
 import byTable from "@/components/byTable/index";
 import useUserStore from "@/store/modules/user";
 import PaymentPDF from "@/components/PDF/paymentPDF.vue";
-
+import $bus from "@/bus/index.js";
 const { proxy } = getCurrentInstance();
 const payStatus = ref([]);
 const fundsPaymentMethod = ref([]);
@@ -302,6 +302,17 @@ const printObj = ref({
     "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
   extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
 });
+
+onMounted(() => {
+  $bus.on("refreshTableData", () => {
+    getList();
+  });
+});
+
+onBeforeUnmount(() => {
+  // 取消订阅特定事件
+  $bus.off("refreshTableData");
+});
 </script>
 
 <style lang="scss" scoped>

src/views/salesMange/afterSales/index.vue

@@ -80,6 +80,7 @@
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import SelectContractProduct from "@/views/salesMange/afterSales/SelectContractProduct.vue";
+import $bus from "@/bus/index.js";
 
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
@@ -480,6 +481,17 @@ const getDtl = (row) => {
   // formData.data.size = `${row.productLength}*${row.productWidth}*${row.productHeight}`;
   // dialogVisible.value = true;
 };
+
+onMounted(() => {
+  $bus.on("refreshTableData", () => {
+    getList();
+  });
+});
+
+onBeforeUnmount(() => {
+  // 取消订阅特定事件
+  $bus.off("refreshTableData");
+});
 </script>
   
 <style lang="scss" scoped>