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

src/views/warehouse/warehouseManagementAdd.vue

@@ -558,6 +558,7 @@ export default {
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;

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>
@@ -234,11 +240,7 @@
         </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="temporaryStorage()"
+        <el-button class="bg-bottom-up" size="small" @click="temporaryStorage()"
           >暂存</el-button
         >
         <el-button
@@ -345,7 +347,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     temporaryStorage() {
@@ -395,9 +397,8 @@ export default {
         return
       }
       if (
-        isNaN(this.deptBudgetList.grossWeight) &&
-        this.deptBudgetList.grossWeight > 0 &&
-        this.deptBudgetList.grossWeight <= 10000
+        this.deptBudgetList.grossWeight < 0 ||
+        this.deptBudgetList.grossWeight >= 10000
       ) {
         this.$message({
           message: '毛重输入错误！',
@@ -412,11 +413,7 @@ export default {
         })
         return
       }
-      if (
-        isNaN(this.deptBudgetList.tare) &&
-        this.deptBudgetList.tare > 0 &&
-        this.deptBudgetList.tare <= 10000
-      ) {
+      if (this.deptBudgetList.tare < 0 || this.deptBudgetList.tare >= 10000) {
         this.$message({
           message: '皮重输入错误！',
           type: 'warning',
@@ -431,9 +428,8 @@ export default {
         return
       }
       if (
-        isNaN(this.deptBudgetList.netWeight) &&
-        this.deptBudgetList.tare > 0 &&
-        this.deptBudgetList.tare <= 10000
+        this.deptBudgetList.netWeight < 0 ||
+        this.deptBudgetList.netWeight >= 10000
       ) {
         this.$message({
           message: '净重输入错误！',
@@ -456,7 +452,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.agent.length < 2 &&
+        this.deptBudgetList.agent.length < 2 ||
         this.deptBudgetList.agent.length > 10
       ) {
         this.$message({
@@ -486,7 +482,10 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.carNo.length != 7) {
+      if (
+        this.deptBudgetList.carNo.length < 6 &&
+        this.deptBudgetList.carNo.length <= 8
+      ) {
         this.$message({
           message: '车牌号输入有误！',
           type: 'warning',
@@ -501,7 +500,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.contractNo.length < 6 &&
+        this.deptBudgetList.contractNo.length < 6 ||
         this.deptBudgetList.contractNo.length > 20
       ) {
         this.$message({
@@ -543,8 +542,8 @@ export default {
     },
     selectgoodsName(e) {
       for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        if (this.goodnameList[i].goodsName == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
         }
       }
     },
@@ -686,6 +685,10 @@ export default {
     }
   }
 }
+.el-button--default {
+  color: #5473e8;
+  border-color: #5473e8;
+}
 .title {
   position: relative;
   padding-left: 10px;
@@ -720,10 +723,6 @@ export default {
   height: 2000px;
   margin: 0 auto;
 }
-/deep/.el-form-item__label {
-  width: 160px;
-}
-
 //选填
 /deep/.el-form-item {
   width: 50%;
@@ -745,14 +744,28 @@ export default {
 }
 //仓位
 .position {
-  width: 52px;
-  height: 20px;
   background: #afb5cb;
   border-radius: 2px;
   font-size: 12px;
-  font-family: PingFangSC-Medium, PingFang SC;
   color: #ffffff;
   line-height: 20px;
+  padding: 2px 4px;
+  position: relative;
+  top: -2px;
+}
+.neifor /deep/.ws-info-table .el-form-item .el-form-item__label {
+  background: #f6f7fc;
+}
+.neifor .ws-info-table {
+  border-left: 1px solid #cdd2dc;
+  border-top: 1px solid #cdd2dc;
+}
+.neifor .ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.inspector /deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 59px;
 }
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
@@ -771,6 +784,7 @@ export default {
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;
@@ -796,6 +810,6 @@ export default {
   background-color: #f6f7fc;
 }
 /deep/.neifor .el-input--small .el-input__inner {
-  width: 120%;
+  width: 100%;
 }
-</style>
+</style>

src/views/warehouse/warehouseManagementEdit.vue

@@ -428,6 +428,7 @@ export default {
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;

src/views/warehouse/warehouseManagementLook.vue

@@ -408,6 +408,7 @@ export default {
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;

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>
@@ -23,12 +26,12 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <h2>
-          {{ this.deptBudgetList1.warehouseName}}库
-           <span class="position">
-          {{this.deptBudgetList1.binNumber }}仓位
+          {{ this.deptBudgetList1.warehouseName }}库
+          <span class="position">
+            {{ this.deptBudgetList1.binNumber }}仓位
           </span>
         </h2>
-       <div class="small-title">基本信息</div>
+        <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -110,7 +113,12 @@
             />
           </ws-form-item>
           <!--出库日期-->
-          <ws-form-item label="出库日期" span="1" prop="inOutDate" class="deliverydate">
+          <ws-form-item
+            label="出库日期"
+            span="1"
+            prop="inOutDate"
+            class="deliverydate"
+          >
             <ws-date-picker
               v-model="deptBudgetList.inOutDate"
               type="date"
@@ -156,7 +164,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-       <div class="small-title">上传仓库照片</div>
+      <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -169,10 +177,10 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-     <div class="small-title">化验数据（选填）</div>
+      <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
-       <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector" >
+        <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
@@ -180,65 +188,64 @@
             size="small"
           />
         </ws-form-item>
-        </div>
-        <div class="neifor">
-      <ws-info-table>
-        <!--水分（%）<=-->
-        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.waterContent"
-            placeholder="请输入水分占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.impurity"
-            placeholder="请输入杂质占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--容重（克/升）>=-->
-        <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
-            placeholder="请输入容重"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
-            placeholder="请输入霉变粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
-            placeholder="请输入热损伤占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-            placeholder="请输入不完整粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-       
-      </ws-info-table>
+      </div>
+      <div class="neifor">
+        <ws-info-table>
+          <!--水分（%）<=-->
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--杂质（%）<=-->
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
+              placeholder="请输入杂质占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--霉变粒（%）<=-->
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
+              placeholder="请输入霉变粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--热损伤（%）<=-->
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+              placeholder="请输入热损伤占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--不完整粒（%）<=-->
+          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+              placeholder="请输入不完整粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -308,7 +315,7 @@ export default {
       appendixIdsAdd: '',
       uploadSuccess: {},
       onChange: {},
-      deptBudgetList1:[],
+      deptBudgetList1: [],
       gradeList: [],
       rules: {
         netWeight: [
@@ -351,7 +358,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //暂存按钮
@@ -387,7 +394,9 @@ export default {
     },
     //提交按钮
     submit() {
-     if (this.deptBudgetList.warehouseInOutDetail.qualityInspector.length<2 || deptBudgetList.warehouseInOutDetail.qualityInspector > 10
+      if (
+        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
+        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
       ) {
         this.$message({
           message: '质检员姓名长度错误！',
@@ -395,7 +404,9 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector.length<2 || deptBudgetList.warehouseInOutDetail.qualityInspector > 10
+      if (
+        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
+        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
       ) {
         this.$message({
           message: '质检员姓名长度错误！',
@@ -404,7 +415,6 @@ export default {
         return
       }
 
-
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -654,36 +664,37 @@ export default {
 }
 .center {
   margin-top: -60px;
-    width: 80%;
+  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;
+.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{
+/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;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 //质检员
-.inspector .el-form-item__content{
+.inspector .el-form-item__content {
   text-align: left;
   margin-left: 0px;
 }
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;
@@ -696,22 +707,22 @@ line-height: 16px;
   top: 13px;
 }
 //下面列表
-.neifor{
+.neifor {
   width: 80%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label{
+/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{
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
   width: 60%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .el-input--small .el-input__inner{
+/deep/.neifor .el-input--small .el-input__inner {
   width: 120%;
 }
-.el-input__inner{
+.el-input__inner {
   width: 150px;
 }
 </style>

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>
@@ -20,11 +26,9 @@
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList1.warehouseName }}库
-           <span class="position">
-          {{deptBudgetList1.binNumber }}仓位
-          </span>
+          <span class="position"> {{ deptBudgetList1.binNumber }}仓位 </span>
         </h2>
-       <div class="small-title">基本信息</div>
+        <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -106,7 +110,12 @@
             />
           </ws-form-item>
           <!--出库日期-->
-          <ws-form-item label="出库日期" span="1" prop="inOutDate" class="deliverydate">
+          <ws-form-item
+            label="出库日期"
+            span="1"
+            prop="inOutDate"
+            class="deliverydate"
+          >
             <ws-date-picker
               v-model="deptBudgetList.inOutDate"
               type="date"
@@ -152,7 +161,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-       <div class="small-title">上传仓库照片</div>
+      <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -165,10 +174,10 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-     <div class="small-title">化验数据（选填）</div>
+      <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
-       <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector" >
+        <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
@@ -176,65 +185,64 @@
             size="small"
           />
         </ws-form-item>
-        </div>
-        <div class="neifor">
-      <ws-info-table>
-        <!--水分（%）<=-->
-        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.waterContent"
-            placeholder="请输入水分占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.impurity"
-            placeholder="请输入杂质占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--容重（克/升）>=-->
-        <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
-            placeholder="请输入容重"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
-            placeholder="请输入霉变粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
-            placeholder="请输入热损伤占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-            placeholder="请输入不完整粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-       
-      </ws-info-table>
+      </div>
+      <div class="neifor">
+        <ws-info-table>
+          <!--水分（%）<=-->
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--杂质（%）<=-->
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
+              placeholder="请输入杂质占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--霉变粒（%）<=-->
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
+              placeholder="请输入霉变粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--热损伤（%）<=-->
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+              placeholder="请输入热损伤占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--不完整粒（%）<=-->
+          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+              placeholder="请输入不完整粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -304,7 +312,7 @@ export default {
       appendixIdsAdd: '',
       uploadSuccess: {},
       onChange: {},
-      deptBudgetList1:[],
+      deptBudgetList1: [],
       gradeList: [],
       rules: {
         netWeight: [
@@ -348,7 +356,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //暂存按钮
@@ -384,7 +392,9 @@ export default {
     },
     //提交按钮
     submit() {
-     if (this.deptBudgetList.warehouseInOutDetail.qualityInspector.length<2 || deptBudgetList.warehouseInOutDetail.qualityInspector > 10
+      if (
+        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
+        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
       ) {
         this.$message({
           message: '质检员姓名长度错误！',
@@ -392,7 +402,9 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector.length<2 || deptBudgetList.warehouseInOutDetail.qualityInspector > 10
+      if (
+        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
+        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
       ) {
         this.$message({
           message: '质检员姓名长度错误！',
@@ -401,7 +413,6 @@ export default {
         return
       }
 
-
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -651,36 +662,37 @@ export default {
 }
 .center {
   margin-top: -60px;
-    width: 80%;
+  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;
+.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{
+/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;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 //质检员
-.inspector .el-form-item__content{
+.inspector .el-form-item__content {
   text-align: left;
   margin-left: 0px;
 }
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;
@@ -693,22 +705,22 @@ line-height: 16px;
   top: 13px;
 }
 //下面列表
-.neifor{
+.neifor {
   width: 80%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label{
+/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{
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
   width: 60%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .el-input--small .el-input__inner{
+/deep/.neifor .el-input--small .el-input__inner {
   width: 120%;
 }
-.el-input__inner{
+.el-input__inner {
   width: 150px;
 }
 </style>

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,8 +26,8 @@
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList.warehouseName }}库
-          {{ deptBudgetList.binNumber }}仓位
-        </h2> 
+          <span class="position"> {{ deptBudgetList.binNumber }}仓位 </span>
+        </h2>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -166,8 +172,8 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <h2>化验数据（选填）</h2>
-      <ws-info-table>
+      <div class="small-title">化验数据（选填）</div>
+      <div class="inspector">
         <!--自检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
@@ -177,62 +183,66 @@
             size="small"
           />
         </ws-form-item>
+      </div>
 
-        <!--水分（%）<=-->
-        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.waterContent"
-            placeholder="请输入水分占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.impurity"
-            placeholder="请输入杂质占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--容重（克/升）>=-->
-        <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
-            placeholder="请输入容重"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
-            placeholder="请输入霉变粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
-            placeholder="请输入热损伤占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-            placeholder="请输入不完整粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-      </ws-info-table>
+      <div class="neifor">
+        <ws-info-table>
+          <!--水分（%）<=-->
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--杂质（%）<=-->
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
+              placeholder="请输入杂质占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--霉变粒（%）<=-->
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
+              placeholder="请输入霉变粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--热损伤（%）<=-->
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+              placeholder="请输入热损伤占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--不完整粒（%）<=-->
+          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+              placeholder="请输入不完整粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </div>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -361,7 +371,7 @@ export default {
   },
   methods: {
     //返回按钮
-    returnWarehouse() {
+    revert() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //提交按钮
@@ -726,14 +736,71 @@ 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;
+  font-weight: 600;
+}
+.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>

src/views/warehouse/warehouseManagementRecord.vue

@@ -511,6 +511,7 @@ export default {
 .small-title {
   position: relative;
   padding: 10px;
+  font-weight: 600;
 }
 .small-title::before {
   position: absolute;