Forráskód Böngészése

前端添加钎样员

gjy 2 éve
szülő
commit
82ea699533
33 módosított fájl, 2308 hozzáadás és 1760 törlés
  1. 1 1
      public/static/outWeightPrint.html
  2. 2 0
      src/api/V2/houseSelfCollect/index.js
  3. 4 0
      src/api/V2/outboundManagement/index.js
  4. 38 38
      src/components/mapdrag/indexMap.vue
  5. 3 0
      src/model/houseSelfCollect/index.js
  6. 7 1
      src/model/outboundManagement/index.js
  7. 25 9
      src/utils/util.js
  8. 122 121
      src/views/contractManagement/purchaseContractAdd.vue
  9. 4 2
      src/views/contractManagement/purchaseContractEdit.vue
  10. 5 2
      src/views/contractManagement/purchaseContractExamine.vue
  11. 36 8
      src/views/home/index.vue
  12. 397 327
      src/views/houseSelfCollect/inspectionManagementNew.vue
  13. 119 1
      src/views/houseSelfCollect/weightCheckRecord.vue
  14. 1 1
      src/views/outboundManagement/component/weightCheckPrint.vue
  15. 18 10
      src/views/outboundManagement/weighingManagementNew.vue
  16. 236 0
      src/views/outboundManagement/weighingManagementrecord.vue
  17. 1 1
      src/views/profitable/cashout.vue
  18. 10 17
      src/views/profitable/expenseallot.vue
  19. 17 5
      src/views/profitable/expensemanagementdetails.vue
  20. 11 18
      src/views/profitable/expensemanagentlook.vue
  21. 1 1
      src/views/profitable/receipt.vue
  22. 1093 1083
      src/views/statisticalReport/autoSettlementList.vue
  23. 0 2
      src/views/taskManagement/inOutWarehouseTaskEdit.vue
  24. 52 44
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  25. 3 6
      src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
  26. 0 1
      src/views/tranManagement/tranManagementShippingFeedbackLook.vue
  27. 1 1
      src/views/tranManagement/tranManagementTransporFeedbackLook.vue
  28. 1 1
      src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue
  29. 14 13
      src/views/tranManagement/tranManagementVehicleDispatching.vue
  30. 1 1
      src/views/tranManagement/tranManagementthirdpartnarReceivingLook.vue
  31. 11 9
      src/views/warehousenew/warehouseManagementList.vue
  32. 9 0
      src/views/warehousenew/warehouseManagementLook.vue
  33. 65 36
      src/views/warehousenew/warehousingOrder.vue

+ 1 - 1
public/static/outWeightPrint.html

@@ -258,7 +258,7 @@
             </div>
             <div class="small-row">
                 <div>出库单位</div>
-                <div>{{tableData.compName}}</div>
+                <div>{{tableData.contractManagement?tableData.contractManagement.seller:tableData.compName}}</div>
             </div>
             <div class="small-row">
                 <div>联系人</div>

+ 2 - 0
src/api/V2/houseSelfCollect/index.js

@@ -106,6 +106,8 @@ export const API_POST_WORKFLOW_TASK = `/newWorkflow/getTaskWebsocket`
 export const API_POST_SUSPENDINSTANCE ='/paymentManagement/api/ReSettlement'
 //导入
 export const API_POST_IMPORT ='/qualityInspectionManagement/api/importQuality'
+//导入移库
+export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighing'
 // 结算单
 export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'
 // 退回

+ 4 - 0
src/api/V2/outboundManagement/index.js

@@ -42,4 +42,8 @@ export const API_POST_NEW_SUBMIT = '/warehouseInOutInfo/api/newInOutWarehouse'
 export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
 // 退回
 export const API_POST_GO_BACK = `/weighingManagement/api/outWeightReturn`
+//导入销售出库
+export const API_POST_IMPORT_SALE ='/weighingManagement/api/importWeighingOut'
+//导入移库出库
+export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighingMoveOut'
 

+ 38 - 38
src/components/mapdrag/indexMap.vue

