md

src/api/common.js

@@ -152,3 +152,14 @@ export function getLatestActionList() {
   })
 }
 
+// 按线路重算批次
+export function autoScanSiteBatch(lineCode) {
+  return request({
+    url: '/common/autoScanSiteBatch?lineCode='+lineCode,
+    method: 'get',
+    timeout: 20000
+  })
+}
+
+
+

src/api/emis/emisSupplier.js

@@ -26,6 +26,22 @@ export function getEmisSupplier(id) {
   })
 }
 
+export async function getEmisSupplierByCode(code) {
+  let res= await request({
+    url: '/emis/emisSupplier/list',
+    method: 'get',
+    params: {code:code}
+  });
+
+  if(res&&res.code==200){
+    let result=res.rows[0];
+    return result;
+  }else{
+    return null;
+  }
+ 
+}
+
 // 新增公司供应商表
 export function addEmisSupplier(data) {
   return request({

src/api/emis/emisTmsSiteBatch.js

@@ -50,3 +50,13 @@ export function getTmsGroupBatchNo(id) {
     method: 'post'
   })
 }
+
+
+//  按批次号重算批次
+export function scanSiteBatch(batchNo) {
+  return request({
+    url: '/emis/emisTmsSiteBatch/scanSiteBatch?batchNo='+batchNo,
+    method: 'get',
+    timeout: 20000
+  })
+}

src/router/index.js

@@ -164,34 +164,7 @@ export const dynamicRoutes = [
       }
     ]
   },
-  {
+  
-    path: '/monitor/job-log',
-    component: Layout,
-    hidden: true,
-    permissions: ['monitor:job:list'],
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
-  },
-  {
-    path: '/tool/gen-edit',
-    component: Layout,
-    hidden: true,
-    permissions: ['tool:gen:edit'],
-    children: [
-      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  }
 ]
 
 // 防止连续点击多次路由报错

src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue

@@ -417,7 +417,6 @@ import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
 
-
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 

src/views/emis/emisSupplier/emisSupplierForm.vue

@@ -40,6 +40,18 @@
                 </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="关联费用类型" prop="transType">
+              <el-select  multiple clearable filterable v-model="form.feeItemRelArr" placeholder="关联费用"  @change="onFeeItemRelChange" style="width:100%" >
+                  <el-option
+                    v-for="item in dict.type.emis_cost_fee_type"
+                    v-bind:key="item.value"
+                    v-bind:label="item.label"
+                    v-bind:value="item.value"
+                  />
+                </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="业务网点" prop="bizSite" >
               <el-button
@@ -81,8 +93,7 @@ export default {
     }
   },
   components: { EmisSiteSelectTreePicker },
-  dicts: ['emis_biz_shipping_method'
+  dicts: ['emis_biz_shipping_method','emis_cost_fee_type'],
-  ],
   data() {
     return {
       emisSupplierOptions: [],
@@ -136,6 +147,10 @@ export default {
               this.$set(this.form,"transTypeIdArr",this.form.transType.split(","))
             }
 
+            if(this.form.feeItemRel){
+              this.$set(this.form,"feeItemRelArr",this.form.feeItemRel.split(","))
+            }
+
             this.loading = false;
           });
         }else{
@@ -148,6 +163,11 @@ export default {
             this.form.transType=this.form.transTypeIdArr.join(",");
       }
     },
+    onFeeItemRelChange(){
+      if(this.form.feeItemRelArr){
+            this.form.feeItemRel=this.form.feeItemRelArr.join(",");
+      }
+    },
     handleSelectSite(){
       this.openSiteSelectTreeForm=true;
     },
@@ -173,6 +193,8 @@ export default {
         settledType: null,
         transType: null,
         transTypeIdArr:[],
+        feeItemRel:null,
+        feeItemRelArr:[],
         bizSite: null,
         bizSiteName: null,
         companyName: null,

src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue

@@ -333,6 +333,8 @@
 import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
 import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
 import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
+import { listSimpleEmisSupplier,getEmisSupplierByCode } from "@/api/emis/emisSupplier";
+
 
 import EmisTmsSiteBatchPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchPicker';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
@@ -507,9 +509,34 @@ export default {
                });
             }
         }
-          // 获取运输类型对应的费用类型
+
+
+        // 获取供应商费用关联信息
+        let feeItemRelStr=null;
+        let supplier=getEmisSupplierByCode(this.form.supplierCode);
+        if(supplier!=null){
+          feeItemRelStr=supplier.feeItemRel;
+        }
+
+          // 获取运输类型对应的费用类型 // 供应商对应的费用类型
           this.form.feeItemList=[];
           
