复核列表优化

src/model/Trnrel/Event.js

@@ -303,7 +303,7 @@ export default {
     async handleReset(){
         this.model.bchcon = "";
         this.model.trncorco.ownref = "";
-        this.model.trncorco.relflg = "Waiting";
+        this.model.trncorco.relflg = "";
         this.model.usrcon = "";
         this.model.trncorco.inidatfro = "";
         this.model.trncorco.inidattil = "";

src/views/Business/Sptsel/index.vue

@@ -3,7 +3,9 @@
         <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false">
             <!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
                 <!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
+                    <c-content>
                     <m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/>
+                    </c-content>
                 <!-- </el-tab-pane> -->
             <!-- </c-tabs> -->
         </el-form>

src/views/Business/Trnrel/Inftrnps.vue

@@ -11,9 +11,13 @@
           size="small"
         >
           <el-row>
-<c-col :span="23">
+            <c-col :span="23">
               <c-col :span="8">
-                    <el-form-item label="业务机构" prop="bchcon" style="width: 100%">
+                <el-form-item
+                  label="业务机构"
+                  prop="bchcon"
+                  style="width: 100%"
+                >
                   <c-select
                     v-model="model.bchcon"
                     style="width: 100%"
@@ -30,9 +34,12 @@
                 </el-form-item>
               </c-col>
 
-              
               <c-col :span="8">
-                    <el-form-item label="业务编号" prop="trncorco.ownref" style="width: 100%">
+                <el-form-item
+                  label="业务编号"
+                  prop="trncorco.ownref"
+                  style="width: 100%"
+                >
                   <c-input
                     v-model="model.trncorco.ownref"
                     maxlength="16"
@@ -42,7 +49,11 @@
               </c-col>
 
               <c-col :span="8" v-show="searchSlot.searchToggle">
-                      <el-form-item label="经办柜员" prop="usrcon"  style="width: 100%">
+                <el-form-item
+                  label="经办柜员"
+                  prop="usrcon"
+                  style="width: 100%"
+                >
                   <c-select
                     v-model="model.usrcon"
                     style="width: 100%"
@@ -58,8 +69,7 @@
                   </c-select>
                 </el-form-item>
               </c-col>
-
-</c-col>
+            </c-col>
           </el-row>
           <!--            
                     <c-col :span="12">
@@ -71,14 +81,18 @@
           <el-row v-show="searchSlot.searchToggle">
             <c-col :span="23">
               <c-col :span="8">
-                    <el-form-item label="业务状态" prop="trncorco.relflg" style="width: 100%">
+                <el-form-item
+                  label="业务状态"
+                  prop="trncorco.relflg"
+                  style="width: 100%"
+                >
                   <c-select
                     v-model="model.trncorco.relflg"
                     style="width: 100%"
                     placeholder="请选择Status"
                   >
                     <el-option
-                          v-for="item in codes.relflg"
+                      v-for="item in relflgCodes"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -88,7 +102,6 @@
                 </el-form-item>
               </c-col>
 
-
               <c-col :span="8">
                 <el-form-item label="创建时间" style="width: 100%">
                   <c-col :span="11">
@@ -113,8 +126,6 @@
                 </el-form-item>
               </c-col>
 
-
-                
               <!--                           
                     <c-col :span="12">
                       <el-form-item label="and">
@@ -123,7 +134,11 @@
                     </c-col> -->
 
               <c-col :span="8">
-                    <el-form-item label="交易代码" prop="atp.cod" style="width: 100%">
+                <el-form-item
+                  label="交易代码"
+                  prop="atp.cod"
+                  style="width: 100%"
+                >
                   <c-col :span="24">
                     <c-col :span="18">
                       <c-input
@@ -136,17 +151,25 @@
                     <!-- <c-input  v-model="model.atpget.sdamod.seainf"  style="width:10%" placeholder="i"></c-input> -->
 
                     <c-col :span="6">
-                     <c-button size="small" style="width: 90%" type="primary" @click="onSeainf" icon="el-icon-search"
-                        ></c-button
-                      >
+                      <c-button
+                        size="small"
+                        style="width: 85%"
+                        type="primary"
+                        @click="onSeainf"
+                        icon="el-icon-search"
+                      ></c-button>
                     </c-col>
                   </c-col>
                 </el-form-item>
               </c-col>
             </c-col>
-<c-col :span="23">
+            <c-col :span="23">
               <c-col :span="8">
-                    <el-form-item label="业务标志" prop="trncorco.dflg"  style="width: 100%">
+                <el-form-item
+                  label="业务标志"
+                  prop="trncorco.dflg"
+                  style="width: 100%"
+                >
                   <c-select
                     v-model="model.trncorco.dflg"
                     style="width: 100%"
@@ -164,7 +187,11 @@
               </c-col>
 
               <c-col :span="8">
-                    <el-form-item label="交易名称" prop="atptxt"  style="width: 100%">
+                <el-form-item
+                  label="交易名称"
+                  prop="atptxt"
+                  style="width: 100%"
+                >
                   <c-input
                     v-model="model.atptxt"
                     maxlength="37"
@@ -172,13 +199,8 @@
                   ></c-input>
                 </el-form-item>
               </c-col>
-</c-col>
-                
-
-                
-
+            </c-col>
           </el-row>
-
         </el-form>
       </template>
     </c-list-search>
@@ -207,7 +229,6 @@
         Search All
       </c-button>  -->
 
-
     <!-- <c-button
         size="small"
         type="primary"
@@ -369,12 +390,14 @@
       > -->
     <el-row>
       <c-col :span="23">
-      <c-istream-table
-        :list="stmData.data"
-        :columns="stmData.columns"
+        <c-istream-table :list="stmData.data" :columns="stmData.columns">
+          <el-table-column
+            fixed="right"
+            prop="display"
+            label="操作"
+            width="260px"
           >
-        <el-table-column fixed="right" prop="display" label="操作" width="300px">
-          <template >
+            <template>
               <!--              <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
               <!-- <a href="javascript:void(0)" @click="display(scope.$index, scope.row)"
               >显示快照</a
@@ -432,36 +455,36 @@
         </c-istream-table>
       </c-col>
     </el-row>
-    <el-row style="margin-top:2rem;">
+    <el-row style="margin-top: 2rem">
       <c-col :span="23">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-                    <span>交易状态信息 —— {{transactionStatus.busiNo}}</span>
+            <span>交易状态信息 —— {{ transactionStatus.busiNo }}</span>
           </div>
           <div class="text item">
             <form class="el-form--label-left el-form--inline">
               <div class="el-form-item">
                 <label class="el-form-item__label">修改次数:</label>
                 <div class="el-form-item__content">
-                            <span>{{transactionStatus.modTimes}}</span>
+                  <span>{{ transactionStatus.modTimes }}</span>
                 </div>
               </div>
               <div class="el-form-item">
                 <label class="el-form-item__label transstatus">交单次数:</label>
                 <div class="el-form-item__content">
-                            <span>{{transactionStatus.postCount}}</span>
+                  <span>{{ transactionStatus.postCount }}</span>
                 </div>
               </div>
               <div class="el-form-item">
                 <label class="el-form-item__label transstatus">付款次数:</label>
                 <div class="el-form-item__content">
-                            <span>{{transactionStatus.earnCount}}</span>
+                  <span>{{ transactionStatus.earnCount }}</span>
                 </div>
               </div>
               <div class="el-form-item">
                 <label class="el-form-item__label transstatus">付款金额:</label>
                 <div class="el-form-item__content">
-                            <span>{{transactionStatus.earnAmt}} CNY</span>
+                  <span>{{ transactionStatus.earnAmt }} CNY</span>
                 </div>
               </div>
             </form>
@@ -488,14 +511,14 @@ export default {
   components: {},
   data() {
     return {
-      initdialog:false,
+      initdialog: false,
       transactionStatus: {
         busiNo: "",
         modTimes: 0,
         postCount: 0,
         accCount: 0,
         earnCount: 0,
-          earnAmt: 0
+        earnAmt: 0,
       },
       stmData: {
         // columns: [
@@ -533,6 +556,7 @@ export default {
         data: [],
       },
       relrowDisabled: true,
+      relflgCodes:[],
       // multipleSelection: [],
     };
   },
@@ -549,8 +573,22 @@ export default {
   },
   created: function () {},
   mounted() {
-    
-    console.log(this.root.tag);
+     if (this.root.tag == "tocheck") {
+      this.relflgCodes = [
+        { label: "Correct", value: "C" },
+        { label: "Entered", value: "E" },
+        { label: "External", value: "X" },
+        { label: "Picked up", value: "P" },
+        { label: "Rejected", value: "N" },
+        { label: "Waiting", value: "W" },
+      ];
+    } else if (this.root.tag == "finish") {
+      this.relflgCodes = [
+        { label: "Closed", value: "M" },
+        { label: "Final", value: "F" },
+        { label: "Released", value: "R" },
+      ];
+    }
   },
   computed: {},
 };

src/views/Business/Trnrel/index.vue

@@ -84,14 +84,6 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: {
-        relflg: [
-          { label: "Correct", value: "C" },
-          { label: "Entered", value: "E" },
-          { label: "External", value: "X" },
-          { label: "Picked up", value: "P" },
-          { label: "Rejected", value: "N" },
-          { label: "Waiting", value: "W" },
-        ],
         dflg: CodeTable.dflg,
         bchtyp: CodeTable.bchtyp,
         usrsort: CodeTable.usrsort,
@@ -100,26 +92,16 @@ export default {
   },
   methods: {},
   mounted: async function () {
-    if (this.tag == "tocheck") {
-      this.codes.relflg = [
-        { label: "Correct", value: "C" },
-        { label: "Entered", value: "E" },
-        { label: "External", value: "X" },
-        { label: "Picked up", value: "P" },
-        { label: "Rejected", value: "N" },
-        { label: "Waiting", value: "W" },
-      ];
-    } else if (this.tag == "finish") {
-      this.codes.relflg = [
-        { label: "Closed", value: "M" },
-        { label: "Final", value: "F" },
-        { label: "Released", value: "R" },
-      ];
-    }
     console.log("进入trnrel交易");
     const that = this;
     that.init(that.model).then((res) => {
       //TODO 处理数据逻辑
+      if (this.tag == "finish") {
+        if ((res.data.trncorco_relflg = "W")) {
+          res.data.trncorco_relflg = "R";
+        }
+      }
+
       that.model = Utils.copyValueFromVO(that.model, res.data);
       //  that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
     });