Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

src/views/Editor/modules/ajzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2022-01-08 14:09:16
+ * @LastEditTime: 2022-01-14 16:25:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -232,7 +232,6 @@ export default {
       // 指纹编辑区域发送指纹数据，替换指纹图片
       console.log(finger);
       this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position })
-
     },
     /**
      * 获取案件指纹原图
@@ -299,6 +298,7 @@ export default {
               })
             }
           }
+          self.$bus.emit('', self.fingers)
           // //console.log(self.fingers);
           // 自动获取第一个
           if (self.fingers.length > 0) {

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2022-01-10 21:19:18
+ * @LastEditTime: 2022-01-14 16:09:52
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -300,7 +300,7 @@
               </div>
               <div class="tjxh">
                 <span>推荐序号</span>
-                <input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<1)value=1" />
+                <input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<0)value=0" />
                 <input v-else type="text" v-model="tjxh" oninput="if(value<101)value=101" />
               </div>
             </div>

src/views/zzwlr/htcj.vue

@@ -31,7 +31,7 @@
             codeUrl="/api/code/sex"
             :clearable="true"
             :multiple="false"
-            :form="ruleForm"
+            :form="liveCollectionTo"
             class="xb"
             v-model="liveCollectionTo.sex"
             id="sex"
@@ -43,7 +43,7 @@
           <span>身份证号：</span>
           <el-input
             placeholder="请输入身份证号"
-            v-model="liveCollectionTo.idcard"
+            v-model="liveCollectionTo.idCard"
             @keyup.enter.native="search"
           >
           </el-input>
@@ -56,7 +56,7 @@
             <span>采集单位：</span>
             <Cascader
               ref="cascader"
-              :form="ruleForm"
+              :form="liveCollectionTo"
               id="collectionDw"
               class="cjdw"
               :width="17.1612"
@@ -75,6 +75,7 @@
           <div class="filter nysj">
             <span>捺印日期：</span>
             <el-date-picker
+              @change="getParam"
               v-model="startEndDate"
               style="display: flex; align-items: center"
               type="daterange"
@@ -592,10 +593,14 @@ export default {
       deep: true,
       immediate: true,
       handler: function (newV, oldV) {
+        console.log(newV);
         if(newV.barcode || newV.name ||  newV.sex || newV.idCard || newV.collectionDw || newV.collectionName || newV.printingTimeStart  !== ''){
           // console.log('不为空，有清空');
           this.isActive = true
           this.isShow = false
+        } else {
+          this.isActive = false
+          this.isShow = true
         }
       }
     }