md

src/api/emis/emisSettleSubBill.js

@@ -139,6 +139,15 @@ export function setBillErrorBySite(id,note) {
 }
 
 
+// 站点设置账单异常
+export function setNoNeedOpenBill(id) {
+  return request({
+    url: '/emis/emisSettleSubBill/setNoNeedOpenBill/' + id,
+    method: 'post',
+  })
+}
+
+
 
 // 删除结算子账单
 export function delEmisSettleSubBill(id) {

src/views/emis/emisCustomerAddress/senderAddress.vue

@@ -119,12 +119,12 @@
       -->
 
       <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
-      <el-table-column :label="$t('寄件人')" align="left" prop="name" width="170"  :show-overflow-tooltip="true" >
+      <el-table-column :label="$t('寄件人')" align="left" prop="name" width="170"  :show-overflow-tooltip="true" :sortable="true"  >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
          </template>
       </el-table-column>
-      <el-table-column :label="$t('寄件电话')" align="center" prop="phone" min-width="100" />
+      <el-table-column :label="$t('寄件电话')" align="center" prop="phone" min-width="100" :sortable="true"  />
 
       <!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
@@ -138,18 +138,18 @@
       <!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
       <!-- <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="address" min-width="200"  :show-overflow-tooltip="true"   />
       <!-- <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"  />
+      <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" />
       <!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
       <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
-      <el-table-column :label="$t('使用网点')" align="center" prop="useSiteName" min-width="100" />
+      <el-table-column :label="$t('使用网点')" align="center" prop="useSiteName" min-width="100" :sortable="true"  />
       <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"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"   />
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
@@ -299,12 +299,41 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    getProperty(obj, str) {
-    handleSortChange(column) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
-      this.queryParams.orderByColumn = column.prop;
+      let arr = str.split(".");
-      this.queryParams.isAsc = column.order;
+      for (let i in arr) {
-      this.getList();
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.emisSettleSubBillList = this.emisSettleSubBillList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
+
     /** 新增按钮操作 */
     handleAdd(row) {
       this.currentId=null;

src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue

@@ -4,17 +4,20 @@
       <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <el-tab-pane label="可开票账单" name="waitOpenBillList" >
-            <SiteWaitOpenBillPanel key="waitOpenBillList" confirmStatus="1" @onApply="onApply"> </SiteWaitOpenBillPanel>
+            <SiteWaitOpenBillPanel key="waitOpenBillList" confirmStatus="1" @onApply="onApply" @onSelect="onSelectShowBill"> </SiteWaitOpenBillPanel>
           </el-tab-pane>
           <el-tab-pane label="开票申请记录"  name="billList" >
             <InvoiceRecordApplyListPanel  key="billList"  @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
           </el-tab-pane>
-          <el-tab-pane label="发票申请"  name="applyPanel" v-if="selectBillList" >
+          <el-tab-pane label="发票申请"  name="applyPanel" v-if="showApply" closable>
             <EmisSettleInvoiceRecordForm :billList="selectBillList"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm>
           </el-tab-pane>
-          <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.applySeqNo" :label="'开票:'+item.applySeqNo"  closable >
+          <el-tab-pane label="账单详情"  name="billDetail" v-if="showBillDetail" closable>
-            <InvoiceDetailPanel :id="item.id"></InvoiceDetailPanel>
+            <SiteConfirmSubBillListPanel :settleBillNo="curSettleBillNo"></SiteConfirmSubBillListPanel>
           </el-tab-pane>
+          <!-- <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.applySeqNo" :label="'开票:'+item.applySeqNo"  closable >
+            <InvoiceDetailPanel :id="item.id"></InvoiceDetailPanel>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
   </div>
@@ -25,7 +28,7 @@ import InvoiceRecordApplyListPanel from '@/views/emis/emisSettleInvoiceRecord/pa
 import InvoiceDetailPanel from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue';
 import SiteWaitOpenBillPanel from '@/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue';
 import EmisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm';
-
+import SiteConfirmSubBillListPanel from '@/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue';
 
 export default {
   name: "SiteInvoiceRecordApply",
@@ -33,7 +36,8 @@ export default {
     InvoiceRecordApplyListPanel,
     InvoiceDetailPanel,
     SiteWaitOpenBillPanel,
-    EmisSettleInvoiceRecordForm
+    EmisSettleInvoiceRecordForm,
+    SiteConfirmSubBillListPanel
  },
   dicts: [
   ],
@@ -41,7 +45,12 @@ export default {
     return {
       activeTab:'billList',
       billTabs:[],
+
+      showApply:false,
       selectBillList:null,
+
+      curSettleBillNo:null,
+      showBillDetail:false
     };
   },
   created() {
@@ -49,6 +58,11 @@ export default {
   methods: {
     handleTabsClick(){
 
+    },
+    onSelectShowBill(item) {
+      this.curSettleBillNo=item.settleBillNo;
+      this.showBillDetail=true;
+      this.activeTab="billDetail";
     },
     onSelectApply(item) {
       let old=this.billTabs.find(mItem=>mItem.applySeqNo==item.applySeqNo);
@@ -61,28 +75,31 @@ export default {
    },
 
    onApply(billList){
+      this.showApply=true;
       this.selectBillList=billList;
       this.activeTab="applyPanel";
    },
    handleFormChanged(){
+    this.showApply=false;
     this.selectBillList=null;
     this.activeTab="waitOpenBillList";
    },
    cancelForm(){
+    this.showApply=false;
     this.selectBillList=null;
     this.activeTab="waitOpenBillList";
    },
    removeTab(targetName) {
-
+      if(targetName=='applyPanel'){
-        var self=this;
+        this.showApply=false;
-        let tabs = self.billTabs;
+        this.selectBillList=null;
-        self.billTabs = tabs.filter(tab => tab.applySeqNo !== targetName);
+        this.activeTab="waitOpenBillList";
-        if(self.billTabs.length>0){
+      }
-          this.activeTab=self.billTabs[self.billTabs.length-1].applySeqNo;
+      else if(targetName=='billDetail'){
-        }else{
+        this.curSettleBillNo=null;
-          this.activeTab="billList";
+        this.showBillDetail=false;
-        }
+        this.activeTab="waitOpenBillList";
-
+      }
     },
 
   }

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

@@ -62,14 +62,21 @@
         <div slot="toolbar" >
 
         <el-col :span="1.5" >
-               <el-button
+               <!-- <el-button
                  type="primary"
                  plain
                  size="mini"
                  :disabled="multiple"
                  @click="handleSetBillErrorBySite"
                  v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
-               >置账单异常</el-button>
+               >置账单异常</el-button> -->
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleSetNoNeedOpenBill"
+               >确认不开票</el-button>
              </el-col>
         </div>
         <el-table-column type="selection" width="55" align="center" />
@@ -275,7 +282,7 @@ import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPa
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 
 import { getInfoBySettleBillNo,addSubBillToSettleBill,removeSubBillFromSettleBill } from "@/api/emis/emisSettleBill";
-import {setBillErrorBySite, listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
+import {setBillErrorBySite, setNoNeedOpenBill,listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
 
 export default {
   name: "SubBillListPanel",
@@ -565,6 +572,14 @@ export default {
        });
      }).catch(() => {});
    },
+   handleSetNoNeedOpenBill(row){
+    const ids = row.id || this.ids;
+      this.$modal.confirm('确认不开票?').then(function() {
+        return setNoNeedOpenBill(ids);
+      }).then(() => {
+        this.getList();
+      }).catch(() => {});
+   },
    // 移除运单
    handleRemovceBillCode(){
       let postData={

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -241,6 +241,17 @@
                  @click="handleExport"
                >导出</el-button>
              </el-col>
+
+             <el-col :span="1.5">
+              <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleSetNoNeedOpenBill"
+               >确认不开票</el-button>
+             </el-col>
+
        </el-row>
      </div>
 
@@ -439,7 +450,9 @@ import { listEmisSettleSubBill,
  confirmBillBySite,
  cancelConfirmBillBySite,
  confirmNoBillBySite,
- setBillErrorBySite
+ setBillErrorBySite,
+
+ setNoNeedOpenBill,
 } from "@/api/emis/emisSettleSubBill";
 
 import { listEmisSettleBill, addEmisSettleBill } from "@/api/emis/emisSettleBill";
@@ -1187,6 +1200,17 @@ export default {
        });
      }).catch(() => {});
    },
+   handleSetNoNeedOpenBill(row){
+
+     const ids = row.id || this.ids;
+     this.$modal.confirm('是否确认').then(function() {
+       return setNoNeedOpenBill(ids);
+     }).then(() => {
+       this.getList();
+       this.$modal.msgSuccess("操作成功");
+     }).catch(() => {});
+
+   },
 
    handleConfirmBySite(row) {
      const ids = row.id || this.ids;

src/views/emis/emisWaybill/waybillModify.vue

@@ -1880,9 +1880,12 @@ methods: {
         totalVolume=totalVolume+item.volume;
     });
 
-    this.form.totalVolume = parseFloat(totalVolume.toFixed(4));
+    if(totalVolume>0.0){
+        this.form.totalVolume = parseFloat(totalVolume.toFixed(4));
+        this.handleCalcVolumeWeight();
+    }
+
 
-    this.handleCalcVolumeWeight();
 
   },
 

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1880,9 +1880,12 @@ methods: {
         totalVolume=totalVolume+item.volume;
     });
 
-    this.form.totalVolume = parseFloat(totalVolume.toFixed(4));
+    if(totalVolume>0.0){
+        this.form.totalVolume = parseFloat(totalVolume.toFixed(4));
+        this.handleCalcVolumeWeight();
+    }
+
 
-    this.handleCalcVolumeWeight();
 
   },
 

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -1747,9 +1747,11 @@ export default {
           totalVolume=totalVolume+item.volume;
       });
 
-      this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
+      if(totalVolume>0.0){
+          this.form.totalVolume = parseFloat(totalVolume.toFixed(4));
+          this.handleCalcVolumeWeight();
+      }
 
-      this.handleCalcVolumeWeight();
 
     },