Merge pull request 'master-dev' (#69) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/69

src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue

@@ -26,6 +26,8 @@
               </template>
             </el-table-column>
             <el-table-column :label="$t('公司')" align="left" prop="company" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('企业名称')" align="left" prop="enterpriseName" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('企业税号')" align="left" prop="enterpriseTaxId" width="100" :show-overflow-tooltip="true"/>
           </el-table>
           <el-pagination
             v-show="pagination"

src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue

@@ -101,7 +101,6 @@
        this.bakOptionItems=[];
        this.optionItems=[];
        listSimpleEmisMonthpayAccount(queryParams).then(response => {
-        console.log('response',response.rows);
          this.loading = false;
          this.bakOptionItems =  response.rows;
          this.optionItems =this.bakOptionItems;

src/views/emis/emisCustomerAddress/senderAddress.vue

@@ -33,6 +33,21 @@
        <el-form-item :label="$t('使用网点')" prop="useSiteCode">
           <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
        </el-form-item>
+       <el-form-item label="企业名称" prop="enterpriseName">
+        <el-input
+          v-model="queryParams.enterpriseName"
+          :placeholder="$t('企业名称')"
+          clearable
+        />
+      </el-form-item>
+       <el-form-item label="企业税号" prop="enterpriseTaxId">
+        <el-input
+          v-model="queryParams.enterpriseTaxId"
+          :placeholder="$t('企业税号')"
+          clearable
+        />
+      </el-form-item>
+
 
     </SearchForm>
 
@@ -40,7 +55,7 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-
+          storageName="senderAddress_main_250825"
           v-loading="loading"
           border
           size="small"
@@ -139,6 +154,9 @@
       <!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
       <!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
       <el-table-column :label="$t('地址')" align="left" prop="address" min-width="200"  :show-overflow-tooltip="true"   />
+      <el-table-column :label="$t('企业名称')" align="left" prop="enterpriseName" min-width="170"  :show-overflow-tooltip="true" :sortable="true" />
+      <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="100" />
+
       <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
       <el-table-column :label="$t('公司')" align="left" prop="company" min-width="170"  :show-overflow-tooltip="true" :sortable="true" />
       <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />

src/views/emis/emisCustomerAddress/senderAddressForm.vue

@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="所属国家" prop="country">
-                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
+                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" @change="handleCountryChange"></CountryPicker>
             </el-form-item>
           </el-col>
           <el-col :span="16">
@@ -47,6 +47,16 @@
               <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.country === '0086' ">
+            <el-form-item label="企业名称" prop="enterpriseName">
+              <el-input v-model="form.enterpriseName" placeholder="请输入企业名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.country === '0086' ">
+            <el-form-item label="企业税号" prop="enterpriseTaxId">
+              <el-input v-model="form.enterpriseTaxId" placeholder="请输入企业税号" />
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12">
             <el-form-item label="邮编(选填)" prop="postCode">
@@ -215,6 +225,9 @@ export default {
         updateTime: null,
         remark: null,
         parseAddress:null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
+
       };
       this.resetForm("form");
     },
@@ -236,6 +249,13 @@ export default {
         }
       });
     },
+    handleCountryChange(val){
+      if(val !== '0086'){
+        this.form.enterpriseName = null;
+        this.form.enterpriseTaxId = null;
+      }
+    }
+
 
   }
 };

src/views/emis/emisWaybill/batchWaybillRecord.vue

@@ -94,6 +94,8 @@
       <el-table-column :label="$t('寄件市')" align="center" prop="sendCity" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('月结客户')" align="center" prop="custNo" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true"/>
