caojunjie 2 years ago
parent
commit
2473ae77bb

+ 3 - 3
src/views/Warehousing/components/incomeMoney.vue

@@ -99,7 +99,7 @@
           <span v-else-if="item.label == 'fQty'">
             <el-input
               oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
-              v-model="scope.row.fQty" placeholder="数量" :disabled="browseStatus || scope.row.fBillstatus == 6"
+              v-model="scope.row.fQty" placeholder="数1量" :disabled="browseStatus || scope.row.fBillstatus == 6"
               @change="changeContractAmt(scope.row)" show-word-limit />
           </span>
           <span v-else-if="item.label == 'fUnitprice'">
@@ -1303,9 +1303,9 @@ export default {
           if (e.fFeeUnitid == 1) {
             qty = this.fQty;
           } else if (e.fFeeUnitid == 2) {
-            qty = (this.fGrossweight / 1000).toFixed(2);
+            qty = (this.fGrossweight / 1000).toFixed(3);
           } else if (e.fFeeUnitid == 3) {
-            qty = (this.fNetweight / 1000).toFixed(2);
+            qty = (this.fNetweight / 1000).toFixed(3);
           } else if (e.fFeeUnitid == 7) {
             qty = this.fCntqty;
           }

+ 2 - 2
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -7974,9 +7974,9 @@ export default {
           if (e.fFeeUnitid == 1) {
             qty = this.fQty
           } else if (e.fFeeUnitid == 2) {
-            qty = (this.fGrossweight / 1000).toFixed(2)
+            qty = (this.fGrossweight / 1000).toFixed(3)
           } else if (e.fFeeUnitid == 3) {
-            qty = (this.fNetweight / 1000).toFixed(2)
+            qty = (this.fNetweight / 1000).toFixed(3)
           } else if (e.fFeeUnitid == 7) {
             qty = this.fCntqty
           }

+ 13 - 4
src/views/reportManagement/generalLedgerCr/index.vue

@@ -681,12 +681,21 @@ export default {
     },
     goDetail(row) {
       let date = [row.reviewDate, row.reviewDate]
+      let dataList = {}
+      if (this.queryParams.switchSection == 1){
+        dataList = {
+          fCorpId: row.fCorpid,
+          fBstimeExamine:date
+        }
+      }else {
+        dataList = {
+          fCorpId: row.fCorpid,
+          fAuditList:date
+        }
+      }
       this.$router.push({
         path: "/analysis/CrDetail",
-        query: {
-          fCorpId: row.fCorpid,
-          fAuditList: date
-        },
+        query: dataList
       });
     },
   },

+ 14 - 4
src/views/reportManagement/generalLedgerDr/index.vue

@@ -684,12 +684,22 @@ export default {
     },
     goDetail(row) {
       let date=[row.reviewDate,row.reviewDate]
-      this.$router.push({
-        path: "/analysis/DrDetail",
-        query: {
+
+      let dataList = {}
+      if (this.queryParams.switchSection == 1){
+        dataList = {
+          fCorpId: row.fCorpid,
+          fBstimeExamine:date
+        }
+      }else {
+        dataList = {
           fCorpId: row.fCorpid,
           fAuditList:date
-        },
+        }
+      }
+      this.$router.push({
+        path: "/analysis/DrDetail",
+        query: dataList,
       });
     },
   },

+ 3 - 3
vue.config.js

@@ -57,15 +57,15 @@ module.exports = {
         // target: `https://hwc.tubaosoft.com/prod-api/`,
         // target: `https://zjxd.dhscs.net/prod-api/`,
         // target: `http://ck.huodaonar.com/prod-api/`,
-        // target: `https://ck.hturing.com/prod-api/`,
-        target: `https://hltd.echepei.com/prod-api/`,
+        target: `https://ck.hturing.com/prod-api/`,
+        // target: `https://hltd.echepei.com/prod-api/`,
         // target: `https://jingang.re-king.cn//prod-api/`,
         // target: `https://wms.hadexpress.com/prod-api/`,
         // target: `https://jingrun.tubaosoft.com/prod-api/`,
         // target: `https://www.jingruntech.com/prod-api/`,
         // target: `https://ke.khzclogistics.com/prod-api/`,
         //道和
-        //  target: `http://192.168.60.147:8090/`,
+        // target: `http://192.168.60.147:8090/`,
         // 凯和正式
         // target: `https://op.khzclogistics.com/prod-api/`,
         // target: `https://hb.tubaosoft.com/prod-api/`,