Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/SearchHigh/src/SearchHigh.vue

@@ -30,13 +30,13 @@
               :value="op[item.optionsValue] || op.value" :key="index" /> -->
           </el-select>
           <!-- 时间 -->
-          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.time"  style="width: 340px;margin-right: 20px;" :disabled="item.disabled"/>
+          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.time"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
           <!-- 日期 -->
           <el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.time" type="daterange"
-           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 340px;margin-right: 20px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
+           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width:  calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
           <!-- 日期时间 -->
           <el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.time" type="datetimerange"
-            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: 340px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
+            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
         </div>
         <!-- 删除条件按钮 -->
         <el-button type="danger" :icon="Minus" circle size="small"
@@ -283,19 +283,19 @@ defineExpose({
    }
 
    .rowInnerItem {
-     margin-right: 20px;
+     margin-right: 10px;
-     width: 220px;
+     width: 20%;
 
      .el-input__wrapper {
-       width: 220px;
+       width:100%;
      }
    }
    .rowInnerItem1{
-    margin-right: 20px;
+    margin-right: 10px;
-     width: 360px;
+     width: 50%;
 
      .el-input__wrapper {
-       width: 340px;
+       width:100%;
      }
    }
    .moreListBaseBts {

src/components/rowDrop/index.vue

@@ -156,6 +156,7 @@ const initSelectSta = () => {
       
       _showTableColumns.push(_myTableColumns[_myTableColumns.length-1])
       updataTableColumns(_showTableColumns)
+      console.log(allData.value)
     } else { // 无缓存
       checkedDataList.value = []
       allData.value = []
@@ -199,12 +200,6 @@ defineExpose({
 
 </script>
 <style lang="scss" scoped>
-// .buttonsBox {
-//   text-align: center;
-//   margin: 0;
-//   padding: 15px;
-//   border-top: #eee solid 1px;
-// }
 .test_wrapper{
   max-height: calc(100vh - 350px);
   overflow-y: auto;
@@ -212,4 +207,18 @@ defineExpose({
 .footer{
   margin-top: 10px;
 }
+.el-checkbox-group ::v-deep(.el-checkbox .el-checkbox__inner){
+  background: url(../../assets/imgs/Eyes-closed.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
+.el-checkbox-group ::v-deep(.el-checkbox .is-checked .el-checkbox__inner){
+  background: url(../../assets/imgs/eye.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
 </style>