@@ -240,6 +242,8 @@ export default {
         sendCounty: null,
         sendTown: null,
         sendAddress: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         sendPostcode: null,
         sendPcd: null,
         paymentType: null,
@@ -487,6 +491,8 @@ export default {
                 sendCity:element['寄件市'],
                 sendCounty:element['寄件区'],
                 sendAddress: element['寄件地址'],
+                enterpriseName: element['企业名称'],
+                enterpriseTaxId: element['企业税号'],
                 paymentType: element['支付方式'],
                 calcFeeType: element['计费方式'],
                 transLineType:  element['线路'],

src/views/emis/emisWaybill/centerWaybillList.vue

@@ -114,6 +114,22 @@
               <el-form-item label="寄件国家" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
             </el-form-item>
+             <el-form-item label="企业名称" prop="enterpriseName">
+                <el-input
+                  v-model="queryParams.enterpriseName"
+                  :placeholder="$t('企业名称')"
+                  clearable
+
+                />
+              </el-form-item>
+              <el-form-item label="企业税号" prop="enterpriseTaxId">
+                  <el-input
+                    v-model="queryParams.enterpriseTaxId"
+                    :placeholder="$t('企业税号')"
+                    clearable
+
+                  />
+                </el-form-item>
             <el-form-item label="录单备注" prop="remark">
               <el-input
                 v-model="queryParams.remark"
@@ -317,7 +333,7 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-          storageName="centerWaybillList_main"
+          storageName="centerWaybillList_main_20250826"
 
           ref="refTable"
           :row-key="rowKey"
@@ -486,7 +502,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -767,6 +784,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         calcFeeType: null,
         custNo: null,

src/views/emis/emisWaybill/dispatchWaybillList.vue

@@ -485,7 +485,6 @@
           </template>
         </el-table-column>
 
-
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -107,6 +107,23 @@
               <el-form-item label="寄件国家" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
             </el-form-item>
+            <el-form-item label="企业名称" prop="enterpriseName">
+                <el-input
+                  v-model="queryParams.enterpriseName"
+                  :placeholder="$t('企业名称')"
+                  clearable
+
+                />
+              </el-form-item>
+            <el-form-item label="企业税号" prop="enterpriseTaxId">
+                <el-input
+                  v-model="queryParams.enterpriseTaxId"
+                  :placeholder="$t('企业税号')"
+                  clearable
+
+                />
+              </el-form-item>
+
             <el-form-item label="录单备注" prop="remark">
               <el-input
                 v-model="queryParams.remark"
@@ -280,7 +297,7 @@
           ref="refTable"
           row-key="id"
 
-          storageName="sendWaybillList_main_240702"
+          storageName="sendWaybillList_main_250825"
           :showStatInfo="true"
 
            v-loading="loading"
@@ -459,7 +476,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -723,6 +741,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         blVirtual: null,
         calcFeeType: null,

src/views/emis/emisWaybill/sendWaybillListNew.vue

@@ -110,6 +110,23 @@
         <el-form-item label="寄件国家" prop="sendCountry">
         <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
       </el-form-item>
+      <el-form-item label="企业名称" prop="enterpriseName">
+          <el-input
+            v-model="queryParams.enterpriseName"
+            :placeholder="$t('企业名称')"
+            clearable
+
+          />
+        </el-form-item>
+      <el-form-item label="企业税号" prop="enterpriseTaxId">
+          <el-input
+            v-model="queryParams.enterpriseTaxId"
+            :placeholder="$t('企业税号')"
+            clearable
+
+          />
+        </el-form-item>
+
       <el-form-item label="录单备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -290,7 +307,8 @@
            :showStatInfo="true"
 
           ref="refTable"
-          storageName="sendWaybillListNew_main_240702"
+          storageName="sendWaybillListNew_main_250825"
+
            v-loading="loading"
            border
            size="mini"
@@ -464,7 +482,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -741,6 +760,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         blVirtual:null,
         calcFeeType: null,

src/views/emis/emisWaybill/waybillDetailReadOnly.vue

@@ -50,6 +50,9 @@
             <el-descriptions-item label="寄件公司" :span="4">{{ form.sender.company }}</el-descriptions-item>
             <el-descriptions-item label="寄件地区"  >{{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }}</el-descriptions-item>
             <el-descriptions-item label="寄件地址" :span="4" >{{ form.sender.address }}</el-descriptions-item>
+            <el-descriptions-item label="企业名称" :span="4">{{ form.sender.enterpriseName }}</el-descriptions-item>
+            <el-descriptions-item label="企业税号" :span="4">{{ form.sender.enterpriseTaxId }}</el-descriptions-item>
+
 
             <el-descriptions-item label="收件人" :span="1">{{ form.reciever.name }}</el-descriptions-item>
             <el-descriptions-item label="收件电话" :span="1">{{ form.reciever.phone }}</el-descriptions-item>

src/views/emis/emisWaybill/waybillGot.vue

@@ -257,7 +257,16 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                      <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                      <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -2011,6 +2020,9 @@ methods: {
     // this.form.receiveTown=value.town;
     this.form.reciever.address=value.address;
     this.form.reciever.company=value.company;
+    this.form.sender.enterpriseName=value.enterpriseName;
+    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    this.form.sender.id = value.id;
 
     this.handleCalcDestSite();
 

src/views/emis/emisWaybill/waybillModify.vue

@@ -259,7 +259,16 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                      <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
+                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                        <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                        </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -2028,6 +2037,10 @@ methods: {
     this.form.sender.address=value.address;
     this.form.sender.company=value.company;
     this.senderCountryCode=value.country;
+    this.form.sender.enterpriseName=value.enterpriseName;
+    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    this.form.sender.id = value.id;
+
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;

src/views/emis/emisWaybill/waybillRecord.vue

@@ -260,7 +260,16 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                      <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                      <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -2020,6 +2029,9 @@ methods: {
     // this.form.receiveTown=value.town;
     this.form.sender.address=value.address;
     this.form.sender.company=value.company;
+    this.form.sender.enterpriseName=value.enterpriseName;
+    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    this.form.sender.id = value.id;
     //校验数据初始化
     this.senderCountryCode=value.country;
   },

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -608,6 +608,9 @@
                              {{ billDetail.sender.cityName }}
                              {{ billDetail.sender.countyName }}
                              {{ billDetail.sender.address }}
+                             {{ billDetail.sender.enterpriseName }}
+                             {{ billDetail.sender.enterpriseTaxId }}
+
                         </span>
                       </el-col>
                       <el-col :span="14">
@@ -645,6 +648,17 @@
                                 <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                               </el-form-item>
                             </el-col>
+                            <el-col :span="12">
+                              <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
+                                <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                              </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                              <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                              </el-form-item>
+                            </el-col>
+
                         </el-row>
                       </el-col>
                     </el-row>
@@ -1757,6 +1771,10 @@ export default {
       // this.form.receiveTown=value.town;
       this.form.sender.address=value.address;
       this.form.sender.company=value.company;
+      this.form.sender.enterpriseName=value.enterpriseName;
+      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+      this.form.sender.id = value.id;
+
     },
     onChangeSelectReceiver(value){
       this.form.reciever.name=value.name;