diff --git a/console-web/src/views/modules/pub/pubbspctl-add-or-update.vue b/console-web/src/views/modules/pub/pubbspctl-add-or-update.vue
index 8d4e7016..3c0bd19d 100644
--- a/console-web/src/views/modules/pub/pubbspctl-add-or-update.vue
+++ b/console-web/src/views/modules/pub/pubbspctl-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()"
@@ -14,7 +14,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="批次号" prop="bat_no">
-            <el-input :readonly="readonly" v-model="dataForm.bat_no" placeholder="批次号" style="width:170px"></el-input>
+            <el-input :readonly="readonly" v-bind:disabled="dataForm.id!=0" v-model="dataForm.bat_no" placeholder="批次号"
+                      style="width:170px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -24,18 +25,24 @@
             <el-input :readonly="readonly" v-model="dataForm.fil_nm" placeholder="批次文件名" style="width:170px"></el-input>
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
-          <el-form-item label="主批次号" prop="m_bat_no">
-            <el-input :readonly="readonly" v-model="dataForm.m_bat_no" placeholder="主批次号"
-                      style="width:170px"></el-input>
+          <el-form-item label="应用类型" prop="app_typ">
+            <el-input :readonly="readonly" v-model="dataForm.app_typ" placeholder="应用类型" style="width:170px"></el-input>
           </el-form-item>
         </el-col>
+
       </el-row>
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="是否主批次" prop="is_primary">
-            <el-input :readonly="readonly" v-model="dataForm.is_primary" placeholder="是否主批次"
-                      style="width:170px"></el-input>
+            <el-select v-model="dataForm.is_primary" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('is_primary')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <!--<el-input :readonly="readonly" v-model="dataForm.is_primary" placeholder="是否主批次"-->
+            <!--style="width:170px"></el-input>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -54,34 +61,52 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="处理阶段" prop="phase">
-            <el-input :readonly="readonly" v-model="dataForm.phase" placeholder="处理阶段" style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.phase" placeholder="处理阶段" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.phase" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('phase')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="批处理状态" prop="status">
-            <el-input :readonly="readonly" v-model="dataForm.status" placeholder="批处理状态" style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.status" placeholder="批处理状态" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.status" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('STATUS')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="前处理状态" prop="pre_sts">
-            <el-input :readonly="readonly" v-model="dataForm.pre_sts" placeholder="前处理状态"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.pre_sts" placeholder="前处理状态"  style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.pre_sts" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('PRE_STS')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="批业务处理状态" prop="proc_sts">
-            <el-input :readonly="readonly" v-model="dataForm.proc_sts" placeholder="批业务处理状态"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.proc_sts" placeholder="批业务处理状态" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.proc_sts" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('PROC_STS')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="后处理状态" prop="after_sts">
-            <el-input :readonly="readonly" v-model="dataForm.after_sts" placeholder="后处理状态"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.after_sts" placeholder="后处理状态"  style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.after_sts" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('AFTER_STS')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -126,8 +151,13 @@
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="预期日期控制标志" prop="due_dt_ctrl">
-            <el-input :readonly="readonly" v-model="dataForm.due_dt_ctrl" placeholder="预期日期控制标志"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.due_dt_ctrl" placeholder="预期日期控制标志" style="width:170px"></el-input>-->
+
+            <el-select v-model="dataForm.due_dt_ctrl" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('DUE_DT_CTRL')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -154,12 +184,20 @@
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="批量模式" prop="bat_mod">
-            <el-input :readonly="readonly" v-model="dataForm.bat_mod" placeholder="批量模式" style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.bat_mod" placeholder="批量模式" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.bat_mod" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('BAT_MOD')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="统计标志" prop="sum_flg">
-            <el-input :readonly="readonly" v-model="dataForm.sum_flg" placeholder="统计标志" style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.sum_flg" placeholder="统计标志" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.sum_flg" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('SUM_FLG')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -291,8 +329,12 @@
       <el-row type="flex" class="row-bg">
         <el-col :span="12">
           <el-form-item label="是否需要后处理" prop="do_pre_proc">
