Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementDelivery.vue

@@ -10,8 +10,14 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnWarehouse()"
-          >返回</el-button
+          @click="revert()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -346,7 +352,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     temporaryStorage() {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -1,7 +1,4 @@
 
-
-
-
 // 完善出库信息
 <template>
   <div class="container">
@@ -14,8 +11,14 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnWarehouse()"
-          >返回</el-button
+          @click="revert()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -351,7 +354,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //暂存按钮

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -10,8 +10,14 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnWarehouse()"
-          >返回</el-button
+          @click="revert()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -348,7 +354,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //暂存按钮

src/views/warehouse/warehouseManagementPut.vue

@@ -10,8 +10,14 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnWarehouse()"
-          >返回</el-button
+          @click="revert()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -20,7 +26,9 @@
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList.warehouseName }}库
+          <span class="position">
           {{ deptBudgetList.binNumber }}仓位
+          </span>
         </h2> 
         <ws-info-table>
           <!-- 货名 -->
@@ -166,10 +174,10 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <h2>化验数据（选填）</h2>
-      <ws-info-table>
-        <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector">
+      <div class="small-title">化验数据（选填）</div>
+      <div class="inspector">
+       <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector" >
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
@@ -177,6 +185,10 @@
             size="small"
           />
         </ws-form-item>
+        </div>
+        
+        <div class="neifor">
+      <ws-info-table>
 
         <!--水分（%）<=-->
         <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
@@ -233,6 +245,7 @@
           />
         </ws-form-item>
       </ws-info-table>
+      </div>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -361,7 +374,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //提交按钮
@@ -726,14 +739,70 @@ export default {
   overflow: scroll;
   height: 120vh;
 }
-
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: center;
 }
 .deliverydate {
-  width: 35%;
+  display: inline-block;
+  width: 10%;
 }
 .center {
   margin-top: -60px;
+    width: 80%;
+}
+//仓位
+.position{
+ width: 52px;
+height: 20px;
+background: #AFB5CB;
+border-radius: 2px;
+font-size: 12px;
+font-family: PingFangSC-Medium, PingFang SC;
+color: #FFFFFF;
+line-height: 20px;
+}
+//表格文字
+/deep/.ws-info-table .el-form-item .el-form-item__label{
+  text-align: left;
+font-size: 14px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #8890B1;
+line-height: 16px;
+}
+//质检员
+.inspector .el-form-item__content{
+  text-align: left;
+  margin-left: 0px;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+//下面列表
+.neifor{
+  width: 80%;
+  background-color: #F6F7FC;
+}
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label{
+  width: 35%;
+  text-align: center;
+}
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content{
+  width: 60%;
+  background-color: #F6F7FC;
+}
+/deep/.neifor .el-input--small .el-input__inner{
+  width: 120%;
 }
 </style>