Merge remote-tracking branch 'origin/main'

src/views/smart/operationticketDetail.vue

@@ -132,7 +132,6 @@ export default {
   data () {
 
     var validateStartTime = (rule, value, callback) => {
-      alert(value);
       if (value === '' || value ===null) {
         callback(new Error('请输入计划开始日期'));
       } else if(this.tab1_form.plannedEndTime !== '' && this.tab1_form.plannedEndTime !== null) {
@@ -143,7 +142,6 @@ export default {
       callback();
     };
     var validateEndTime = (rule, value, callback) => {
-      alert(value);
       if (value === '' || value ===null ) {
         callback(new Error('请输入计划结束日期'));
       } else if(this.tab1_form.plannedStartTime > value) {

src/views/spares/materialDetail.vue

@@ -297,6 +297,14 @@
         inbound_data: [],
         inbound_form: {},
         option_inbound: {
+          align: 'center',
+          menuAlign: 'center',
+          height: 'auto',
+          calcHeight: 210,
+          searchShow: true,
+          searchMenuSpan: 6,
+          tip: false,
+          border: true,
           submitBtn: false,
           emptyBtn: false,
           column: [
@@ -341,6 +349,14 @@
         outbound_data: [],
         outbound_form: {},
         option_outbound: {
+          align: 'center',
+          menuAlign: 'center',
+          height: 'auto',
+          calcHeight: 210,
+          searchShow: true,
+          searchMenuSpan: 6,
+          tip: false,
+          border: true,
           submitBtn: false,
           emptyBtn: false,
           column: [
@@ -442,8 +458,8 @@
     },
     methods: {
       test(val) {
-        this.$refs.diaForm.resetForm();
         this.dialogVisible = true;
+        this.$refs.diaForm.resetForm();
       },
       handleFormSubmit() {
         this.$refs.tab1_form.validate((valid, done, msg) => {