md

src/views/emis/emisSettleBill/EmisSettleBillQuery.vue

@@ -65,15 +65,19 @@
 
           </SearchForm>
          <!-- 账单表 -->
-         <!-- slot-scope="slotProps"
+         <!--  -->
-         :height="(slotProps.contentHeight)+'px'" -->
          <!-- -->
           <XdTable
                 slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
 
                 v-loading="loading"
                 border stripe
                 size="mini"
+
+                ref="refTable"
+
                 storageName="emisSettleBillList_custbill_query_main"
                 :data="emisSettleBillList"
                 :showSearch.sync="showSearch"
@@ -99,16 +103,15 @@
                         v-hasPermi="['emis:emisSettleBill:edit']"
                       >修改账单</el-button>
                     </el-col> -->
-                    <!-- <el-col :span="1.5">
+                    <el-col :span="1.5">
                       <el-button
                         type="warning"
                         plain
                         icon="el-icon-download"
                         size="mini"
                         @click="handleExport"
-                        v-hasPermi="['emis:emisSettleBill:export']"
                       >导出</el-button>
-                    </el-col> -->
+                    </el-col>
               <!-- <el-col :span="1.5" v-if="confirmStatus==0">
                <el-button
                  type="primary"
@@ -264,7 +267,9 @@ export default {
     }
   },
   components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