@@ -158,11 +158,11 @@
         var that = this
         this.makeJsonData()
         AMapLoader.load({
-          "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key,首次调用 load 时必填
-          "version": "2.0", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
-          "Loca": { // 是否加载 Loca, 缺省不加载
-            "version": '2.0.0' // Loca 版本,缺省 1.3.2
+          'key': '211dd6f989e719022aaf47ddb0659c47', // 申请好的Web端开发者Key,首次调用 load 时必填
+          'version': '2.0', // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
+          'plugins': ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
+          'Loca': { // 是否加载 Loca, 缺省不加载
+            'version': '2.0.0' // Loca 版本,缺省 1.3.2
           },
         }).then((AMap) => {
           this.loadmap()
@@ -192,26 +192,26 @@
           _coordinates1.push(Number(_position1[1]))
           _coordinates1.push(Number(_position1[0]))
           let _obj1 = {
-            "type": "Feature",
-            "properties": {
-              "type": i,
+            'type': 'Feature',
+            'properties': {
+              'type': i,
             },
-            "geometry": {
-              "type": "Point",
-              "coordinates": _coordinates1
+            'geometry': {
+              'type': 'Point',
+              'coordinates': _coordinates1
             }
           }
           let _position11 = _data.startPlace ? _data.startPlace.split(',') : []
           _coordinates11.push(Number(_position11[1]))
           _coordinates11.push(Number(_position11[0]))
           let _obj11 = {
-            "type": "Feature",
-            "properties": {
-              "type": i,
+            'type': 'Feature',
+            'properties': {
+              'type': i,
             },
-            "geometry": {
-              "type": "Point",
-              "coordinates": _coordinates11
+            'geometry': {
+              'type': 'Point',
+              'coordinates': _coordinates11
             }
           }
 
@@ -235,31 +235,31 @@
           _marker.name = _data.name
           this.markerList.push(_marker)
           let _obj2 = {
-            "type": "Feature",
-            "properties": {
+            'type': 'Feature',
+            'properties': {
 
             },
-            "geometry": {
-              "type": "LineString",
-              "coordinates": _coordinates2
+            'geometry': {
+              'type': 'LineString',
+              'coordinates': _coordinates2
             }
           }
           _features2.push(_obj2)
         }
         this.mapPointData = {
-          "type": "FeatureCollection",
-          "features": _features1
+          'type': 'FeatureCollection',
+          'features': _features1
         }
         this.mapLineData = {
-          "type": "FeatureCollection",
-          "features": _features2
+          'type': 'FeatureCollection',
+          'features': _features2
         }
-        console.log("this.mapPointData", this.mapPointData)
-        console.log("this.mapPointData", this.mapLineData)
+        console.log('this.mapPointData', this.mapPointData)
+        console.log('this.mapPointData', this.mapLineData)
 
       },
       loadmap(val) {
-        var map = new AMap.Map('mapContainer', {
+          let map = new AMap.Map('mapContainer', {
           zoom: 4.89,
           showLabel: true,
           viewMode: '3D',
@@ -270,13 +270,13 @@
           showIndoorMap: false,
         });
 
-        var loca = new Loca.Container({
+        let loca = new Loca.Container({
           map,
         });
         for (let i = 0; i < this.markerList.length; i++) {
           // 构造点标记
           if (this.markerList[i].iconSrc[0] && this.markerList[i].iconSrc[1]) {
-            var marker = new AMap.Marker({
+            let marker = new AMap.Marker({
               position: this.markerList[i].iconSrc,
               anchor: 'bottom-center',
               icon: new AMap.Icon({
@@ -288,7 +288,7 @@
             map.add(marker);
             marker.setLabel({
               offset: new AMap.Pixel(0, 0), //设置文本标注偏移量
-              content: "<div class = 'maker-item'>" + this.markerList[i].name + "</div>", //设置文本标注内容
+              content: '<div class = \'maker-item\'>' + this.markerList[i].name + '</div>', //设置文本标注内容
               direction: 'right' //设置文本标注方位
 
             });
@@ -301,8 +301,8 @@
         this.timer = setInterval(function() {
           _markerDom[_index].style.opacity = 1
           _markerDom[_index].style.transition = '2s'
-          var elseLi = _markerDom;
-          for (var i = 0; i < elseLi.length; i++) {
+          let elseLi = _markerDom;
+          for (let i = 0; i < elseLi.length; i++) {
             if (elseLi[i] !== _markerDom[_index]) { //判断是否是ele节点,是否与触发事件的节点相同
               elseLi[i].style.opacity = 0
               _markerDom[_index].style.transition = '2s'
@@ -314,7 +314,7 @@
 
 
         // 呼吸点
-        var scatter = new Loca.ScatterLayer({
+        let scatter = new Loca.ScatterLayer({
           loca,
           zIndex: 10,
           opacity: 0.6,
@@ -322,7 +322,7 @@
           zooms: [2, 22],
         });
 
-        var pointGeo = new Loca.GeoJSONSource({
+        let pointGeo = new Loca.GeoJSONSource({
           // url: 'https://a.amap.com/Loca/static/loca-v2/demos/mock_data/pulselink-china-city-point.json',
           data: this.mapPointData
         });
@@ -338,7 +338,7 @@
         loca.add(scatter);
 
         // 弧线
-        var pulseLink = new Loca.PulseLinkLayer({
+        let pulseLink = new Loca.PulseLinkLayer({
           // loca,
           zIndex: 10,
           opacity: 1,
@@ -347,7 +347,7 @@
           depth: true,
         });
 
-        var geo = new Loca.GeoJSONSource({
+        let geo = new Loca.GeoJSONSource({
           // url: 'https://a.amap.com/Loca/static/loca-v2/demos/mock_data/data-line-out.json',
           data: this.mapLineData
         });

+ 3 - 0
src/model/houseSelfCollect/index.js

@@ -54,6 +54,7 @@ import {
   API_POST_INSPECT_GETWEIGHTDELETE,
   API_POST_SUSPENDINSTANCE,
   API_POST_IMPORT,
+  API_POST_IMPORT_YK,
   API_GET_INSPECT_CONTRACTNO,
   API_GET_SETTLEACCOUT,
   API_POST_RETURN,
@@ -169,6 +170,8 @@ export const workflowcontent = appRx.get(API_POST_WORKFLOW_TASK, errorCatcher, e
 export const suspendinstance = appRx.post(API_POST_SUSPENDINSTANCE, errorCatcher, errorHandle, filter)
 // 导入
 export const importWord = appRx.post(API_POST_IMPORT, errorCatcher, errorHandle, filter)
+// 导入移库
+export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
 // 查看结算单
 export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)
 // 退回

+ 7 - 1
src/model/outboundManagement/index.js

@@ -23,6 +23,8 @@ import {
     API_GET_INSPECT_CONTRANCLISTWEIGHING,
     API_POST_NEW_SUBMIT,
     API_POST_CHANE_NO,
+    API_POST_IMPORT_SALE,
+    API_POST_IMPORT_YK,
     API_POST_GO_BACK
 }   from '@/api/V2/outboundManagement'
 
@@ -69,4 +71,8 @@ export const newSubmit = appRx.post(API_POST_NEW_SUBMIT, errorCatcher, errorHand
 // 换仓
 export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)
 // 退回
-export const goBack = appRx.post(API_POST_GO_BACK, errorCatcher, errorHandle, filter)
+export const goBack = appRx.post(API_POST_GO_BACK, errorCatcher, errorHandle, filter)
+// 导入销售出库
+export const importWordSale = appRx.post(API_POST_IMPORT_SALE, errorCatcher, errorHandle, filter)
+// 导入移库出库
+export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)

+ 25 - 9
src/utils/util.js

@@ -199,25 +199,41 @@ export const fullscreenEnable = () => {
  * 浏览器全屏
  */
 export const reqFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
-    document.documentElement.requestFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
-    document.documentElement.webkitRequestFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
-    document.documentElement.mozRequestFullScreen();
+  let _documentDom = document.getElementById('contentView')
+  if (_documentDom.requestFullScreen) {
+    _documentDom.requestFullScreen();
+  } else if (_documentDom.webkitRequestFullScreen) {
+    _documentDom.webkitRequestFullScreen();
+  } else if (_documentDom.mozRequestFullScreen) {
+    _documentDom.mozRequestFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.documentElement.requestFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.documentElement.webkitRequestFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.documentElement.mozRequestFullScreen();
+  // }
 };
 /**
  * 浏览器退出全屏
  */
 export const exitFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
+  let _documentDom = document.getElementById('contentView')
+    if (_documentDom.requestFullScreen) {
     document.exitFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
+  } else if (_documentDom.webkitRequestFullScreen) {
     document.webkitCancelFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
+  } else if (_documentDom.mozRequestFullScreen) {
     document.mozCancelFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.exitFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.webkitCancelFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.mozCancelFullScreen();
+  // }
 };
 /**
  * 递归寻找子类的父类

+ 122 - 121
src/views/contractManagement/purchaseContractAdd.vue

@@ -89,6 +89,7 @@
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="3">对方送货(临时库)</el-radio>
           <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
               我方自提</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
@@ -269,7 +270,7 @@
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
         </ws-form-item>
-        <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
+        <ws-form-item v-show="deptBudgetList.deliverType != 2" label="临时仓库负责人" span="1" prop="packingMethod">
           <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
             @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
@@ -969,11 +970,11 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
         if (
-          this.deptBudgetList.contractNo.length < 6 ||
+          this.deptBudgetList.contractNo.length < 5 ||
           this.deptBudgetList.contractNo.length > 50
         ) {
           this.$message({
-            message: '合同编号长度不符合要求,请输入6到50个字符之内!',
+            message: '合同编号长度不符合要求,请输入5到50个字符之内!',
             type: 'warning',
           })
           return
@@ -1285,124 +1286,124 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-          this.$message({
-            message: '请输入杂质',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.contractGoodsInfo.impurity &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).length -
-          (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
-        ) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-          this.$message({
-            message: '请输入容重',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
-            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
-            (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
-          .bulkDensity < 0
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-          this.$message({
-            message: '请输入霉变粒',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
-            (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .mildewGrain < 0)
-        ) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-          this.$message({
-            message: '请输入热损伤',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-          (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
-            -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
-            (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-            .jiaorenli < 0)
-        ) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-          this.$message({
-            message: '请输入不完善粒',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
-            (String(
-                this.deptBudgetList.contractGoodsInfo.imperfectGrain
-              ).indexOf('.') +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .imperfectGrain < 0)
-        ) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+        //   this.$message({
+        //     message: '请输入杂质',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.deptBudgetList.contractGoodsInfo.impurity &&
+        //   String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
+        //   String(this.deptBudgetList.contractGoodsInfo.impurity).length -
+        //   (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
+        //   2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
+        // ) {
+        //   this.$message({
+        //     message: '杂质输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+        //   this.$message({
+        //     message: '请输入容重',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
+        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
+        //     2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
+        //   .bulkDensity < 0
+        // ) {
+        //   this.$message({
+        //     message: '容重输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+        //   this.$message({
+        //     message: '请输入霉变粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
+        //       '.'
+        //     ) != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
+        //         '.'
+        //       ) +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .mildewGrain < 0)
+        // ) {
+        //   this.$message({
+        //     message: '霉变粒输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+        //   this.$message({
+        //     message: '请输入热损伤',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
+        //     -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
+        //         '.'
+        //       ) +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .jiaorenli < 0)
+        // ) {
+        //   this.$message({
+        //     message: '热损伤输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+        //   this.$message({
+        //     message: '请输入不完善粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
+        //       '.'
+        //     ) != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
+        //     (String(
+        //         this.deptBudgetList.contractGoodsInfo.imperfectGrain
+        //       ).indexOf('.') +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .imperfectGrain < 0)
+        // ) {
+        //   this.$message({
+        //     message: '不完善粒输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         // if (
         //   (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
         //     (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||

+ 4 - 2
src/views/contractManagement/purchaseContractEdit.vue

@@ -196,12 +196,12 @@
         </ws-form-item>
 
         <!-- 临时仓库负责人 -->
-        <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType == 1">
+        <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType != 2">
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>
-        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod" v-if="deptBudgetList.deliverType==1">
           {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
         </ws-form-item>
       </ws-info-table>
@@ -518,6 +518,8 @@
               this.deptBudgetList.deliverType1 = '我方自提'
             } else if (this.deptBudgetList.deliverType == 2) {
               this.deptBudgetList.deliverType1 = '对方送货'
+            }else if (this.deptBudgetList.deliverType == 3) {
+              this.deptBudgetList.deliverType1 = '对方送货(临时库)'
             }
 
           })

+ 5 - 2
src/views/contractManagement/purchaseContractExamine.vue

@@ -126,10 +126,10 @@
         <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType != 2">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>
-        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod" v-if="deptBudgetList.deliverType==1">
           {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
         </ws-form-item>
       </ws-info-table>
@@ -294,6 +294,9 @@
             } else if (this.deptBudgetList.deliverType == 2) {
               this.deptBudgetList.deliverType1 = '对方送货'
             }
+            else if (this.deptBudgetList.deliverType == 3) {
+              this.deptBudgetList.deliverType1 = '对方送货(临时库)'
+            }
           })
         // 包装方式
         packList({

+ 36 - 8
src/views/home/index.vue

@@ -1,6 +1,6 @@
 <!-- 首页模块 首页面 -->
 <template>
-  <div class="home">
+  <div class="home" id='contentView'>
     <div class="body-middle" :class="{ 'body-middle-height': blockList[0].flag }">
       <div class="body-middle-left">
         <!-- 任务、消息、提醒、超期 -->
@@ -75,7 +75,7 @@
             </el-row>
             <el-row>
               <h3 class="content2-map">库点流向分布</h3>
-              <div class="center-map">
+              <div class="center-map" style="border: 2px solid #6a5f5f">
                 <map-drag :listData=' mapInfo'></map-drag>
               </div>
             </el-row>
@@ -237,7 +237,7 @@
         nowTime: null, //存放时分秒变量
         timer: '', //定义一个定时器的变量
         currentTime: new Date(), // 获取当前时间
-        timer: '',
+        timer1: '',
         dialogVisible: false,
         showEchart: false,
         phone: '', // 正式租户电话号码
@@ -360,6 +360,7 @@
       // this.checkUserInfoDialog()
       // {
       this.timer = setInterval(this.getTime, 1000);
+      this.timer1 = setInterval(this.flushData, 120000);
       // }
     },
     beforeDestroy() {
@@ -367,6 +368,10 @@
       if (this.timer) {
         clearInterval(this.timer); // 在Vue实例销毁前,清除定时器
       }
+      clearInterval(this.timer1);
+      if (this.timer1) {
+        clearInterval(this.timer1); // 在Vue实例销毁前,清除定时器
+      }
     },
     async mounted() {
       var staffId = JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
@@ -406,7 +411,8 @@
       // this.getNewList()
       gChartsData({
         compId: localStorage.getItem('ws-pf_compId'),
-        seachMoth: '2021'
+        loadingstatus: 1,
+        seachMoth: '2022'
       }).toPromise().then(res => {
         console.log('··············', res)
         this.chartsData = res
@@ -453,6 +459,27 @@
     },
     methods: {
       ...mapActions('user', ['toSetShow', 'changeVesslBank']),
+      flushData(){
+         gChartsData({
+          compId: localStorage.getItem('ws-pf_compId'),
+          loadingstatus: 1,
+          seachMoth: '2022'
+        }).toPromise().then(res => {
+          console.log('··············', res)
+          // this.chartsData = res
+          this.carCount1 = res[6].biViewInfoList[0].count
+          this.carCount2 = res[6].biViewInfoList[1].count
+          this.carCount3 = res[6].biViewInfoList[2].count
+          // this.physicalInventory = Number(res[7].biViewInfoList[0].count).toFixed(2)
+          // this.procurementPending= Number(res[7].biViewInfoList[1].count).toFixed(2)
+          // this.salesPending =  Number(res[7].biViewInfoList[2].count).toFixed(2)
+          // this.position = Number(Number(this.physicalInventory)+Number(this.procurementPending) - Number(this.salesPending)).toFixed(2)
+          // this.totalReserves = res[8].biViewInfoList
+          // this.mapInfo = res[9]
+          // console.log(res)
+          // this.initCharts()
+        })
+      },
       getChartsData() {
         noticeNumber().toPromise().then(res => {
           const {
@@ -554,7 +581,7 @@
       },
       initCharts() {
         let app = this;
-        var roseCharts = document.getElementsByClassName('roseChart');
+        let roseCharts = document.getElementsByClassName('roseChart');
         for (let i = 0; i < roseCharts.length; i++) {
           let myChart = app.$echarts.init(roseCharts[i]);
           let color = []
@@ -586,7 +613,7 @@
               color = ['#247ef4', '#3a3b40'];
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
-                name: '已开票1',
+                name: '已开票',
                 value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
                 type: '采购合同'
               }, {
@@ -751,7 +778,8 @@
         let _y = []
         for (let i = 0; i < this.totalReserves.length; i++) {
           _x.push(this.totalReserves[i].name)
-          _y.push(this.totalReserves[i].count)
+          var a = Number(this.totalReserves[i].count).toFixed(2)
+          _y.push(a)
         }
 
         // 柱状图
@@ -1952,7 +1980,7 @@
   }
 
   .home {
-    background: rgb(27, 28, 30);
+    background: #2a2a2a;
     padding-bottom: 20px
   }
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 397 - 327
src/views/houseSelfCollect/inspectionManagementNew.vue


+ 119 - 1
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -40,7 +40,12 @@
       <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
       <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
       <el-button size="small" @click="print('',1)">批量打印</el-button>
-        
+       <el-upload style="margin-top: -35px; margin-left:430px" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClick" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入(移库)</ws-button>
+        </el-upload>
       <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
@@ -170,6 +175,7 @@
     getPrint,
     returnInfo,
     changeNo,
+    importWordYk,
     getweighingDelete
   } from '@/model/houseSelfCollect/index'
   import weightCheckPrint from './component/weightCheckPrint.vue'
@@ -311,6 +317,118 @@
       this.getList()
     },
     methods: {
+      importClick(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if (fileType == 'xlsx' || fileType == 'xls') {
+            this.importf(this.fileTemp)
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误,请删除后重新上传!',
+            })
+          }
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传附件!',
+          })
+        }
+      },
+      importf(obj) {
+        this.excelFreightspace = []
+        // this.dialogVisible = true;
+        let _this = this;
+        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0];
+        var rABS = false; //是否将文件读取为二进制字符串
+        var f = this.file;
+        var reader = new FileReader();
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = '';
+          var rABS = false; //是否将文件读取为二进制字符串
+          var pt = this;
+          var wb; //读取完成的数据
+          var outdata;
+          var reader = new FileReader();
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result);
+            var length = bytes.byteLength;
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i]);
+            }
+            var XLSX = require('xlsx');
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                type: 'base64',
+                cellDates: true
+              });
+            } else {
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              });
+            }
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+              v = JSON.parse(jsonString);
+              let obj = {}
+              //xxx代表列名
+              obj.number = v.业务编号
+              obj.inOutTaskNo = v.移库任务编号
+              obj.outType = v.运输方式
+              obj.carNumber = v.车牌号
+              obj.grossWeight = v.毛重
+              obj.tare = v.皮重
+              obj.netWeight = v.净重
+              obj.grossDate = _this.formatDate(v.入库日期, '-')
+              _this.excelFreightspace.push(obj)
+            })
+            if (_this.excelFreightspace) {
+              importWordYk({
+                  warehouseName: _this.warehouseName,
+                  weighingManagementList: _this.excelFreightspace
+                }).toPromise()
+                .then((response) => {
+                  if (response == 'ok') {
+                    this.$notify({
+                      title: '成功',
+                      message: '导入成功',
+                      type: 'success'
+                    });
+                    _this.getList()
+                  }
+                })
+
+            }
+          }
+          reader.readAsArrayBuffer(f);
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f);
+        } else {
+          reader.readAsBinaryString(f);
+        }
+
+      },
+      formatDate(numb, format) {
+        const old = numb - 1;
+        const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
+        const time = new Date(1900, 0, old, 0, 0, t)
+        const year = time.getFullYear();
+        const month = time.getMonth() + 1;
+        const date = time.getDate();
+        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+          ' 00:00:00'
+      },
       binNumberChange(e){
         this.binNumber = e
         for(let i = 0 ; i < this.binnumberList.length ; i++){

+ 1 - 1
src/views/outboundManagement/component/weightCheckPrint.vue

@@ -14,7 +14,7 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">出库单位</td>
-            <td class="col" colspan="2">{{tableData.compName}}</td>
+            <td class="col" colspan="2">{{tableData.contractManagement ? tableData.contractManagement.seller:tableData.compName}}</td>
             <td class="col col-bgc">联系人</td>
             <td class="col" >{{tableData.person}}</td>
             <td class="col col-bgc">联系电话</td>

+ 18 - 10
src/views/outboundManagement/weighingManagementNew.vue

@@ -944,7 +944,7 @@
             })
             return
           }
-          if (!this.weighingList.binNumber) {
+          if (!this.weighingList.binNumber && this.weighingList.warehouseType == 1) {
             this.$message({
               message: '仓位号不能为空',
               type: 'warning',
@@ -997,7 +997,7 @@
             return
           }
         }
-        if (!this.weighingList.binNumber) {
+        if (!this.weighingList.binNumber&& this.weighingList.warehouseType == 1) {
           this.$message({
             message: '仓位号不能为空',
             type: 'warning',
@@ -1005,6 +1005,13 @@
           return
         }
         if (this.tpyeNo == 1) {
+          if (!this.weighingList.inOutType) {
+            this.$message({
+              message: '出库类型不能为空',
+              type: 'warning',
+            })
+            return
+          }
           if (!this.weighingList.tare) {
             this.$message({
               message: '皮重不能为空',
@@ -1061,7 +1068,7 @@
         }
         this.weighingList.compId = localStorage.getItem('ws-pf_compId')
         this.weighingList.warehouseName = this.warehouseName
-        this.weighingList.warehouseType = this.warehouseTyp
+        this.weighingList.warehouseType = this.warehouseType
         this.$confirm('确定保存检斤信息?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -1672,6 +1679,7 @@
         }
         this.weighingList.inOutTaskNo=e
         this.warehouseCount = this.warehouseCount1
+        var data = null
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
             //  this.weighingList.number = this.taskNolist[i].inOutTaskNo
@@ -1679,7 +1687,7 @@
             this.weighingList.numberLetter = 'XSCK'
             this.weighingList.goodsName = this.taskNolist[i].goodsName
             this.weighingList.tips = this.taskNolist[i].businessDescribe
-            var data = this.taskNolist[i]
+            data = this.taskNolist[i]
             if(this.taskNolist[i].inOutType=='移库出库'){
               this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
             }else{
@@ -1693,7 +1701,7 @@
             
           }
         }
-        if (!data) return
+        // if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
             this.weighingList.goodsName = this.outContractNo[i].goodsName
@@ -1731,18 +1739,18 @@
 
               this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
               this.weighingList.seller = this.outContractNo[i].sendWarehouse
-              this.weighingList.goodsName = data.goodsName
-              this.weighingList.goodsNameKey = data.goodsNameKey
-              this.weighingList.grade = data.grade
+              this.weighingList.goodsName = data == null?'玉米':data.goodsName
+              this.weighingList.goodsNameKey = data == null?'1':data.goodsNameKey
+              this.weighingList.grade = data == null?'二等品':data.grade
               if (this.outContractNo[i].unitContractPrice) {
                 this.weighingList.tips =
                   '入货库' +
-                  data.receiveWarehouse +
+                  data == null?'':data.receiveWarehouse +
                   '( ' +
                   this.outContractNo[i].unitContractPrice +
                   '元/吨)'
               } else {
-                this.weighingList.tips = '入货库' + data.receiveWarehouse
+                this.weighingList.tips = '入货库' + data == null?'':data.receiveWarehouse
               }
               this.weighingList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {

+ 236 - 0
src/views/outboundManagement/weighingManagementrecord.vue

@@ -3,6 +3,20 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
+         <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClick" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入(销售)</ws-button>
+        </el-upload>
+      </template>
+      <template slot="left">
+         <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClickYk" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入(移库)</ws-button>
+        </el-upload>
       </template>
       <!-- <template slot="left"> </template> -->
       <template slot="right">
@@ -134,6 +148,8 @@
     delelteWeighing,
     getweighing,
     changeNo,
+    importWordSale,
+    importWordYk,
     goBack
   } from '@/model/outboundManagement/index'
   import {
@@ -185,6 +201,226 @@
       this.showType = this.isShow
     },
     methods: {
+            importClick(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if (fileType == 'xlsx' || fileType == 'xls') {
+            this.importf(this.fileTemp)
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误,请删除后重新上传!',
+            })
+          }
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传附件!',
+          })
+        }
+      },
+      importf(obj) {
+        this.excelFreightspace = []
+        // this.dialogVisible = true;
+        let _this = this;
+        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0];
+        var rABS = false; //是否将文件读取为二进制字符串
+        var f = this.file;
+        var reader = new FileReader();
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = '';
+          var rABS = false; //是否将文件读取为二进制字符串
+          var pt = this;
+          var wb; //读取完成的数据
+          var outdata;
+          var reader = new FileReader();
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result);
+            var length = bytes.byteLength;
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i]);
+            }
+            var XLSX = require('xlsx');
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                type: 'base64',
+                cellDates: true
+              });
+            } else {
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              });
+            }
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+              v = JSON.parse(jsonString);
+              let obj = {}
+              //xxx代表列名
+              obj.number = v.业务编号
+              obj.inOutTaskNo = v.出库任务编号
+              obj.outType = v.运输方式
+              obj.carNumber = v.车牌号
+              obj.grossWeight = v.毛重
+              obj.tare = v.皮重
+              obj.netWeight = v.净重
+              obj.contractNo = v.销售合同号
+              obj.contractPrice = v.销售合同单价
+              obj.grossDate = _this.formatDate(v.出库日期, '-')
+              obj.settleWeight = v.结算数量
+              obj.settlePrice = v.结算单价
+              obj.settleDate = v.结算日期
+              obj.settleMoney = v.结算金额
+              _this.excelFreightspace.push(obj)
+            })
+            if (_this.excelFreightspace) {
+              importWordSale({
+                  warehouseName: _this.warehouseName,
+                  weighingManagementList: _this.excelFreightspace
+                }).toPromise()
+                .then((response) => {
+                  if (response == 'ok') {
+                    this.$notify({
+                      title: '成功',
+                      message: '导入成功',
+                      type: 'success'
+                    });
+                    _this.getList()
+                  }
+                })
+
+            }
+          }
+          reader.readAsArrayBuffer(f);
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f);
+        } else {
+          reader.readAsBinaryString(f);
+        }
+
+      },
+      importClickYk(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if (fileType == 'xlsx' || fileType == 'xls') {
+            this.importfYk(this.fileTemp)
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误,请删除后重新上传!',
+            })
+          }
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传附件!',
+          })
+        }
+      },
+      importfYk(obj) {
+        this.excelFreightspace = []
+        // this.dialogVisible = true;
+        let _this = this;
+        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0];
+        var rABS = false; //是否将文件读取为二进制字符串
+        var f = this.file;
+        var reader = new FileReader();
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = '';
+          var rABS = false; //是否将文件读取为二进制字符串
+          var pt = this;
+          var wb; //读取完成的数据
+          var outdata;
+          var reader = new FileReader();
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result);
+            var length = bytes.byteLength;
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i]);
+            }
+            var XLSX = require('xlsx');
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                type: 'base64',
+                cellDates: true
+              });
+            } else {
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              });
+            }
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+              v = JSON.parse(jsonString);
+              let obj = {}
+              //xxx代表列名
+              obj.number = v.业务编号
+              obj.inOutTaskNo = v.出库任务编号
+              obj.outType = v.运输方式
+              obj.carNumber = v.车牌号
+              obj.grossWeight = v.毛重
+              obj.tare = v.皮重
+              obj.netWeight = v.净重
+              obj.grossDate = _this.formatDate(v.出库日期, '-')
+              _this.excelFreightspace.push(obj)
+            })
+            if (_this.excelFreightspace) {
+              importWordYk({
+                  warehouseName: _this.warehouseName,
+                  weighingManagementList: _this.excelFreightspace
+                }).toPromise()
+                .then((response) => {
+                  if (response == 'ok') {
+                    this.$notify({
+                      title: '成功',
+                      message: '导入成功',
+                      type: 'success'
+                    });
+                    _this.getList()
+                  }
+                })
+
+            }
+          }
+          reader.readAsArrayBuffer(f);
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f);
+        } else {
+          reader.readAsBinaryString(f);
+        }
+
+      },
+      formatDate(numb, format) {
+        const old = numb - 1;
+        const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
+        const time = new Date(1900, 0, old, 0, 0, t)
+        const year = time.getFullYear();
+        const month = time.getMonth() + 1;
+        const date = time.getDate();
+        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+          ' 00:00:00'
+      },
       returnBack(item){   
           goBack({id:item.id}).toPromise()
 						.then((response) => {

+ 1 - 1
src/views/profitable/cashout.vue

@@ -12,7 +12,7 @@
     <div class="center">
      
       <div>
-        <el-form label-position="left"><div style='margin:30px 0 30px;'>基本信息</div>
+        <el-form label-position="left"><div style='margin:20px -30px;font-weight:bold'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="合同费用"

+ 10 - 17
src/views/profitable/expenseallot.vue

@@ -13,23 +13,16 @@
      
       <div>
         <el-form label-position="left">
-          <div style='margin:10px auto; '>基本信息</div>
-          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
-                style="color: #8890b1" />
-                <ws-option label="库点费用" value="3"
-                style="color: #8890b1" />
-                <ws-option label="经营性费用" value="5"
-                style="color: #8890b1" />
-            </ws-select>
+          <div style='margin:0 -30px 10px;font-weight:bold'>基本信息</div>
+         <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
+              <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect" >
-                <ws-option label="粮款" value="1" style="color: #8890b1" />
-                <ws-option label="非粮款" value="3" style="color: #8890b1" />
-                <ws-option label="保证金" value="5" style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
+              <span v-if='deptBudgetList.costType==1'>粮款</span>
+              <span v-if='deptBudgetList.costType==3'>非粮款</span>
+              <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
@@ -62,7 +55,7 @@
           </div>
         </el-form-item>
         </el-form>
-        <div style='margin:10px auto;width:90%;'>费用分配</div>
+        <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
         <div style='margin:10px auto;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" class="typeselect" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"

+ 17 - 5
src/views/profitable/expensemanagementdetails.vue

@@ -44,7 +44,7 @@
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="costNo" label="编号">
+          <el-table-column prop="costNo" label="编号" width="100px">
           </el-table-column>
           <el-table-column prop="feeType" label="类型">
             <template slot-scope="scope">
@@ -52,7 +52,7 @@
               <div v-if='scope.row.expensesType==2'>支出</div>
             </template>
           </el-table-column>
-          <el-table-column prop="purpose" label="用途">
+          <el-table-column prop="purpose" label="用途" width="150px">
             <template slot-scope="scope">
               <div v-if='scope.row.expensesPurpose==1'>合同费用
                 <span v-if='scope.row.costType==1'>-粮款</span>
@@ -71,6 +71,18 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column prop="purpose" label="流向" width="200px">
+            <template slot-scope="scope">
+              <div v-if='scope.row.expensesPurpose==1'>
+                <span>{{ scope.row.contractNo }}</span>
+              </div>
+              <div v-if='scope.row.expensesPurpose==3'>
+                <span>{{scope.row.warehouseName}}</span>
+              </div>
+              <div v-if='scope.row.expensesPurpose==5'>中天昊元
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="expenseName" label="费用名称"></el-table-column>
           <el-table-column prop="amountMoney" width="120" label="费用金额(元)"></el-table-column>
           <el-table-column prop="unallocatedAmount" width="100" label="未分配(元)"></el-table-column>
@@ -88,14 +100,14 @@
         </template>
           </el-table-column>
           <el-table-column prop="agent" label="经办人"></el-table-column>
-          <el-table-column prop="expenseDate" label="发起日期"></el-table-column>
-          <el-table-column prop="status" label="费用状态" width="120">
+          <el-table-column prop="createDate" label="发起日期" width="90"></el-table-column>
+          <el-table-column prop="status" label="费用状态" width="100">
             <template slot-scope="scope">
               <span v-if='scope.row.approveStatus'>{{scope.row.approveStatus}}</span><span v-else>{{scope.row.status}}</span>
               <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
             </template>
           </el-table-column>
-          <el-table-column prop="address" label="操作" width="500">
+          <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
               <el-button v-if='scope.row.status=="待确认"&&scope.row.expensesType==1' @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>

+ 11 - 18
src/views/profitable/expensemanagentlook.vue

@@ -10,28 +10,21 @@
         </el-button></el-col>
     </el-row>
     <div class="center">
-     <div style='margin:0 auto 10px;width:90%;'>基本信息</div>
+     <div style='margin:0 50px 10px;width:90%;font-weight:bold'>基本信息</div>
       <div>
         <el-form label-position="left">
-          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
-                style="color: #8890b1" />
-                <ws-option label="库点费用" value="3"
-                style="color: #8890b1" />
-                <ws-option label="经营性费用" value="5"
-                style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
+              <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect" >
-                <ws-option label="粮款" value="1" style="color: #8890b1" />
-                <ws-option label="非粮款" value="3" style="color: #8890b1" />
-                <ws-option label="保证金" value="5" style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
+              <span v-if='deptBudgetList.costType==1'>粮款</span>
+              <span v-if='deptBudgetList.costType==3'>非粮款</span>
+              <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
+          {{deptBudgetList.warehouseName}}
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}

+ 1 - 1
src/views/profitable/receipt.vue

@@ -11,7 +11,7 @@
     </el-row>
     <div class="center">
       <div>
-        <el-form label-position='left'><div style='margin:30px 0;'>基本信息</div>
+        <el-form label-position='left'><div style='margin:20px -30px;font-weight:bold'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="合同费用"

+ 1093 - 1083
src/views/statisticalReport/autoSettlementList.vue

@@ -29,6 +29,9 @@
           </el-select>
         </el-col>
       </el-row>
+      <el-row>
+        <div style="color:red">注:审核时,同一运输阶段勾选任意复选框,当前运输阶段下所有条目都通过审核!</div>
+      </el-row>
       <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"
         border :summary-method="getSummaries" show-summary @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
@@ -49,13 +52,13 @@
                 position: relative;
                 font-size: 14px;
               " @click="lookloadingImg(scope.row)">
-              <span>{{scope.row.loadingWeight}}</span>
+              <span>{{ scope.row.loadingWeight }}</span>
             </div>
           </template>
         </el-table-column>
         <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)"><template
             slot-scope="scope">
-            <span v-if="scope.row.unloadingWeight == null ">未卸车</span>
+            <span v-if="scope.row.unloadingWeight == null">未卸车</span>
             <div style="
                 display: inline-block;
                 color: #5878e8;
@@ -63,64 +66,64 @@
                 position: relative;
                 font-size: 14px;
               " @click="lookunloadingImg(scope.row)">
-              <span>{{scope.row.unloadingWeight}}</span>
+              <span>{{ scope.row.unloadingWeight }}</span>
             </div>
           </template>
         </el-table-column>
         <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)"><template slot-scope="scope">
             <span v-if="scope.row.unloadingWeight == null">--</span>
             <span v-else-if="
-                scope.row.lossWeight > 0 &&
-                scope.row.lossWeight > scope.row.loadingWeight / 1000
-              " style="color: #f10404; font-weight: 600">{{ scope.row.lossWeight }}</span>
+              scope.row.lossWeight > 0 &&
+              scope.row.lossWeight > scope.row.loadingWeight / 1000
+            " style="color: #f10404; font-weight: 600">{{ scope.row.lossWeight }}</span>
             <span v-else style="font-weight: 600">{{ scope.row.lossWeight }}</span>
           </template>
         </el-table-column>
         <el-table-column width="120" class="table_td" prop="transportPrice" label="运输单价(元/吨)"></el-table-column>
         <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"><template
             slot-scope="scope">
-            <span v-if="scope.row.unloadingWeight == '未卸车'">{{scope.row.loadingWeight}}}</span>
+            <span v-if="scope.row.unloadingWeight == '未卸车'">{{ scope.row.loadingWeight }}}</span>
             <span v-if="
-                !scope.row.settlementWeightchange && scope.row.settlementWeight
-              ">{{ scope.row.settlementWeight }}</span>
+              !scope.row.settlementWeightchange && scope.row.settlementWeight
+            ">{{ scope.row.settlementWeight }}</span>
             <input v-if="scope.row.settlementWeightchange" style="width: 60px" v-model="settlementWeight" type="text" />
             <!--改结算重量-->
             <i @click="changesettlementWeight(scope.row)" v-if="
-                (scope.row.settlementWeightchange &&
-                  scope.row.approveStatus == '待物流部审核') ||
-                (scope.row.settlementWeightchange &&
-                  scope.row.status == '已驳回')
-              " class="iconfont icon-dui"></i>
+              (scope.row.settlementWeightchange &&
+                scope.row.approveStatus == '待物流部审核') ||
+              (scope.row.settlementWeightchange &&
+                scope.row.status == '已驳回')
+            " class="iconfont icon-dui"></i>
             <img v-if="
-                (!scope.row.settlementWeightchange &&
-                  scope.row.settlementWeight &&
-                  scope.row.approveStatus == '待物流部审核') ||
-                (!scope.row.settlementWeightchange &&
-                  scope.row.settlementWeight &&
-                  scope.row.status == '已驳回')
-              " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              (!scope.row.settlementWeightchange &&
+                scope.row.settlementWeight &&
+                scope.row.approveStatus == '待物流部审核') ||
+              (!scope.row.settlementWeightchange &&
+                scope.row.settlementWeight &&
+                scope.row.status == '已驳回')
+            " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editsettlementWeight(scope.row)" alt="" />
           </template></el-table-column>
         <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"><template slot-scope="scope">
             <span v-if="
-                !scope.row.deductionAmountchange && scope.row.deductionAmount
-              ">{{ scope.row.deductionAmount }}</span>
+              !scope.row.deductionAmountchange && scope.row.deductionAmount
+            ">{{ scope.row.deductionAmount }}</span>
             <input v-if="scope.row.deductionAmountchange" style="width: 60px" v-model="deductionAmount" type="text" />
             <!--改扣款-->
             <i @click="changedeductionAmount(scope.row)" v-if="
-                (scope.row.deductionAmountchange &&
-                  scope.row.approveStatus == '待物流部审核') ||
-                (scope.row.deductionAmountchange &&
-                  scope.row.status == '已驳回')
-              " class="iconfont icon-dui"></i>
+              (scope.row.deductionAmountchange &&
+                scope.row.approveStatus == '待物流部审核') ||
+              (scope.row.deductionAmountchange &&
+                scope.row.status == '已驳回')
+            " class="iconfont icon-dui"></i>
             <img v-if="
-                (!scope.row.deductionAmountchange &&
-                  scope.row.deductionAmount &&
-                  scope.row.approveStatus == '待物流部审核') ||
-                (!scope.row.deductionAmountchange &&
-                  scope.row.deductionAmount &&
-                  scope.row.status == '已驳回')
-              " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              (!scope.row.deductionAmountchange &&
+                scope.row.deductionAmount &&
+                scope.row.approveStatus == '待物流部审核') ||
+              (!scope.row.deductionAmountchange &&
+                scope.row.deductionAmount &&
+                scope.row.status == '已驳回')
+            " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" />
           </template></el-table-column>
         <el-table-column width="100" class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column>
@@ -133,7 +136,7 @@
                 position: relative;
                 font-size: 14px;
               " @click="lookpaymentScreenshot(scope.row)">
-              <span>{{scope.row.amountEdPayable}}</span>
+              <span>{{ scope.row.amountEdPayable }}</span>
             </div>
           </template>
         </el-table-column>
@@ -163,7 +166,7 @@
         <el-table-column label="状态" prop="status" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.approveStatus != null">{{
-              scope.row.approveStatus
+                scope.row.approveStatus
             }}</span>
             <span v-else>{{ scope.row.status }}</span>
           </template>
@@ -244,9 +247,9 @@
     <el-dialog width="30%" title="账户信息" :visible.sync="dialogFormVisible8" :append-to-body="true">
       <h3 style="margin-left: 30px">{{ driverPayeeList.payeeName }}的账户</h3>
       <div v-for="(item, index) in driverPayeeList" :key="index">
-        <h4 style="margin-left: 30px">账户-{{index+1}}</h4>
+        <h4 style="margin-left: 30px">账户-{{ index + 1 }}</h4>
         <div class="anniu">
-          <el-radio-group @change="bankCard(item,id)" v-model="item.radio">
+          <el-radio-group @change="bankCard(item, id)" v-model="item.radio">
             <el-radio label="1">本次收款账户</el-radio>
           </el-radio-group>
         </div>
@@ -298,1188 +301,1195 @@
   <!-- </div> -->
 </template>
 <script>
-  import {
-    autoList,
-    editauto,
-    autocontract,
-    autopaymoney,
-    openinvoicelist,
-    // postaudit,
-    //   getselectctcontractno,
-  } from '@/model/statisticalReport/index'
-  import {
-    workflowcontent
-  } from '@/model/houseSelfCollect/index'
-  import {
-    posthandle
-  } from '@/model/purchasingManagement/index'
-  import {
-    downloadFile
-  } from '@/utils/batchDown'
-  import Pagination from '@/components/Pagination'
-  import WsUpload from '@/components/WsUpload'
-  import {
-    EventBus
-  } from 'base-core-lib'
-  export default {
-    name: 'viewSpareMoney',
-    components: {
-      WsUpload,
-      Pagination,
+import {
+  autoList,
+  editauto,
+  autocontract,
+  autopaymoney,
+  openinvoicelist,
+  // postaudit,
+  //   getselectctcontractno,
+} from '@/model/statisticalReport/index'
+import {
+  workflowcontent
+} from '@/model/houseSelfCollect/index'
+import {
+  posthandle
+} from '@/model/purchasingManagement/index'
+import {
+  downloadFile
+} from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import {
+  EventBus
+} from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
     },
-    watch: {
-      vesselId(val) {
-        this.getList()
-      },
-      isShow(val) {
-        this.showType = val
-      },
+    isShow(val) {
+      this.showType = val
     },
+  },
 
-    data() {
-      return {
-        checked: true,
-        alreadyInvoice: '',
-        needReapply: true,
-        dialogFormVisible1: false,
-        dialogFormVisible2: false,
-        dialogFormVisible3: false,
-        dialogFormVisible4: false,
-        dialogFormVisible5: false,
-        dialogFormVisible6: false,
-        dialogFormVisible7: false,
-        dialogFormVisible8: false,
-        dialogFormVisible11: false,
-        dialogFormVisible16: false,
-        dialogVisible: false,
+  data() {
+    return {
+      checked: true,
+      alreadyInvoice: '',
+      needReapply: true,
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      dialogFormVisible6: false,
+      dialogFormVisible7: false,
+      dialogFormVisible8: false,
+      dialogFormVisible11: false,
+      dialogFormVisible16: false,
+      dialogVisible: false,
 
-        form: {
-          transactionPrice: '',
-          transactionsNumber: '',
-          basis: '',
-        },
-        currect: true,
-        formLabelWidth: '120px',
-        formLabelWidth1: '140px',
-        barWidth: 0,
-        barHeight: 0,
-        retioX: 1,
-        ratioY: 1,
-        isTaped: false,
-        isHover: false,
-        settlementWeightchange: false,
-        deductionAmountchange: false,
-        isShow: !this.autohide,
-        //弹出框
-        dialogViewSpareMoney: false,
-        contractNoList: [],
-        // 是否显示
-        showType: true,
-        // 年
-        year: '',
-        options: [],
-        id: '',
-        pickerOptions: {},
-        value2: '',
-        deptBudgetTotal: 0,
-        currentPage: 1,
-        pageSize: 10,
-        searchType: '1',
-        manualFlag: '',
-        searchTypeText: '未完成',
-        searchKeyWord: '',
-        driverPayeeList: {
-          radio: '1',
-        },
-        contractType: 2,
-        accessoryTFs: false,
-        accesscard: false,
-        paymentImg: false,
-        enter: {
-          closePositionList: [],
-        },
+      form: {
+        transactionPrice: '',
+        transactionsNumber: '',
+        basis: '',
+      },
+      currect: true,
+      formLabelWidth: '120px',
+      formLabelWidth1: '140px',
+      barWidth: 0,
+      barHeight: 0,
+      retioX: 1,
+      ratioY: 1,
+      isTaped: false,
+      isHover: false,
+      settlementWeightchange: false,
+      deductionAmountchange: false,
+      isShow: !this.autohide,
+      //弹出框
+      dialogViewSpareMoney: false,
+      contractNoList: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options: [],
+      id: '',
+      pickerOptions: {},
+      value2: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: '1',
+      manualFlag: '',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      driverPayeeList: {
+        radio: '1',
+      },
+      contractType: 2,
+      accessoryTFs: false,
+      accesscard: false,
+      paymentImg: false,
+      enter: {
+        closePositionList: [],
+      },
 
-        // 提交类型
-        submitType: true,
-        size: 10,
-        spanArr: [],
-        contractNo: '全部合同',
-        inOutTaskNo: '',
-        compId: localStorage.getItem('ws-pf_compId'),
-        roleId: localStorage.getItem('ws-pf_roleId'),
-        deptCircularPage: {},
-        warehouseList: [],
-        orderList: {},
-        tranPriceApproveList: [],
-        deptBudgetList: {},
-        id: '',
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      contractNo: '全部合同',
+      inOutTaskNo: '',
+      compId: localStorage.getItem('ws-pf_compId'),
+      roleId: localStorage.getItem('ws-pf_roleId'),
+      deptCircularPage: {},
+      warehouseList: [],
+      orderList: {},
+      tranPriceApproveList: [],
+      deptBudgetList: {},
+      id: '',
 
-        pcFlag: 1,
-        carryoverlist: {},
-        modification: [],
-        loadingImg1: [],
-        unloadingImg1: [],
-        paymentScreenshot1: [],
-        amendlist: {},
-        roleFlag: 1,
-        alreadyInvoice1: 0,
-        money: '',
-        paymentDate: '',
+      pcFlag: 1,
+      carryoverlist: {},
+      modification: [],
+      loadingImg1: [],
+      unloadingImg1: [],
+      paymentScreenshot1: [],
+      amendlist: {},
+      roleFlag: 1,
+      alreadyInvoice1: 0,
+      money: '',
+      paymentDate: '',
+      tranSettlementReportList: [],
+      autoSettlementReport: {
         tranSettlementReportList: [],
-        autoSettlementReport: {
-          tranSettlementReportList: [],
-          money: '',
-          amountNotPayable: 0,
-          amountEdPayable: 0,
-          paymentDate: '',
-          paymentScreenshot: '',
-          id: '',
-        },
-
+        money: '',
         amountNotPayable: 0,
         amountEdPayable: 0,
-        paymentScreenshotUrls: [],
-        carryovercontractnolist: [],
-        historyList: [],
-        pickerBeginDateBefore: {
-          disabledDate: (time) => {
-            return time.getTime() > Date.now()
-          },
+        paymentDate: '',
+        paymentScreenshot: '',
+        id: '',
+      },
+
+      amountNotPayable: 0,
+      amountEdPayable: 0,
+      paymentScreenshotUrls: [],
+      carryovercontractnolist: [],
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
         },
+      },
+    }
+  },
+  activated() {
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    cur(status) {
+      if (status == 0) {
+        this.currect = true
+      } else {
+        var that = this
+        this.currect = false
+        getselectctcontractno({
+          customerName: this.modification[0].customerName,
+          contractNo: this.modification[0].contractNo,
+        })
+          .toPromise()
+          .then((response) => {
+            that.carryovercontractnolist = response
+            for (var i = 0; i < that.carryovercontractnolist.length; i++) {
+              if (that.carryovercontractnolist[i].amountNotPayable > 0) {
+                that.carryovercontractnolist[i].closeaccountstatus = '待结算'
+              } else {
+                that.carryovercontractnolist[i].closeaccountstatus = '已结算'
+              }
+            }
+          })
+          .catch((response) => {
+            console.log(response)
+            EventBus.$emit('error', response.message)
+          })
       }
     },
-    activated() {
-      this.getList()
-      this.showType = this.isShow
-    },
-    methods: {
-      cur(status) {
-        if (status == 0) {
-          this.currect = true
+    handleRowClick(row) {
+      if (row.approveStatus == null) {
+        this.$refs.warehouseList.toggleRowSelection(row)
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
         } else {
-          var that = this
-          this.currect = false
-          getselectctcontractno({
-              customerName: this.modification[0].customerName,
-              contractNo: this.modification[0].contractNo,
-            })
-            .toPromise()
-            .then((response) => {
-              that.carryovercontractnolist = response
-              for (var i = 0; i < that.carryovercontractnolist.length; i++) {
-                if (that.carryovercontractnolist[i].amountNotPayable > 0) {
-                  that.carryovercontractnolist[i].closeaccountstatus = '待结算'
-                } else {
-                  that.carryovercontractnolist[i].closeaccountstatus = '已结算'
-                }
-              }
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        }
-      },
-      handleRowClick(row) {
-        if (row.approveStatus == null) {
           this.$refs.warehouseList.toggleRowSelection(row)
           return true
-        } else if (row.approveStatus != null) {
-          if (row.taskId == null) {
-            return false
-          } else {
-            this.$refs.warehouseList.toggleRowSelection(row)
-            return true
-          }
         }
-      },
-      selectInit(row) {
-        //在这里一定要记得类型匹配的上。
-        if (row.approveStatus == null) {
+      }
+    },
+    selectInit(row) {
+      debugger
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
           return true
-        } else if (row.approveStatus != null) {
-          if (row.taskId == null) {
-            return false
-          } else {
-            return true
-          }
-        }
-      },
-      handleClose() {
-        this.accessoryTFs = false
-      },
-      handleClose1() {
-        this.accesscard = false
-      },
-      handleClose2() {
-        this.paymentImg = false
-      },
-      //账户
-      look(item) {
-        this.dialogFormVisible8 = true
-        if (item.driverPayeeInfoList) {
-          this.driverPayeeList = item.driverPayeeInfoList
-          this.driverPayeeList.payeeName = item.driverPayeeInfoList[0].payeeName
-          for (var i = 0; i < item.driverPayeeInfoList.length; i++) {
-            if (item.driverPayeeInfoList[i].bankCard == item.cardNo) {
-              this.driverPayeeList[i].radio = '1'
-            } else {
-              this.driverPayeeList[i].radio = '2'
-            }
-            console.log(this.driverPayeeList[i].radio)
-          }
-          this.id = item.id
         }
-      },
-      //付款
-      handlepayment() {
-        this.amountNotPayable = 0
-        // this.money = this.money
-        this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
-        this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-        this.paymentDate = this.paymentDate
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择一条要付款的条目')
-        } else {
-          for (var i = 0; i < this.modification.length; i++) {
-            if (
-              this.modification[i].status != '已通过' &&
-              this.modification[i].status != '部分付款'
-            ) {
-              this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
-              return
-            }
-            this.amountNotPayable += Number(this.modification[i].amountNotPayable)
+      }
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleClose1() {
+      this.accesscard = false
+    },
+    handleClose2() {
+      this.paymentImg = false
+    },
+    //账户
+    look(item) {
+      this.dialogFormVisible8 = true
+      if (item.driverPayeeInfoList) {
+        this.driverPayeeList = item.driverPayeeInfoList
+        this.driverPayeeList.payeeName = item.driverPayeeInfoList[0].payeeName
+        for (var i = 0; i < item.driverPayeeInfoList.length; i++) {
+          if (item.driverPayeeInfoList[i].bankCard == item.cardNo) {
+            this.driverPayeeList[i].radio = '1'
+          } else {
+            this.driverPayeeList[i].radio = '2'
           }
-          this.amountNotPayable = this.amountNotPayable.toFixed(2)
-          this.dialogFormVisible1 = true
+          console.log(this.driverPayeeList[i].radio)
         }
-      },
-      submitMoney() {
-        this.autoSettlementReport.money = this.money
-        this.autoSettlementReport.paymentDate = this.paymentDate
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择一条要付款的条目')
-        } else {
+        this.id = item.id
+      }
+    },
+    //付款
+    handlepayment() {
+      this.amountNotPayable = 0
+      // this.money = this.money
+      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
+      this.paymentDate = this.paymentDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
+        for (var i = 0; i < this.modification.length; i++) {
           if (
-            this.money < 0 ||
-            (String(this.money).indexOf('.') != -1 &&
-              String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
+            this.modification[i].status != '已通过' &&
+            this.modification[i].status != '部分付款'
           ) {
-            this.$message({
-              message: '付款金额输入错误',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.money) {
-            if (isNaN(this.money)) {
-              this.$message({
-                message: '付款金额非数字!',
-                type: 'warning',
-              })
-              return
-            }
-          }
-          if (!this.money) {
-            this.$message({
-              message: '付款金额不能为空!',
-              type: 'warning',
-            })
+            this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
             return
           }
-          if (Number(this.money) > Number(this.amountNotPayable)) {
-            this.$message({
-              message: '付款金额不能大于未付金额!',
-              type: 'warning',
-            })
-            return
-          }
-          this.$confirm(`确定提交付款信息?`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
+          this.amountNotPayable += Number(this.modification[i].amountNotPayable)
+        }
+        this.amountNotPayable = this.amountNotPayable.toFixed(2)
+        this.dialogFormVisible1 = true
+      }
+    },
+    submitMoney() {
+      this.autoSettlementReport.money = this.money
+      this.autoSettlementReport.paymentDate = this.paymentDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
+        if (
+          this.money < 0 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+            2)
+        ) {
+          this.$message({
+            message: '付款金额输入错误',
             type: 'warning',
-          }).then(() => {
-            autopaymoney({
-                tranSettlementReportList: this.modification,
-                // amountEdPayable: this.modification[0].amountEdPayable,
-                // amountNotPayable: this.modification[0].amountNotPayable,
-                money: this.money,
-                paymentDate: this.paymentDate,
-                paymentScreenshot: this.paymentScreenshot,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '付款成功',
-                })
-                this.tranSettlementReportList = {}
-                this.money = ''
-                this.paymentDate = ''
-                this.dialogFormVisible1 = false
-                this.getList()
-              })
-              .catch((response) => {
-                console.log(response)
-                EventBus.$emit('error', response.message)
-              })
           })
+          return
         }
-      },
-      //开发票
-      editClickInvoice(row) {
-        this.id = row.id
-        this.alreadyInvoice1 = row.alreadyInvoice
-        this.amountEdPayable = row.amountEdPayable
-        this.amountNotPayable = row.amountNotPayable
-        this.dialogFormVisible3 = 'true'
-      },
-      submitInvoice() {
-        if (this.amountEdPayable < 0) {
-          this.$message.warning('请选择一条已付款的条目')
-        } else {
-          if (
-            this.alreadyInvoice < 0 ||
-            this.alreadyInvoice > this.amountEdPayable - this.alreadyInvoice1 ||
-            (String(this.alreadyInvoice).indexOf('.') != -1 &&
-              String(this.alreadyInvoice).length -
-              (String(this.alreadyInvoice).indexOf('.') + 1) >
-              2)
-          ) {
+        if (this.money) {
+          if (isNaN(this.money)) {
             this.$message({
-              message: '金额输入错误',
+              message: '付款金额非数字!',
               type: 'warning',
             })
             return
           }
-          if (this.alreadyInvoice) {
-            if (isNaN(this.alreadyInvoice)) {
-              this.$message({
-                message: '金额非数字!',
-                type: 'warning',
-              })
-              return
-            }
-          }
-          if (!this.alreadyInvoice) {
-            this.$message({
-              message: '金额不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          this.$confirm(`确定提交发票信息?`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          }).then(() => {
-            editauto({
-                id: this.id,
-                flag: 2,
-                alreadyInvoice: this.alreadyInvoice,
-                amountEdPayable: this.amountEdPayable,
-                amountNotPayable: this.amountNotPayable,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '提交成功',
-                })
-                this.dialogFormVisible3 = false
-                this.getList()
-              })
-              .catch((response) => {
-                console.log(response)
-                EventBus.$emit('error', response.message)
-              })
-          })
-        }
-      },
-      //批量开发票
-      handleninvoice() {
-        this.amountEdPayable = 0
-        this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
-        for (var i = 0; i < this.modification.length; i++) {
-          this.amountEdPayable += this.modification[i].amountEdPayable
         }
-        this.dialogFormVisible2 = true
-      },
-      submitBatchInvoice() {
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择一条要开发票的条目')
-        } else if (this.modification[0].amountEdPayable < 0) {
-          this.$message.warning('请选择一条已付款的条目')
-        } else {
-          this.$confirm(`确定提交发票信息?`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          }).then(() => {
-            openinvoicelist({
-                tranSettlementReportList: this.modification,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '提交成功',
-                })
-                this.dialogFormVisible2 = false
-                this.getList()
-              })
-              .catch((response) => {
-                console.log(response)
-                EventBus.$emit('error', response.message)
-              })
-          })
-        }
-      },
-      //修改结算重量
-      changesettlementWeight(item) {
-        if (!this.settlementWeight) {
+        if (!this.money) {
           this.$message({
-            message: '结算重量不能为空!',
+            message: '付款金额不能为空!',
             type: 'warning',
           })
           return
         }
-        if (
-          (this.settlementWeight &&
-            String(this.settlementWeight).indexOf('.') != -1 &&
-            String(this.settlementWeight).length -
-            (String(this.settlementWeight).indexOf('.') + 1) >
-            2) ||
-          (this.settlementWeight && this.settlementWeight > 100) ||
-          (this.settlementWeight && this.settlementWeight < 1)
-        ) {
+        if (Number(this.money) > Number(this.amountNotPayable)) {
           this.$message({
-            message: '结算重量输入错误',
+            message: '付款金额不能大于未付金额!',
             type: 'warning',
           })
           return
         }
-        this.reviewer = localStorage.getItem('ws-pf_roleName') + localStorage.getItem('ws-pf_staffName')
-        editauto({
-            settlementWeight: Math.abs(this.settlementWeight),
-            id: item.id,
-            reviewer: this.reviewer,
-            flag: 0,
-          })
-          .toPromise()
-          .then((response) => {
-            this.$message.success('修改结算重量成功')
-            this.getList()
-          })
-          .catch((req) => {
-            this.$message.warning('修改结算重量失败')
-          })
-      },
-      //设置本次账户
-      bankCard(item, id) {
-        editauto({
-            cardNo: item.bankCard,
-            id: id,
-            flag: 3,
-          })
-          .toPromise()
-          .then((response) => {
-            this.$message.success('成功')
-            this.dialogFormVisible8 = false
-            this.getList()
-          })
-          .catch((req) => {
-            this.$message.warning('失败')
+        this.$confirm(`确定提交付款信息?`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          autopaymoney({
+            tranSettlementReportList: this.modification,
+            // amountEdPayable: this.modification[0].amountEdPayable,
+            // amountNotPayable: this.modification[0].amountNotPayable,
+            money: this.money,
+            paymentDate: this.paymentDate,
+            paymentScreenshot: this.paymentScreenshot,
           })
-      },
-      editsettlementWeight(item) {
-        this.settlementWeight = item.settlementWeight
-        item.settlementWeightchange = true
-      },
-      //修改扣款
-      changedeductionAmount(item) {
-        if (!this.deductionAmount) {
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '付款成功',
+              })
+              this.tranSettlementReportList = {}
+              this.money = ''
+              this.paymentDate = ''
+              this.dialogFormVisible1 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //开发票
+    editClickInvoice(row) {
+      this.id = row.id
+      this.alreadyInvoice1 = row.alreadyInvoice
+      this.amountEdPayable = row.amountEdPayable
+      this.amountNotPayable = row.amountNotPayable
+      this.dialogFormVisible3 = 'true'
+    },
+    submitInvoice() {
+      if (this.amountEdPayable < 0) {
+        this.$message.warning('请选择一条已付款的条目')
+      } else {
+        if (
+          this.alreadyInvoice < 0 ||
+          this.alreadyInvoice > this.amountEdPayable - this.alreadyInvoice1 ||
+          (String(this.alreadyInvoice).indexOf('.') != -1 &&
+            String(this.alreadyInvoice).length -
+            (String(this.alreadyInvoice).indexOf('.') + 1) >
+            2)
+        ) {
           this.$message({
-            message: '扣款金额不能为空!',
+            message: '金额输入错误',
             type: 'warning',
           })
           return
         }
-        if (
-          (this.deductionAmount &&
-            String(this.deductionAmount).indexOf('.') != -1 &&
-            String(this.deductionAmount).length -
-            (String(this.deductionAmount).indexOf('.') + 1) >
-            2) ||
-          (this.deductionAmount && this.deductionAmount > 100000) ||
-          (this.deductionAmount && this.deductionAmount < 1)
-        ) {
+        if (this.alreadyInvoice) {
+          if (isNaN(this.alreadyInvoice)) {
+            this.$message({
+              message: '金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.alreadyInvoice) {
           this.$message({
-            message: '扣款金额输入错误',
+            message: '金额不能为空!',
             type: 'warning',
           })
           return
         }
-        editauto({
-            deductionAmount: Math.abs(this.deductionAmount),
-            id: item.id,
-            flag: 1,
-          })
-          .toPromise()
-          .then((response) => {
-            this.$message.success('修改扣款成功')
-            this.getList()
-          })
-          .catch((req) => {
-            this.$message.warning('修改扣款失败')
+        this.$confirm(`确定提交发票信息?`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          editauto({
+            id: this.id,
+            flag: 2,
+            alreadyInvoice: this.alreadyInvoice,
+            amountEdPayable: this.amountEdPayable,
+            amountNotPayable: this.amountNotPayable,
           })
-      },
-      editdeductionAmount(item) {
-        this.deductionAmount = item.deductionAmount
-        item.deductionAmountchange = true
-      },
-      //装车磅单
-      lookloadingImg(row) {
-        if (row.loadingImg == null || row.loadingImg == '') {
-          EventBus.$emit(
-            this.$message.warning('暂无磅单信息')
-          )
-        } else {
-          this.accessoryTFs = true
-        }
-        this.loadingImg1 = row.loadingImg
-      },
-      //卸车磅单
-      lookunloadingImg(row) {
-        if (row.unloadingImg === null || row.unloadingImg === '') {
-          EventBus.$emit(
-            this.$message.warning('暂无磅单信息')
-          )
-        } else {
-          this.accesscard = true
-        }
-        this.unloadingImg1 = row.unloadingImg
-      },
-      //付款截图
-      lookpaymentScreenshot(row) {
-        if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
-          EventBus.$emit(
-            this.$message.warning('暂无付款截图信息')
-          )
-        } else {
-          this.paymentImg = true
-        }
-        this.paymentScreenshot1 = row.paymentScreenshot.split('$')
-      },
-      //审核
-      audit(item, index, status, status2, reason) {
-        if (index < this.modification.length) {
-          posthandle({
-              taskId: item.taskId,
-              approved: status,
-              auditMind: reason != undefined ? '已驳回' : '34',
-              needReapply: status2 != undefined ? true : false,
-            })
             .toPromise()
             .then((response) => {
-              if (index == 0) {
-                workflowcontent({
-                    workflowId: item.workflowId,
-                    businessKey: item.id,
-                    type: '汽运结算报表'
-                  }).toPromise()
-                  .then((response1) => {
-                    console.log(response1)
-                    // this.$message.success('审核成功')
-                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-                  })
-              }
-              this.audit(this.modification[index + 1], index + 1, status)
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible3 = false
+              this.getList()
             })
-            .catch((req) => {
-              this.$message.warning(req.message)
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
             })
-        } else {
-          if (status == true) {
-            this.$message.success('通过成功')
-            this.getList()
-          } else if (status == false) {
-            this.$message.success('驳回成功')
-            this.getList()
-          }
-        }
-      },
-      handlereject(status) {
-        var that = this
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要驳回的条目')
-        } else {
-          this.$confirm(`是否确定驳回?`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          }).then(() => {
-            that.audit(this.modification[0], 0, false, true, '已驳回')
+        })
+      }
+    },
+    //批量开发票
+    handleninvoice() {
+      this.amountEdPayable = 0
+      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      for (var i = 0; i < this.modification.length; i++) {
+        this.amountEdPayable += this.modification[i].amountEdPayable
+      }
+      this.dialogFormVisible2 = true
+    },
+    submitBatchInvoice() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要开发票的条目')
+      } else if (this.modification[0].amountEdPayable < 0) {
+        this.$message.warning('请选择一条已付款的条目')
+      } else {
+        this.$confirm(`确定提交发票信息?`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          openinvoicelist({
+            tranSettlementReportList: this.modification,
           })
-        }
-      },
-      dataFilter(val) {
-        // console.log(val,"名")
-        this.contractNo = val
-        if (val) {
-          //val存在
-          this.options = this.contractNoList.filter((item) => {
-            if (
-              !!~item.contractNo.indexOf(val) ||
-              !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
-            ) {
-              return true
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible2 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //修改结算重量
+    changesettlementWeight(item) {
+      if (!this.settlementWeight) {
+        this.$message({
+          message: '结算重量不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.settlementWeight &&
+          String(this.settlementWeight).indexOf('.') != -1 &&
+          String(this.settlementWeight).length -
+          (String(this.settlementWeight).indexOf('.') + 1) >
+          2) ||
+        (this.settlementWeight && this.settlementWeight > 100) ||
+        (this.settlementWeight && this.settlementWeight < 1)
+      ) {
+        this.$message({
+          message: '结算重量输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      this.reviewer = localStorage.getItem('ws-pf_roleName') + localStorage.getItem('ws-pf_staffName')
+      editauto({
+        settlementWeight: Math.abs(this.settlementWeight),
+        id: item.id,
+        reviewer: this.reviewer,
+        flag: 0,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改结算重量成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改结算重量失败')
+        })
+    },
+    //设置本次账户
+    bankCard(item, id) {
+      editauto({
+        cardNo: item.bankCard,
+        id: id,
+        flag: 3,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('成功')
+          this.dialogFormVisible8 = false
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('失败')
+        })
+    },
+    editsettlementWeight(item) {
+      this.settlementWeight = item.settlementWeight
+      item.settlementWeightchange = true
+    },
+    //修改扣款
+    changedeductionAmount(item) {
+      if (!this.deductionAmount) {
+        this.$message({
+          message: '扣款金额不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.deductionAmount &&
+          String(this.deductionAmount).indexOf('.') != -1 &&
+          String(this.deductionAmount).length -
+          (String(this.deductionAmount).indexOf('.') + 1) >
+          2) ||
+        (this.deductionAmount && this.deductionAmount > 100000) ||
+        (this.deductionAmount && this.deductionAmount < 1)
+      ) {
+        this.$message({
+          message: '扣款金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      editauto({
+        deductionAmount: Math.abs(this.deductionAmount),
+        id: item.id,
+        flag: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改扣款成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改扣款失败')
+        })
+    },
+    editdeductionAmount(item) {
+      this.deductionAmount = item.deductionAmount
+      item.deductionAmountchange = true
+    },
+    //装车磅单
+    lookloadingImg(row) {
+      if (row.loadingImg == null || row.loadingImg == '') {
+        EventBus.$emit(
+          this.$message.warning('暂无磅单信息')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.loadingImg1 = row.loadingImg
+    },
+    //卸车磅单
+    lookunloadingImg(row) {
+      if (row.unloadingImg === null || row.unloadingImg === '') {
+        EventBus.$emit(
+          this.$message.warning('暂无磅单信息')
+        )
+      } else {
+        this.accesscard = true
+      }
+      this.unloadingImg1 = row.unloadingImg
+    },
+    //付款截图
+    lookpaymentScreenshot(row) {
+      if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
+        EventBus.$emit(
+          this.$message.warning('暂无付款截图信息')
+        )
+      } else {
+        this.paymentImg = true
+      }
+      this.paymentScreenshot1 = row.paymentScreenshot.split('$')
+    },
+    //审核
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        posthandle({
+          taskId: item.taskId,
+          approved: status,
+          auditMind: reason != undefined ? '已驳回' : '34',
+          needReapply: status2 != undefined ? true : false,
+        })
+          .toPromise()
+          .then((response) => {
+            if (index == 0) {
+              workflowcontent({
+                workflowId: item.workflowId,
+                businessKey: item.id,
+                type: '汽运结算报表'
+              }).toPromise()
+                .then((response1) => {
+                  console.log(response1)
+                  // this.$message.success('审核成功')
+                  // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                })
             }
+            this.audit(this.modification[index + 1], index + 1, status)
           })
-        } else {
-          //val为空时,还原数组
-          this.options = this.contractNoList
-        }
-      },
-      //查看修改结算重量记录
-      editRecord() {
-        this.dialogFormVisible16 = true
-      },
-      handlepass() {
-        var that = this
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要通过的条目')
-        } else {
-          this.$confirm(`是否确定通过?`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          }).then(() => {
-            that.audit(this.modification[0], 0, true, 2)
+          .catch((req) => {
+            this.$message.warning(req.message)
           })
+      } else {
+        if (status == true) {
+          this.$message.success('通过成功')
+          this.getList()
+        } else if (status == false) {
+          this.$message.success('驳回成功')
+          this.getList()
         }
-      },
-      handleSelectionChange(val) {
-        this.modification = val
-      },
-      handlestatus(status) {
-        this.searchType = status
-        this.getList()
-      },
-      contractchange(e) {
-        this.contractNo = e
-        this.getList()
-      },
-      updated() {
-        this.$nextTick(() => {
-          this.$refs.warehouseList.doLayout()
+      }
+    },
+    handlereject(status) {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm(`是否确定驳回?`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, false, true, '已驳回')
         })
-      },
-      //合计
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-          } else if (
-            index === 7 ||
-            index === 8 ||
-            index === 11 ||
-            index === 13 ||
-            index === 14 ||
-            index === 15 ||
-            index === 16
+      }
+    },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter((item) => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
           ) {
-            const values = data.map((item) => Number(item[column.property]))
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
-                } else {
-                  return prev
-                }
-              }, 0)
-            } else {
-              sums[index] = '元'
-            }
-          } else {
-            sums[index] = '--'
+            return true
           }
         })
-        sums[sums.length - 4] = sums[sums.length - 4].toFixed(2)
-        sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
-        sums[sums.length - 6] = sums[sums.length - 6].toFixed(2)
-        sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
-        sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
-        sums[sums.length - 12] = sums[sums.length - 12].toFixed(2)
-        sums[sums.length - 13] = sums[sums.length - 13].toFixed(2)
-        return sums
-      },
-      //列表
-      getList() {
-        console.log(this.contractNo, 'this.contractNo值')
-        autoList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            tranTypeKey: 1,
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            contractNo: this.contractNo,
-            manualFlag: this.manualFlag,
-          })
-          .toPromise()
-          .then((response) => {
-            for (var i = 0; i < response.records.length; i++) {
-              response.records[i].settlementWeightchange = false
-              response.records[i].deductionAmountchange = false
-              response.records[i].amountIngPayable = response.records[i].amountIngPayable.toFixed(2)
-              response.records[i].amountEdPayable = response.records[i].amountEdPayable.toFixed(2)
-              response.records[i].amountNotPayable = (response.records[i].amountIngPayable - response.records[i]
-                .amountEdPayable).toFixed(2)
-              if (response.records[i].tranPriceApproveList) {
-                for (var j = 0; j < response.records[i].tranPriceApproveList.length; j++) {
-                  this.tranPriceApproveList.push(response.records[i].tranPriceApproveList[j])
-                }
+      } else {
+        //val为空时,还原数组
+        this.options = this.contractNoList
+      }
+    },
+    //查看修改结算重量记录
+    editRecord() {
+      this.dialogFormVisible16 = true
+    },
+    handlepass() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        this.$confirm(`是否确定通过?`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          //批次通过  选中列表中 数据一个batchId, 选中列表去重
+          var obj = {};
+          that.modification = that.modification.reduce(function (item, next) {
+            obj[next.batchId] ? '' : obj[next.batchId] = true && item.push(next);
+            return item;
+          }, []);
+          console.log('去重后提交数据', that.modification);
+          that.audit(this.modification[0], 0, true, 2)
+        })
+      }
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
+    contractchange(e) {
+      this.contractNo = e
+      this.getList()
+    },
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.warehouseList.doLayout()
+      })
+    },
+    //合计
+    getSummaries(param) {
+      const {
+        columns,
+        data
+      } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (
+          index === 7 ||
+          index === 8 ||
+          index === 11 ||
+          index === 13 ||
+          index === 14 ||
+          index === 15 ||
+          index === 16
+        ) {
+          const values = data.map((item) => Number(item[column.property]))
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+          } else {
+            sums[index] = '元'
+          }
+        } else {
+          sums[index] = '--'
+        }
+      })
+      sums[sums.length - 4] = sums[sums.length - 4].toFixed(2)
+      sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
+      sums[sums.length - 6] = sums[sums.length - 6].toFixed(2)
+      sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
+      sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
+      sums[sums.length - 12] = sums[sums.length - 12].toFixed(2)
+      sums[sums.length - 13] = sums[sums.length - 13].toFixed(2)
+      return sums
+    },
+    //列表
+    getList() {
+      console.log(this.contractNo, 'this.contractNo值')
+      autoList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        tranTypeKey: 1,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        contractNo: this.contractNo,
+        manualFlag: this.manualFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].settlementWeightchange = false
+            response.records[i].deductionAmountchange = false
+            response.records[i].amountIngPayable = response.records[i].amountIngPayable.toFixed(2)
+            response.records[i].amountEdPayable = response.records[i].amountEdPayable.toFixed(2)
+            response.records[i].amountNotPayable = (response.records[i].amountIngPayable - response.records[i]
+              .amountEdPayable).toFixed(2)
+            if (response.records[i].tranPriceApproveList) {
+              for (var j = 0; j < response.records[i].tranPriceApproveList.length; j++) {
+                this.tranPriceApproveList.push(response.records[i].tranPriceApproveList[j])
               }
             }
-            this.deptBudgetTotal = response.total
-            this.warehouseList = response
-          })
-        autocontract({
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            // roleFlag: this.roleFlag,
-          })
-          .toPromise()
-          .then((response) => {
-            this.contractNoList = response
-            this.contractNoList.unshift({
-              contractNo: '全部合同'
-            })
-            this.options = this.contractNoList
+          }
+          this.deptBudgetTotal = response.total
+          this.warehouseList = response
+        })
+      autocontract({
+        compId: localStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        // roleFlag: this.roleFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+          this.contractNoList.unshift({
+            contractNo: '全部合同'
           })
-      },
-      handleRemove(file) {
-        console.log(file)
-      },
-      handlePictureCardPreview(file) {
-        this.paymentScreenshot = file.url
+          this.options = this.contractNoList
+        })
+    },
+    handleRemove(file) {
+      console.log(file)
+    },
+    handlePictureCardPreview(file) {
+      this.paymentScreenshot = file.url
 
-        this.dialogVisible = true
-      },
-      handleDownload(file) {
-        console.log(file)
-      },
-      getSpanArr(data) {
-        let that = this
+      this.dialogVisible = true
+    },
+    handleDownload(file) {
+      console.log(file)
+    },
+    getSpanArr(data) {
+      let that = this
 
-        //页面展示的数据,不一定是全部的数据,所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+      //页面展示的数据,不一定是全部的数据,所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-        that.spanArr = []
+      that.spanArr = []
 
-        that.pos = 0
+      that.pos = 0
 
-        // //遍历数据
+      // //遍历数据
 
-        data.forEach((item, index) => {
-          //判断是否是第一项
+      data.forEach((item, index) => {
+        //判断是否是第一项
 
-          if (index === 0) {
-            this.spanArr.push(1)
-            this.pos = 0
+        if (index === 0) {
+          this.spanArr.push(1)
+          this.pos = 0
+        } else {
+          //不是第一项时,就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
           } else {
-            //不是第一项时,就根据标识去存储
-            if (data[index].warehouseNumViewList.length > 1) {
-              查找到符合条件的数据时每次要把之前存储的数据 + 1
-              this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-              this.spanArr.push(0)
-            } else {
-              // 没有符合的数据时,要记住当前的index
-              this.spanArr.push(1)
-              this.pos = index
-            }
+            // 没有符合的数据时,要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
           }
-        })
-      },
-      dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加,必须转化成字符串
         }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
+      })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加,必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
         }
-        return fmt
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
-      // 关闭 dialog时 处理文件url 初始化upload组件
-      handleCloe() {
-        this.dialogViewSpareMoney = false
-      },
-      history(row) {
-        billoperatehis({
-            id: row.id
-          })
-          .toPromise()
-          .then((response) => {
-            this.historyList = response
-          })
-      },
-      async exportlist() {
-        const {
-          data
-        } = await export1({
-          compId: localStorage.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',
+      }
+      return fmt
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      billoperatehis({
+        id: row.id
+      })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
         })
-      },
-      total() {},
     },
-  }
+    async exportlist() {
+      const {
+        data
+      } = await export1({
+        compId: localStorage.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',
+      })
+    },
+    total() { },
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .connert {
-    width: 90%;
-    margin: 0 auto;
-  }
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
 
-  .vertical-text-left {
-    width: 62px;
-    text-align: right;
-  }
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
 
-  //分页
-  .el-pagination {
-    padding: 10px 15px;
-    margin-bottom: 0;
-    text-align: center;
-  }
+//分页
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
 
-  /deep/.el-pager li.active {
-    color: #5878e8;
-    cursor: default;
-  }
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
 
-  /deep/.el-pager li:hover {
-    color: #5878e8;
-    cursor: default;
-  }
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
 
-  .el-button--default {
-    color: #8890b1;
-    border-color: #e8eaf1;
-  }
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
 
-  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
-    width: 30px;
-    margin-left: 0;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-  }
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
 
-  /deep/.findValue .el-input__inner {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-    width: 385px;
-  }
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
 
-  .completed.el-button--default {
-    border-color: #5878e8;
-    background-color: #f6f7fc;
-    color: #5878e8;
-  }
+.completed.el-button--default {
+  border-color: #5878e8;
+  background-color: #f6f7fc;
+  color: #5878e8;
+}
 
-  .putstorage.el-button--default,
-  .deliverystorage.el-button--default {
-    border-color: #8890b1;
-    background-color: #fff;
-    color: #8890b1;
-  }
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
 
-  /deep/.el-table td,
-  /deep/.el-table th.is-leaf {
-    border-right: 1px solid #e9ecf7;
-    text-align: center;
-  }
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
 
-  /deep/.el-table tr td:first-child,
-  /deep/.el-table tr th.is-leaf:first-child {
-    border-left: 1px solid #e9ecf7;
-  }
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
 
-  .record,
-  .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-  }
+.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;
-  }
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
 
-  .anniu {
-    margin-left: 40%;
-    margin-top: -7%;
-    margin-bottom: 6%;
-  }
+.anniu {
+  margin-left: 40%;
+  margin-top: -7%;
+  margin-bottom: 6%;
+}
 
-  // .el-row{
-  //     height: 150px;
-  // }
-  .base_header_layout .grid-content {
-    margin-top: 80px;
-  }
+// .el-row{
+//     height: 150px;
+// }
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
 
-  .el-input--small .el-input__inner {
-    margin-left: 20px;
-  }
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
 
-  .el-range-editor--small.el-input__inner {
-    height: 32px;
-    margin-left: -20%;
-  }
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin-left: -20%;
+}
 
-  //执行样式
-  .executory,
-  .inExecution,
-  .done {
-    width: 6px;
-    height: 6px;
-    display: inline-block;
-    border-radius: 50%;
-    position: relative;
-    top: -1px;
-    font-size: 14px;
-  }
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
 
-  .executory {
-    background: #ff9f24;
-  }
+.executory {
+  background: #ff9f24;
+}
 
-  .inExecution {
-    background: #5878e8;
-  }
+.inExecution {
+  background: #5878e8;
+}
 
-  .done {
-    background: #50cad4;
-  }
+.done {
+  background: #50cad4;
+}
 
-  .record,
-  .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-    font-size: 14px;
-  }
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
 
-  .container {
-    overflow: scroll;
-    height: 93vh;
-  }
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
 
-  .button-container {
+  &>div {
+    margin-left: 10px;
     display: flex;
     flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
+    flex-direction: row;
 
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
+    &>span {
+      line-height: 50px;
     }
+  }
 
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
 
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
 
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
+    &/deep/.auditFlow-main {
+      position: absolute;
     }
   }
+}
 
-  .bg-left {
-    padding-left: 30px;
-  }
+.bg-left {
+  padding-left: 30px;
+}
 
-  .title {
-    position: relative;
-  }
+.title {
+  position: relative;
+}
 
-  .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
-  }
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
 
-  .el-button--primary {
-    background-color: #5878e8;
-    border-color: #5878e8;
-    // margin-left: 85%;
-    margin-top: 13px;
-  }
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+  // margin-left: 85%;
+  margin-top: 13px;
+}
 
-  //导航条样式
-  .el-col-12 {
-    width: 50%;
-    height: 60px;
-    background: #f6f7fc;
-    border-radius: 4px 4px 1px 1px;
-  }
+//导航条样式
+.el-col-12 {
+  width: 50%;
+  height: 60px;
+  background: #f6f7fc;
+  border-radius: 4px 4px 1px 1px;
+}
 
-  .el-input--small .el-input__inner {
-    height: 32px;
-    line-height: 32px;
-    width: 385px;
-    margin-top: 10px;
-  }
+.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  width: 385px;
+  margin-top: 10px;
+}
 
-  .bg-bottom {
-    margin-left: 85%;
-  }
+.bg-bottom {
+  margin-left: 85%;
+}
 
-  .but {
-    margin-left: 30%;
-    /* margin-top: -32px; */
-    overflow: auto;
-    /* float: left; */
-    /* margin-left: 1px; */
-    margin-left: -10px;
-  }
+.but {
+  margin-left: 30%;
+  /* margin-top: -32px; */
+  overflow: auto;
+  /* float: left; */
+  /* margin-left: 1px; */
+  margin-left: -10px;
+}
 
-  .look .el-form-item {
-    border-bottom: 1px solid #ccc;
-  }
+.look .el-form-item {
+  border-bottom: 1px solid #ccc;
+}
 
-  .el-input--small {
-    font-size: 13px;
-    width: 390px;
-    margin-left: 74%;
-  }
+.el-input--small {
+  font-size: 13px;
+  width: 390px;
+  margin-left: 74%;
+}
 
-  /deep/.el-table .el-table__header .cell,
-  .el-table .el-table__body .cell {
-    text-align: center;
-  }
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
 
-  .el-scrollbar__wrap {
-    overflow-y: hidden;
-  }
+.el-scrollbar__wrap {
+  overflow-y: hidden;
+}
 
-  /deep/.deal {
-    margin-left: 0%;
-    width: 64%;
-  }
+/deep/.deal {
+  margin-left: 0%;
+  width: 64%;
+}
 
-  .photo {
-    padding: 0% 34%;
-  }
+.photo {
+  padding: 0% 34%;
+}
 
-  .photo1 {
-    padding: 0 10%;
-  }
+.photo1 {
+  padding: 0 10%;
+}
 
-  .photo2 {
-    padding: 0 12%;
-  }
+.photo2 {
+  padding: 0 12%;
+}
 
-  /deep/.el-form-item--small .el-form-item__label,
-  .el-form-item--small .el-form-item__content {
-    text-align: center;
-  }
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: center;
+}
 
-  hr {
-    width: 91%;
-  }
+hr {
+  width: 91%;
+}
 
-  /deep/.deaal {
-    width: 66%;
-    margin-left: 9%;
-  }
+/deep/.deaal {
+  width: 66%;
+  margin-left: 9%;
+}
 
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner,
-  .el-input-number--small {
-    width: 123% !important;
-  }
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
 
-  /deep/.el-table td,
-  .el-table th.is-leaf {
-    border-right: 1px solid #e9ecf7;
-    text-align: center;
-    height: 40px;
-  }
+/deep/.el-table td,
+.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+  height: 40px;
+}
 </style>

+ 0 - 2
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -83,7 +83,6 @@
           <!-- 货名 -->
           <el-form-item label="货源" class="huom">
             {{goods}}
-            <!-- </el-select> -->
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px">
@@ -197,7 +196,6 @@
           </el-form-item>
           <el-form-item v-else label="货源" class="huom">
             {{goods}}
-            <!-- </el-select> -->
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px">

+ 52 - 44
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -67,6 +67,13 @@
 						</el-input>
 					</el-form-item>
 					<!-- 货名 -->
+					<el-form-item v-if="dataList.taskTypeKey != 3" label="货名" class="huom">
+						<el-select disabled v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName"
+						filterable clearable>
+						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+							:value="item.constValue"></el-option>
+						</el-select>
+					</el-form-item>
 					<el-form-item label="货源" class="huom">
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
@@ -74,7 +81,7 @@
 					</el-form-item>
 					<!--重量(吨)-->
 					<el-form-item label="重量(吨)">
-						<el-input disabled @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量(吨)"
+						<el-input disabled  @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量(吨)"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->
@@ -188,7 +195,7 @@
 					</el-form-item>
 					<!--重量(吨)-->
 					<el-form-item label="重量(吨)">
-						<el-input disabled @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量(吨)"
+						<el-input disabled  @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量(吨)"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->
@@ -512,15 +519,15 @@
 			this.sourceId=''
 			this.dataList.weight=0
 			this.dataList1.weight=0
-			if(localStorage.getItem("taskTypeKey")){
-				this.dataList.taskTypeKey=localStorage.getItem("taskTypeKey")
-				this.dataList1.taskTypeKey=localStorage.getItem("taskTypeKey")
+			if(localStorage.getItem('taskTypeKey')){
+				this.dataList.taskTypeKey=localStorage.getItem('taskTypeKey')
+				this.dataList1.taskTypeKey=localStorage.getItem('taskTypeKey')
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					if(localStorage.getItem("warehouse")){
-						this.dataList.warehouseName=localStorage.getItem("warehouse")
+					if(localStorage.getItem('warehouse')){
+						this.dataList.warehouseName=localStorage.getItem('warehouse')
 					}
-					if(localStorage.getItem("warehouseId")){
-						this.baseId=localStorage.getItem("warehouseId")
+					if(localStorage.getItem('warehouseId')){
+						this.baseId=localStorage.getItem('warehouseId')
 					}
 					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
 					.toPromise()
@@ -529,18 +536,18 @@
 						this.staffList = response
 						//  this.agent = response
 					})
-					this.dataList.contractNo=localStorage.getItem("contractNo")
+					this.dataList.contractNo=localStorage.getItem('contractNo')
 					if(this.dataList.taskTypeKey==3){
-						this.dataList.moveTaskNo=localStorage.getItem("contractNo")
-						this.dataList1.moveTaskNo=localStorage.getItem("contractNo")
+						this.dataList.moveTaskNo=localStorage.getItem('contractNo')
+						this.dataList1.moveTaskNo=localStorage.getItem('contractNo')
 					}
 				}
 				else if(this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==4){
-					if(localStorage.getItem("warehouse")){
-						this.dataList1.warehouseName=localStorage.getItem("warehouse")
+					if(localStorage.getItem('warehouse')){
+						this.dataList1.warehouseName=localStorage.getItem('warehouse')
 					}
-					if(localStorage.getItem("warehouseId")){
-						this.baseId=localStorage.getItem("warehouseId")
+					if(localStorage.getItem('warehouseId')){
+						this.baseId=localStorage.getItem('warehouseId')
 					}
 					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
 					.toPromise()
@@ -549,15 +556,15 @@
 						this.staffList = response
 						//  this.agent = response
 					})
-					this.dataList1.contractNo=localStorage.getItem("contractNo")
+					this.dataList1.contractNo=localStorage.getItem('contractNo')
 				}
 			}
-			if(localStorage.getItem("supplygoods1")){
-				if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"||this.dataList.taskTypeKey==4){
-					var supplygoods=JSON.parse(localStorage.getItem("supplygoods1"))
+			if(localStorage.getItem('supplygoods1')){
+				if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList.taskTypeKey==4){
+					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
 					for (let i = 0; i < supplygoods.length; i++) {
 						if(supplygoods[i].sourceRelationInfoList){
-							if(localStorage.getItem("supplygoodsstatus")&&localStorage.getItem("supplygoodsstatus")==1){
+							if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==1){
 							for (let q = 0; q < supplygoods[i].sourceRelationInfoList.length; q++) {
 								
 								if(this.goods.indexOf(supplygoods[i].sourceRelationInfoList[q].goodsName)==-1){
@@ -571,8 +578,8 @@
 						console.log(this.goods)
 					}
 				}else if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					var supplygoods=JSON.parse(localStorage.getItem("supplygoods1"))
-					if(localStorage.getItem("supplygoodsstatus")&&localStorage.getItem("supplygoodsstatus")==0){
+					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
+					if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==0){
 						for (let i = 0; i < supplygoods.length; i++) {
 							this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
 							this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
@@ -593,14 +600,14 @@
 			supplygoods(){
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
 					if(this.dataList.warehouseName){
-						localStorage.setItem("warehouse",this.dataList.warehouseName);
+						localStorage.setItem('warehouse',this.dataList.warehouseName);
 						if(this.dataList.taskTypeKey==3){
-							localStorage.setItem("contractNo",this.dataList.moveTaskNo);
+							localStorage.setItem('contractNo',this.dataList.moveTaskNo);
 						}else{
-							localStorage.setItem("contractNo",this.dataList.contractNo);
+							localStorage.setItem('contractNo',this.dataList.contractNo);
 						}
-            			localStorage.setItem("taskTypeKey",this.dataList.taskTypeKey);
-						localStorage.setItem("warehouseId",this.baseId);
+            			localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
+						localStorage.setItem('warehouseId',this.baseId);
 						this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId}})
 					}else{
 						this.$message({
@@ -608,12 +615,12 @@
 							type: 'warning'
 						});
 					}
-				}else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"||this.dataList1.taskTypeKey==4){
+				}else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList1.taskTypeKey==4){
 					if(this.dataList1.moveTaskNo||this.dataList1.contractNo){
-						localStorage.setItem("warehouse",this.dataList1.warehouseName);
-						localStorage.setItem("contractNo",this.dataList1.contractNo);
-            			localStorage.setItem("taskTypeKey",this.dataList1.taskTypeKey);
-						localStorage.setItem("warehouseId",this.baseId);
+						localStorage.setItem('warehouse',this.dataList1.warehouseName);
+						localStorage.setItem('contractNo',this.dataList1.contractNo);
+            			localStorage.setItem('taskTypeKey',this.dataList1.taskTypeKey);
+						localStorage.setItem('warehouseId',this.baseId);
 						this.$router.push({name:'outsupplyofgoods',query:{contractNo:this.dataList1.contractNo,taskTypeKey:this.dataList1.taskTypeKey}})
 					}else{
 						this.$message({
@@ -865,7 +872,7 @@
 									this.$set(this.dataList1, 'gradeKey', response.gradeKey)
 									this.$set(this.dataList1, 'waterContent', response.waterContent)
 									this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
-									if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"){
+									if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'){
 										this.goods=''
 										this.dataList1.weight=0
 									}else{
@@ -1484,21 +1491,22 @@
 						return
 					}
 				}
-				localStorage.removeItem("warehouse")
-				localStorage.removeItem("contractNo");
-            	localStorage.removeItem("taskTypeKey");
+				localStorage.removeItem('warehouse')
+				localStorage.removeItem('contractNo');
+            	localStorage.removeItem('taskTypeKey');
 				// this.dataList.goodsNameKey =
 				// this.dataList.positionId =
 				// this.dataList.baseId =
 				this.dataList.inOutFlag = 1
 				this.dataList1.inOutFlag = 2
-				var data=JSON.parse(localStorage.getItem("supplygoods"))
+				var data=JSON.parse(localStorage.getItem('supplygoods'))
 				if(data){
 					for (let i = 0; i < data.length; i++) {
 						data[i].sourceId=data[i].id
 					}
 				}else{
-					if(this.dataList.taskTypeKey == 1||this.dataList.taskTypeKey == 3||this.dataList.taskTypeKey == 4||this.dataList1.taskTypeKey == 2&&this.dataList1.inOutType){
+					// ||this.dataList1.taskTypeKey == 2&&this.dataList1.inOutType
+					if(this.dataList.taskTypeKey == 1||this.dataList.taskTypeKey == 3||this.dataList.taskTypeKey == 4){
 						this.$message({
 							message: '请选择货源!',
 							type: 'warning'
@@ -1698,23 +1706,23 @@
 			},
 			getList() {
 				this.tasknumber()
-				if(localStorage.getItem("taskTypeKey")){
-					if(localStorage.getItem("taskTypeKey") == 1){
+				if(localStorage.getItem('taskTypeKey')){
+					if(localStorage.getItem('taskTypeKey') == 1){
 						this.$set(this.dataList, 'inOutType', '销售出库')
 						this.$set(this.dataList, 'inOutTypeKey', '1')
 						this.$set(this.dataList, 'goodsName', '玉米')
 						this.$set(this.dataList, 'goodsNameKey', '1')
 						this.$set(this.dataList1, 'goodsName', '玉米')
 						this.$set(this.dataList1, 'goodsNameKey', '1')
-					}else if(localStorage.getItem("taskTypeKey") == 2){
+					}else if(localStorage.getItem('taskTypeKey') == 2){
 						this.$set(this.dataList1, 'inOutType', '采购入库')
 						this.$set(this.dataList1, 'inOutTypeKey', '2')
-					}else if(localStorage.getItem("taskTypeKey") == 3){
+					}else if(localStorage.getItem('taskTypeKey') == 3){
 						this.$set(this.dataList, 'inOutType', '移库出库')
 						this.$set(this.dataList, 'inOutTypeKey', '3')
 						this.$set(this.dataList1, 'inOutType', '移库入库')
 						this.$set(this.dataList1, 'inOutTypeKey', '3')
-					}else if(localStorage.getItem("taskTypeKey") == 4){
+					}else if(localStorage.getItem('taskTypeKey') == 4){
 						this.$set(this.dataList, 'inOutType', '销售出库')
 						this.$set(this.dataList, 'inOutTypeKey', '4')
 						this.$set(this.dataList1, 'inOutType', '退库')

+ 3 - 6
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -172,10 +172,9 @@
           <el-form-item
             label="重量(吨)"
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
+            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
-            disabled
               v-model="dataList.weight"
               placeholder="请输入重量(吨)"
               maxlength="120"
@@ -422,10 +421,9 @@
           <el-form-item
             label="重量(吨)"
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
+            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
-              disabled
               @input="weightchange"
               v-model="dataList1.weight"
               placeholder="请输入重量(吨)"
@@ -644,10 +642,9 @@
           <el-form-item
             label="重量(吨)"
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
+            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
-              disabled
               v-model="dataList.weight"
               placeholder="请输入重量(吨)"
               maxlength="120"

+ 0 - 1
src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -172,7 +172,6 @@
   import {
     seeCat,
     packList,
-    feedback
   } from '@/model/transport/index'
   import WsUpload from '@/components/WsUpload'
   import mapDrag from '@/components/mapdrag/mapdrag'

+ 1 - 1
src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -249,7 +249,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
+import { seeCat, } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

+ 1 - 1
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -283,7 +283,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
+import { seeCat,  } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

+ 14 - 13
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -85,10 +85,10 @@
             </el-col>
           </el-row>
           <div class="small-title" style="font-size: 16px">派车
-            <!-- <el-radio-group @change='pricetypechange' v-model="pricetype">
+            <el-radio-group @change='pricetypechange' v-model="pricetype">
               <el-radio label="1">元/吨计费</el-radio>
               <el-radio label="2">元/车计费</el-radio>
-            </el-radio-group> -->
+            </el-radio-group>
             </div>
           
           <div class="myTest">
@@ -426,11 +426,11 @@
               for (let i = index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
                 let number = Number(this.deptBudgetList.tranCarInfoList[i].tranCarNo.split('C')[1]) - 1
                 if (number < 10) {
-                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = "C00" + number
+                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = 'C00' + number
                 } else if (number < 100) {
-                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = "C0" + number
+                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = 'C0' + number
                 } else {
-                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = "C" + number
+                  this.deptBudgetList.tranCarInfoList[i].tranCarNo = 'C' + number
                 }
               }
             }
@@ -518,7 +518,7 @@
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 billingMethod:this.pricetype,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C00" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
@@ -540,7 +540,7 @@
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 billingMethod:this.pricetype,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C0" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
@@ -562,7 +562,7 @@
                 billingMethod:this.pricetype,
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             }
@@ -592,7 +592,7 @@
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 billingMethod:this.pricetype,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C00" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
@@ -614,7 +614,7 @@
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 billingMethod:this.pricetype,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C0" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
@@ -636,7 +636,7 @@
                 billingMethod:this.pricetype,
                 tranPriceCar:this.deptBudgetList.tranPriceCar,
                 // tranCarNo: tmp1+(this.deptBudgetList.count),
-                tranCarNo: "C" + (this.deptBudgetList.tranCarInfoList.length + 1),
+                tranCarNo: 'C' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
             }
@@ -657,7 +657,7 @@
           tranProcessInfo.reviewer = localStorage.getItem('ws-pf_roleName') +
             localStorage.getItem('ws-pf_staffName')
           tranProcessInfo.id = this.deptBudgetList.id
-          tranProcessInfo.flag = "2"
+          tranProcessInfo.flag = '2'
           tranProcessInfo.tranTypeKey = 1
           tranProcessInfo.billingMethod= this.deptBudgetList.billingMethod
           if(this.deptBudgetList.billingMethod==2){
@@ -692,9 +692,10 @@
           .then(() => {
             var tranProcessInfo = {}
             tranProcessInfo.id = this.deptBudgetList.id
-            tranProcessInfo.flag = "1"
+            tranProcessInfo.flag = '1'
             tranProcessInfo.tranTypeKey = 1
             tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
+            if(!this.deptBudgetList.billingMethod) this.deptBudgetList.billingMethod=1
             tranProcessInfo.billingMethod= this.deptBudgetList.billingMethod
             tranProcessInfo.tranPriceIngCar = this.deptBudgetList.tranPriceIngCar
             if(status==2){

+ 1 - 1
src/views/tranManagement/tranManagementthirdpartnarReceivingLook.vue

@@ -205,7 +205,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback, stateRec,state,gettranprocessinfo,posttranprocessinfo } from '@/model/transport/index'
+import { seeCat, packList,  stateRec,state,gettranprocessinfo,posttranprocessinfo } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'

+ 11 - 9
src/views/warehousenew/warehouseManagementList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <!-- 表格 -->
     <div class="top_form" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`">
-      <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">今储量明细</span><span style="color:#8890B1;font-size:16px">({{dateTime}})</span></div>
+      <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">今储量明细</span><span style="color:#8890B1;font-size:16px">({{dateTime}})</span></div>
       <el-table :data="tableData" style="width: 100%;margin-top:20px">
       <el-table-column :prop="item" :label="item" show-overflow-tooltip v-for="(item, index) in tableHeader" :key="index"></el-table-column>
     </el-table>
@@ -1057,17 +1057,19 @@
             }
             this.initCharts()
             this.warehouseList = response.warehouseViewList
-            this.warehouseInfo = this.warehouseList[0]
-            this.warehouseInfo.warehouseLocation = this.warehouseList[0].warehousePrivate + this.warehouseList[0].warehouseCity + this.warehouseList[0].warehouseArea
-            // this.warehouseInfo.maxReserves = 0
-            //经纬度
-             this.warehousePositioning.lat = this.warehouseInfo.warehousePositioning.split(',')[1]
-             this.warehousePositioning.lng = this.warehouseInfo.warehousePositioning.split(',')[0]
-             for(let j = 0 ; j < this.warehouseXiaLa.length ; j++){
+            if(this.warehouseList.length>0){
+              this.warehouseInfo = this.warehouseList[0]
+              this.warehouseInfo.warehouseLocation = this.warehouseList[0].warehousePrivate + this.warehouseList[0].warehouseCity + this.warehouseList[0].warehouseArea
+              // this.warehouseInfo.maxReserves = 0
+              //经纬度
+              this.warehousePositioning.lat = this.warehouseInfo.warehousePositioning.split(',')[1]
+              this.warehousePositioning.lng = this.warehouseInfo.warehousePositioning.split(',')[0]
+              for(let j = 0 ; j < this.warehouseXiaLa.length ; j++){
                 if(this.warehouseInfo.warehouseName == this.warehouseXiaLa[j].warehouseName){
                   this.warehouseInfo.maxReserves = this.warehouseXiaLa[j].totalStorage
-                 }
+                  }
               }
+            }
           })
       }
     },

+ 9 - 0
src/views/warehousenew/warehouseManagementLook.vue

@@ -82,6 +82,15 @@
           >
             {{ deptBudgetList.detailedAddress }}
           </ws-form-item>
+          <!--仓库编号-->
+          <ws-form-item
+            label="仓库编号"
+            span="1"
+            prop="commonWarehouseNo"
+            class="readonly"
+          >
+            {{ deptBudgetList.commonWarehouseNo }}
+          </ws-form-item>
           <!--总储量(吨)-->
           <ws-form-item
             v-show="warehouseType == '1'"

+ 65 - 36
src/views/warehousenew/warehousingOrder.vue

@@ -82,9 +82,10 @@
         </el-table-column>
         <el-table-column prop="goodsSource" label="货源" width="80"></el-table-column>
         <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="customer" label="客户" width="100"></el-table-column>
+        <el-table-column prop="goodsName" label="货名" width="60">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1"  width="200" class="table_td" label="入库重量(吨)">
+        <el-table-column prop="inWarehouseWeight1"  width="140" class="table_td" label="入库重量(吨)">
           <template scope="scope">
             <span v-if='scope.row.weightedit==false&&scope.row.warehouseType==2||scope.row.warehouseType==1'>{{scope.row.inWarehouseWeight1}}</span>
             <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.warehouseType==2' v-model='scope.row.inWarehouseWeight1'></el-input>
@@ -94,11 +95,11 @@
               src="../../../public/img/edit.png" @click="editWeight(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="outWarehouseWeight"  width="130" class="table_td" label="出库重量(吨)"></el-table-column>
+        <el-table-column prop="outWarehouseWeight"  width="110" class="table_td" label="出库重量(吨)"></el-table-column>
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏(吨)"></el-table-column>
-        <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量(吨)"></el-table-column>
-        <el-table-column prop="grainFund"  width="130" class="table_td" label="粮款(元)"></el-table-column>
-        <el-table-column prop="amountEdPayable"  width="130" class="table_td" label="已付(元)">
+        <el-table-column prop="surplusWeight" width="110" class="table_td" label="剩余重量(吨)"></el-table-column>
+        <el-table-column prop="grainFund"  width="100" class="table_td" label="粮款(元)"></el-table-column>
+        <el-table-column prop="amountEdPayable"  width="100" class="table_td" label="已付(元)">
           <template scope="scope">
             <span >{{scope.row.amountEdPayable}}</span>
             <img v-if='scope.row.addressUrl' width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -106,17 +107,25 @@
           </template>
         </el-table-column>
         <el-table-column prop="amountNotPayable" class="table_td" label="未付(元)"></el-table-column>
-        <el-table-column prop="amountMoney" width="130" class="table_td" label="费用(元)">
+        <el-table-column prop="amountMoney" width="80" class="table_td" label="费用(元)">
           <template scope="scope">
             <span @click='costclick(scope.row)'>{{scope.row.amountMoney}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="avgCost"  width="130" class="table_td" label="平均成本(元/吨)"></el-table-column>
-        <el-table-column prop="requestFunds"  width="180" class="table_td" label="请款">
+        <el-table-column prop="requestFunds"  width="130" class="table_td" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
             <el-input v-else v-model='scope.row.requestFunds'></el-input>
           </template>
+        </el-table-column>
+         <el-table-column prop="remark"  width="130" class="table_td" label="请款备注">
+          <template scope="scope">
+            <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
+              <span class="text_css">查看</span>
+            </div>
+            <el-input v-else v-model='scope.row.remark'></el-input>
+          </template>
         </el-table-column>
         <el-table-column prop="approveStatus" label="请款状态" width="90">
           <template slot-scope="scope">
@@ -152,25 +161,28 @@
         </span>
       </el-dialog>
       <!-- <el-dialog
-  title="提示"
-  :visible.sync="dialogVisible"
-  width="30%"
-  :before-close="handleClose">
-  <div> 
-    <el-time-picker
-    v-model="value1"
-      format='HH:mm'
-    value-format="HH:mm"
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <div> 
+        <el-time-picker
+        v-model="value1"
+          format='HH:mm'
+        value-format="HH:mm"
 
-    
-    placeholder="任意时间点"> </el-time-picker>
-    <ws-button type="primary" @click="handleAdd()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">修改
-        </ws-button>
-  </div>
-</el-dialog> -->
-<el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
+        
+        placeholder="任意时间点"> </el-time-picker>
+        <ws-button type="primary" @click="handleAdd()" v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.add`
+              ">修改
+            </ws-button>
+      </div>
+    </el-dialog> -->
+    <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
+      <span>{{remark}}</span>
+    </el-dialog>
+    <el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
       <div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
        <el-image 
         style="width: 100px; height: 100px"
@@ -179,7 +191,7 @@
       </el-image>
       </div>
     </el-dialog>
-  <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
+    <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
       <div v-for="(item,index) in costlist" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
@@ -195,7 +207,7 @@
         </div>
       </div>
     </el-dialog>
-</div>
+  </div>
   </div>
 </template>
 <script>
@@ -337,6 +349,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           },
         },
         accessoryTFs: false,
+        remarkList: false,
+        remark:''
       }
     },
     // activated() {
@@ -364,6 +378,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         
         console.log(this.appendixIdss)
       },
+      lookRemark(row) {
+        if(row.remark){
+        this.remark = row.remark
+        this.remarkList = true
+        }
+        else{
+          this.$message({
+              message: '暂无请款备注',
+              type: 'warning'
+            });
+        }
+      },
       handle(status){
         this.searchType=status
         this.getList()
@@ -406,7 +432,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             type: 'warning',
           })
           .then(() => {
-            editwarehousingorder({id:row.id,inWarehouseWeight:row.inWarehouseWeight1*1000}).toPromise()
+            editwarehousingorder({id:row.id,inWarehouseWeight:row.inWarehouseWeight1}).toPromise()
               .then((response) => {
                 // row.weightedit=false
                 this.getList()
@@ -414,9 +440,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           })
       },
       payout(item){
-        // console.log(item)
+        console.log(item)
         if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          if(this.multipleSelection1[item.id].length>0){
+          if(Object.keys(this.multipleSelection1).length!=0&&this.multipleSelection1[item.id].length>0){
             item.payshow=false
             for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
               if(item.warehouseName==this.multipleSelection1[item.id][i].warehouseName){
@@ -561,7 +587,6 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           })
       },
       paymentsubmit(item){
-        // console.log(item.id)
         var that=this
         console.log(this.multipleSelection1,this.multipleSelection1[this.currectdata.id])
         var arr2=this.multipleSelection1[this.currectdata.id]
@@ -572,9 +597,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          console.log(arr2)
           for (let i = 0; i < arr2.length; i++) {
-            arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(this.paymentScreenshot)
+            if(arr2[i].addressUrlArray){
+              arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(this.paymentScreenshot)
+            }
+            else{
+              arr2[i].addressUrlArray=this.paymentScreenshot
+            }
             arr2[i].addressUrl=arr2[i].addressUrlArray.toString()
             
           }
@@ -752,8 +781,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               var data=response.records[i].warehousingOrderList
               for (let q = 0; q < data.length; q++) {
                 if(data[q].inType=='收购入库'){
-                  data[q].inWarehouseWeight1=Number((data[q].inWarehouseWeight/1000).toFixed(3))
-                   data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
+                  data[q].inWarehouseWeight1=Number((data[q].inWarehouseWeight).toFixed(3))
+                   data[q].surplusWeight=(data[q].inWarehouseWeight)-data[q].outWarehouseWeight+data[q].profitAndLoss
                 }else{
                   data[q].inWarehouseWeight1=data[q].inWarehouseWeight.toFixed(3)
                   data[q].surplusWeight=data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott