From e2aa14c9e8d715b4baaf42b9e4fa45b3aebacdef Mon Sep 17 00:00:00 2001
From: lai_kd <lai_kd@123>
Date: Mon, 9 Sep 2019 15:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pub/buimsg-add-or-update.vue      |  7 ++--
 console-web/src/views/modules/pub/buimsg.vue  |  8 +++--
 .../modules/pub/buioperlog-add-or-update.vue  | 14 ++++----
 .../modules/pub/buisch-add-or-update.vue      | 32 ++++++++---------
 .../modules/pub/buischjnl-add-or-update.vue   | 14 ++++----
 .../src/views/modules/pub/buischjnl.vue       |  8 ++---
 .../modules/pub/buisequence-add-or-update.vue |  3 +-
 .../src/views/modules/pub/buisequence.vue     |  4 ++-
 .../src/views/modules/pub/pubbspctl.vue       |  2 +-
 .../src/views/modules/pub/pubbtpinf.vue       |  4 +--
 .../modules/pub/pubflowpar-add-or-update.vue  | 35 ++++++++++---------
 .../src/views/modules/pub/pubflowpar.vue      |  4 ++-
 12 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/console-web/src/views/modules/pub/buimsg-add-or-update.vue b/console-web/src/views/modules/pub/buimsg-add-or-update.vue
index 67ba0b74..8faf4659 100644
--- a/console-web/src/views/modules/pub/buimsg-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buimsg-add-or-update.vue
@@ -13,8 +13,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="信息类型" prop="msg_typ">
-            <el-select :readonly="readonly" v-model="dataForm.msg_typ" placeholder="信息类型"
-                       style="width:170px"></el-select>
+            <!--<el-select :readonly="readonly" v-model="dataForm.msg_typ" placeholder="信息类型"style="width:170px"></el-select>-->
+            <el-select v-model="dataForm.msg_typ" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('MSG_TYP')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/console-web/src/views/modules/pub/buimsg.vue b/console-web/src/views/modules/pub/buimsg.vue
index 6965f0f6..4f1c1230 100644
--- a/console-web/src/views/modules/pub/buimsg.vue
+++ b/console-web/src/views/modules/pub/buimsg.vue
@@ -8,9 +8,9 @@
         <el-button @click="getDataList01()">查询</el-button>
         <!--<el-button v-if="isAuth('pub:buimsg:query')" type="primary" @click="queryHandle()">查看</el-button>-->
         <el-button v-if="isAuth('pub:buimsg:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('pub:buimsg:delete')" type="danger" @click="deleteHandle()"
-                   :disabled="dataListSelections.length <= 0">批量删除
-        </el-button>
+        <!--<el-button v-if="isAuth('pub:buimsg:delete')" type="danger" @click="deleteHandle()"-->
+        <!--:disabled="dataListSelections.length <= 0">批量删除-->
+        <!--</el-button>-->
       </el-form-item>
     </el-form>
     <el-table
@@ -35,6 +35,8 @@
       </el-table-column>
       <el-table-column
         prop="msg_typ"
