Merge branch 'dev_1114' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_1114

src/views/modules/api/scanswitch-add-or-update.vue

@@ -8,10 +8,27 @@
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="扫码开关 0关1开"
-                    prop="scanSwitch">
-        <el-input v-model="dataForm.scanSwitch"
-                  placeholder="扫码开关 0关1开"></el-input>
+      <el-form-item label="版本号:"
+                    prop="versionNum">
+        <el-input v-model="dataForm.versionNum"
+                  placeholder="版本号"></el-input>
+      </el-form-item>
+      <el-form-item label="扫码开关:" prop="scanFlag">
+        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
+          <el-option v-for="item in scanFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维护状态:" prop="maintainFlag">
+        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态">
+          <el-option v-for="item in maintainFlagArr" :key="item.maintainValue" :label="item.maintainName" :value="item.maintainValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维护信息:"
+                    prop="maintainInfo">
+        <el-input v-model="dataForm.maintainInfo"
+                  placeholder="维护信息"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -30,13 +47,24 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        scanSwitch: '',
+        versionNum: '',
+        maintainInfo: '',
+        scanFlag: '',
+        maintainFlag: '',
         delFlag: '',
         creator: '',
         createdTime: '',
         updater: '',
         updatedTime: ''
-      }
+      },
+      scanFlagArr: [
+        { dictValue: 0, dictName: '关闭扫码' },
+        { dictValue: 1, dictName: '开启扫码' }
+      ],
+      maintainFlagArr: [
+        { maintainValue: 0, maintainName: '关闭维护' },
+        { maintainValue: 1, maintainName: '开启维护' }
+      ]
     }
   },
   computed: {

src/views/modules/api/scanswitch.vue

@@ -35,10 +35,22 @@
                          label="id"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="scanSwitch"
+        <el-table-column prop="versionNum"
+                         label="版本号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="scanFlag"
                          label="开关状态：0-需要扫码；1-不需要扫码"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="maintainFlag"
+                         label="维护状态：0-关闭维护，1-开启维护"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="maintainInfo"
+                         label="维护信息"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="createdBy"
                          label="创建者"
                          header-align="center"

src/views/modules/news/notice.vue

@@ -40,8 +40,7 @@
         <el-table-column prop="deptName"
                          label="通知所属部门"
                          header-align="center"
-                         align="center"
-                         :formatter="showDeptNameFormatter"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"