Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -44,12 +44,13 @@
             prop="xckybh"
           >
             <el-input
+              class="inputBh"
               v-model.trim="ruleForm.xckybh"
               placeholder="请输入现场勘验编号"
-              maxlength="23"
+              maxlength="22"
               show-word-limit
               clearable
-            ></el-input>
+            ><template slot="prepend">K</template></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -377,7 +378,9 @@ export default {
           }
           reqParam.caseBase = this.ruleForm
           let defaultArr = 'A'
+          let defaultValue = 'K'
           reqParam.personDo.ysxtAsjbh = defaultArr.concat(this.ruleForm.ysxtAsjbh)
+          reqParam.personDo.xckybh = defaultValue.concat(this.ruleForm.xckybh)
           this.$axios
             .post("/api/casestore/caseadd", reqParam)
             .then(response => {

src/views/drFPTX/RAList.vue

@@ -12,8 +12,14 @@
         v-model="dataType"
         class="chooseType"
       >
-        <el-radio :label="1">人员</el-radio>
-        <el-radio :label="2">案件</el-radio>
+        <el-radio
+          :label="1"
+          @click.native.prevent="clickitemdataType(1)"
+        >人员</el-radio>
+        <el-radio
+          :label="2"
+          @click.native.prevent="clickitemdataType(2)"
+        >案件</el-radio>
       </el-radio-group>
       <div class='search barcode'>
         <div class='item'> 条码号：</div>
@@ -74,6 +80,9 @@
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :picker-options="{
+                disabledDate: disabledDate,
+              }"
         >
         </el-date-picker>
       </div>
@@ -543,7 +552,7 @@ export default {
   },
   data () {
     return {
-      dataType: 1, // 导入类型
+      dataType: null, // 导入类型
       barcode: "", // 条码号
       logicDatabaseoptions: [
         {
@@ -631,6 +640,10 @@ export default {
       this.search();
     },
   },
+  mounted () {
+    this.search();
+
+  },
   methods: {
     // 获取全部人员列表请求
     search () {
@@ -878,6 +891,16 @@ export default {
       }
       console.log(this.multipleSelection);
     },
+    disabledDate (a) {
+      if (a.getTime() > new Date().getTime()) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    clickitemdataType (e) {
+      e === this.dataType ? this.dataType = '' : this.dataType = e
+    },
   },
   computed: {
     /**
@@ -886,6 +909,7 @@ export default {
      * @return {*}
      */
     Tpage1 () {
+      console.log(this.total1, this.pageSize, 1112223333)
       return (
         Math.floor(this.total1 / this.pageSize) + 1
       );