From 082ed4716af0690ba76bc87da34b091ffb6cfc7e Mon Sep 17 00:00:00 2001
From: "zhaoxingchang.sd" <zhaoxingchang.sd@ele-cloud.com>
Date: Fri, 30 Aug 2024 18:13:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/editOrder.vue    | 41 +++++++++++++++++++-------------
 src/views/order/orderReading.vue |  4 ++--
 vue.config.js                    |  4 ++--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
index b7e67e0..438c000 100644
--- a/src/views/order/editOrder.vue
+++ b/src/views/order/editOrder.vue
@@ -42,7 +42,7 @@
       <div style="text-align:center">
         <div class="tableColor" style="font-size:34px;">
           <el-select class="fpzldm-select" style='width:436px !important' v-model="formInline.fpzlDm" @change="fplxChange" placeholder="请选择发票种类" >
-             <el-option :label="item.label" :value="item.value" v-for="(item,index) in fpzlList"
+             <el-option :label="item.label" :value="item.value" v-for="(item,index) in fpzlListTwo"
                          :key="index"></el-option>
            </el-select>
         </div>
@@ -1104,7 +1104,7 @@
           </div>
           <table  border="" width="100%" cellspacing="0" style="border:1px solid #9E520A;table-layout:fixed;" >
             <tr>
-                <el-table :data="zytableList" :header-cell-style="{background:'#FFF'}" 
+                <el-table :data="zytableList" :header-cell-style="{background:'#FFF'}"
                           :row-class-name="tableRowClassName3" border fit highlight-current-row show-summary
                         :summary-method="getSummaries" :header-cell-class-name="star1" class="tablelist ystablelist">
                 <el-table-column label="+" width="27" align="center" :render-header="addlist3">
@@ -1158,7 +1158,7 @@
                       </el-select> -->
                       <div :class="['input-div',zyInput[scope.$index]['xh'] ? 'is-focus' : '']"
                           :data-attr="zyInput[scope.$index]['xh'] ? '' : scope.row.xh">
-                        <el-input v-if="!scope.row.hiddenRow" v-model="scope.row.xh"  :title="scope.row.xh" 
+                        <el-input v-if="!scope.row.hiddenRow" v-model="scope.row.xh"  :title="scope.row.xh"
                             @input="scope.row.xh=scope.row.xh.replace(/^(0+)|[^\d]+/g,'')"
                             @focus="zytableListInputFocus(scope.$index,'xh')"
                             @blur="zytableListInputFocus(scope.$index, 'xh', 'blur'),dyfpmxChange()">
@@ -1266,11 +1266,11 @@
         </div>
         <div v-if="gtgmfModel" style="border:1px solid #9E520A;border-top:none">
           <div class="ystitle">共同购买方信息</div>
-          <div style="margin: 0px 0px 10px 10px;"> 
+          <div style="margin: 0px 0px 10px 10px;">
             <el-button type="primary" size="small" @click="addgtgmf" >增加</el-button>
             <el-button plain size="small" @click="gtgmfdel" >删除</el-button>
           </div>
-          <el-table :data="gttableList" :header-cell-style="{background:'#FFF'}" style="border-top:1px solid #9E520A !important;"  @selection-change="handleSelectionChange" 
+          <el-table :data="gttableList" :header-cell-style="{background:'#FFF'}" style="border-top:1px solid #9E520A !important;"  @selection-change="handleSelectionChange"
           :row-class-name="tableRowClassName4" border fit highlight-current-row  :header-cell-class-name="star" class="tablelist ystablelist">
             <el-table-column type="selection" width="50"></el-table-column>
             <el-table-column label="序号" align="center" width="50">
@@ -2018,6 +2018,15 @@ export default {
           value: '52'
         },
       ],
+      fpzlListTwo: [
+        {
+          label: "数电票（增值税专用发票）",
+          value: "01"
+        }, {
+          label: "数电票（普通发票）",
+          value: "02"
+        },
+      ],
       checked:false,
       gtgmfChecked:false,
       gtgmfModel:false,
@@ -2555,7 +2564,7 @@ export default {
         this.ylfwmzForm.hzsfzjhm = this.gfForm.buyerTaxpayerCode;
       }
     },
-    
+
     queryTaxEquipment() {
       let data = {
         nsrsbh: this.xhfNsrsbh,
@@ -3678,7 +3687,7 @@ export default {
               }
             }
           }
