前端

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -524,31 +524,6 @@
         return year + '' + mouth + datetime
       },
       opendBtn() {
-        html2canvas(this.$refs.saveImg.$el).then((canvas) => {
-          let dataURL = canvas.toDataURL('image/png')
-          this.imgUrl = dataURL
-          if (this.imgUrl !== '') {
-            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
-            let formdata = new FormData()
-            formdata.append('file', b)
-            axios({
-              method: 'post',
-              url:this.global.uploadPath,
-              data: formdata,
-            }).then((response) => {
-              // debugger
-              // console.log(response,111111111111)
-              //编辑接口
-              this.printData.pictureAddress = response.data.data.url
-              this.inspect.pictureAddress = response.data.data.url
-              addOut(this.inspect)
-                .toPromise()
-                .then((response) => {})
-            })
-          }
-        })
-      },
-      closeDialog() {
         // html2canvas(this.$refs.saveImg.$el).then((canvas) => {
         //   let dataURL = canvas.toDataURL('image/png')
         //   this.imgUrl = dataURL
@@ -561,15 +536,42 @@
         //       url:this.global.uploadPath,
         //       data: formdata,
         //     }).then((response) => {
+        //       // debugger
+        //       // console.log(response,111111111111)
         //       //编辑接口
-        //       this.printData.pictureAddress = response.data.url
-        //       this.inspect.pictureAddress = response.data.url
+        //       this.printData.pictureAddress = response.data.data.url
+        //       this.inspect.pictureAddress = response.data.data.url
         //       addOut(this.inspect)
         //         .toPromise()
         //         .then((response) => {})
         //     })
         //   }
         // })
+      },
+      closeDialog() {
+        html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+          let dataURL = canvas.toDataURL('image/png')
+          this.imgUrl = dataURL
+          if (this.imgUrl !== '') {
+            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
+            let formdata = new FormData()
+            formdata.append('file', b)
+            axios({
+              method: 'post',
+              url:this.global.uploadPath,
+              data: formdata,
+            }).then((response) => {
+              //编辑接口
+              this.printData.pictureAddress = response.data.url
+              this.inspect.pictureAddress = response.data.url
+              addOut(this.inspect)
+                .toPromise()
+                .then((response) => {
+                  this.getList()
+                })
+            })
+          }
+        })
         this.isShowPrint = false
       },
       print() {
@@ -767,7 +769,7 @@
                     this.printData.contractManagement = this.inspect.contractManagement
                     console.log(this.printData)
                     this.isShowPrint = true
-                    this.getList()
+                    
                   })
 
               })

src/views/profitable/expensemanagementdetails.vue

@@ -396,7 +396,22 @@ export default {
   methods: {
     async exportFile(){
         let _data = {
-          expenseInfoExportList:this.choiceObj
+          // expenseInfoExportList:this.choiceObj,
+          compId: localStorage.getItem('ws-pf_compId'),
+          startDate: this.startDate,
+          endDate: this.endDate,
+          searchKeyWord: this.searchKeyWord,
+          currentPage: this.currentPage,
+          pageSize: 9999,
+          searchType: this.searchType,
+          expensesPurpose: this.expensesPurpose,
+          costNo:this.costNo.length>0?this.costNo.toString():'',
+          purpose:this.purpose.length>0?this.purpose.toString():'',
+          expenseName:this.expenseName.length>0?this.expenseName.toString():'',
+          unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
+          agent:this.agent.length>0?this.agent.toString():'',
+          flowTo:this.flowTo.length>0?this.flowTo.toString():'',
+          warehouseName:this.warehouseName
         }
         const {
           data

src/views/statisticalReport/autoSettlementList.vue

@@ -1277,14 +1277,35 @@ export default {
         })
     },
     editsettlementWeight(item) {
+      if (item.approveStatus) {
+        this.$message({
+          message: '请选择待请款的条目进行修改!',
+          type: 'warning',
+        })
+        return
+      }
       this.settlementWeight = item.settlementWeight
       item.settlementWeightchange = true
     },
     editsettlementPrice(item) {
+      if (item.approveStatus) {
+        this.$message({
+          message: '请选择待请款的条目进行修改!',
+          type: 'warning',
+        })
+        return
+      }
       this.settlementPrice = item.settlementPrice
       item.settlementPricechange = true
     },
     editactualLoss(item) {
+      if (item.approveStatus) {
+        this.$message({
+          message: '请选择待请款的条目进行修改!',
+          type: 'warning',
+        })
+        return
+      }
       this.actualLoss = item.actualLoss
       item.actualLosschange = true
     },
@@ -1327,6 +1348,13 @@ export default {
         })
     },
     editdeductionAmount(item) {
+      if (item.approveStatus) {
+        this.$message({
+          message: '请选择待请款的条目进行修改!',
+          type: 'warning',
+        })
+        return
+      }
       this.deductionAmount = item.deductionAmount
       item.deductionAmountchange = true
     },
