前端sdy

src/views/contractManagement/salesContractAdd.vue

@@ -716,7 +716,6 @@ export default {
         })
         return
       }
-      console.log(this.deptBudgetList.contractNo.length)
       if (
         this.deptBudgetList.contractNo.length < 6 ||
         this.deptBudgetList.contractNo.length > 20

src/views/warehouse/warehouseManagementDelivery.vue

@@ -23,8 +23,8 @@
            <span class="position">
           {{deptBudgetList.binNumber }}仓位
           </span>
-        
         </h2>
+       <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -152,6 +152,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
+       <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -164,7 +165,7 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <h2>化验数据（选填）</h2>
+     <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
        <!--自检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector" >
@@ -176,9 +177,8 @@
           />
         </ws-form-item>
         </div>
+        <div class="neifor">
       <ws-info-table>
-       
-
         <!--水分（%）<=-->
         <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
@@ -233,7 +233,9 @@
             size="small"
           />
         </ws-form-item>
+       
       </ws-info-table>
+      </div>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -380,6 +382,120 @@ export default {
     },
     //提交按钮
     submit() {
+      if (this.deptBudgetList.goodsName=="") {
+        this.$message({
+          message: '货名不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.grossWeight=="") {
+        this.$message({
+          message: '毛重不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (isNaN(this.deptBudgetList.grossWeight) && this.deptBudgetList.grossWeight>0 && this.deptBudgetList.grossWeight <= 10000) {
+        this.$message({
+          message: '毛重输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.tare=="") {
+        this.$message({
+          message: '皮重不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (isNaN(this.deptBudgetList.tare) && this.deptBudgetList.tare>0 && this.deptBudgetList.tare <= 10000) {
+        this.$message({
+          message: '皮重输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.netWeight=="") {
+        this.$message({
+          message: '净重不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (isNaN(this.deptBudgetList.netWeight) && this.deptBudgetList.tare>0 && this.deptBudgetList.tare <= 10000) {
+        this.$message({
+          message: '净重输入错误！',
+          type: 'warning',
+        })
+        return
+      }  
+       if (this.deptBudgetList.grade=="") {
+        this.$message({
+          message: '品级不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+        if (this.deptBudgetList.agent=="") {
+        this.$message({
+          message: '经办人不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.agent.length<2 && this.deptBudgetList.agent.length>10) {
+        this.$message({
+          message: '经办人姓名输入有误！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.inOutDate=="") {
+        this.$message({
+          message: '出库日期不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.inOutType=="") {
+        this.$message({
+          message: '出库类型不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.carNo=="") {
+        this.$message({
+          message: '车牌号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.carNo.length != 7) {
+        this.$message({
+          message: '车牌号输入有误！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.contractNo=="") {
+        this.$message({
+          message: '合同编号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+       if (this.deptBudgetList.contractNo.length < 6 && this.deptBudgetList.contractNo.length > 20) {
+        this.$message({
+          message: '合同编号输入有误！',
+          type: 'warning',
+        })
+        return
+      }
+
+
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -611,9 +727,7 @@ export default {
 /deep/.el-form-item__label {
   width: 160px;
 }
-/deep/.el-input--small {
-  width: 70%;
-}
+
 //选填
 /deep/.el-form-item {
   width: 50%;
@@ -658,4 +772,34 @@ line-height: 16px;
   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>

src/views/warehouse/warehouseManagementIoss.vue

@@ -72,8 +72,8 @@
         <!--库损比例-->
         <ws-form-item label="库损比例：" span="1" prop="inventoryRatio" class="readonly">
           <!-- .占比=损耗量÷（累计入库-实际库存） -->
-          <!-- ((deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory)/(deptBudgetList.cumulativeStockIn-deptBudgetList.physicalInventory)*1000 > 0 ? ((deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory)/(deptBudgetList.cumulativeStockIn-deptBudgetList.physicalInventory)*1000 : 0  -->
-          <span class="proportion" v-if="inventoryRatio1 > 3">{{inventoryRatio1 > 0 ? inventoryRatio1 : 0}} {{'‰'}}</span> 
+          <span class="proportion" v-show="inventoryRatio1 > 3">{{inventoryRatio1 > 0 ? inventoryRatio1 : 0}} {{'‰'}}</span> 
+          <span class="proportion1" v-show="inventoryRatio1 <3">{{inventoryRatio1 > 0 ? inventoryRatio1 : 0}} {{'‰'}}</span>
         </ws-form-item>
         <p class="fontsize">注：提交成功后，当期实际库存将作为下一期的初始库存。</p>
       </ws-form>
@@ -412,6 +412,9 @@ line-height: 17px;
 .proportion{
 color: #FF2C58;
 }
+.proportion1{
+color: black;
+}
 .title {
   position: relative;
 }

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -1,4 +1,4 @@
-// 完善入库信息
+// 完善出库信息
 <template>
   <div class="container">
     <el-row>
@@ -18,7 +18,6 @@
     <div class="center">
       <h2>鲅鱼圈一号库 102仓位</h2>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        
         <!--毛重（吨）-->
         <ws-form-item label="毛重（吨）" span="1" prop="shippingType">
           <ws-input
@@ -28,7 +27,6 @@
             size="small"
           />
         </ws-form-item>
-
         <!--皮重（吨）-->
         <ws-form-item label="皮重（吨）" span="1" prop="buyer" class="readonly">
           <ws-input
@@ -38,7 +36,6 @@
             size="small"
           />
         </ws-form-item>
-
         <!--净重（吨）-->
         <ws-form-item label="净重（吨）" span="1" prop="settlementMethod">
           <ws-input