-          
+
         } else {
           this.$message({
             message: response.msg,
@@ -3821,7 +3830,7 @@ export default {
           if (this.routerParams.qdbz == '5' || this.routerParams.qdbz == '6' || this.routerParams.tspz =='3' || this.routerParams.tspz =='17') { //机动车
             data.tdyslxdm = '13'
           }
-          
+
           this.listLoading = true;
           queryCommodityListHttp(JSON.stringify(data)).then((response) => {
               this.listLoading = false;
@@ -3854,7 +3863,7 @@ export default {
               }else{
                 this.moreList = response.page.list;
                 this.spxxPage.totalCount = response.page.totalCount;
-              }               
+              }
             } else {
                 this.moreList = [];
                 this.xmmcList = [];
@@ -3963,9 +3972,9 @@ export default {
       }
       console.log(this.tableList)
       this.jshj();
-      
+
     },
-    
+
     moreSure() {
       this.moreform.xmmc = this.tableList[this.closeIndex].xmmc;
         this.querySpxxList(this.tableList[this.closeIndex].xmmc,this.closeIndex)
@@ -4625,7 +4634,7 @@ export default {
                 let slData = {"sl":dicListElement.code,"slMc":dicListElement.value};
                 this.taxRateList.push(slData)
               }
-            
+
             }
           }else if(cacheType =='qdLkysZjlx'){
             this.zjlxList = response.dictionaries;
@@ -4811,7 +4820,7 @@ export default {
         this.fpzlList=[{
           label: "增值税普通发票",
           value: "2"
-        }] 
+        }]
       }else if(this.formInline.fpzlDm =='52'){
         this.fpzlList=[{
           label: "增值税电子专用发票",
@@ -4858,12 +4867,12 @@ export default {
 
       }
     }
-   
+
     this.fplxChange(this.formInline.fpzlDm);
     this.formInline.ddh = this.routerParams.ddh;
     this.queryYwlx();
 
-    
+
     this.gfForm.buyerName = this.routerParams.ghfMc;
     this.gfForm.buyerTaxpayerCode = this.routerParams.ghfNsrsbh;
     this.gfForm.buyerAddress = this.routerParams.ghfDz;
@@ -5119,7 +5128,7 @@ export default {
       this.qdsfzsgfyhzh = this.routerParams.qdsfzsgfyhzh =='Y'?true:false;
       this.qdsfzsxfyhzh = this.routerParams.qdsfzsxfyhzh =='Y'?true:false;
     }
-    
+
 
   }
 };
diff --git a/src/views/order/orderReading.vue b/src/views/order/orderReading.vue
index d765dcd..fe24b95 100644
--- a/src/views/order/orderReading.vue
+++ b/src/views/order/orderReading.vue
@@ -367,11 +367,11 @@ export default {
   methods: {
     handleSort(column, prop, order) {
       console.log(column);
-      if(column.prop == "ddh"){
+      if(column.prop == "cdlcode"){
         column.order == 'ascending' ?  this.orderBy = 'ddhAsc' : this.orderBy = 'ddhDesc';
 
       }
-      if(column.prop == "pzh"){
+      if(column.prop == "cpznum"){
         column.order == 'ascending' ?  this.orderBy = 'pzhAsc' : this.orderBy = 'pzhDesc';
       }
       this.orderList();
diff --git a/vue.config.js b/vue.config.js
index 7e71f26..246c731 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -71,7 +71,7 @@ module.exports = {
       '/sims-api': {
         // target: 'http://10.1.31.166:18107/sims-api', // 张双超
         // target: 'http://10.1.30.104:18108/sims-api', // 姚旭光
-        target: 'http://10.18.90.124:10000/sims-api', // 测试环境
+        target: 'http://10.18.90.125:10000/sims-api', // 测试环境
         changeOrigin: false,
         // target: 'http://10.1.3.216:10000/sims-api', //乐企通
         pathRewrite: {
@@ -79,7 +79,7 @@ module.exports = {
         },
       },
       '/management': {
-        target: 'http://10.18.90.124:10000/management', // 新测试环境
+        target: 'http://10.18.90.125:10000/management', // 新测试环境
         // target: 'http://10.1.3.216:10000/management', //乐企通
         changeOrigin: false,
         pathRewrite: {