+          // 根据供应商对应的费用类型来判断
+          if(feeItemRelStr){
+            let feeTypeArr = feeItemRelStr.split(',');
+              this.dict.type.emis_cost_fee_type.forEach(itemType => {
+                  if(feeTypeArr.includes(itemType.value)){
+                    let feeItem={
+                      feeType:itemType.value,
+                      price:null,
+                      fee:null,
+                      currency:'CNY'
+                    }
+                    this.form.feeItemList.push(feeItem);
+                  }
+              });
+          }
+          else{
             for(let i=0;i<this.dict.type.emis_trans_feeitem_rel.length;i++ ){
               let item=this.dict.type.emis_trans_feeitem_rel[i];
               if(item.label == this.form.transType){
@@ -527,7 +554,7 @@ export default {
                     });
                     break;
                 }
-
+            }
           }
 
           this.loading = false;

src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue

@@ -357,7 +357,12 @@
 </template>
 
 <script>
-import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
+import { listEmisTmsSiteBatch, 
+  getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, 
+  addEmisTmsSiteBatch, updateEmisTmsSiteBatch,
+  scanSiteBatch
+
+} from "@/api/emis/emisTmsSiteBatch";
 import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
 import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading";
 import { listEmisWaybill } from "@/api/emis/emisWaybill";
@@ -1095,6 +1100,14 @@ export default {
           }
         }
 
+        // 批次重算
+        try{
+          let resScan=await scanSiteBatch(this.form.batchNo);
+        }
+        catch(e){
+          console.log(e)
+        }
+
         this.isDoing=false;
 
       }
@@ -1126,6 +1139,14 @@ export default {
             }
           }
         }
+
+         // 批次重算
+         try{
+          let resScan=await scanSiteBatch(this.form.batchNo);
+        }
+        catch(e){
+          console.log(e)
+        }
       }
       this.isDoing=false;
       this.$modal.msgSuccess('操作成功！');
@@ -1212,6 +1233,15 @@ export default {
           this.$modal.msgError(res && res.msg || '未知错误')
           return;
         }
+        else{
+          // 批次重算
+          try{
+            scanSiteBatch(this.form.batchNo);
+          }
+          catch(e){
+            console.log(e)
+          }
+        }
       }
     },
     async handleCoAdd(){
@@ -1235,6 +1265,8 @@ export default {
               this.$modal.msgError(response && response.msg || '组批次明细新增失败')
               return;
             }
+           
+            
           }
         }
       })
@@ -1257,6 +1289,15 @@ export default {
           this.$modal.msgError(res && res.msg || '未知错误')
           return;
         }
+        else{
+          // 批次重算
+          try{
+            let resScan=await scanSiteBatch(this.form.batchNo);
+          }
+          catch(e){
+            console.log(e)
+          }
+        }
       }
     },
     handleCloseWayBill(){
@@ -1329,6 +1370,14 @@ export default {
               if(!res || res.code != 200){
                 this.$modal.msgError(res && res.msg || '未知错误')
                 return;
+              }else{
+                // 批次重算
+                try{
+                  let resScan=await scanSiteBatch(this.form.batchNo);
+                }
+                catch(e){
+                  console.log(e)
+                }
               }
               this.$modal.msgSuccess('删除成功')
             }

src/views/emis/emisTransPlanRule/index.vue

@@ -112,15 +112,16 @@
                   v-hasPermi="['emis:emisTransPlanRule:export']"
                 >导出</el-button>
               </el-col>
-                <!-- <el-col :span="1.5">
+              
+                <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
-                  @click="handleBatchAdd"
+                  @click="handleBatchReCalc"
-                  v-hasPermi="['emis:emisTransPlanRule:add']"
+                  v-hasPermi="['emis:emisTransPlanRule:edit']"
-                >批量导入</el-button>
+                >按线路重算</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -155,6 +156,10 @@
 import { listEmisTransPlanRule, getEmisTransPlanRule, delEmisTransPlanRule, addEmisTransPlanRule, updateEmisTransPlanRule } from "@/api/emis/emisTransPlanRule";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
+
+import { autoScanSiteBatch } from "@/api/common"
+
+
 import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
 
@@ -308,7 +313,17 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-
+    handleBatchReCalc(){
+      if(this.selectList&&this.selectList.length>0){
+        let lineCode=this.selectList[0].lineCode;
+        this.$modal.confirm('确认是否重算').then(function() {
+          return autoScanSiteBatch(lineCode);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("重算成功");
+        }).catch(() => {});
+      }
+    },
      /** 导出按钮操作 */
      handleExport() {
       const loadingInstance = this.$loading({