+        column-key="MSG_TYP"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="信息类型">
diff --git a/console-web/src/views/modules/pub/buioperlog-add-or-update.vue b/console-web/src/views/modules/pub/buioperlog-add-or-update.vue
index e9cc9cd2..bd2b28f5 100644
--- a/console-web/src/views/modules/pub/buioperlog-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buioperlog-add-or-update.vue
@@ -70,13 +70,13 @@
         visible: false,
         dataForm: {
           id: 0,
-          oper_no: ' ',
-          oper_nm: ' ',
-          txn_cd: ' ',
-          ip_addr: ' ',
-          req_data: ' ',
-          msg_code: ' ',
-          msg_info: ' '
+          oper_no: '',
+          oper_nm: '',
+          txn_cd: '',
+          ip_addr: '',
+          req_data: '',
+          msg_code: '',
+          msg_info: ''
         },
         dataRule: {
           oper_no: [
diff --git a/console-web/src/views/modules/pub/buisch-add-or-update.vue b/console-web/src/views/modules/pub/buisch-add-or-update.vue
index 22a3e60a..01597e2b 100644
--- a/console-web/src/views/modules/pub/buisch-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buisch-add-or-update.vue
@@ -144,22 +144,22 @@
         ],
         dataForm: {
           id: 0,
-          sch_id: ' ',
-          reg_id: ' ',
-          istxn: ' ',
-          objsvr: ' ',
-          txncod: ' ',
-          txndatatype: ' ',
-          txndat: ' ',
-          funcname: ' ',
-          funcpath: ' ',
-          sndflag: ' ',
-          tmout: ' ',
-          interval: ' ',
-          cron_expression: ' ',
-          trace: ' ',
-          data: ' ',
-          rmk: ' '
+          sch_id: '',
+          reg_id: '',
+          istxn: '',
+          objsvr: '',
+          txncod: '',
+          txndatatype: '',
+          txndat: '',
+          funcname: '',
+          funcpath: '',
+          sndflag: '',
+          tmout: '',
+          interval: '',
+          cron_expression: '',
+          trace: '',
+          data: '',
+          rmk: ''
         },
         dataRule: {
           sch_id: [
diff --git a/console-web/src/views/modules/pub/buischjnl-add-or-update.vue b/console-web/src/views/modules/pub/buischjnl-add-or-update.vue
index c487225d..3c1bb8a4 100644
--- a/console-web/src/views/modules/pub/buischjnl-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buischjnl-add-or-update.vue
@@ -67,13 +67,13 @@
         visible: false,
         dataForm: {
           id: 0,
-          sys_dt: ' ',
-          sys_tm: ' ',
-          objsvr: ' ',
-          txncod: ' ',
-          msg_cod: ' ',
-          msg_inf: ' ',
-          proc_tim: ' '
+          sys_dt: '',
+          sys_tm: '',
+          objsvr: '',
+          txncod: '',
+          msg_cod: '',
+          msg_inf: '',
+          proc_tim: ''
         },
         dataRule: {
           sys_dt: [
diff --git a/console-web/src/views/modules/pub/buischjnl.vue b/console-web/src/views/modules/pub/buischjnl.vue
index 2d72125b..80749c87 100644
--- a/console-web/src/views/modules/pub/buischjnl.vue
+++ b/console-web/src/views/modules/pub/buischjnl.vue
@@ -6,11 +6,11 @@
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList01()">查询</el-button>
-        <el-button v-if="isAuth('pub:buischjnl:query')" type="primary" @click="queryHandle()">查看</el-button>
+        <!--<el-button v-if="isAuth('pub:buischjnl:query')" type="primary" @click="queryHandle()">查看</el-button>-->
         <el-button v-if="isAuth('pub:buischjnl:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('pub:buischjnl:delete')" type="danger" @click="deleteHandle()"
-                   :disabled="dataListSelections.length <= 0">批量删除
-        </el-button>
+        <!--<el-button v-if="isAuth('pub:buischjnl:delete')" type="danger" @click="deleteHandle()"-->
+        <!--:disabled="dataListSelections.length <= 0">批量删除-->
+        <!--</el-button>-->
       </el-form-item>
     </el-form>
     <el-table
diff --git a/console-web/src/views/modules/pub/buisequence-add-or-update.vue b/console-web/src/views/modules/pub/buisequence-add-or-update.vue
index 7a21d037..1cc3d77a 100644
--- a/console-web/src/views/modules/pub/buisequence-add-or-update.vue
+++ b/console-web/src/views/modules/pub/buisequence-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
+    :title="title"
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
@@ -66,6 +66,7 @@
   export default {
     data() {
       return {
+        title: '',
         readonly: false,
         visible: false,
         sndflagOptions: [
diff --git a/console-web/src/views/modules/pub/buisequence.vue b/console-web/src/views/modules/pub/buisequence.vue
index aa187f1a..2b5e01fc 100644
--- a/console-web/src/views/modules/pub/buisequence.vue
+++ b/console-web/src/views/modules/pub/buisequence.vue
@@ -83,6 +83,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
+          <el-button type="text" size="small" @click="queryHandle(scope.row.id)">查看</el-button>
           <el-button v-if="isAuth('pub:buisequence:update')" type="text" size="small"
                      @click="addOrUpdateHandle(scope.row.id)">修改
           </el-button>
@@ -193,14 +194,15 @@
       addOrUpdateHandle(id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
+          this.$refs.addOrUpdate.title = !id ? '新增' : '修改'
           this.$refs.addOrUpdate.readonly = false
           this.$refs.addOrUpdate.init(id)
         })
       },
-      // 查看
       queryHandle(id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
+          this.$refs.addOrUpdate.title = '查看'
           this.$refs.addOrUpdate.readonly = true
           this.$refs.addOrUpdate.init(id)
         })
diff --git a/console-web/src/views/modules/pub/pubbspctl.vue b/console-web/src/views/modules/pub/pubbspctl.vue
index 4314135e..5894700e 100644
--- a/console-web/src/views/modules/pub/pubbspctl.vue
+++ b/console-web/src/views/modules/pub/pubbspctl.vue
@@ -390,6 +390,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
+          <el-button type="text" size="small" @click="queryHandle(scope.row.bat_no)">查看</el-button>
           <el-button v-if="isAuth('pub:pubbspctl:update')" type="text" size="small"
                      @click="addOrUpdateHandle(scope.row.bat_no)">修改
           </el-button>
@@ -491,7 +492,6 @@
       },
       // 新增 / 修改
       addOrUpdateHandle(id) {
-        console.log("id****************" + id);
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.title = !id ? '新增' : '修改'
diff --git a/console-web/src/views/modules/pub/pubbtpinf.vue b/console-web/src/views/modules/pub/pubbtpinf.vue
index c75d5ec8..98cb2d30 100644
--- a/console-web/src/views/modules/pub/pubbtpinf.vue
+++ b/console-web/src/views/modules/pub/pubbtpinf.vue
@@ -8,9 +8,7 @@
         <el-button @click="getDataList01()">查询</el-button>
         <!--<el-button v-if="isAuth('pub:pubbtpinf:query')" type="primary" @click="queryHandle()">查看</el-button>-->
         <el-button v-if="isAuth('pub:pubbtpinf:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('pub:pubbtpinf:delete')" type="danger" @click="deleteHandle()"
-                   :disabled="dataListSelections.length <= 0">批量删除
-        </el-button>
+        <!--<el-button v-if="isAuth('pub:pubbtpinf:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
       </el-form-item>
     </el-form>
     <el-table
diff --git a/console-web/src/views/modules/pub/pubflowpar-add-or-update.vue b/console-web/src/views/modules/pub/pubflowpar-add-or-update.vue
index 6d9f234b..eda84732 100644
--- a/console-web/src/views/modules/pub/pubflowpar-add-or-update.vue
+++ b/console-web/src/views/modules/pub/pubflowpar-add-or-update.vue
@@ -74,9 +74,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="状态（0-无效，1-有效）" prop="sts">
-            <el-input :readonly="readonly" v-model="dataForm.sts" placeholder="状态（0-无效，1-有效）"
-                      style="width:170px"></el-input>
+          <el-form-item label="状态" prop="sts">
+            <!--<el-input :readonly="readonly" v-model="dataForm.sts" placeholder="状态（0-无效，1-有效）" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.sts" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('sts')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -106,19 +109,19 @@
         visible: false,
         dataForm: {
           id: 0,
-          reg_id: ' ',
-          sys_cnl: ' ',
-          bus_cnl: ' ',
-          mod_cd: ' ',
-          txn_cd: ' ',
-          fld_nam: ' ',
-          fld_val: ' ',
-          max_flow: ' ',
-          flow_priority: ' ',
-          eff_dt: ' ',
-          exp_dt: ' ',
-          sts: ' ',
-          rmk: ' '
+          reg_id: '',
+          sys_cnl: '',
+          bus_cnl: '',
+          mod_cd: '',
+          txn_cd: '',
+          fld_nam: '',
+          fld_val: '',
+          max_flow: '',
+          flow_priority: '',
+          eff_dt: '',
+          exp_dt: '',
+          sts: '',
+          rmk: ''
         },
         dataRule: {
           reg_id: [
diff --git a/console-web/src/views/modules/pub/pubflowpar.vue b/console-web/src/views/modules/pub/pubflowpar.vue
index 62221958..1ad17d96 100644
--- a/console-web/src/views/modules/pub/pubflowpar.vue
+++ b/console-web/src/views/modules/pub/pubflowpar.vue
@@ -101,9 +101,11 @@
       </el-table-column>
       <el-table-column
         prop="sts"
+        column-key="sts"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
-        label="状态（0-无效，1-有效）">
+        label="状态">
       </el-table-column>
       <el-table-column
         prop="rmk"