修改部分操作按钮显示条件/处理付款方式显示异常问题

zkqy-ui/src/views/orderMange/approve.vue

@@ -1128,6 +1128,7 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(salePayType, "payment_method"); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -1235,13 +1236,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="4">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${salePayType}</td>
+              <td colspan="8">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">

zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -648,6 +648,10 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(
+          salePayType,
+          this.dict.type.payment_method
+        ); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -754,13 +758,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="3">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="7">付款方式：${salePayType}</td>
+              <td colspan="7">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">

zkqy-ui/src/views/orderMange/index.vue

@@ -1350,8 +1350,8 @@ export default {
               btnName: "打印出库单",
               btnType: "printOutBound",
               btnIcon: "",
-              // btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
-              btnShowCondition: "[]",
+              btnShowCondition:
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1359,8 +1359,9 @@ export default {
               btnName: "出库发货",
               btnType: "deliver",
               btnIcon: "",
-              btnShowCondition: "[]",
-              // btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              // btnShowCondition: "[]",
+              btnShowCondition:
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -2805,6 +2806,7 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(salePayType, "payment_method"); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -2912,13 +2914,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="4">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${salePayType}</td>
+              <td colspan="8">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">