md

src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue

@@ -412,32 +412,7 @@ export default {
         }
       });
     },
-    //   /** 转换菜单数据结构 */
-    //  normalizer(node) {
-    //   if (node.children && !node.children.length) {
-    //     delete node.children;
-    //   }
-    //   return {
-    //     id: node.id,
-    //     label: node.idName,
-    //     children: node.children
-    //   };
-    // },
-    //  /** 查询菜单下拉树结构 */
-    // getTreeselect() {
-    //   const queryParams = {}
-    //   listEmisSettleInvoiceChRecord(queryParams).then(response => {
-    //     this.emisSettleInvoiceChRecordOptions = [];
-    //     const rootItem = { idId: 0, emisSettleInvoiceChRecordName: '-', children: [] };
-    //     rootItem.children = this.handleTree(response.data, "id");
-    //     this.emisSettleInvoiceChRecordOptions.push(rootItem);
 
-    //     if(this.parentId != undefined) {
-    //       this.form.parentId = this.parentId;
-    //     }
-
-    //   });
-    // },
   }
 };
 </script>

src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue

@@ -14,6 +14,7 @@
             <el-descriptions-item label="开户银行">{{ emisSettleInvoiceRecord.bankName }} {{ emisSettleInvoiceRecord.bankAccNo }}</el-descriptions-item>
             <el-descriptions-item label="开票类型" :span="1">
               <span v-if="emisSettleInvoiceRecord.invoiceType==1"> 增值税电子普通发票</span>
+              <span v-if="emisSettleInvoiceRecord.invoiceType==4"> 增值税电子专用发票</span>
               <span v-if="emisSettleInvoiceRecord.invoiceType==2"> 增值税普通发票(纸质发票)</span>
               <span v-if="emisSettleInvoiceRecord.invoiceType==3"> 增值税专用发票(纸质发票)</span>
               <span v-if="emisSettleInvoiceRecord.invoiceType==9"> 其它手工开票</span>

src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue

@@ -146,6 +146,7 @@
               </span>
               <el-select clearable v-model="form.invoiceType" placeholder="请选择" style="width:100%">
                 <el-option label="增值税电子普通发票" :value="1"></el-option>
+                <el-option label="增值税电子专用发票" :value="4"></el-option>
                 <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
                 <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
                 <el-option label="其它手工发票" :value="9"></el-option>
@@ -156,6 +157,8 @@
             <el-form-item label="加开税点" prop="addTaxRate">
               <el-select clearable v-model="form.addTaxRate" placeholder="请选择" style="width:100%" @change="handleCalcFeeItem">
                 <el-option label="0%" :value="0"></el-option>
+                <el-option label="1%" :value="0.01"></el-option>
+                <el-option label="3%" :value="0.03"></el-option>
                 <el-option label="6%" :value="0.06"></el-option>
                 <el-option label="9%" :value="0.09"></el-option>
               </el-select>

src/views/emis/emisSettleInvoiceRecord/index.vue

@@ -47,6 +47,7 @@
       <el-form-item label="发票类型" prop="invoiceType">
           <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
              <el-option label="增值税电子普通发票" :value="1"></el-option>
+             <el-option label="增值税电子专用发票" :value="4"></el-option>
              <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
              <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
              <el-option label="其它手工开票" :value="9"></el-option>
@@ -220,6 +221,7 @@
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag>

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue

@@ -47,6 +47,7 @@
       <el-form-item label="发票类型" prop="invoiceType">
           <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
              <el-option label="增值税电子普通发票" :value="1"></el-option>
+             <el-option label="增值税电子专用发票" :value="4"></el-option>
              <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
              <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
              <el-option label="其它手工开票" :value="9"></el-option>
@@ -191,6 +192,7 @@
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工发票</el-tag>

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue

@@ -46,6 +46,7 @@
       <el-form-item label="发票类型" prop="invoiceType">
           <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
              <el-option label="增值税电子普通发票" :value="1"></el-option>
+             <el-option label="增值税电子专用发票" :value="4"></el-option>
              <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
              <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
              <el-option label="其它手工开票" :value="9"></el-option>
@@ -190,6 +191,7 @@
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工发票</el-tag>

src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue

@@ -18,6 +18,7 @@
                     </el-descriptions-item>
                     <el-descriptions-item label="开票类型" span="1">
                       <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
                       <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='2'" type="info">增值税普通发票</el-tag>
                       <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='3'" type="info">增值税专用发票</el-tag>
                       <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='9'" type="info">其它手工发票</el-tag>

src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue

@@ -47,6 +47,7 @@
       <el-form-item label="发票类型" prop="invoiceType">
           <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
              <el-option label="增值税电子普通发票" :value="1"></el-option>
+             <el-option label="增值税电子专用发票" :value="4"></el-option>
              <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
              <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
              <el-option label="其它手工开票" :value="9"></el-option>
@@ -186,6 +187,7 @@
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag>
@@ -628,6 +630,9 @@ export default {
           if(v['invoiceType']  == 1){
             return '增值税电子普通发票';
           }
+          else if(v['invoiceType']  == 4){
+            return '增值税电子专用发票';
+          }
           else if(v['invoiceType']  == 2){
             return '增值税普通发票(纸质发票)';
           }

src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue

@@ -54,6 +54,7 @@
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
           <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工发票</el-tag>

src/views/emis/emisWaybill/waybillModify.vue

@@ -1966,13 +1966,13 @@ methods: {
 
         calcSetteldWeight(postData).then(response => {
           // 结算重量发生改变才计算费用
-          if(this.form.settlementWeight  != response.data.settlementWeight ){
+          // if(this.form.settlementWeight  != response.data.settlementWeight ){
             this.form.settlementWeight = response.data.settlementWeight;
             this.form.feeWeight = this.form.settlementWeight ;
 
             // 计算费用
             this.calcBillFee();
-          }
+          // }
         });
       }
 

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1966,13 +1966,13 @@ methods: {
 
         calcSetteldWeight(postData).then(response => {
           // 结算重量发生改变才计算费用
-          if(this.form.settlementWeight  != response.data.settlementWeight ){
+          // if(this.form.settlementWeight  != response.data.settlementWeight ){
             this.form.settlementWeight = response.data.settlementWeight;
             this.form.feeWeight = this.form.settlementWeight ;
 
             // 计算费用
             this.calcBillFee();
-          }
+          // }
         });
       }
 

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -1789,13 +1789,13 @@ export default {
 
             calcSetteldWeight(postData).then(response => {
               // 结算重量发生改变才计算费用
-              if(this.form.settlementWeight  != response.data.settlementWeight ){
+              // if(this.form.settlementWeight  != response.data.settlementWeight ){
                 this.form.settlementWeight = response.data.settlementWeight;
                 this.form.feeWeight = this.form.settlementWeight ;
 
                 // 计算费用
                 this.calcBillFee();
-              }
+              // }
             });
           }