zhongtianhaoyuan преди 4 години
родител
ревизия
53581b52fc

+ 34 - 34
src/views/warehouse/warehouseManagementDelivery.vue

@@ -382,14 +382,14 @@ export default {
     },
     //提交按钮
     submit() {
-      if (this.deptBudgetList.goodsName=="") {
+      if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空!',
           type: 'warning',
         })
         return
       }
-       if (this.deptBudgetList.grossWeight=="") {
+       if (!this.deptBudgetList.grossWeight) {
         this.$message({
           message: '毛重不能为空!',
           type: 'warning',
@@ -403,7 +403,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.tare=="") {
+      if (!this.deptBudgetList.tare) {
         this.$message({
           message: '皮重不能为空!',
           type: 'warning',
@@ -417,7 +417,7 @@ export default {
         })
         return
       }
-       if (this.deptBudgetList.netWeight=="") {
+       if (!this.deptBudgetList.netWeight) {
         this.$message({
           message: '净重不能为空!',
           type: 'warning',
@@ -431,42 +431,42 @@ export default {
         })
         return
       }  
-       if (this.deptBudgetList.grade=="") {
+       if (!this.deptBudgetList.grade) {
         this.$message({
           message: '品级不能为空!',
           type: 'warning',
         })
         return
       }
-        if (this.deptBudgetList.agent=="") {
+        if (!this.deptBudgetList.agent) {
         this.$message({
           message: '经办人不能为空!',
           type: 'warning',
         })
         return
       }
-       if (this.deptBudgetList.agent.length<2 && this.deptBudgetList.agent.length>10) {
+       if (this.deptBudgetList.agent.length < 2 && this.deptBudgetList.agent.length > 10) {
         this.$message({
           message: '经办人姓名输入有误!',
           type: 'warning',
         })
         return
       }
-       if (this.deptBudgetList.inOutDate=="") {
+       if (!this.deptBudgetList.inOutDate) {
         this.$message({
           message: '出库日期不能为空!',
           type: 'warning',
         })
         return
       }
-      if (this.deptBudgetList.inOutType=="") {
+      if (!this.deptBudgetList.inOutType) {
         this.$message({
           message: '出库类型不能为空!',
           type: 'warning',
         })
         return
       }
-      if (this.deptBudgetList.carNo=="") {
+      if (!this.deptBudgetList.carNo) {
         this.$message({
           message: '车牌号不能为空!',
           type: 'warning',
@@ -480,7 +480,7 @@ export default {
         })
         return
       }
-       if (this.deptBudgetList.contractNo=="") {
+       if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空!',
           type: 'warning',
@@ -640,29 +640,29 @@ export default {
         })
     },
 
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
+    // async exportlist() {
+    //   const { data } = await export1(
+    //     {
+    //       compId: sessionStorage.getItem('ws-pf_compId'),
+    //       contractType: this.contractType,
+    //       currentPage: this.currentPage,
+    //       pageSize: this.pageSize,
+    //       searchType: this.searchType,
+    //       searchKeyWord: this.searchKeyWord,
+    //       startDate: this.startDate,
+    //       endDate: this.endDate,
+    //     },
+    //     {},
+    //     { responseType: 'blob' }
+    //   ).toPromise()
+    //   downloadFile({
+    //     res: data,
+    //     fileName: `${
+    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+    //     }_采购合同`,
+    //     type: 'xls',
+    //   })
+    // },
     // deletecontract(){},
     //删除
     approve() {},

+ 4 - 5
src/views/warehouse/warehouseManagementIoss.vue

@@ -150,7 +150,6 @@ export default {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
       },
-
       contractList: [],
       deptBudgetList:{
         physicalInventory:0
@@ -188,8 +187,8 @@ export default {
       if((loss/defect)==1){
         var num=0
       }else{
- // .占比=损耗量÷(累计入库-实际库存)
-     var num = Math.floor((loss/defect)*1000000)/1000
+        // .占比=损耗量÷(累计入库-实际库存)
+        num = Math.floor((loss/defect)*1000000)/1000
       }
      
      return num;
@@ -211,8 +210,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.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()
   },

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

@@ -45,8 +45,7 @@
              @click="edits(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-           
+            "    
             >编辑</ws-button
           >
           <ws-button
@@ -67,13 +66,11 @@
             size="small"
             @click="returnWarehouse()"
             >关闭</el-button
-          >
-          
+          >    
         </div>
       <!-- </ws-form> -->
     </div>
   </div>
-  
 </template>
 <script>
 import {
@@ -176,14 +173,11 @@ export default {
       if(row.inOutFlag==2){
          this.$router.push({
            path:'warehouseManagementPerfectput',
-          
            })
       }else if(row.inOutFlag==1){
         this.$router.push({
           path:'warehouseManagementPerfectDelivery',
-
           })
-        
       }
      
     },