-  dicts: [
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
   ],
   data() {
     return {
@@ -378,10 +383,7 @@ export default {
   },
 
   methods: {
-  /** 查询结算总账单列表 */
+    initQueryParams(){
-  getList() {
-      this.loading = true;
-
       // 按运单查询时的处理
       if(this.queryOrderType=='1'){
         this.queryParams.params.billCode=this.queryParams.queryCode;
@@ -392,6 +394,14 @@ export default {
         this.queryParams.settleBillNo=this.queryParams.queryCode;
       }
 
+    },
+
+  /** 查询结算总账单列表 */
+  getList() {
+      this.loading = true;
+
+      this.initQueryParams();
+
       // console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
       // if(this.$store.getters.ownerSiteCode !='88888'){
       //   this.queryParams.salesmen=this.$store.getters.empName
@@ -605,105 +615,120 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
+
-    handleExport() {
+     /** 导出按钮操作 */
-    //   this.download('emis/emisSettleBill/export', {
+     handleExport() {
-    //     ...this.queryParams
+      const loadingInstance = this.$loading({
-    //   }, `emisSettleBill_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
+      })
 
+      if(this.selectList&&this.selectList.length>0){
+        this.exportData(this.selectList,loadingInstance);
+      }
+      else{
 
-       var qParam = {...this.queryParams};
+          this.initQueryParams();
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+          let qExportParam={...this.queryParams};
-        this.downloadLoading = false
+          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
-        if (response.code === 200) {
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
 
-           const curList = response.rows
+          listEmisSettleBill(qExportParam).then(response => {
-          import('@/vendor/Export2Excel').then(excel => {
+            if (response.code === 200) {
-
+              this.exportData(response.rows,loadingInstance);
-            const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+            }
-            const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+          });
-            const data = this.formatJson(filterVal, curList, response.rows)
+      }
-            axios({
-                method: "get",
-                url: this.templateFile,
-                responseType: "arraybuffer",
-              }).then(response =>{
-
-
-                console.log("==this.templateFile=>",this.templateFile);
-                console.log("==xxxx=>",response);
-
-                excel.export_json_to_excel_by_tpl({
-                  tplData:response,
-                  header: tHeader,
-                  data,
-                  filename: '账单',
-                  autoWidth: true
-                })
-
-
-            }).catch(error => console.log(error))
-
-
-            loadingInstance.close()
-          })
-        }
-      });
     },
-    /** 导出按钮操作 */
+    exportData(selData,loadingInstance){
-    handleExport_old() {
+      const curList =selData
-    //   this.download('emis/emisSettleBill/export', {
+      import('@/vendor/Export2Excel').then(excel => {
-    //     ...this.queryParams
+        const exportParam=this.$refs.refTable.getExportParam();
-    //   }, `emisSettleBill_${new Date().getTime()}.xlsx`)
+        const tHeader = exportParam.header;
-     const loadingInstance = this.$loading({
+        const filterVal = exportParam.filter;
-            text: '正在导出...'
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '账单列表',
+          autoWidth: true
         })
-       var qParam = {...this.queryParams};
+        loadingInstance.close()
-       qParam.pageNum=1;
+      })
-       qParam.pageSize=5000;
-
-       listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-
-                // const curList = response.rows
-                // import('@/vendor/Export2Excel').then(excel => {
-                //   const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                //   const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                //   const data = this.formatJson(filterVal, curList, response.rows)
-                //   excel.export_json_to_excel({
-                //     header: tHeader,
-                //     data,
-                //     filename: '结算总账单',
-                //     autoWidth: true
-                //   })
-                //   loadingInstance.close()
-                // })
-        }
-      });
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
+        if (j === 'kjlx') {
-          var statusStr='xxx'
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
-          if(v[j] == 10){
+        }
-              statusStr='xxx'
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
           }
-          return statusStr;
+        }
+
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+        if (j === 'openBillStatus') {
+          if(v[j] == 0){
+            return '未开票';
+          }
+          else if(v[j] == 1){
+            return '已开票';
+          }
+          else if(v[j] == 2){
+            return '部分开票';
+          }
+          else if(v[j] == 3){
+            return '不开票';
+          }
+          else{
+            return '/';
+          }
+        }
+        if (j === 'chargeStatus') {
+          if(v[j] == 0){
+            return '未核销';
+          }else{
+            return '已核销';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
         return v[j]
       }))
     },
+
     /** 列索引函数  */
     getIndex($index) {
           return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue

@@ -73,12 +73,12 @@
                 slot-scope="slotProps"
                 :height="(slotProps.contentHeight)+'px'" -->
           <XdTable
-
-
                 slot="pageContent"
                 slot-scope="slotProps"
                 :height="(slotProps.contentHeight-190)+'px'"
 
+                ref="refTable"
+
                 v-loading="loading"
                 border
                 size="mini"
@@ -98,27 +98,15 @@
                 >
             <div slot="toolbar">
             <el-row :gutter="10" class="mb8">
-                    <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
-                      <el-button
+                <el-button
-                        type="primary"
+                  type="warning"
-                        plain
+                  plain
-                        icon="el-icon-edit"
+                  icon="el-icon-download"
-                        size="mini"
+                  size="mini"
-                        :disabled="single"
+                  @click="handleExport"
-                        @click="handleUpdate"
+                >导出</el-button>
-                        v-hasPermi="['emis:emisSettleBill:edit']"
+              </el-col>
-                      >修改账单</el-button>
-                    </el-col> -->
-                    <!-- <el-col :span="1.5">
-                      <el-button
-                        type="warning"
-                        plain
-                        icon="el-icon-download"
-                        size="mini"
-                        @click="handleExport"
-                        v-hasPermi="['emis:emisSettleBill:export']"
-                      >导出</el-button>
-                    </el-col> -->
               <el-col :span="1.5" v-if="confirmStatus==0">
                <el-button
                  type="primary"
@@ -280,7 +268,9 @@ export default {
     }
   },
   components: {PayQrCode, MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
-  dicts: [
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
   ],
   data() {
     return {
@@ -397,9 +387,7 @@ export default {
   },
 
   methods: {
-  /** 查询结算总账单列表 */
+    initQueryParams(){
-  getList() {
-      this.loading = true;
 
       // 按运单查询时的处理
       if(this.queryOrderType=='1'){
@@ -411,6 +399,16 @@ export default {
         this.queryParams.settleBillNo=this.queryParams.queryCode;
       }
 
+    },
+  /** 查询结算总账单列表 */
+  getList() {
+      this.loading = true;
+
+      // cfd1d2
+
+
+      this.initQueryParams();
+
       // console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
       // if(this.$store.getters.ownerSiteCode !='88888'){
       //   this.queryParams.salesmen=this.$store.getters.empName
@@ -631,99 +629,112 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-    //   this.download('emis/emisSettleBill/export', {
+      const loadingInstance = this.$loading({
-    //     ...this.queryParams
-    //   }, `emisSettleBill_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
+      })
 
+      if(this.selectList&&this.selectList.length>0){
+        this.exportData(this.selectList,loadingInstance);
+      }
+      else{
 
-       var qParam = {...this.queryParams};
+          this.initQueryParams();
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+          let qExportParam={...this.queryParams};
-        this.downloadLoading = false
+          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
-        if (response.code === 200) {
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
 
-           const curList = response.rows
+          listEmisSettleBill(qExportParam).then(response => {
-          import('@/vendor/Export2Excel').then(excel => {
+            if (response.code === 200) {
-
+              this.exportData(response.rows,loadingInstance);
-            const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+            }
-            const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+          });
-            const data = this.formatJson(filterVal, curList, response.rows)
+      }
-            axios({
-                method: "get",
-                url: this.templateFile,
-                responseType: "arraybuffer",
-              }).then(response =>{
-
-
-                console.log("==this.templateFile=>",this.templateFile);
-                console.log("==xxxx=>",response);
-
-                excel.export_json_to_excel_by_tpl({
-                  tplData:response,
-                  header: tHeader,
-                  data,
-                  filename: '账单',
-                  autoWidth: true
-                })
-
-
-            }).catch(error => console.log(error))
-
-
-            loadingInstance.close()
-          })
-        }
-      });
     },
-    /** 导出按钮操作 */
+    exportData(selData,loadingInstance){
-    handleExport_old() {
+      const curList =selData
-    //   this.download('emis/emisSettleBill/export', {
+      import('@/vendor/Export2Excel').then(excel => {
-    //     ...this.queryParams
+        const exportParam=this.$refs.refTable.getExportParam();
-    //   }, `emisSettleBill_${new Date().getTime()}.xlsx`)
+        const tHeader = exportParam.header;
-     const loadingInstance = this.$loading({
+        const filterVal = exportParam.filter;
-            text: '正在导出...'
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '账单列表',
+          autoWidth: true
         })
-       var qParam = {...this.queryParams};
+        loadingInstance.close()
-       qParam.pageNum=1;
+      })
-       qParam.pageSize=5000;
-
-       listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-
-                // const curList = response.rows
-                // import('@/vendor/Export2Excel').then(excel => {
-                //   const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                //   const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                //   const data = this.formatJson(filterVal, curList, response.rows)
-                //   excel.export_json_to_excel({
-                //     header: tHeader,
-                //     data,
-                //     filename: '结算总账单',
-                //     autoWidth: true
-                //   })
-                //   loadingInstance.close()
-                // })
-        }
-      });
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
+        if (j === 'kjlx') {
-          var statusStr='xxx'
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
-          if(v[j] == 10){
+        }
-              statusStr='xxx'
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
           }
-          return statusStr;
+        }
+
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+        if (j === 'openBillStatus') {
+          if(v[j] == 0){
+            return '未开票';
+          }
+          else if(v[j] == 1){
+            return '已开票';
+          }
+          else if(v[j] == 2){
+            return '部分开票';
+          }
+          else if(v[j] == 3){
+            return '不开票';
+          }
+          else{
+            return '/';
+          }
+        }
+        if (j === 'chargeStatus') {
+          if(v[j] == 0){
+            return '未核销';
+          }else{
+            return '已核销';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
         return v[j]
       }))

src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue

@@ -395,6 +395,8 @@ export default {
       // this.titleForm = "新增开票申请";
       // 跳转到开单界面
       if(this.selectBillList&&this.selectBillList.length>0){
+        // 检查是否可开票
+
         this.$emit("onApply",this.selectBillList);
       }else{
         this.$modal.msgError("请先选择账单");

src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue

@@ -314,6 +314,13 @@
                 <span v-else>{{scope.row.waybillDetail.freight}}</span>
             </template>
           </el-table-column>
+      <el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120"   >
+         <template slot-scope="scope">
+           <span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
+           <el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</el-tag>
+         </template>
+     </el-table-column>
+
        <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
        <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
@@ -321,6 +328,7 @@
            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
          </template>
        </el-table-column>
+
        <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
        <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120"  :sortable="true" />
        <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120"  :sortable="true"  />
@@ -743,6 +751,10 @@ export default {
          return {"background-color": "#03a9f4 !important"};
        }
 
+       if (row.waybillDetail.blSpecialQuote==1 ) {
+         return {"background-color": "#a9b0b3 !important"};
+       }
+
        if (row.blConfirmCenter=='0'  ) {
          return {};
        }

src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue

@@ -335,7 +335,14 @@
                         <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
                         <span v-else>{{scope.row.waybillDetail.freight}}</span>
                     </template>
-                  </el-table-column>
+              </el-table-column>
+
+              <el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120"   >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
+                    <el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</el-tag>
+                  </template>
+              </el-table-column>
               <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
               <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
               <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
@@ -834,10 +841,14 @@ export default {
 
    tableRowClassName({row, rowIndex}) {
 
-      if (row.waybillDetail.realFee!=row.waybillDetail.freight ) {
+       if (row.waybillDetail.realFee!=row.waybillDetail.freight ) {
          return {"background-color": "#03a9f4 !important"};
        }
 
+       if (row.waybillDetail.blSpecialQuote==1 ) {
+         return {"background-color": "#a9b0b3 !important"};
+       }
+
        if (row.blConfirmCenter=='0') {
          return {};
        }

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -326,6 +326,13 @@
                 <span v-else>{{scope.row.waybillDetail.freight}}</span>
             </template>
           </el-table-column>
+        <el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120"   >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
+                  <el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</el-tag>
+                </template>
+        </el-table-column>
+
        <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
 
@@ -755,10 +762,14 @@ export default {
 
    tableRowClassName({row, rowIndex}) {
 
-        if (row.waybillDetail.realFee!=row.waybillDetail.freight ) {
+       if (row.waybillDetail.realFee!=row.waybillDetail.freight ) {
          return {"background-color": "#03a9f4 !important"};
        }
 
+       if (row.waybillDetail.blSpecialQuote==1 ) {
+         return {"background-color": "#a9b0b3 !important"};
+       }
+
        if (row.blConfirmCenter=='0') {
          return {};
        }