Przeglądaj źródła

前端孟祥旭

mxx 4 lat temu
rodzic
commit
ac4c5187e3

+ 0 - 1
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

+ 33 - 19
src/views/warehouse/warehouseManagementDelete.vue

@@ -74,10 +74,10 @@
             >
           </template> -->
            <template slot-scope="scope">
-            <div class="" v-if="scope.row.showFlag == 0" @click="handleHide(scope.row)">显示</div>
-            <div class="" v-if="scope.row.showFlag == 1" @click="handleHide(scope.row)">隐藏</div>
-            <div class=""  @click="handleDelete(scope.row)">删除</div>
-          </template><v-if></v-if>
+            <div class="record" v-if="scope.row.showFlag == 0" @click="handleHide(scope.row)">显示</div>
+            <div class="record" v-if="scope.row.showFlag == 1" @click="handleHide(scope.row)">隐藏</div>
+            <div class="adjustment"  @click="handleDelete(scope.row)">删除</div>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -509,19 +509,33 @@ export default {
   border-top: 0px;
 }
 
-// .connert {
-//   padding: 10px 40px;
-// }
-// .bg-right{
-// text-align: right;
-//   margin: 15px 0;
-// }
-// //表格文字居中
-// /deep/.el-table th.is-leaf,/deep/.el-table td {
-//     text-align: center;
-// }
-// //表格数据文字
-//  /deep/.el-table .el-table__body .cell{
-//    font-size: 14px;
-//  } 
+.connert {
+  padding: 10px 40px;
+}
+
+//表格文字居中
+/deep/.el-table th.is-leaf,/deep/.el-table td {
+    text-align: center;
+}
+//表格数据文字
+ /deep/.el-table .el-table__body .cell{
+   font-size: 14px;
+ } 
+ .record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
 </style>

+ 190 - 27
src/views/warehouse/warehouseManagementDelivery.vue

@@ -20,8 +20,11 @@
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList.warehouseName }}库
-          {{ deptBudgetList.binNumber }}仓位
+           <span class="position">
+          {{deptBudgetList.binNumber }}仓位
+          </span>
         </h2>
+       <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -103,12 +106,7 @@
             />
           </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"
@@ -154,6 +152,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
+       <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -166,10 +165,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,7 +176,9 @@
             size="small"
           />
         </ws-form-item>
-
+        </div>
+        <div class="neifor">
+      <ws-info-table>
         <!--水分(%)<=-->
         <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
           <ws-input
@@ -232,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"
@@ -342,15 +345,6 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.getList()
   },
