Merge remote-tracking branch 'origin/development-202206' into development-202206

src/views/Business/Bctset/Cips2.vue

@@ -25,7 +25,9 @@
                   
        <c-col :span="12">
         <el-form-item label="业务种类" prop="trnmod.bustyp">
-            <c-select v-model="model.trnmod.bustyp" style="width:100%" :placeholder="$t('other.please_enter')+'业务种类'">
+            <c-select v-model="model.trnmod.bustyp" 
+            :code="codes.bustyp"
+            style="width:100%" :placeholder="$t('other.please_enter')+'业务种类'">
               </c-select>
         </el-form-item>
        </c-col>

src/views/Business/Bctset/Dftcrep.vue

@@ -45,7 +45,7 @@
                   style="width: 100%"
                   disabled
                   placeholder="请选择单据金额："
-                  :code="codes.cur"
+                  :code="codes.curtxt1"
                 >
                 </c-select>
               </el-form-item>
@@ -67,7 +67,7 @@
                   v-model="model.dftcre.dfdgrp.cbs.max.cur"
                   style="width: 100%"
                   placeholder="请选择代付金额："
-                  :code="codes.cur"
+                  :code="codes.curtxt1"
                 >
                 </c-select>
               </el-form-item>

src/views/Business/Bctset/index.vue

@@ -122,11 +122,11 @@
             <m-cfactlp :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="Cips" name="cips">
+          <el-tab-pane label="Cips" name="cips" v-if="model.trnmod.cmtflg=='P'">
             <m-cips :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="Cips要素" name="cips2">
+          <el-tab-pane label="Cips要素" name="cips2" v-if="model.trnmod.cmtflg=='P'">
             <m-cips2 :model="model" :codes="codes" />
           </el-tab-pane>