@@ -1369,6 +1397,13 @@ export default {
         })
     },
     editserviceCharge(item) {
+      if (item.approveStatus) {
+        this.$message({
+          message: '请选择待请款的条目进行修改!',
+          type: 'warning',
+        })
+        return
+      }
       this.serviceCharge = item.serviceCharge
       item.serviceChargechange = true
     },

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -175,7 +175,7 @@
           </el-table-column>
           <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
             <template scope="scope">
-              {{ scope.row.weightOut - scope.row.weightIn - Number(count)}}
+              {{ Number(scope.row.weightOut - scope.row.weightIn - Number(count)).toFixed(2)}}
             </template>
           </el-table-column>
         </el-table>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -543,6 +543,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
+            console.log(this.deptBudgetList.tranCarInfoList,this.deptBudgetList.tranCarInfoList1.length)
             if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 10) {
               this.deptBudgetList.tranCarInfoList1.push({
                 driverName: '',
@@ -908,24 +909,6 @@
                 billingMethod:1,
                 tranPrice: this.deptBudgetList.tranPrice
               }, ]
-            if (this.deptBudgetList.tranCarInfoList.length == 0) {
-              this.deptBudgetList.tranCarInfoList = [{
-                driverName: '',
-                driverPhone: '',
-                carLength: 0,
-                carLengthKey: '',
-                loadWeight: null,
-                carModel: '',
-                carModelKey: '',
-                carNumber: '',
-                disabled: false,
-                fleetFlag:0,
-                tranType: '1',
-                tranCarNo: 'C001',
-                billingMethod:1,
-                tranPrice: this.deptBudgetList.tranPrice
-              }, ]
-            }
           })
         nameXiala({
             compId: this.compId

src/views/warehousenew/component/router/index.js

@@ -12,6 +12,21 @@ const warehouseManagementRouter = {
     icon: '-cangkubeifen'
   },
   children: [
+    {
+      path: 'warehousingOrder',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
+      name: 'warehousingOrder',
+      meta: {
+        title: 'warehousingOrder',
+        shortcutEntrance: 'warehousingOrder',
+        module: 'warehouseManagement.warehousingOrder',
+        permissicon: [],
+        keepAlive: true,
+        _title:'入库单'
+        // module: 'procurement.sparepart.applDetail'
+      },
+    },
     {
       path: 'warehouseManagementList',
       component: () =>
@@ -432,21 +447,7 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },  
-    {
-      path: 'warehousingOrder',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
-      name: 'warehousingOrder',
-      meta: {
-        title: 'warehousingOrder',
-        shortcutEntrance: 'warehousingOrder',
-        module: 'warehouseManagement.warehousingOrder',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库单'
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
+    
     {
       path: 'inventoryCheck',
       component: () =>

src/views/workNotification/utils/index.js

@@ -117,6 +117,10 @@ export function profitable(code, state){
     case 'FEIYONGGUANLI-APPROVE':
       url = 'expensemanagementdetails'
       break
+      //费用运费管理
+    case 'FEIYONGGUANLI-APPROVE':
+      url = 'expensemanagementdetails'
+      break
   }
   return url
 }