lilei 1 week ago
parent
commit
486555c90e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1754018781933
+  "version": 1757897792460
 }
 }

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -223,7 +223,7 @@ export default {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           const dataInfo = res.data
           const dataInfo = res.data
-          if (dataInfo.totalOrigAmount && dataInfo.totalAmount) {
+          if (dataInfo.totalOrigAmount && (dataInfo.totalAmount || dataInfo.totalAmount == 0)) {
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
           } else {
           } else {
             dataInfo.discountAmount = null
             dataInfo.discountAmount = null

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -225,7 +225,7 @@ export default {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           const dataInfo = res.data
           const dataInfo = res.data
-          if (dataInfo.totalOrigAmount && dataInfo.totalAmount) {
+          if (dataInfo.totalOrigAmount && (dataInfo.totalAmount || dataInfo.totalAmount == 0)) {
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
           } else {
           } else {
             dataInfo.discountAmount = null
             dataInfo.discountAmount = null

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        // target: 'http://192.168.2.10/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.10/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,