-  // activated() {
-  //   //cg.viewBudget
-  //   //cg.viewSpareMoney
-  //   // this.getVesselData();
-  //   console.log(2222)
-  //   this.getList()
-  //   console.log(1111)
-  //   this.showType = this.isShow
-  // },
   methods: {
     //返回按钮
     returnWarehouse() {
@@ -388,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')
@@ -619,9 +727,7 @@ export default {
 /deep/.el-form-item__label {
   width: 160px;
 }
-/deep/.el-input--small {
-  width: 70%;
-}
+
 //选填
 /deep/.el-form-item {
   width: 50%;
@@ -630,13 +736,70 @@ export default {
   overflow: scroll;
   height: 120vh;
 }
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+/deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: center;
 }
 .deliverydate {
-  width: 35%;
+  display: inline-block;
+  width: 10%;
 }
-.center[data-v-32a9842f] {
+.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>

+ 1 - 7
src/views/warehouse/warehouseManagementEdit.vue

@@ -231,6 +231,7 @@ export default {
     this.loaddata()
     this.showType = this.isShow
   },
+  
   methods: {
     //返回按钮
     returnWarehouse() {
@@ -246,13 +247,6 @@ export default {
     },
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
     },
     onChange(files) {
       this.fileNum = files

+ 127 - 28
src/views/warehouse/warehouseManagementIoss.vue

@@ -2,15 +2,21 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">盘损当期仓损</h2>
+        <h2 class="bg-left title">&nbsp;&nbsp;盘损当期仓损</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
+         <el-button
           class="bg-bottom"
           type="primary"
           size="small"
           @click="returnWarehouse()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -18,10 +24,12 @@
       <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
         <h2>                      
           {{deptBudgetList1.warehouseName }}库
+          <span class="position">
           {{deptBudgetList1.binNumber }}仓位
+          </span>
       </h2>
         <!-- 货名 -->
-        <ws-form-item label="货名" span="1"  class="readonly" prop="goodsName">
+        <ws-form-item label="货名:" span="1" prop="goodsName" class="goodsname">
           <ws-select
             v-model="deptBudgetList.goodsName"
             placeholder=""
@@ -37,36 +45,37 @@
           </ws-select>
         </ws-form-item>
         <!--当期累计入库量-->
-        <ws-form-item label="当期累计入库量(吨)" span="1" prop="cumulativeStockIn">
+        <ws-form-item label="当期累计入库量(吨)" span="1" prop="cumulativeStockIn" class="readonly">
           {{deptBudgetList.cumulativeStockIn}}
         </ws-form-item>
-        <!--当期累计出库量(吨)-->
-        <ws-form-item label="当期累计出库量(吨)" span="1" prop="cumulativeStockOut" class="readonly">
-          {{deptBudgetList.cumulativeStockOut}}
-        </ws-form-item>
-        <!--应余库存(吨)-->
-        <ws-form-item label="应余库存(吨)" span="1" prop="surplusInventory">
-         {{deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut > 0 ? deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut : 0}}
-        </ws-form-item>
         <!--实际库存(吨)-->
-        <ws-form-item label="实际库存(吨)" span="1" prop="physicalInventory" class="readonly">
+        <ws-form-item label="实际库存(吨):" span="1" prop="physicalInventory" class="readonly">
           <ws-input
             v-model="deptBudgetList.physicalInventory"
-            placeholder="请输入实际库存(吨)"
+            placeholder=""
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <!--损耗量(吨)-->
-        <ws-form-item label="损耗量(吨)" span="1" prop="ioss">
-          {{(deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory > 0 ? (deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory : 0}}
+        <!--当期累计出库量(吨)-->
+        <ws-form-item label="当期累计出库量(吨):" span="1" prop="cumulativeStockOut" class="readonly">
+          {{deptBudgetList.cumulativeStockOut}}
+        </ws-form-item>
+           <!--损耗量(吨)-->
+        <ws-form-item label="损耗量(吨):" span="1" prop="ioss" class="readonly">
+          {{ioss1 > 0 ? ioss1 : 0}}
+        </ws-form-item>
+        <!--应余库存(吨)-->
+        <ws-form-item label="应余库存(吨):" span="1" prop="surplusInventory" class='readonly'>
+         {{surplusInventory1 > 0 ? surplusInventory1 : 0 }}
         </ws-form-item>
         <!--库损比例-->
-        <ws-form-item label="库损比例" span="1" prop="inventoryRatio">
+        <ws-form-item label="库损比例" span="1" prop="inventoryRatio" class="readonly">
           <!-- .占比=损耗量÷(累计入库-实际库存) -->
-          {{((deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory)/(deptBudgetList.cumulativeStockIn-deptBudgetList.physicalInventory) > 0 ? ((deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory)/(deptBudgetList.cumulativeStockIn-deptBudgetList.physicalInventory) : 0 }} {{'‰'}}
+          <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>注:提交成功后,当期实际库存将作为下一期的初始库存。</p>
+        <p class="fontsize">注:提交成功后,当期实际库存将作为下一期的初始库存。</p>
       </ws-form>
 
       <div style="text-align: right; padding: 10px">
@@ -143,7 +152,9 @@ export default {
       },
 
       contractList: [],
-      deptBudgetList:{},
+      deptBudgetList:{
+        physicalInventory:0
+      },
       historyList: [],
        rules: {
         netWeight: [
@@ -163,6 +174,27 @@ export default {
       accessoryTFs: false,
     }
   },
+   computed:{
+        ioss1 :function() {
+     return (this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut)-this.deptBudgetList.physicalInventory
+      // return this.message.split('').reverse().join('')
+    },
+    surplusInventory1: function(){
+      return this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut
+    },
+    inventoryRatio1 : function(){
+      var loss=(this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut)-this.deptBudgetList.physicalInventory
+      var defect=this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.physicalInventory
+      if((loss/defect)==1){
+        var num=0
+      }else{
+ // .占比=损耗量÷(累计入库-实际库存)
+     var num = Math.floor((loss/defect)*1000000)/1000
+      }
+     
+     return num;
+    }
+   },
   activated() {
     //cg.viewBudget
     //cg.viewSpareMoney
@@ -179,6 +211,8 @@ export default {
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
    this.deptBudgetList1.baseId=this.$route.query.baseId
     this.deptBudgetList1.positionId=this.$route.query.positionId
+    this.deptBudgetList.inventoryRatio=((deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory)/(deptBudgetList.cumulativeStockIn-deptBudgetList.physicalInventory)*100
+    this.deptBudgetList.ioss=(deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory
     // this.deptBudgetList1.goodsNameKey=this.deptBudgetList.goodsNameKey
     // this.getList()
   },
@@ -308,10 +342,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.container {
+  padding: 20px;
+}
 .center {
-  position: relative;
-  margin-top: 100px;
-  top: 100px;
+  top: 50px;
   width: 40%;
   height: 700px;
   margin: 0 auto; 
@@ -322,10 +357,74 @@ export default {
 /deep/.el-input--small{
   width: 70%;
 }
+/deep/.bg-right{
+    padding-right: 10px;
+    text-align: right;
+}
 .container .bg-bottom {
+ margin: 15px 0px;
+}
+
+//仓位
+.position{
+ width: 52px;
+height: 20px;
+background: #AFB5CB;
+border-radius: 2px;
+font-size: 12px;
+font-family: PingFangSC-Medium, PingFang SC;
+color: #FFFFFF;
+line-height: 20px;
+}
+//表格
+.readonly{
+    width: 49%;
+    display: inline-flex;
+    height: 40px;
+}
+/deep/.el-form-item__label {
+    width: 170px;
+    text-align: left;
+    font-size: 14px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #8890B1;
+line-height: 16px;
+}
+//下拉框
+.goodsname{
+  width: 40%;
+}
+.goodsname:first-child{
+  width: 140px;
+}
+//注意字体
+.fontsize{
+  width: 312px;
+height: 17px;
+font-size: 12px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #AFB5CB;
+line-height: 17px;
+}
+//比例文字
+.proportion{
+color: #FF2C58;
+}
+.proportion1{
+color: black;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
   position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+  left: 0;
 }
 </style>

+ 13 - 8
src/views/warehouse/warehouseManagementNoComplete.vue

@@ -31,7 +31,9 @@
           alt=""
         />
         {{ this.$route.query.warehouseName}}库
+        <span class="position">
           {{ this.$route.query.binNumber }}仓位
+          </span>
       </h2>
         <el-table
         :data="improved.records"
@@ -400,17 +402,10 @@ export default {
 /deep/.el-form-item {
   width: 33%;
 }
-.winseaview-main{
-  
-  // box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5), 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-}
 .el-row{
   background: #F6F7FC;
-  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
+  // box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
   border-radius: 4px 4px 1px 1px;
-}
-.container .bg-left{
-  
 }
 .container .bg-bottom{
   width: 74px;
@@ -503,4 +498,14 @@ font-weight: 600;
 color: #323233;
 line-height: 29px;
 }
+.position {
+    width: 52px;
+    height: 20px;
+    background: #AFB5CB;
+    border-radius: 2px;
+    font-size: 12px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    color: #FFFFFF;
+    line-height: 20px;
+}
 </style>

+ 3 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -1,4 +1,7 @@
 
+
+
+
 // 完善出库信息
 <template>
   <div class="container">

+ 1 - 1
src/views/warehouse/warehouseManagementPut.vue

@@ -21,7 +21,7 @@
         <h2>
           {{ deptBudgetList.warehouseName }}库
           {{ deptBudgetList.binNumber }}仓位
-        </h2>
+        </h2> 
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">