地市比中信息复核

src/main.js

@@ -12,6 +12,7 @@ import './plugins/axios'
 import fHttp from './request/http.js'
 import NetUtil from './netmgr/NetUtil'
 import RegExpUtil from './utils/verify-data/RegExpUtil.js'
+import ValueFormatUtil from './utils/ValueFormatUtil.js'
 import App from './App.vue'
 import router from './router'
 import store from './store'
@@ -44,6 +45,7 @@ import IconSvg from './utils/IconSvg.vue'
 Vue.component('svg-icon', IconSvg)
 moment.locale('zh-cn')
 Vue.prototype.$moment = moment
+window.moment = moment
 // 引入上传组件
 import uploader from 'vue-simple-uploader'
 
@@ -87,6 +89,8 @@ window.user = UserUtil
 window.ljkUtil = LjkUtil
 window.fHttp = fHttp
 window.fRegExp = RegExpUtil
+Vue.prototype.$fFormatUtil = ValueFormatUtil
+window.fFormatUtil = ValueFormatUtil
 window.NetUtil = NetUtil
 Vue.use(VueWechatTitle)
 Vue.use(VueClipboard)

src/utils/ValueFormatUtil.js

+export default {
+
+  // 时间格式化
+  dateTimeFormat (row, colnum) {
+    let prop = colnum.property;
+    return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
+  },
+
+  // 普通值非空格式化
+  valueFormat(row, colnum) {
+    let prop = colnum.property
+    return row[prop] ? row[prop] : '---'
+  },
+}

src/views/bzxxgl/bzxxfh.vue

@@ -20,10 +20,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="源条码号：" prop="ytmh" class="ytmh">
-            <el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
+            <el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
           </el-form-item>
           <el-form-item label="目标条码号：" prop="mbtmh" class="mbtmh">
-            <el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
+            <el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
           </el-form-item>
         </div>
         <div class="line1 line2">
@@ -91,23 +91,23 @@
         <el-table :height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark" style="width: 100%;" :class="{delSelection: !selectBoo}" class="bzxxfh-table" @selection-change="handleSelectionChange">
           <el-table-column type="selection" :reserve-selection="true" :width="width33">
           </el-table-column>
-          <el-table-column prop="ytmh" label="源条码号" :width="width1">
+          <el-table-column prop="ytmh" label="源条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="mbtmh" label="目标条码号" :width="width1">
+          <el-table-column prop="mbtmh" label="目标条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="yzw" label="源指位/序号" :width="width4">
+          <el-table-column prop="yzw" label="源指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="mbzw" label="目标指位/序号" :width="width4">
+          <el-table-column prop="mbzw" label="目标指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2">
+          <el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzrXm" label="比中人" :width="width3">
+          <el-table-column prop="bzrXm" label="比中人" :width="width3" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="dateTimeFormat">
+          <el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
           </el-table-column>
-          <el-table-column prop="fhrXm" label="复核人" :width="width3">
+          <el-table-column prop="fhrXm" label="复核人" :width="width3" :formatter="$fFormatUtil.valueFormat">
           </el-table-column>
-          <el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="dateTimeFormat">
+          <el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
           </el-table-column>
           <el-table-column prop="reviewStatus" label="复核状态" :width="width5">
             <template slot-scope="scope">
@@ -198,7 +198,6 @@ export default {
         personLogicIds: [],
         caseLogicIds: []
       },
-      rules: {},
       selectBoo: false,// 是否批量操作
       width33: 50,
       width4: 120,
@@ -234,7 +233,25 @@ export default {
       // 人员逻辑库
       personLogicIds: [],
       // 案件逻辑库
-      caseLogicIds: []
+      caseLogicIds: [],
+      rules: {
+        ytmh: [
+          {required: false, message: '请输入条码号', trigger: 'change'},
+          {
+            pattern: fRegExp.SYS._TMH,
+            message: '格式不正确',
+            trigger: 'change'
+          }
+        ],
+        mbtmh: [
+          {required: false, message: '请输入条码号', trigger: 'change'},
+          {
+            pattern: fRegExp.SYS._TMH,
+            message: '格式不正确',
+            trigger: 'change'
+          }
+        ],
+      }
     }
   },
   components: {
@@ -542,11 +559,6 @@ export default {
       this.currPage = page;
       this.getData(page)
     },
-    // 时间格式化
-    dateTimeFormat (row, colnum) {
-      let prop = colnum.property;
-      return row[prop] ? this.$moment(row[prop]).format("YYYY-MM-DD") : "---";
-    },
     /**
      * @description: 单选事件
      * @param {*} val

src/views/bzxxgl/scss/bzxxfh.scss

@@ -14,13 +14,12 @@ $tableHeight: var(--tableHeight, 33rem);
     }
   }
   .bzxxfh-top {
-    margin: 24px 24px 16px 24px;
+    margin: 24px 20px 16px 24px;
     //border-bottom: 1px solid #eeeeee;
-    padding: 16px 20px 10px 20px;
+    padding: 16px 0px 8px 20px;
     background: #F6F8FA;
     box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
     border-radius: 10px;
-
     /deep/.el-form-item__label {
       width: 70px !important;
       padding: 0;
@@ -72,11 +71,11 @@ $tableHeight: var(--tableHeight, 33rem);
       }
       .ytmh {
         /deep/ .el-input {
-          width: 256px;
+          width: 290px;
           height: 32px;
           .el-input__inner {
             height: 32px;
-            width: 256px;
+            width: 290px;
           }
         }
       }
@@ -89,11 +88,11 @@ $tableHeight: var(--tableHeight, 33rem);
           margin-left: 90px !important;
         }
         /deep/ .el-input {
-          width: 256px;
+          width: 290px;
           height: 32px;
           .el-input__inner {
             height: 32px;
-            width: 256px;
+            width: 290px;
           }
         }
       }
@@ -114,6 +113,13 @@ $tableHeight: var(--tableHeight, 33rem);
       /deep/.el-form-item__label {
         text-align: left;
       }
+      .rdsj{
+        .el-input__inner {
+          height: 32px;
+          width: 290px;
+          margin-top: 2px;
+        }
+      }
     }
     .line3 {
       .fhyh {
@@ -155,6 +161,7 @@ $tableHeight: var(--tableHeight, 33rem);
         }
       }
       .clear-btn {
+        transform: translateX(20px);
         cursor: pointer;
         font-size: 14px;
         font-family: HarmonyOS_Sans_SC;
@@ -162,6 +169,7 @@ $tableHeight: var(--tableHeight, 33rem);
         margin-right: 8px;
       }
       .select-btn {
+        transform: translateX(20px);
         cursor: pointer;
         width: 72px;
         height: 32px;
@@ -499,6 +507,12 @@ $tableHeight: var(--tableHeight, 33rem);
       }
     }
   }
+
+  /deep/.el-form-item__error {
+    padding-top: 0rem;
+    margin-top: 0rem;
+  }
+
   .jcbzgx-dialog {
     width: 300px;
     height: 118px;