Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/components/Menu/SideMenu.vue

@@ -8,7 +8,14 @@
     :trigger="null"
   >
     <logo />
-    <s-menu :collapsed="collapsed" :menu="menus" :theme="theme" :mode="mode" @select="onSelect"></s-menu>
+    <s-menu
+      class="s-menu-box"
+      :collapsed="collapsed"
+      :menu="menus"
+      :theme="theme"
+      :mode="mode"
+      @select="onSelect"
+    ></s-menu>
   </a-layout-sider>
 </template>
 
@@ -54,3 +61,14 @@ export default {
   }
 }
 </script>
+<style lang="less">
+.s-menu-box{
+  height:calc(100vh - 55px);
+  overflow-y: auto;
+  scrollbar-width: none; /* firefox */
+  -ms-overflow-style: none; /* IE 10+ */
+  &::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
+}
+</style>

src/views/main/BookingLedger/list/index.vue

@@ -270,7 +270,7 @@
     <!-- 运踪弹窗 end -->
     <!-- 批量编辑 start -->
     <a-modal
-      width="44vw"
+      width="820px"
       :maskClosable="false"
       v-model="editingModalVisible"
       title="批量编辑"
@@ -933,7 +933,12 @@ export default {
       } else if (form.type === 'date') {
         this.formRes[form.label] = value
       } else if (form.type === 'dateRange') {
-        // 根据逻辑填写内容
+        // 根据逻辑填写内容, 目前仅etd为时间范围
+        // this.formRes[form.label] = value
+        if (form.label === 'ETD') {
+          this.formRes.BETD = value[0]
+          this.formRes.EETD = value[1]
+        }
       } else if (form.type === 'select') {
         // 根据逻辑填写内容
       }
@@ -1836,6 +1841,16 @@ export default {
 @media (min-width: 1192px) and (max-width: 1591px) {
   .booking-from-box {
     padding-right: 24px;
+    /deep/ .ant-calendar-picker-icon{
+      display: none;
+    }
+  }
+}
+
+.booking-from-box {
+  /deep/ .ant-calendar-picker-icon{
+    margin-top: -4px !important;
   }
 }
+
 </style>

src/views/main/BookingLedger/list/modules/formLabel.vue

@@ -7,7 +7,7 @@
       <a-date-picker format="YYYY-MM-DD" @change="changeDate" v-model="value"/>
     </template>
     <template v-else-if="labelData.type == 'dateRange'">
-      <a-range-picker format="YYYY-MM-DD" @change="changeRangeDate" v-model="value"/>
+      <a-range-picker format="YYYY-MM-DD" @change="changeRangeDate" v-model="dateVal"/>
     </template>
     <template v-else-if="labelData.type == 'select'">
       <a-select
@@ -19,10 +19,28 @@
         <a-select-option value="0"> 未截单 </a-select-option>
       </a-select>
     </template>
+    <!-- <template v-else-if="abelData.type == 'complete'">
+      <auto-complete
+        :allowClear="true"
+        class="customer-input"
+        :dropdown-match-select-width="false"
+        :dropdown-style="{ width: '200px' }"
+        v-model="value"
+        :data-source="dataSourceList"
+        @select="completeSelect"
+        @focus="completeChange"
+        @change="debounce(completeChange, 300, $event)"
+      >
+      </auto-complete>
+    </template> -->
   </div>
 </template>
 <script>
+// import { AutoComplete } from 'ant-design-vue'
 export default {
+  components: {
+    // AutoComplete
+  },
   props: {
     labelData: {
       type: Object,
@@ -37,11 +55,17 @@ export default {
       type: Boolean,
       default: true
     }
+    // eslint-disable-next-line vue/require-default-prop
+    // dataSourceList: {
+    //   type: Array,
+    //   required: false
+    // }
   },
   watch: {
     resetType (nval, oval) {
       if (!nval) {
         this.value = ''
+        this.dateVal = []
         // this.$emit('change', {
         //   form: this.labelData,
         //   value: ''
@@ -51,10 +75,11 @@ export default {
   },
   data() {
     return {
-      value: ''
+      value: '',
+      dateVal: []
     }
   },
-  mounted() {},
+  mounted() { },
   methods: {
     changeInput(e) {
       this.$emit('change', {
@@ -69,11 +94,26 @@ export default {
       })
     },
     changeRangeDate(e, mode) {
+      console.log('== date-range ==', e, mode)
+      // this.value = mode
       this.$emit('change', {
         form: this.labelData,
         value: mode
       })
-    }
+    },
+
+    // == 模糊搜索 ==
+    debounce () {
+
+    },
+    completeSelect () {
+
+    },
+    completeChange () {
+
+    },
+
+
   }
 }
 </script>

src/views/main/ProductNameList/modules/addFrom.vue

@@ -40,7 +40,7 @@
               :wrapperCol="wrapperCol"
               has-feedback
             >
-              <a-input :rows="4" placeholder="请输入品名英文" v-decorator="['goodsNameEN']"></a-input>
+              <a-input :rows="4" placeholder="请输入品名英文" v-decorator="['goodsNameEN', {rules: [{required: true, message: '请输入品名英文！'}]}]"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="12">