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

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

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/index/components/printReceipt.vue

@@ -175,13 +175,12 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 190px; font-size: 20px;height: 40px"
+            style="margin-left: 690px; font-size: 20px;height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width: 14.5%;text-align: left">签收人：</th>
-              <th style="width: 14.5%;text-align: left">签收时间：</th>
+              <th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
             </tr>
           </table>
         </div>
@@ -304,6 +303,16 @@ export default {
             this.deliveryOrderMaterialList.push(deliver)
             console.log(this.deliveryOrderMaterialList)
           }
+          /*var beforePrint = function (e) {
+            console.log("正在打印中")
+          };
+
+          var afterPrint = function (e) {
+            //打印后的业务代码
+            console.log("打印结束")
+          };*/
+          /*window.onbeforeprint = beforePrint;
+          window.onafterprint = afterPrint;*/
           document.getElementById('printReceipt').click()
         })
     },
@@ -320,7 +329,7 @@ export default {
     print1() {
       let orderNumber = this.$route.query.orderNumber
       this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
-      this.backScan()
+      //this.backScan()
     },
     backScan() {
       this.$router.go(-1)

src/views/index/components/printScan.vue

@@ -38,15 +38,15 @@
       >
       </el-switch>-->
     </div>
-    <div class="tip">
+<!--    <div class="tip">
       手机二维码对准下方摄像头<br />
       <div class="arrowDown">⇩</div>
-      <!-- <i
+      &lt;!&ndash; <i
         class="el-icon-bottom"
         style="padding-left: 450px;font-size: 300px;color: red"
-      ></i> -->
-    </div>
-    <div class="emg"><span style="">紧急联系人:曾16670077829</span></div>
+      ></i> &ndash;&gt;
+    </div>-->
+    <div class="emg"><span style="">紧急联系人:0818-2521703</span></div>
   </div>
 </template>
 <script>
@@ -57,7 +57,11 @@ export default {
       orderNumber: null,
       isEdit: true,
       edit1: true,
-      backgroundImgURL: require('@/assets/saleSelfMachine/backgroundImg.jpg')
+      backgroundImgURLList:[require('@/assets/saleSelfMachine/00.png'),
+        require('@/assets/saleSelfMachine/01.png'),
+        require('@/assets/saleSelfMachine/02.png'),
+        require('@/assets/saleSelfMachine/03.png')],
+      backgroundImgURL: require('@/assets/saleSelfMachine/00.png')
     }
   },
   created() {
@@ -94,12 +98,12 @@ export default {
         this.$refs.inputs.focus()
       })
     },
-    fullScreen() {
+    /*fullScreen() {
       if (screenfull.isEnabled && !screenfull.isFullscreen) {
         screenfull.request()
         this.edit1 = false
       }
-    },
+    },*/
     /*async querynumber(){
       console.log(this.orderNumber)
       let orderNumber=this.orderNumber
@@ -149,7 +153,9 @@ export default {
   mounted() {
     document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
-    // this.changfouce();
+    const timer1 = setInterval(async ()=>{
+      this.backgroundImgURL=this.backgroundImgURLList[0]
+    },3000)
     const timer = setInterval(async () => {
       // if(this.$refs.inputs.focus==false){
       //     console.log("false")
@@ -167,7 +173,7 @@ export default {
           let promise = await this.querynumber(this.orderNumber)
           console.log(promise)
           if (promise == 1) {
-            this.$message.error('你已经打印过了')
+            this.backgroundImgURL=this.backgroundImgURLList[1]
             this.orderNumber = null
             return
           }
@@ -183,7 +189,7 @@ export default {
         //清空输入框，免得一次多个重复订单还无法删除
         this.orderNumber = null
       }
-    }, 1000)
+    }, 3000)
     this.$once('hook:beforeDestroy', () => {
       clearInterval(timer)
     })

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,22 @@ 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"
+        }
+      },
+      time2:null
     };
   },
   computed: {
@@ -887,6 +904,15 @@ export default {
       if (this.form.typeRemarks == undefined) {
         this.form.typeRemarks = "";
       }
+      if (this.DueTime == null && this.isOpenDueTime == false) {
+        //默认选择明天0点
+        var dd=new Date(this.form.requirementTruckTime);
+        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        dd.setHours(null);
+        dd.setMinutes(null);
+        dd.setSeconds(null);
+        DueTime = sjTime(dd);
+      }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: