From 093e8392219dfc8bfc1a55765fbab5e700c0e1a2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 11 Jun 2025 08:14:20 +0800
Subject: [PATCH] md

---
 .../EmisBaseTools/AddressSelectPicker.vue     |   2 +-
 .../EmisBaseTools/WarehouseInNoPicker.vue     |   2 +-
 src/views/emis/emisTmsSiteBatchMiss/index.vue | 192 +++++-------------
 .../emis/emisTransLine/emisTransLineForm.vue  |  12 +-
 src/views/emis/emisTransLine/index.vue        |   2 +
 .../emisTransPlanRuleForm.vue                 |   7 +-
 .../emis/emisWaybill/dispatchWaybillList.vue  |   3 +-
 src/views/emis/emisWaybill/waybillModify.vue  |  19 +-
 8 files changed, 91 insertions(+), 148 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/AddressSelectPicker.vue b/src/views/emis/EmisBaseTools/AddressSelectPicker.vue
index 0a5aec39..5e2ba970 100644
--- a/src/views/emis/EmisBaseTools/AddressSelectPicker.vue
+++ b/src/views/emis/EmisBaseTools/AddressSelectPicker.vue
@@ -50,7 +50,7 @@ export default {
   name: "AddressSelectPicker",
   props:{
     addressType:{
-       type:String
+       type:[String,Number]
     },
     useSiteCode:{
        type:String
diff --git a/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue b/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
index d79210a1..1c2013a6 100644
--- a/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
+++ b/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
@@ -13,7 +13,7 @@
        @focus="onFocus"
       @change="onChange"
       >
-        <el-option v-for="item in filterData" :key="item.inNo" :label="item.inNo" :value="item.inNo">
+        <el-option v-for="item in filterData" :key="item.id" :label="item.inNo" :value="item.inNo">
         </el-option>
     </el-select>
 </template>
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index 1ea7fa5d..07fbc51d 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -1,44 +1,40 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="billCode">
+
+      <el-form-item :label="$t('运单号')" prop="billCode">
         <el-input
           v-model="queryParams.billCode"
           :placeholder="$t('运单号')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="missReason">
+      <el-form-item :label="$t('漏组批次原因')" prop="missReason" label-width="120px">
         <el-input
           v-model="queryParams.missReason"
           :placeholder="$t('漏组批次原因')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="起始节点" prop="sendSiteCode">
+        <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
       </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="下一节点" prop="destinationCode">
+        <EmisSiteSimplePicker2  v-model="queryParams.destinationCode"  ></EmisSiteSimplePicker2>
       </el-form-item>
+
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
-           border stripe
+    <XdTable
+           v-loading="loading"
+           border
+           stripe
+
+           ref="refTable"
+           row-key="id"
+
+           storageName="emisTmsSiteBatchMissList_main_240702"
+
            size="small"
            :data="emisTmsSiteBatchMissList"
            :showSearch.sync="showSearch"
@@ -47,44 +43,10 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
-           >
-      
+      >
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['emis:emisTmsSiteBatchMiss:add']"
-                >新增</el-button>
-              </el-col>
-              <!-- 
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisTmsSiteBatchMiss:edit']"
-                >修改</el-button>
-              </el-col> -->
-              <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisTmsSiteBatchMiss:remove']"
-                >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -93,85 +55,53 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisTmsSiteBatchMiss:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
+      <el-table-column :label="$t('运单号')" align="left" prop="billCode" min-width="170" />
+      <el-table-column :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="200" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('起始节点')" align="left" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('下一节点')" align="left" prop="destinationName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('线路')" align="left" prop="transLineTypeName" min-width="100" />
+      <el-table-column :label="$t('产品类型')" align="left" prop="productTypeName" min-width="100" />
+
+      <el-table-column :label="$t('寄件国')" align="center" prop="sendCountryName" min-width="100" />
+      <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" min-width="100" />
+
+      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="100" />
+      <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
+      <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
+      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+      <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
+
+      <el-table-column :label="$t('节点负责人')" align="center" prop="manager" min-width="100" />
+      <el-table-column :label="$t('线路负责人')" align="center" prop="transManager" min-width="100" />
+
+      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
+          </template>
       </el-table-column>
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
+      <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
+      <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
+      <el-table-column :label="$t('录单备注')" align="center" prop="waybillRemark" min-width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('创建人')" align="center" prop="createByName" min-width="100" />
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
 
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('漏组批次原因')" align="center" prop="missReason" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisTmsSiteBatchMiss:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisTmsSiteBatchMiss:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisTmsSiteBatchMissForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchMissForm>
-    </el-dialog>
-    
-
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
         <emisTmsSiteBatchMissView :id="id" ></EmisTmsSiteBatchMissView>
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -203,7 +133,7 @@ export default {
       total: 0,
       // TMS漏组批次信息表表格数据
       emisTmsSiteBatchMissList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -212,10 +142,6 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 删除标志（0代表存在时间范围
-      daterangeCreateTime: [],
-      // 删除标志（0代表存在时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -235,21 +161,13 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       listEmisTmsSiteBatchMiss(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisTmsSiteBatchMissList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisTransLine/emisTransLineForm.vue b/src/views/emis/emisTransLine/emisTransLineForm.vue
index 4b3e8fe0..f3d2720a 100644
--- a/src/views/emis/emisTransLine/emisTransLineForm.vue
+++ b/src/views/emis/emisTransLine/emisTransLineForm.vue
@@ -39,7 +39,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="运输方式" prop="transType">
-              <el-select v-model="form.transType" placeholder="运输方式" clearable filterable>
+              <el-select v-model="form.transType" style="width:100%" placeholder="运输方式" clearable filterable>
                   <el-option
                     v-for="item in dict.type.emis_biz_shipping_method"
                     v-bind:key="item.value"
@@ -51,7 +51,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="适用范围" prop="applyScope">
-              <el-select v-model="form.applyScope" placeholder="适用范围" clearable filterable>
+              <el-select v-model="form.applyScope" style="width:100%" placeholder="适用范围" clearable filterable>
                   <el-option
                     v-for="item in dict.type.emis_affiliate_type"
                     v-bind:key="item.value"
@@ -69,6 +69,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="transManager">
+                <EmpNamePicker :placeholder="$t('负责人')" v-model="form.transManager"  ></EmpNamePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
               <el-form-item label="排序" prop="orderNum">
                 <el-input v-model="form.orderNum" placeholder="" />
@@ -114,13 +119,14 @@ import { listEmisTransLine, getEmisTransLine, delEmisTransLine, addEmisTransLine
 import CountryPickerStart from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import CountryPickerDest from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisBrandPicker from '@/views/emis/EmisBaseTools/EmisBrandPicker.vue';
+import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 export default {
   name: "emisTransLineForm",
   props:{
     id:{type:Number}
   },
-  components: { CountryPickerStart,CountryPickerDest ,EmisBrandPicker},
+  components: { CountryPickerStart,CountryPickerDest ,EmisBrandPicker,EmpNamePicker},
   dicts: ['sys_normal_disable','emis_biz_shipping_method','emis_affiliate_type'],
   data() {
     return {
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index ab27ff50..dcd3bd21 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -149,6 +149,8 @@
             <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
           </template>
       </el-table-column>
+      <el-table-column label="负责人" align="center" prop="transManager" width="100" />
+
       <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
       <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
index ff3a0c26..7065d73b 100644
--- a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
+++ b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
@@ -15,7 +15,12 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="供应商" prop="supplierCode">
-                <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierPicker>
+
+                <EmisSupplierMultiplePicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierMultiplePicker>
+
+              /Users/alan/work/git/tanex56/emis-frontend/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue
+
+                <!-- <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierPicker> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 17f8cd65..b640f495 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -306,10 +306,11 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
 
-
           ref="refTable"
           :row-key="rowKey"
 
+          :showStatInfo="true"
+
           storageName="dispatchWaybillList_main"
 
           :row-class-name="tableRowClassName"
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index e62f3754..f9450830 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -1412,6 +1412,7 @@ methods: {
 
   },
   onPaymentTypeChange(){
+    console.log("==onPaymentTypeChange==>")
   // 非月结清空月结客户选择
   if(this.form.paymentType == '1' ||
      this.form.paymentType == '3' ||
@@ -1425,6 +1426,8 @@ methods: {
   },
 
   onCalcFeeTypeChange(){
+     console.log("==onCalcFeeTypeChange==>")
+
     if(this.form.calcFeeType == '3' ){
     }
 
@@ -1432,6 +1435,7 @@ methods: {
 
   },
   onSelectMonthUser(item){
+    console.log("==onSelectMonthUser==>")
     if(item!=null){
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
@@ -1571,6 +1575,7 @@ methods: {
           }
 
 
+
           // 接单处理
           if(this.action=="got"){
              // 获取可用运单数
@@ -1584,7 +1589,8 @@ methods: {
           }
 
         });
-      }else{
+      }
+      else{
 
         // this.startTimer();
         // this.form.sendDate =  parseTime(new Date());
@@ -1744,6 +1750,7 @@ methods: {
     this.resetForm("form");
   },
   onProductChange(item){
+
     if(item!=null && item.length==2){
       this.form.transLine=item[0];
       this.form.productType=item[1];
@@ -1754,6 +1761,9 @@ methods: {
     }
   },
   onSendSiteSelect(item){
+    console.log("==onSendSiteSelect==>",item)
+    console.log("==onSendSiteSelect==this.form=>",this.form)
+
     if(!item){
       this.form.sendSiteCode = null;
       this.form.sendSiteName = null;
@@ -1763,9 +1773,7 @@ methods: {
     this.form.sendSiteName=item.siteName;
 
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
-    this.calcBillFee();
-
-
+    // this.calcBillFee();
   },
   /** 提交按钮 */
   submitForm() {
@@ -1930,6 +1938,8 @@ methods: {
 
   },
   calcDestSite(){
+    console.log("==calcDestSite==>")
+
     let queryParams = {
         country:this.form.reciever.country,
         province:this.form.reciever.province,
@@ -2202,6 +2212,7 @@ methods: {
     this.form.dispatchUnderlingSiteName= item.siteName;
     // this.form.dispatchSite= item.siteName;
 
+    console.log("==onDestinationChange==>")
     // 需要触发重新计算费用
     this.calcBillFee();
   },