静态交易页面优化

src/views/Business/Botcan/index.vue

@@ -32,8 +32,8 @@
                     <m-setpan :model="model" :codes="codes" />
                   </el-collapse-item>
                   <el-collapse-item title="账务" name="glepan">
-                    <!-- 结算 -->
-                    <m-setpan :model="model" :codes="codes" />
+                    <!-- 会计分录 -->
+                    <m-glepan :model="model" :codes="codes" />
                   </el-collapse-item>
                 </el-collapse>
               </div>
@@ -133,6 +133,7 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
+      activeNames: ["engp"],
     };
   },
   methods: {

src/views/Business/Botset/Cnyp.vue

@@ -6,11 +6,11 @@
               <m-wg :model="model" :codes="codes" />
           </el-collapse-item>
 
-          <el-collapse-item title="涉外收入申请单-基础信息" name="basp3" v-if="model.bopmod.szflg=='1' && model.lendoc.actflg=='X'">
+          <el-collapse-item title="涉外收入申请单-基础信息" name="basp3" v-if="model.bopmod.szflg=='1' && model.bopmod.basflg=='X'">
               <m-basp3 :model="model" :codes="codes" />
           </el-collapse-item>
 
-          <el-collapse-item title="境内收入申请单-基础信息" name="basp2" v-if="model.bopmod.szflg=='2' && model.lendoc.actflg=='X'">
+          <el-collapse-item title="境内收入申请单-基础信息" name="basp2" v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'">
               <m-basp2 :model="model" :codes="codes" />
           </el-collapse-item>
 

src/views/Business/Botset/Setp.vue

@@ -432,11 +432,11 @@ export default {
       flag1: true,
       stmData: {
         columns: [
-          '1 1 "类型" 500',
-          '2 2 "Dbt" 500',
-          '3 3 "Cdt" 500',
-          '4 4 "币种" 500',
-          '5 5 "金额" 500 2 8 1 4',
+          '1 1 "类型" 250',
+          '2 2 "Dbt" 250',
+          '3 3 "Cdt" 250',
+          '4 4 "币种" 250',
+          '5 5 "金额" auto 2 8 1 4',
           // '6 6 "Mat.Dat." 500 4 7 1',
           {
             index: 6,

src/views/Business/Botset/index.vue

@@ -5,7 +5,7 @@
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
         <el-tab-pane label="业务信息" name="ovwp">
             <c-content>
-              <m-ovwp :model="model" :codes="codes" />
+              <m-ovwp ref="ovwp" :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
@@ -214,7 +214,7 @@ export default {
         "m-coninfp" : Coninfp,
         "m-docpan" : Docpan,
         "m-doctre" : Doctre,
-        "m-docpan" : Docpan,
+        // "m-docpan" : Docpan,
         "m-wg" : Wg,
         "m-cnyp" : Cnyp,
         "m-limitbody" : Limitbody,
@@ -267,7 +267,9 @@ export default {
       if (this.isInDisplay) {
         this.restoreDisplay();
       }
-      this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
+      // this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.toggleRowSelection(this.model.liaall.tenstm.rows[0], true);
+      this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
+      // this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
         }else{
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }

src/views/Statics/Dbicur/index.vue

@@ -7,9 +7,9 @@
         </c-content>
       </el-form>
       <div style="text-align: center">
-        <c-button type="primary" style="margin-right: 10px" @click="commitAdd" v-if="type === 'add'">提 交</c-button>
-        <c-button type="primary" style="margin-right: 10px" @click="commitEdit" v-if="type === 'edit'">提 交</c-button>
-        <c-button type="primary" style="margin-right: 10px" @click="commitDelete" v-if="type === 'delete'">提 交
+        <c-button type="primary" style="margin-right: 10px" @click="commitAdd" v-if="type === 'add'">提 交1</c-button>
+        <c-button type="primary" style="margin-right: 10px" @click="commitEdit" v-if="type === 'edit'">提 交2</c-button>
+        <c-button type="primary" style="margin-right: 10px" @click="commitDelete" v-if="type === 'delete'">提 交3
         </c-button>
         <c-button type="primary" @click="goBack">返 回</c-button>
       </div>

src/views/Statics/Infcur/Cur.js

@@ -112,10 +112,10 @@ export const Pattern = {
         { "pattern": /^-?\d{0,8}(\.\d{1,3})?$/, "message": "整数不能超过8位，小数不能超过3位", "trigger": "blur" }
     ],
     "begdat": [
-        { "type": "date", "trigger": "blur" }
+        { "type": "string", "trigger": "blur" }
     ],
     "enddat": [
-        { "type": "date", "trigger": "blur" }
+        { "type": "string", "trigger": "blur" }
     ],
     "odrintday": [
         { "required": true, "message": "必输项", "trigger": "blur" },

src/views/Statics/Infcur/Infsea.vue

@@ -76,9 +76,15 @@ export default {
       ],
     };
   },
+  activated() {
+    const { update } = this.$route.params
+    if (update) {
+      this.onSearch();
+    }
+  },
   methods: {
     toBbacur(){
-      this.$router.history.push("/statics/dbacur");
+      this.$router.push("/statics/dbacur");
     },
     // handleReset() {
     //   this.root.$refs.modelForm.resetFields();
@@ -105,7 +111,6 @@ export default {
         this.model.pageNum = res.pageNumber
         this.model.pageSize = res.pageSize
         this.model.total = res.total
-        console.log(this.model);
       })
     },
     // async onInfbutSearow() {
@@ -155,7 +160,9 @@ export default {
             .then((res) => {
               console.log(res);
               this.$message.success("删除成功！");
-              this.goBack(true)
+              this.onInfcurSearch();
+              // this.onSearch();
+              // this.goBack(true)
             })
             .catch((err) => {
               console.log(err);
@@ -167,7 +174,6 @@ export default {
             message: "已取消删除",
           });
         });
-      this.onInfcurSearch();
     },
     goBack(update) {
       this.$store.dispatch("TagsView/delView", this.$route);