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/botcan/model/check.js

@@ -118,10 +118,10 @@ let checkObj = {
     "mtabut.coninf.conexedat":[
         //{type: "date", required: false, message: "输入正确的日期"}
     ],
-    "mtabut.coninf.usr.extkey":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 8,message:"长度不能超过8"}
-    ],
+    // "mtabut.coninf.usr.extkey":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 8,message:"长度不能超过8"}
+    // ],
 
     "trnmod.trndoc.advnam":[
         {type: "string", required: false, message: "必输项"},
@@ -154,7 +154,7 @@ let checkObj = {
     ],
     "setmod.dspflg"                      :null,
     "botp0.recget.sdamod.dadsnd"                      :null,
-    "mtabut.coninf.conexedat"                      :null,
+    // "mtabut.coninf.conexedat"                      :null,
     "setmod.docamt"                      :null,
 }
 

src/business/botcan/views/Ovwp.vue

@@ -8,6 +8,7 @@
     </div>
     </template>
     <script>
+
     import commonProcess from "~/mixin/commonProcess";
     import Event from "~/model/Getcan/Event"
     import canp from "./Canp";

src/business/botcan/views/index.vue

@@ -18,25 +18,21 @@
             </c-content>
           </el-tab-pane>
 
-          <!-- 费用/账务 -->
-          <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
+         <el-tab-pane label="表外记账" name="engp">
             <c-content>
-              <div class="eibs-tab">
-                <el-collapse v-model="activeNames">
-                  <el-collapse-item title="表外记账" name="engp">
-                    <!-- 表外记账 -->
-                    <m-engp :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="结算" name="setpan">
-                    <!-- 结算 -->
-                    <m-setpan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="账务" name="glepan">
-                    <!-- 会计分录 -->
-                    <m-glepan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
+              <!-- 表外记账 -->
+              <m-engp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+
+          <!--PD000027 -->
+          <el-tab-pane label="费用/账务" name="setmod">
+            <c-content>
+              <m-setmod
+                  :model="model"
+                  :codes="codes"
+                  @changeSetmodModel="changeSetmodModel"
+              />
             </c-content>
           </el-tab-pane>
 
@@ -64,10 +60,11 @@
       </el-form>
 
       <c-grid-ety-prompt-dialog
-        ref="etyDialog"
-        :promptData="promptData"
-        v-on:select-ety="selectEty"
-      ></c-grid-ety-prompt-dialog>
+          ref="etyDialog"
+          :promptData="promptData"
+          @select-ety="selectGridEtyPromptData"
+      >
+      </c-grid-ety-prompt-dialog>
       <c-function-btn
     :handleSubmit="handleSubmit"
     :handleCheck="handleCheck"
@@ -88,30 +85,26 @@
 import Api from "~/service/Api";
 import Utils from "~/utils/index";
 import CodeTable from "~/config/CodeTable";
-import Botcan from "~/model/Botcan";
-import commonProcess from "~/mixin/commonProcess";
-import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Botcan/Check";
-import Default from "~/model/Botcan/Default";
-import Pattern from "~/model/Botcan/Pattern";
-
+import Botcan from "../model"
+import formRules from '../model/check'
 import Canp from "./Canp";
+import Doctre from "~/components/business/doctre/views";
+import Setmod from "~/components/business/setmod/views";
+import Docpan from "~/components/business/docpan/views"
+import Coninfp from "~/components/business/coninfp/views";
+import Engp from "~/components/business/engp/views";
+import Glepan from "~/components/business/glentry/views";
+import Ovwp from "./Ovwp"
 
-import Doctre from "~/views/Public/Doctre";
-import Setpan from "~/components/business/setmod/views";
-import Docpan from "~/views/Public/Docpan"
-import Coninfp from "~/views/Public/Coninfp"
-import Engp from "~/views/Public/Engp";
-import Glepan from "~/views/Public/Glepan";
-import Ovwp from "./Ovwp.vue";
 
 import event from "../event";
+import operationFunc from "@/mixin/operationFunc";
 
 export default {
   name: "Botcan",
   components: {
     "m-canp": Canp,
-    "m-setpan": Setpan,
+    "m-setmod": Setmod,
     "m-coninfp": Coninfp,
     "m-docpan": Docpan,
     "m-doctre": Doctre,
@@ -124,16 +117,13 @@ export default {
       root: this,
     };
   },
-  mixins: [commonProcess,commonFuncs,event], // 里面包含了Default、Check等的公共处理
+  mixins: [operationFunc,event], // 里面包含了Default、Check等的公共处理
   data() {
     return {
       tabVal: "ovwp",
       trnName: "botcan",
       model: new Botcan().data,
-      checkRules: Check,
-      defaultRules: Default,
-      pattern: Pattern,
-      rules: null,
+      rules: formRules,
       codes: { ...CodeTable },
       activeNames: ["engp"],
     };