Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/brtame/model/index.js

@@ -75,7 +75,9 @@ export default class Brtame {
           nam: '',
           opndat: '',
           redclsflg: '',
-          branchinr:''
+          branchinr:'',
+          shppars18:'',
+          shppar:''
 
         },
         cbs: {

src/business/brtcan/event/index.js

@@ -22,7 +22,14 @@ export default {
     ...doctre,
     async init () {
       const params = {
-        spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
+        spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
+        trnmod:{
+          trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
+        }
+      }
+      if ( typeof(this.$route.query.inr) == 'string' ){
+        params.spt = null
+        params.trnmod.trn =null
       }
       const res = await Api.post('/service/brtcan/init', {
         ...params,
@@ -32,7 +39,8 @@ export default {
           rec:{
             inr:this.$route.query.inr
           }
-        }
+        },
+        
       });
       if (!res.data) {
         return

src/business/brtlat/event/index.js

@@ -25,6 +25,9 @@ export default {
         const params = {
           spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
         }
+        if ( typeof(this.$route.query.inr) == 'string' ) {
+          params.spt = null
+        }
       const res = await Api.post('/service/brtlat/init', {
         ...params,
         transName: this.trnName,

src/business/brtsnd/event/index.js

@@ -24,8 +24,8 @@ export default {
       const params = {
         spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
       }
-      if( this.$route.query.inr !='') {
-         localStorage.setItem('row_brtsnd',null)
+      if( typeof(this.$route.query.inr) == 'string') {
+        params.spt = null
       }
       const res = await Api.post('/service/brtsnd/init', {
         ...params,

src/business/litame/views/Ovwp1.vue

@@ -133,8 +133,8 @@
         </el-form-item>
        </c-col>
         <c-col :span="12">
-        <el-form-item label="分批装运" prop="lidgrp.rec.shppar">
-            <c-select v-model="model.lidgrp.rec.shppar" style="width:100%" placeholder="请选择"
+        <el-form-item label="分批装运" prop="lidgrp.rec.shppars18">
+            <c-select v-model="model.lidgrp.rec.shppars18" style="width:100%" placeholder="请选择"
             :code="codes.shptrss18"
             >
               </c-select>

src/business/litopn/event/index.js

@@ -22,6 +22,9 @@ export default {
     async init() {
       const params = {
         // spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
+        trnmod:{
+                  trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
+                }
       }
       const loading = this.loading();
       const res = await Api.post('/service/litopn/init', {
@@ -123,8 +126,8 @@ export default {
     async onLitpButgetref() {
       let params = {
         ptainr: this.model.lidgrp.apl.pts.ptainr,
-        businessType: 'LG',
-        tbl: 'LG',
+        businessType: 'LC',
+        tbl: 'LC',
       };
       const loading = this.loading();
       let res = await Api.post('/service/litopn/getOwnRef', params);

src/business/litopn/model/index.js

@@ -99,6 +99,7 @@ export default class Litopn {
           spcrcb: '',
         },
         rec: {
+          inr:'',
           tenmaxday: '',
           expplc: '',
           nomton: '',

src/review/ReviewBrtcan.vue

+<template>
+    <ReviewWrapper>
+        <Brtcan></Brtcan>
+    </ReviewWrapper>
+</template>
+  
+<script>
+import Brtcan from '../business/brtcan/views';
+import { ReviewWrapper} from "~/components/gj-common.min.js";
+
+export default {
+    name: "ReviewBrtcan",
+    components: { ReviewWrapper, Brtcan },
+    created() {},
+    mounted() {},
+}
+</script>
\ No newline at end of file

src/routers/modules/review.js

@@ -3,5 +3,6 @@ const Business = [
   { path: 'litopn', component: () => import('~/review/ReviewLitopn.vue'), name: 'litopn', meta: { title: '复核-Litopn' } },
   { path: 'litdck', component: () => import('~/review/ReviewLitdck.vue'), name: 'litdck', meta: { title: '复核-Litdck' } },
   { path: 'litame', component: () => import('~/review/ReviewLitame.vue'), name: 'litame', meta: { title: '复核-Litame' } },
+  { path: 'brtcan', component: () => import('~/review/ReviewBrtcan.vue'), name: 'brtcan', meta: { title: '复核-Brtcan' } },
 ]
 export default Business