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

src/components/main.vue

@@ -908,6 +908,7 @@ export default {
     };
   },
   created() {
+    this.orgcodezs=getCookie("orgCode");
     this.current_theme = window.top.localStorage.getItem("current_theme")
       ? window.top.localStorage.getItem("current_theme")
       : "deepBlue_theme";
@@ -920,6 +921,7 @@ export default {
     } else {
       this.styleControll = false;
     }
+    console.log("获取到的orgCode+++++++++++++"+this.orgcodezs)
     this.getinformation();
   },
   destroyed() {
@@ -933,7 +935,6 @@ export default {
   beforeCreate() {
     let userId = getCookie("userId");
     this.appId = getCookie("appId");
-    this.orgcodezs=getCookie("orgCode");
     let menuId = window.top.localStorage.getItem("activeMenu");
     let companyId = window.top.localStorage.getItem("companyId");
   },
@@ -2558,6 +2559,7 @@ export default {
       this.socketshow=false;
     },
     getinformation(){
+      console.log("获取到的orgCode----------------"+this.orgcodezs)
       this.axios.post("/api/v1/ams/getNotice",{orgcodezs:this.orgcodezs}).then((res)=>{
          this.noticedata=res.data.data;
          this.taskAllNum=res.data.data[0].taskAllNum

src/views/RMS/components/addOilPrice.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 添加油价信息 -->
-  <div class="addWagonLoad">
+  <div class="addOilPrice">
     <page-title>返回</page-title>
     <div class="form_you">
       <span class="text">油品名称 </span>
@@ -133,7 +133,7 @@ export default {
 </script>
 <style lang='scss'>
 
-.addWagonLoad{
+.addOilPrice{
   .form_you{
     margin-left: 35%;
     margin-top: 30px;

src/views/index/components/printReceipt.vue

@@ -27,7 +27,7 @@
             cellpadding="10"
             cellspacing="0"
             style="margin: auto; font-size: 20px"
-            width="1000px"
+            width="1300px"
             class="tablePart0"
           >
             <tr>
@@ -42,8 +42,8 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 10px; text-align: center"
-            width="1000px"
+            style="margin-top: 10px; text-align: center;height: 40px"
+            width="1300px"
             class="tablePart1"
           >
             <tr>
@@ -69,8 +69,8 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px"
-            width="1000px"
+            style="border-top: 0px;height: 30px"
+            width="1300px"
             class="tablePart2"
           >
             <tr>
@@ -86,8 +86,8 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px"
-            width="1000px"
+            style="border-top: 0px;height: 30px"
+            width="1300px"
             class="tablePart3"
           >
             <tr>
@@ -103,8 +103,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px"
-            width="1000px"
+            style="border-top: 0px;height: 30px"
+            width="1300px"
             class="tablePart4"
           >
             <tr>
@@ -120,8 +120,8 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px"
-            width="1000px"
+            style="border-top: 0px;height: 30px"
+            width="1300px"
             class="tablePart9"
           >
             <tr>
@@ -137,8 +137,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; font-size: 20px"
-            width="1000px"
+            style="margin: auto; font-size: 20px;height: 30px"
+            width="1300px"
             class="tablePart6"
           >
             <tr>
@@ -172,8 +172,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; font-size: 20px"
-            width="1000px"
+            style="margin: auto; font-size: 20px;height: 50px"
+            width="1300px"
             class="tablePart6"
           >
             <tr>
@@ -312,6 +312,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+#id{
+  width: 1500px;
+  height: 700px;
+}
 .title {
   font-size: 25px;
 }

src/views/index/components/printScan.vue

@@ -144,7 +144,7 @@ export default {
         //清空输入框，免得一次多个重复订单还无法删除
         this.orderNumber = null;
       }
-    }, 3000);
+    }, 1000);
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
@@ -171,11 +171,11 @@ export default {
     align-items: center;
   }
   .tip{
-    width: 1500px;
-    height: 500px;
+    width: 1800px;
+    height: 600px;
     font-size: 100px;
-    padding-left: 100px;
-    padding-top: 200px;
+    padding-left: 350px;
+    padding-top: 500px;
     color: #4cc9e9;
   }
 }

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -285,6 +285,20 @@
           width="150px"
         >
         </el-table-column>
+        <el-table-column
+          prop="isAccept"
+          label="是否验收"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="isAcceptTime"
+          label="验收时间"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
         <el-table-column label="操作" align="center" width="150px" prop="operation">
           <template slot-scope="scope">
             <el-button type="text" @click="operate(scope.row)">保存</el-button>