Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Business/Botame/Ovwp1.vue

@@ -272,7 +272,7 @@
         <el-form-item label="发票类型" prop="bodgrp.rec.invtyp">
           <c-select v-model="model.bodgrp.rec.invtyp" style="width: 100%">
             <el-option
-              v-for="item in invtyp"
+              v-for="item in codes.invtyp"
               :key="item.value"
               :label="item.label"
               :value="item.value"

src/views/Business/Botset/Docpan1.vue

@@ -33,7 +33,7 @@
             <template slot="footer">
               <el-form-item label="" prop="lendoc.actflg">
                 <c-checkbox v-model="actflg" style="margin-left: 10px"
-                  >输入金额</c-checkbox
+                  >输入账号</c-checkbox
                 >
               </el-form-item>
             </template>

src/views/Business/Botset/Wg.vue

@@ -21,10 +21,10 @@
             </c-select>
           </el-form-item>
           <template slot="footer">
-            <el-form-item label="" prop="lendoc.actflg">
+            <el-form-item label="" prop="bopmod.basflg">
               <c-checkbox
               :disabled="model.bopmod.szflg=='3' || model.bopmod.szflg==''"
-                v-model="model.lendoc.actflg"
+                v-model="model.bopmod.basflg"
                 style="margin-left: 10px"
                 >基础数据</c-checkbox
               >

src/views/Business/Infbdd/BusNavbar.vue

@@ -79,7 +79,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infbdd/Infsea.vue

@@ -376,10 +376,10 @@ export default {
         this.$refs.childs.initdialog = true
         console.log("ownref:" +ownref);
       },
-        async  onChoose(code){
+        async  onChoose(code, prePageId){
             //跳转交易
           // this.$router.history.push("/business/" + code) 
-          this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
+          this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
           this.$refs.childs.initdialog = false                    
         } ,
         async  getDitSelInfo(code){

src/views/Business/Infbed/BusNavbar.vue

@@ -75,7 +75,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infbed/Infsea.vue

@@ -429,10 +429,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
       // this.$router.history.push("/business/" + code);
-      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infbfd/BusNavbar.vue

@@ -79,7 +79,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infbfd/Infsea.vue

@@ -382,10 +382,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
       // this.$router.history.push("/business/" + code);
-      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infbrd/BusNavbar.vue

@@ -79,7 +79,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infbrd/Infsea.vue

@@ -424,11 +424,11 @@ export default {
             this.$refs.childs.initdialog = true
             console.log("ownref:" +ownref);
   },
-    async  onChoose(code){
+    async  onChoose(code, prePageId){
         //跳转交易
       // this.$router.history.push("/business/" + code)
-      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
-      this.$refs.childs.initdialog = false
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
+      this.$refs.childs.initdialog = false;
     } ,
     async  getDitSelInfo(code){
         //跳转交易

src/views/Business/Infbtd/BusNavbar.vue

@@ -75,7 +75,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infbtd/Infsea.vue

@@ -398,9 +398,9 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getLetSelInfo(code) {

src/views/Business/Infccd/Infsea.vue

@@ -452,9 +452,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infcld/BusNavbar.vue

@@ -81,7 +81,7 @@
         let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
         if (rtnmsg.respCode == SUCCESS) {
           this.navcode = [];
-          this.$emit("onChoose", code.toLowerCase());
+          this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
         } else {
           this.$notify.error({ title: "错误", message: "服务请求失败！" });
         }

src/views/Business/Infcld/Infsea.vue

@@ -245,9 +245,10 @@ export default {
             this.opndat = opndat;
             console.log("ownref:" + ownref);
         },
-        async onChoose(code) {
+        async onChoose(code, prePageId) {
             //跳转交易
-            this.$router.history.push("/business/" + code)
+            // this.$router.history.push("/business/" + code)
+            this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
             this.$refs.childs.initdialog = false
         },
         closeTrn(refId) {

src/views/Business/Infdet/Infsea.vue

@@ -435,9 +435,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infdid/Infsea.vue

@@ -440,9 +440,10 @@ export default {
         this.$refs.childs.initdialog = true
         console.log("ownref:" +ownref);
       },
-        async  onChoose(code){
+        async  onChoose(code, prePageId){
             //跳转交易
-          this.$router.history.push("/business/" + code) 
+          // this.$router.history.push("/business/" + code) 
+          this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
           this.$refs.childs.initdialog = false                    
         } ,
         async  getDitSelInfo(code){

src/views/Business/Infgcd/Infsea.vue

@@ -430,9 +430,10 @@ export default {
       console.log("dialogFlag:" + this.dialogFlag);
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infgid/Infsea.vue

@@ -670,9 +670,10 @@ export default {
       console.log("dialogFlag:" + this.dialogFlag);
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infltd/BusNavbar.vue

@@ -75,7 +75,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Business/Infltd/Infsea.vue

@@ -402,10 +402,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
       // this.$router.history.push("/business/" + code);
-      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getLetSelInfo(code) {

src/views/Business/Letdrw/Detp.vue

@@ -208,6 +208,7 @@
               maxlength="65"
               show-word-limit
               placeholder="请输入装运期"
+              :disabled="model.ledgrp.rec.shpdat!=''"
             ></c-input>
           </el-form-item>
         </c-col>

src/views/Business/Letdrw/Ovwp1.vue

@@ -233,6 +233,7 @@
               v-model="model.ledgrp.rec.shpdat"
               style="width: 90%"
               placeholder="请选择装运日期"
+              :disabled="model.ledgrp.blk.shpper!=''"
             ></c-date-picker>
           </el-form-item>
         </c-col>