Browse Source

完善车队配载功能

阿伏兔 4 years ago
parent
commit
e5524b8578

+ 4 - 4
src/views/index.vue

@@ -174,7 +174,7 @@
                   <span v-else-if="item.refno2 === 'FF'">付费</span>
                   <span v-else-if="item.refno2 === 'FF'">付费</span>
                   <span v-else-if="item.refno2 === 'JSCCF'">计算仓储费</span>
                   <span v-else-if="item.refno2 === 'JSCCF'">计算仓储费</span>
                 </div>
                 </div>
-                <div class="home_stock_table" @click="approval(item.refno2)">
+                <div class="home_stock_table" @click="approval(item)">
                   查看详情
                   查看详情
                 </div>
                 </div>
               </div>
               </div>
@@ -699,7 +699,7 @@ export default {
     },
     },
     //跳转审批页面
     //跳转审批页面
     approval(row) {
     approval(row) {
-      switch (row) {
+      switch (row.refno2) {
         case "SJRK": {
         case "SJRK": {
           this.$router.push({
           this.$router.push({
             path: "/business/inStock",
             path: "/business/inStock",
@@ -1331,8 +1331,8 @@ export default {
   align-self: center;
   align-self: center;
   p{
   p{
   display: inline-block;
   display: inline-block;
-  white-space: nowrap; 
-  width: 100%; 
+  white-space: nowrap;
+  width: 100%;
   overflow: hidden;
   overflow: hidden;
   text-overflow:ellipsis;
   text-overflow:ellipsis;
   }
   }

+ 14 - 0
src/views/track/cabinet/index.vue

@@ -764,6 +764,20 @@ export default {
           checked: 0,
           checked: 0,
           width: 100,
           width: 100,
         },
         },
+        {
+          surface: "37",
+          label: "mBillNo",
+          name: "主单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "38",
+          label: "billKind",
+          name: "单据类型",
+          checked: 0,
+          width: 100,
+        },
       ],
       ],
       allCheck: false,
       allCheck: false,
       title: "",
       title: "",

+ 1 - 1
src/views/warehouseBusiness/cargoClearance/index.vue

@@ -4039,7 +4039,7 @@ export default {
     },
     },
     Jump() {
     Jump() {
       this.approval = this.$route.query.data;
       this.approval = this.$route.query.data;
-      if (this.approval) {
+      if (this.approval && this.approval !== "{}") {
         let queryParams = { pageNum: 1, fDc: "C" };
         let queryParams = { pageNum: 1, fDc: "C" };
         listFees(queryParams).then((response) => {
         listFees(queryParams).then((response) => {
           this.fCNameOptions = response.rows;
           this.fCNameOptions = response.rows;

+ 2 - 2
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2682,7 +2682,7 @@ export default {
           index === 13 ||
           index === 13 ||
           index === 11 ||
           index === 11 ||
           index === 12 ||
           index === 12 ||
-          index === 14 || 
+          index === 14 ||
           index === 15
           index === 15
         ) {
         ) {
           const values = data.map((item) => Number(item[column.property]));
           const values = data.map((item) => Number(item[column.property]));
@@ -2740,7 +2740,7 @@ export default {
     },
     },
     Jump() {
     Jump() {
       this.approval = this.$route.query.data;
       this.approval = this.$route.query.data;
-      if (this.approval) {
+      if (this.approval && this.approval !== "{}") {
         this.getTreeselect();
         this.getTreeselect();
         this.reset();
         this.reset();
         this.colseButton = false;
         this.colseButton = false;

+ 1 - 1
src/views/warehouseBusiness/inStock/index.vue

@@ -4633,7 +4633,7 @@ export default {
     //首页审批跳转
     //首页审批跳转
     adoPt() {
     adoPt() {
       this.approval = this.$route.query.data;
       this.approval = this.$route.query.data;
-      if (this.approval) {
+      if (this.approval && this.approval !== "{}") {
         let queryParams = { pageNum: 1, fDc: "C" };
         let queryParams = { pageNum: 1, fDc: "C" };
         listFees(queryParams).then((response) => {
         listFees(queryParams).then((response) => {
           this.fCNameOptions = response.rows;
           this.fCNameOptions = response.rows;

+ 1 - 1
src/views/warehouseBusiness/outStock/index.vue

@@ -4586,7 +4586,7 @@ export default {
     //审批页面跳转
     //审批页面跳转
     adoPt() {
     adoPt() {
       this.approval = this.$route.query.data;
       this.approval = this.$route.query.data;
-      if (this.approval) {
+      if (this.approval && this.approval !== "{}") {
         let queryParams = { pageNum: 1, fDc: "C" };
         let queryParams = { pageNum: 1, fDc: "C" };
         listFees(queryParams).then((response) => {
         listFees(queryParams).then((response) => {
           this.fCNameOptions = response.rows;
           this.fCNameOptions = response.rows;

+ 1 - 1
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -4232,7 +4232,7 @@ export default {
     },
     },
     Jump() {
     Jump() {
       this.approval = this.$route.query.data;
       this.approval = this.$route.query.data;
-      if (this.approval) {
+      if (this.approval && this.approval !== "{}") {
         let queryParams = { pageNum: 1, fDc: "C" };
         let queryParams = { pageNum: 1, fDc: "C" };
         listFees(queryParams).then((response) => {
         listFees(queryParams).then((response) => {
           this.fCNameOptions = response.rows;
           this.fCNameOptions = response.rows;