前端

package-lock.json

@@ -194,11 +194,6 @@
             "node-releases": "^1.1.71"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001230",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
-        },
         "electron-to-chromium": {
           "version": "1.3.742",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
@@ -7368,12 +7363,6 @@
         "lodash.uniq": "^4.5.0"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001164",
-      "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001164.tgz?cache=0&sync_timestamp=1606806154399&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001164.tgz",
-      "integrity": "sha1-W7/WTKYF1DEy8TzH/auxfDA2v9w=",
-      "dev": true
-    },
     "canvas-compress": {
       "version": "1.1.5",
       "resolved": "https://registry.npm.taobao.org/canvas-compress/download/canvas-compress-1.1.5.tgz",
@@ -8597,11 +8586,6 @@
             "node-releases": "^1.1.71"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001230",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
-        },
         "electron-to-chromium": {
           "version": "1.3.742",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
@@ -23206,4 +23190,4 @@
       "integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
     }
   }
-}
+}

src/views/outboundManagement/weighingManagementNew.vue

@@ -156,14 +156,14 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <el-input :maxlength="'7'" v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+                        <el-input :maxlength="'7'" v-if="carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
                            size="small" :disabled="recheck1"/>
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange" :disabled="recheck1">
                           <el-option v-for="item in options2" :key="item.constKey"
                             :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                         </el-select>
-                        <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{ carChange1 }}</el-button>
+                        <el-button type="primary" @click="carNoTypeChange" v-if="!carstatus">{{ carChange1 }}</el-button>
                       </ws-form-item>
                       <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="
                       weighingList.outType == '汽运' ||
@@ -448,7 +448,7 @@
         tpyeNo: 1,
         types: null,
         information: '皮重',
-        carChange1: '识别下拉',
+        carChange1: '手动填写',
         inWarehouseType: 1, //入库类型
         outContractNo: [],
         mListTop: [],
@@ -466,7 +466,7 @@
         weighingList: {
           grossWeight: '',
           tare: '',
-          selfLoading: 1,
+          selfLoading: 0,
           buckleMiscellaneous: 0,
           netWeight: 0,
           weight: '',
@@ -1580,7 +1580,7 @@
                   // this.isShowPrint = true
                   this.weighingList = {
                     grossWeight: 0,
-                    selfLoading: 1,
+                    selfLoading: 0,
                     tare: 0,
                     tips: '',
                     // contractNo:'',
@@ -1761,7 +1761,7 @@
         this.getList()
         this.weighingList = {
           grossWeight: 0,
-          selfLoading: 1,
+          selfLoading: 0,
           tare: 0,
           tips: '',
           // contractNo:'',
@@ -2019,7 +2019,7 @@
                     });
                 }
               })
-              this.carjudge=true
+              this.carjudge=false
               
               if(this.warehouseType == '1'){
                 this.recheckPrice = true
@@ -2028,7 +2028,7 @@
               }
               
             }else{
-              this.carjudge=false
+              this.carjudge=true
               if (this.taskNolist[i].contractNo) {
                 // console.log(this.taskNolist[i])
                 this.weighingList.contractNo = this.taskNolist[i].contractNo
@@ -2151,12 +2151,14 @@
               this.options2 = this.outContractNo[i].tranCarInfoList
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               this.carstatus = true
+
             }
             if (this.outContractNo[i].tranCarInfoList1) {
               this.fleetNameList = this.outContractNo[i].tranCarInfoList1
             }
           }
         }
+        
       },
       selectWarehouse() {
         selectWarehouseSelf({

src/views/profitable/expensemanagementdetails.vue

@@ -32,11 +32,11 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
-          <!-- <el-badge v-if="approveStatus" is-dot class="item">
+          <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left:10px" @click="oilcost()">油费</el-button>
           </el-badge>
           <el-button v-else style="margin-left:10px" @click="oilcost()">油费</el-button>
-          <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button> -->
+          <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.add`" style="margin-left:10px" @click="cashout('')">请款</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
         </el-col>

src/views/statisticalReport/autoSettlementList.vue

@@ -88,7 +88,7 @@
             <span v-if="scope.row.unloadingWeight == null">--</span>
             <span v-else-if="
               scope.row.lossWeight > 0 &&
-              scope.row.lossWeight > scope.row.loadingWeight / 1000
+              scope.row.lossWeight > scope.row.loadingWeight 
             " style="color: #f10404; font-weight: 600">{{ scope.row.lossWeight }}</span>
             <span v-else style="font-weight: 600">{{ scope.row.lossWeight }}</span>
           </template>

src/views/statisticalReport/component/routers/route.js

@@ -13,69 +13,69 @@ const statisticalReportRouter = {
   },
   children: [
     // 期货采购入库报表统计
-    {
-      path: 'purchaseReceiptStatisticsList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseReceiptStatisticsList'),
-      name: 'purchaseReceiptStatisticsList',
-      meta: {
-        title: 'purchaseReceiptStatisticsList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.procurementInReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货采购入库报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'purchaseReceiptStatisticsList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseReceiptStatisticsList'),
+    //   name: 'purchaseReceiptStatisticsList',
+    //   meta: {
+    //     title: 'purchaseReceiptStatisticsList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.procurementInReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货采购入库报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //期货采购平仓报表
-    {
-      path: 'purchaseClosingCashierList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
-      name: 'purchaseClosingCashierList',
-      meta: {
-        title: 'purchaseClosingCashierList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.procurementCloseReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货采购平仓报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'purchaseClosingCashierList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
+    //   name: 'purchaseClosingCashierList',
+    //   meta: {
+    //     title: 'purchaseClosingCashierList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.procurementCloseReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货采购平仓报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     // 期货销售出库报表统计
-    {
-      path: 'salesDeliveryReportList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesDeliveryReportList'),
-      name: 'salesDeliveryReportList',
-      meta: {
-        title: 'salesDeliveryReportList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货销售出库报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'salesDeliveryReportList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesDeliveryReportList'),
+    //   name: 'salesDeliveryReportList',
+    //   meta: {
+    //     title: 'salesDeliveryReportList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.saleOutReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货销售出库报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //期货销售平仓报表
-    {
-      path: 'salesClosingCashierList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
-      name: 'salesClosingCashierList',
-      meta: {
-        title: 'salesClosingCashierList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.saleCloseReport',
-        permissicon: [],
-        keepAlive: true,
-        _title:'期货销售平仓报表'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
+    // {
+    //   path: 'salesClosingCashierList',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
+    //   name: 'salesClosingCashierList',
+    //   meta: {
+    //     title: 'salesClosingCashierList',
+    //     shortcutEntrance: 'statisticalReport',
+    //     module: 'report.saleCloseReport',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'期货销售平仓报表'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   }
+    // },
     //汽运结算报表
     {
       path: 'autoSettlementList',

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -177,6 +177,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
+                  
                   <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
@@ -260,9 +261,9 @@
             <!-- <img width="22" height="22" src="../../../public/img/add.png" alt="" /> -->
             <div class="spans">添加司机</div>
           </el-button>
-          <!-- <el-button class="add" type="primary" size="small" @click="addteam()">
+          <el-button class="add" type="primary" size="small" @click="addteam()">
             <div class="spans">添加车队</div>
-          </el-button> -->
+          </el-button>
           <div style="text-align: right; padding: 10px">
             <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
           </div>