Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/components/contractCom/contractDetails.vue

@@ -53,7 +53,11 @@
         :action-list="[]"
       >
         <template #amount="{ item }">
-          <div>{{ item.currency }} {{ moneyFormat(item.amount, 2) }}</div>
+          <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
+            <span style="padding-right: 4px">{{ item.currency }}</span>
+            <span v-if="item.status === '20'">-</span>
+            <span>{{ moneyFormat(item.amount, 2) }}</span>
+          </div>
         </template>
         <template #accountManagementName="{ item }">
           <div>
@@ -89,6 +93,18 @@ const transactionType = ref([
     value: "1",
   },
   {
+    label: "请款",
+    value: "2",
+  },
+  {
+    label: "请款",
+    value: "3",
+  },
+  {
+    label: "请款",
+    value: "4",
+  },
+  {
     label: "采购付款",
     value: "20",
   },

src/components/process/SendPurchase.vue

@@ -553,7 +553,11 @@ const getAuxiliaryData = (supplyId, productIdList) => {
           {
             label: "合同编号",
             value: "",
-            fn: () => {},
+            style: {
+              color: "#0084FF",
+              cursor: isHave.value ? "pointer" : "revert",
+            },
+            fn: isHave.value ? handlePushRoute : () => {},
             num: 1,
           },
           {
@@ -634,7 +638,11 @@ const getAuxiliaryData = (supplyId, productIdList) => {
         {
           label: "合同编号",
           value: "",
-          fn: () => {},
+          style: {
+            color: "#0084FF",
+            cursor: isHaveOne.value ? "pointer" : "revert",
+          },
+          fn: isHaveOne.value ? handlePushRouteOne : () => {},
           num: 1,
         },
         {
@@ -859,6 +867,39 @@ onMounted(() => {
   }
 });
 
+// 判断当前用户有无采购合同页面权限
+const isHave = ref(false);
+if (
+  useUserStore().permissions &&
+  useUserStore().permissions.includes("alreadyPurchase")
+) {
+  isHave.value = true;
+}
+const handlePushRoute = (row) => {
+  proxy.$router.push({
+    name: "AlreadyPurchase",
+    query: {
+      code: row.value,
+    },
+  });
+};
+
+const isHaveOne = ref(false);
+if (
+  useUserStore().permissions &&
+  useUserStore().permissions.includes("contract")
+) {
+  isHaveOne.value = true;
+}
+const handlePushRouteOne = (row) => {
+  proxy.$router.push({
+    name: "Contract",
+    query: {
+      code: row.value,
+    },
+  });
+};
+
 const getFormData = () => {
   return proxy.deepClone(formData.data);
 };

src/views/process/processApproval/index.vue

@@ -630,7 +630,7 @@ const skipPage = () => {
   useTagsStore.delVisitedView(router.currentRoute.value);
   if (route.query.processType) {
     router.replace({
-      path: "/oa/1/dealWith",
+      path: "/oa/1/backlog",
     });
   } else {
     ElMessage({

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -65,7 +65,8 @@
           <el-table-column label="" width="120">
             <template #default="{ row }">
               <div>
-                {{ row.currency }} {{ moneyFormat(row.purchaseAmount, 2) }}
+                <!-- {{ row.currency }} {{ moneyFormat(row.purchaseAmount, 2) }} -->
+                CNY {{ moneyFormat(row.purchaseAmount, 2) }}
               </div>
             </template>
           </el-table-column>