Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/addOilPrice.vue

@@ -2,7 +2,7 @@
   <!-- 添加油价信息 -->
   <div class="addOilPrice">
     <page-title>返回</page-title>
-    <div class="form_you">
+    <div id="form_you">
       <span class="text">油品名称 </span>
       <el-select v-model="oilNameId" filterable placeholder="请选择">
         <el-option
@@ -14,10 +14,10 @@
       </el-select>
       <el-button type="primary" @click="dialogVisible = true">新增油品名称</el-button>
     </div>
-    <div class="form_box" style="margin-right: 10rem">
+    <div id="form_box" style="margin-right: 10rem">
       <dil-form :formId="357" v-model="form1" ref="from1" @change="onchang"></dil-form>
     </div>
-    <div class="button_box">
+    <div id="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -134,7 +134,7 @@ export default {
 <style lang='scss'>
 
 .addOilPrice{
-  .form_you{
+  #form_you{
     margin-left: 35%;
     margin-top: 30px;
     .text{
@@ -147,7 +147,7 @@ export default {
       margin-right: 20px;
     }
   }
-  .form_box{
+  #form_box{
     margin-left: 35%;
     padding-top: 10px;
     width: 470px;
@@ -167,7 +167,7 @@ export default {
       margin-left: 30px;
     }
   }
-  .button_box{
+  #button_box{
     margin-left: 40%;
     padding-top: 30px;
     width: 310px;

src/views/appoint/components/inward/updateTransPrice.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 修改运价 -->
-  <div id="contractDetails">
+  <div class="updateTransportPrice">
     <page-title>编辑</page-title>
     <div class="form">
       <div class="form_box">
@@ -364,45 +364,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.form {
-  display: flex;
-  .form_box {
-    width: 500px;
-    margin-left: 35%;
-    margin-top: 30px;
-    margin-right: 20px;
+.updateTransportPrice {
+  .form {
+    display: flex;
 
-    .el-form {
-      .preview-group {
-        .el-form-item {
-          .el-form-item__label {
-            display: inline-block;
-            width: 70px !important;
-          }
+    .form_box {
+      width: 500px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
 
-          .el-form-item__content {
-            .el-select {
-              width: 250px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
             }
 
-            .el-input {
-              width: 250px;
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+
+              .el-input {
+                width: 250px;
+              }
             }
           }
         }
       }
     }
-  };
-  .txt1{
-  display: inline-block;
-  width: 150px;
-  text-align: right;
-};
-}
-.elForm {
-  margin-left: 30%;
-}
-.button_box {
-  margin-left: 45%;
+  ;
+
+    .txt1 {
+      display: inline-block;
+      width: 150px;
+      text-align: right;
+    }
+  ;
+  }
+  .elForm {
+    margin-left: 30%;
+  }
+  .button_box {
+    margin-left: 45%;
+  }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
 }
 </style>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -254,13 +254,15 @@
           <!-- <el-button type="primary" @click="makeSure1">确定</el-button> -->
           <div class="tablecls">
             <!-- 查询所有的物资 -->
-            <dilTable
-              ref="materialTable"
-              v-bind.sync="materialTable"
-              @selection-change="selectionChange"
-              :drawer="aaadrawer"
-            >
-            </dilTable>
+            <vue-scroll :ops="ops" style="width:100%;height:100%">
+              <dilTable
+                ref="materialTable"
+                v-bind.sync="materialTable"
+                @selection-change="selectionChange"
+                :drawer="aaadrawer"
+              >
+              </dilTable>
+            </vue-scroll>
           </div>
         </el-drawer>
       </div>
@@ -444,7 +446,21 @@ export default {
         selectionType: "radio",
         mapList3: []
       },
-      form: {}
+      form: {},
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      }
     };
   },
   computed: {
@@ -802,6 +818,7 @@ export default {
       // console.log("进来了");
       // console.log(this.whether);
       // console.log(this.installremark);
+
       if (this.tableData.length > 1 && this.form.requirementType != "倒库") {
         this.$message.warning("非倒库需求只允许填写一个物资");
         return;
@@ -868,6 +885,18 @@ export default {
         this.disabled = false;
         return;
       }
+      if (this.DueTime == null && this.isOpenDueTime == false) {
+        //默认选择明天0点
+        var dd = new Date();
+        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        dd.setHours(null);
+        dd.setMinutes(null);
+        dd.setSeconds(null);
+        var y = dd.getFullYear();
+        var m = dd.getMonth()+1;//获取当前月份的日期
+        var d = dd.getDate();
+        this.DueTime=dd;
+      }
       if (this.DueTime == null) {
         DueTime = null;
       } else {