From 40ebe5f5495130d02bf9d0fa4589ac0c48d5a9da Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Feb 2025 10:16:19 +0800
Subject: [PATCH] md

---
 .../emisTmsCostFee/emisTmsCostFeeForm.vue     | 50 +++++--------------
 .../panel/BigBatchEditForm.vue                |  4 +-
 2 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
index b2c86450..e7fb2bab 100644
--- a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
+++ b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
@@ -70,12 +70,15 @@
                                 </el-table-column>
                                 <el-table-column prop="price" :label="$t('单价')" align="center" min-width="80">
                                   <template slot-scope="scope">
-                                    <el-input-number  v-model="scope.row.price"  placeholder="" size="mini" :min="0.00" :controls="false" :precision="2" @blur="(val)=>handleCalcFeeItem(scope.row)" @keyup.enter.native="handleCalcFeeItem(scope.row)"></el-input-number>
+                                    <!-- <el-input-number  v-model="scope.row.price"  placeholder="" size="mini"  :controls="false" :precision="2" @blur="(val)=>handleCalcFeeItem(scope.row)" @keyup.enter.native="handleCalcFeeItem(scope.row)"></el-input-number> -->
+                                    <el-input  v-model="scope.row.price"  placeholder="" size="mini"   @blur="(val)=>handleCalcFeeItem(scope.row)" @keyup.enter.native="handleCalcFeeItem(scope.row)"></el-input>
+
                                   </template>
                                 </el-table-column>
                                 <el-table-column prop="fee" :label="$t('费用')" align="center" min-width="80">
                                   <template slot-scope="scope">
-                                    <el-input-number  v-model="scope.row.fee"  placeholder="" size="mini" :min="0.00" :controls="false" :precision="2" ></el-input-number>
+                                    <!-- <el-input-number  v-model="scope.row.fee"  placeholder="" size="mini" :controls="false" :precision="2" ></el-input-number> -->
+                                    <el-input  v-model="scope.row.fee"  placeholder="" size="mini"  ></el-input>
                                   </template>
                                 </el-table-column>
                                 <el-table-column prop="currency"  :label="$t('币种')"  align="center" width="150" >
@@ -179,28 +182,19 @@
           </el-col>
 
 
-
           <!-- <el-col :span="5">
             <el-form-item label="费用" prop="costFee">
               <el-input-number  v-model="form.costFee"  style="width:100%"  placeholder="总费用" :min="1" :controls="false" :precision="2"></el-input-number>
             </el-form-item>
           </el-col> -->
-
           <!-- <el-col :span="24">
             <el-form-item label="成本名称" prop="costName">
               <el-input v-model="form.costName" placeholder="请输入成本名称" />
             </el-form-item>
           </el-col> -->
-
-
-
           <!-- <el-col :span="6">
           </el-col> -->
-          <!-- <el-col :span="24">
-            <el-form-item label="供应商代码" prop="supplierCode">
-              <el-input v-model="form.supplierCode" placeholder="请输入供应商代码" />
-            </el-form-item>
-          </el-col> -->
+
 
           <el-col :span="24">
             <el-form-item label="关联单号" prop="billCode" >
@@ -226,7 +220,7 @@
                             :data="form.billRelList"
                             size="mini"
                             style="width: 100%"
-
+                            max-height="300px"
                           >
 
                           <!-- max-height="500px" -->
@@ -310,7 +304,7 @@
           </el-col> -->
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" rows="3" type="textarea" placeholder="请输入备注" />
+              <el-input v-model="form.remark" rows="1" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
 
@@ -454,7 +448,6 @@ export default {
 
     },
     async onSelecTmsBatch(item){
-        console.log("==111==>==>",item);
 
         // 基础信息
         this.form.realTotalWeight=item.transWeight;
@@ -467,6 +460,11 @@ export default {
         this.form.supplierName=item.supplierName;
         this.form.tradeDate= this.parseTime(item.etd);
         this.form.costName=item.batchName;
+        // this.form.costFee=item.startSiteName;
+        this.form.sendPieceSum=item.sendPieceSum;
+        this.form.pieceNumber=item.pieceNumber;
+        this.form.totalWeight=item.totalWeight;
+        this.form.totalVolume=item.totalVolume;
 
         this.form.billRelList=[];
         // 运单列表信息
@@ -475,7 +473,6 @@ export default {
         let resBatch=await listEmisTmsSiteBatchDtl({batchNo: item.batchNo});
         if(resBatch.code==200){
             if(resBatch.rows&&resBatch.rows.length>0){
-              // billCodeStr=resBatch.rows.map( item=> item.billCode).join();
                this.form.billRelList=[];
                let uniqMap = new Map();
                resBatch.rows.forEach(itemWaybill=>{
@@ -488,34 +485,13 @@ export default {
                });
             }
         }
-          console.log("==billCodeStr==>",billCodeStr);
-        //  let qParam={
-        //       billCode:billCodeStr,
-        //       pageNum:1,
-        //       pageSize:2000
-        //   }
-        //   // 查询子账单
-        //   let res=await listEmisSettleSubBill(qParam);
-        //   if(res.code==200){
-        //     let subBillList = res.rows;
-        //     for(let i=0;i<subBillList.length;i++){
-        //       let itemSubBill=subBillList[i];
-        //       let relItem={...itemSubBill};
-        //       this.form.billRelList.push(relItem);
-        //     };
-        //   }
-
           // 获取运输类型对应的费用类型
           this.form.feeItemList=[];
 
           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){
-                  // console.log("==this.form.transType==>",this.form.transType);
-                  // console.log("==item.value==>",item.value);
                   let feeTypeArr = item.value.split(',');
-                  // console.log("==feeTypeArr==>",feeTypeArr);
-
                   this.dict.type.emis_cost_fee_type.forEach(itemType => {
                       if(feeTypeArr.includes(itemType.value)){
                         let feeItem={
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 5f29947b..312bb20f 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -345,8 +345,9 @@
           </el-col>
          </el-row>
         </el-form>
+        <!-- :loading="isDoing" -->
         <div slot="footer" class="dialog-footer" style="text-align:center">
-          <el-button type="primary" @click="submitFormBatch">确定</el-button>
+          <el-button type="primary"  @click="submitFormBatch">确定</el-button>
           <el-button @click="cancelBatch">取 消</el-button>
         </div>
     </el-dialog>
@@ -396,6 +397,7 @@ export default {
       loading2: false,
       loadingWait: false,
       loadingDone: false,
+      isDoing:false,
       // 选中数组
       ids: [],
       // 非单个禁用