-            <el-input :readonly="readonly" v-model="dataForm.do_pre_proc" placeholder="是否需要后处理"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.do_pre_proc" placeholder="是否需要后处理"style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.do_pre_proc" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('DO_PRE_PROC')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -311,8 +353,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="是否需要后处理" prop="do_after_proc">
-            <el-input :readonly="readonly" v-model="dataForm.do_after_proc" placeholder="是否需要后处理"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.do_after_proc" placeholder="是否需要后处理" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.do_after_proc" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('DO_AFTER_PROC')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -338,8 +384,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="更新明细表额外数据标志" prop="upd_flg">
-            <el-input :readonly="readonly" v-model="dataForm.upd_flg" placeholder="更新明细表额外数据标志"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.upd_flg" placeholder="更新明细表额外数据标志" style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.upd_flg" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('UPD_FLG')" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -352,8 +401,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="申请日志号标志" prop="apply_jrn_flg">
-            <el-input :readonly="readonly" v-model="dataForm.apply_jrn_flg" placeholder="申请日志号标志"
-                      style="width:170px"></el-input>
+            <!--<el-input :readonly="readonly" v-model="dataForm.apply_jrn_flg" placeholder="申请日志号标志"  style="width:170px"></el-input>-->
+            <el-select v-model="dataForm.apply_jrn_flg" placeholder="请选择" style="width:170px">
+              <el-option v-for="item in dict.get('APPLY_JRN_FLG')" :key="item.value" :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -369,13 +422,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row type="flex" class="row-bg">
-        <el-col :span="12">
-          <el-form-item label="应用类型" prop="app_typ">
-            <el-input :readonly="readonly" v-model="dataForm.app_typ" placeholder="应用类型" style="width:170px"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!--<el-row type="flex" class="row-bg">-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item label="应用类型" prop="app_typ">-->
+      <!--<el-input :readonly="readonly" v-model="dataForm.app_typ" placeholder="应用类型" style="width:170px"></el-input>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -390,6 +443,7 @@
   export default {
     data() {
       return {
+        title: '',
         readonly: false,
         visible: false,
         dataForm: {
@@ -622,12 +676,17 @@
     methods: {
       init(id) {
         this.dataForm.id = id || 0
+        if (id == null || id == undefined) {
+          this.addorupdflag = true;
+        } else {
+          this.addorupdflag = false;
+        }
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/buipubbpc1/pubbspctl/query.do?id=${this.dataForm.id}`),
+              url: this.$http.adornUrl(`/buipubbpc1/pubbspctl/query.do?bat_no=${this.dataForm.id}`),
               method: 'get',
               params: this.$http.adornParams()
             }).then(({data}) => {
@@ -643,7 +702,7 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/buipubbpc1/pubbspctl/${!this.dataForm.id ? 'add' : 'update'}.do`),
+              url: this.$http.adornUrl(`/buipubbpc1/pubbspctl/${this.addorupdflag ? 'add' : 'update'}.do`),
               method: 'post',
               data: this.$http.adornData({
                 'id': this.dataForm.id || undefined,
diff --git a/console-web/src/views/modules/pub/pubbspctl.vue b/console-web/src/views/modules/pub/pubbspctl.vue
index d554ebab..4314135e 100644
--- a/console-web/src/views/modules/pub/pubbspctl.vue
+++ b/console-web/src/views/modules/pub/pubbspctl.vue
@@ -7,7 +7,7 @@
       <el-form-item>
         <el-button @click="getDataList01()">查询</el-button>
         <!--<el-button v-if="isAuth('pub:pubbspctl:query')" type="primary" @click="queryHandle()">查看</el-button>-->
-        <el-button v-if="isAuth('pub:pubbspctl:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <!--<el-button v-if="isAuth('pub:pubbspctl:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>-->
         <el-button v-if="isAuth('pub:pubbspctl:delete')" type="danger" @click="deleteHandle()"
                    :disabled="dataListSelections.length <= 0">批量删除
         </el-button>
@@ -45,14 +45,16 @@
         align="center"
         label="批次文件名">
       </el-table-column>
-      <el-table-column
-        prop="m_bat_no"
-        header-align="center"
-        align="center"
-        label="主批次号">
-      </el-table-column>
+      <!--<el-table-column-->
+      <!--prop="m_bat_no"-->
+      <!--header-align="center"-->
+      <!--align="center"-->
+      <!--label="主批次号">-->
+      <!--</el-table-column>-->
       <el-table-column
         prop="is_primary"
+        column-key="is_primary"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="是否主批次">
@@ -71,30 +73,40 @@
       </el-table-column>
       <el-table-column
         prop="phase"
+        column-key="phase"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="处理阶段">
       </el-table-column>
       <el-table-column
         prop="status"
+        column-key="STATUS"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="批处理状态">
       </el-table-column>
       <el-table-column
         prop="pre_sts"
+        column-key="PRE_STS"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="前处理状态">
       </el-table-column>
       <el-table-column
         prop="proc_sts"
+        column-key="PROC_STS"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="批业务处理状态">
       </el-table-column>
       <el-table-column
         prop="after_sts"
+        column-key="AFTER_STS"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="后处理状态">
@@ -137,6 +149,8 @@
       </el-table-column>
       <el-table-column
         prop="due_dt_ctrl"
+        column-key="DUE_DT_CTRL"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="预期日期控制标志">
@@ -161,12 +175,16 @@
       </el-table-column>
       <el-table-column
         prop="bat_mod"
+        column-key="BAT_MOD"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="批量模式">
       </el-table-column>
       <el-table-column
         prop="sum_flg"
+        column-key="SUM_FLG"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="统计标志">
@@ -281,6 +299,8 @@
       </el-table-column>
       <el-table-column
         prop="do_pre_proc"
+        column-key="DO_PRE_PROC"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="是否需要后处理">
@@ -299,6 +319,8 @@
       </el-table-column>
       <el-table-column
         prop="do_after_proc"
+        column-key="DO_AFTER_PROC"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="是否需要后处理">
@@ -323,6 +345,8 @@
       </el-table-column>
       <el-table-column
         prop="upd_flg"
+        column-key="UPD_FLG"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="更新明细表额外数据标志">
@@ -335,6 +359,8 @@
       </el-table-column>
       <el-table-column
         prop="apply_jrn_flg"
+        column-key="APPLY_JRN_FLG"
+        :formatter="dict.formatter"
         header-align="center"
         align="center"
         label="申请日志号标志">
@@ -365,7 +391,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button v-if="isAuth('pub:pubbspctl:update')" type="text" size="small"
-                     @click="addOrUpdateHandle(scope.row.id)">修改
+                     @click="addOrUpdateHandle(scope.row.bat_no)">修改
           </el-button>
           <el-button v-if="isAuth('pub:pubbspctl:delete')" type="text" size="small" @click="deleteHandle(scope.row)">
             删除
@@ -405,6 +431,7 @@
         dataListLoading: false,
         dataListSelections: [],
         addOrUpdateVisible: false,
+        addorupdflag: false,
       }
     },
     components: {
@@ -464,16 +491,18 @@
       },
       // 新增 / 修改
       addOrUpdateHandle(id) {
+        console.log("id****************" + 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)
         })