From 71afd736ae347e5a932e88c1c94ccefbfb9eb595 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 20 Dec 2024 15:06:46 +0800
Subject: [PATCH] md

---
 public/static/tpl/batch_import_order.xls      | Bin 26112 -> 24064 bytes
 src/api/oms/emisWaybill.js                    |   4 +-
 .../oms/emisWaybill/BatchOrderRecord.vue      |  83 ++++++++++++++----
 src/views/oms/emisWaybill/OrderRecord.vue     |  64 +++++++++++---
 4 files changed, 120 insertions(+), 31 deletions(-)

diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 0289bf39640da2955d6008fe3b72bd921092d0a5..05376fc4efd14ccb6ec5792484f8ad614b4c35dc 100644
GIT binary patch
delta 3214
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
BBn|)o

delta 4942
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

diff --git a/src/api/oms/emisWaybill.js b/src/api/oms/emisWaybill.js
index 99091c6..2a7eaa5 100644
--- a/src/api/oms/emisWaybill.js
+++ b/src/api/oms/emisWaybill.js
@@ -120,9 +120,9 @@ export function addEmisWaybill(data) {
 }
 
 // 草稿下单
-export function draftSubmitOrder(data) {
+export function draftSubmitOrderByOms(data) {
   return request({
-    url: '/oms2c/emisWaybill/draftSubmitOrder',
+    url: '/oms2c/emisWaybill/draftSubmitOrderByOms',
     method: 'post',
     data: data
   })
diff --git a/src/views/oms/emisWaybill/BatchOrderRecord.vue b/src/views/oms/emisWaybill/BatchOrderRecord.vue
index 4c3fd3e..00500fc 100644
--- a/src/views/oms/emisWaybill/BatchOrderRecord.vue
+++ b/src/views/oms/emisWaybill/BatchOrderRecord.vue
@@ -145,7 +145,7 @@
 </template>
 
 <script>
-import { listEmisWaybill, draftSubmitOrder } from "@/api/oms/emisWaybill";
+import { listEmisWaybill, draftSubmitOrderByOms } from "@/api/oms/emisWaybill";
 
 import { parseTime } from "@/utils/custom";
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -457,6 +457,50 @@ export default {
         // 取件方式	派送方式	运费	支付方式	月结客户	回款联系人	销售联系人	费用备注
         // 取件员/操作员
         // 发货/签收短信
+        // let rowIndex=element['__rowNum__']
+        // let orderData={
+        //         billCode: element['运单号'],
+        //         sendDate: parseTime(new Date()),
+        //         custNo:  element['月结客户'],
+        //         receiveName: element['收件人'],
+        //         receiveCompany:element['收件公司'],
+        //         receiveMobile:element['收件电话'],
+        //         receiveCountry: element['收件国'],
+        //         receiveProvince: element['收件省'],
+        //         receiveCity: element['收件市'],
+        //         receiveCounty:  element['收件区'],
+        //         receiveAddress: element['收件地址'],
+        //         sendName: element['发货人'],
+        //         sendCompany: element['发货公司'],
+        //         sendMobile: element['发货电话'],
+        //         sendCountry: element['发货国'],
+        //         sendProvince: element['发货省'],
+        //         sendCity:element['发货市'],
+        //         sendCounty:element['发货区'],
+        //         sendAddress: element['发货地址'],
+        //         paymentType: element['支付方式'],
+        //         calcFeeType: element['计费方式'],
+        //         transLineType:  element['线路'],
+        //         productType: element['产品类型'],
+        //         customsClear: element['清关方式'],
+        //         customsEclaration:  element['报关方式'],
+        //         dispatchMethod:  element['派送方式'],
+        //         pickupMethod: element['取件方式'],
+        //         goodsInfo: element['货物名称'],
+        //         // totalVolume: element['体积'],
+        //         totalVolume: '0.00',
+        //         parcelQty: element['件数'],
+        //         billWeight: element['重量'],
+        //         operateEmployeeCode: element['专属业务员'],
+        //         orderRemark:  element['备注'],
+        //         packType: '纸箱',
+        //         freight:0.00,
+
+        //         uploadStatus: 0,
+        //         errorInfo:'',
+        // }
+        // this.tmpDataList.push(orderData);
+
         let rowIndex=element['__rowNum__']
         let orderData={
                 billCode: element['运单号'],
@@ -470,31 +514,36 @@ export default {
                 receiveCity: element['收件市'],
                 receiveCounty:  element['收件区'],
                 receiveAddress: element['收件地址'],
-                sendName: element['发货人'],
-                sendCompany: element['发货公司'],
-                sendMobile: element['发货电话'],
-                sendCountry: element['发货国'],
-                sendProvince: element['发货省'],
-                sendCity:element['发货市'],
-                sendCounty:element['发货区'],
-                sendAddress: element['发货地址'],
+                sendName: element['寄件人'],
+                sendCompany: element['寄件公司'],
+                sendMobile: element['寄件电话'],
+                sendCountry: element['寄件国'],
+                sendProvince: element['寄件省'],
+                sendCity:element['寄件市'],
+                sendCounty:element['寄件区'],
+                sendAddress: element['寄件地址'],
                 paymentType: element['支付方式'],
                 calcFeeType: element['计费方式'],
                 transLineType:  element['线路'],
                 productType: element['产品类型'],
                 customsClear: element['清关方式'],
                 customsEclaration:  element['报关方式'],
+                packType: element['包装类型'],
                 dispatchMethod:  element['派送方式'],
                 pickupMethod: element['取件方式'],
                 goodsInfo: element['货物名称'],
-                // totalVolume: element['体积'],
-                totalVolume: '0.00',
+                totalVolume: element['体积'],
                 parcelQty: element['件数'],
-                billWeight: element['重量'],
-                operateEmployeeCode: element['专属业务员'],
-                orderRemark:  element['备注'],
-                packType: '纸箱',
-                freight:0.00,
+                billWeight: element['实际重量'],
+                freight: element['运费'],
+                feeRemark:element['费用备注'],
+                payee: element['销售联系人'],
+                salesmen: element['销售联系人'],
+                // operateEmployeeCode: element['取件员/操作员'],
+                orderRemark:  element['下单备注'],
+                // blMessage:  element['寄件/签收短信'],
+                realValue: element['货值'],
+                extInfo: element['附加信息'],
 
                 uploadStatus: 0,
                 errorInfo:'',
@@ -519,7 +568,7 @@ export default {
               if(this.selectionList&&this.selectionList.length>0){
                 for(let i=0;i<this.selectionList.length;i++){
                   let orderItem=this.selectionList[i];
-                  let res=await draftSubmitOrder(orderItem)
+                  let res=await draftSubmitOrderByOms(orderItem)
 
                   let rstData=res.data;
                   if(rstData.result=='success'){
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index aa96ed8..17f9de3 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -104,7 +104,7 @@
                         <el-input v-model="form.sendSiteName" placeholder="" disabled />
                       </el-form-item>
                     </el-col> -->
-                    <el-col :span="12" >
+                    <!-- <el-col :span="12" >
                       <el-form-item :label="$t('专属业务员')"  prop="privSalesmen">
                         <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
 
@@ -116,7 +116,7 @@
                           size="small"
                           @click="handlePrivSalesmen"
                         > {{ $t('去绑定业务员') }}</el-button>
-                    </el-col>
+                    </el-col> -->
 
 
                   </el-row>
@@ -255,7 +255,27 @@
                           ></el-date-picker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="12">
+
+                      <el-col :span="12"  v-if="form.pickupMethod==2">
+                          <el-form-item :label="$t('快递员')"  prop="privSalesmen">
+                            <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12"  v-if="form.pickupMethod==2">
+                          <el-button
+                              type="primary"
+                              size="small"
+                              @click="handlePrivSalesmen"
+                            > {{ $t('去绑定快递员') }}</el-button>
+                        </el-col>
+                        <el-col :span="24"  v-if="form.pickupMethod==1">
+                          <el-form-item :label="$t('业务员')"  prop="salesmen">
+                            <SalemanPicker :placeholder="$t('业务员')" v-model="form.salesmen"  ></SalemanPicker>
+                          </el-form-item>
+                        </el-col>
+
+
+                      <el-col :span="12" v-if="form.pickupMethod==2">
                         <el-form-item  :label="$t('报关方式')"  prop="customsEclaration">
                           <el-select v-model="form.customsEclaration" placeholder=""  @change="preCalcFee">
                             <el-option
@@ -493,9 +513,25 @@
                                 <!-- <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
                               </template>
                             </el-table-column>
-                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="100">
+                            <el-table-column prop="cargoQty" :label="$t('数量')" align="center" width="100">
                               <template slot-scope="scope">
-                                <el-input v-model="scope.row.cargoQty"    size="mini" placeholder=""></el-input>
+                                <el-input v-model="scope.row.cargoQty"    size="mini" placeholder="">
+
+                                </el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="unit" :label="$t('单位')" align="center" width="100">
+                              <template slot-scope="scope">
+                                <el-select filterable v-model="scope.row.unit" style="width: 100%;">
+                                        <el-option key="件" label="件" value="件" ></el-option>
+                                        <el-option key="个" label="米" value="个" ></el-option>
+                                        <el-option key="条" label="条" value="条" ></el-option>
+                                        <el-option key="米" label="米" value="米" ></el-option>
+                                        <el-option key="根" label="根" value="根" ></el-option>
+                                        <el-option key="副" label="副" value="副" ></el-option>
+                                        <el-option key="张" label="张" value="张" ></el-option>
+                                        <el-option key="块" label="块" value="块" ></el-option>
+                                    </el-select>
                               </template>
                             </el-table-column>
                             <el-table-column prop="price" label="货值(USD)" align="center" width="100" :show-overflow-tooltip="true">
@@ -508,28 +544,28 @@
                                 <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
                               </template>
                             </el-table-column> -->
-                            <el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
+                            <!-- <el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
                               </template>
-                            </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
+                            </el-table-column> -->
+                            <el-table-column  v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.brand" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
 
-                            <el-table-column  v-if="this.transType==1" prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="material" label="材质" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.material" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="purpose" label="用途" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.purpose" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
                               </template>
@@ -568,7 +604,7 @@
                             </el-table-column>
 
 
-                            <el-table-column :label="$t('操作')"  align="left" min-width="50">
+                            <el-table-column :label="$t('操作')"  align="left" min-width="100">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -1056,6 +1092,10 @@ methods: {
             this.billCode=null;
             this.form.billCode=null;
           }
+          else if(this.action=='modify'){
+            // 加载产品列表
+            this.preCalcFee();
+          }
         });
       }else{
          this.form.customsEclaration='1';