save

src/components/FinancialModule/BasicDocuments.vue

@@ -1458,7 +1458,7 @@
                 </div>
                 <p style="color: red;" v-if="GetDetail.Status==4">该单据已作废，无法审核</p>
                 <div style="padding-left: 75px;" v-if="GetDetail.Status!=2 ">
-                  <template v-if="GetDetail.Status!=4">
+                  <template v-if="GetDetail.Status!=4 && !GetDetail.SigningCustomerId">
                     <button class="normalBtn" @click="AuditOrRefund()">保存</button>
                   </template>
                   <button class="hollowFixedBtn" @click="ReturnBack()">返回</button>

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -587,7 +587,7 @@
                 </el-select>
               </span></p>
           </div>
-          <!-- <div>
+          <div>
             <p>签约客户：<span>
                 <el-select filterable v-model='msg.SigningCustomerId' class="w135 _border_b_1">
                   <el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId'
@@ -595,7 +595,7 @@
                   </el-option>
                 </el-select>
               </span></p>
-          </div> -->
+          </div>
         </div>
         <div class="_remark">
           <p>{{$t('system.label_info')}}</p>
@@ -1955,7 +1955,7 @@
       }
     },
     mounted() {
-      // this.getCustomerIdList();
+      this.getCustomerIdList();
       let userInfo = this.getLocalStorage();
       this.department = userInfo.DepartName;
       this.emplyeeName = userInfo.emName;

src/components/SalesModule/signedFinance.vue

@@ -357,7 +357,7 @@
         </span>
       </li>
       <li>
-        <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
+        <button class="hollowFixedBtn" @click="getList(),getTotalData()">{{$t('pub.searchBtn')}}</button>
       </li>
     </div>
     <div class="_mc_addbox">
@@ -370,37 +370,36 @@
         <div class="divActive" v-show="type==2"></div>
       </li>
     </div>
+    <div style="margin: 10px">汇总金额:{{totalData.Money}}</div>
+    <div v-if="type == 1" style="margin: 10px">
+      <el-checkbox v-model="allCheck" @change="changeSelect">全选</el-checkbox>
+      <el-button style="margin-left: 10px" type="primary" size="small" @click="eidtItems">批量操作</el-button>
+    </div>
     <div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''"><table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
                 <tr>
-                <th></th>
+                <th v-if="type == 1"></th>
                 <th>单号</th>
                 <th>公司</th>
                 <th>费用类型</th>
-                <th>币种</th>
-                <th>汇率</th>
                 <th>金额</th>
-                <th>冲抵金额</th>
                 <th>状态</th>
                 <th>付款对象</th>
-                <th>操作</th>
+                <th v-if="type == 1">操作</th>
                 </tr>
                 <tr v-for="(item,index) in czList" :key="index">
-                <td><input type="checkbox" :value="item" v-model="yfcheckList" @change="ckeckOne"></td>
+                <td v-if="type == 1"><input type="checkbox" :value="item.FrID" v-model="item.check" @change="changeSelectItem"></td>
                 <td>{{item.FrID}}</td>
                 <td>{{item.BranchName}}</td>
-                <td>{{item.CostTypeName}}</td>
-                <td>{{item.CurrencyName}}</td>
-                <td>{{item.Rate}}</td>
+                <td>{{item.TypeName}}</td>
                 <td>{{item.Money}}</td>
-                <td>{{item.MatchMoney}}</td>
                 <td>{{item.StatusStr}}</td>
                 <td>
                     <el-tooltip class="item" effect="dark" :content="item.ClientTypeName+':'+item.RemitterName+'('+item.AccountNumber+')'" placement="top-start">
-                    <div style="width:250px;overflow:hidden">{{item.ClientTypeName}}:{{item.RemitterName}}</div>
+                    <div style="width:250px;overflow:hidden">{{item.RemitterName}}</div>
                     </el-tooltip>
                     </td>
-                <td>
-                    <el-button @click="checkFinance(item)">结算</el-button>
+                <td v-if="type == 1">
+                    <el-button size="small" type="primary" @click="checkFinance(item)">结算</el-button>
                 </td>
                 </tr>
                 <tr v-if="czList.length==0">
@@ -450,6 +449,8 @@
   export default {
     data() {
       return {
+        totalData: {},
+      allCheck: false,
         addMsg: {},
         showCheck: false,
         saveMsg: [],
@@ -501,6 +502,34 @@
       }
     },
     methods: {
+    changeSelect() {
+      console.log("changeSelect");
+      this.czList.forEach((element) => {
+        element.check = this.allCheck;
+      });
+    },
+    changeSelectItem() {
+      const listTmp = JSON.parse(JSON.stringify(this.czList));
+      this.czList = [];
+      this.$nextTick(() => {
+        this.czList = listTmp;
+      });
+    },
+      eidtItems() {
+        this.checkObj = {}
+        this.checkObj.FrID = this.getSelcetedIds();
+        if (!this.checkObj.FrID) {
+          this.$message.error("请选择要编辑的内容");
+          return;
+        }
+        this.showCheck = true;
+      },
+      getSelcetedIds() {
+        return this.czList
+          .filter((item) => item.check)
+          .map((item) => item.FrID)
+          .join(",");
+      },
       checkSubmit() {
         if(!this.BusinessCardPhotos) {
           this.$message.error('请上传凭证')
@@ -568,80 +597,32 @@
     ZhiDanChongDi() {
       this.yfcdState = true;
       this.yfcheckList = [];
-    },
-    goUrlZD(item) {
-      let that = this;
-      let yfcheckList
-      if(item){
-        this.yfcheckList = []
-        this.yfcheckList.push(item)
-        that.yfHandmsg.OtherType = 65
-      }else{
-        that.yfHandmsg.OtherType = 7
-      }
-      yfcheckList = JSON.parse(JSON.stringify(this.yfcheckList));
-      if (this.yfcheckList.length > 1) {
-        this.Error("只能选择一项！");
-        return;
-      }
-      if (this.yfcheckList.length == 0) {
-        this.Error("至少选择一项");
-        return;
-      }
-
-      let arr = [];
-      // var TCArr = [this.yfHandmsg.TCNUM];
-      let orderObj = {
-        OrderID: 0,
-        OrderSource: 8,
-        Obj: {}
-        // TCIDList: TCArr
-      };
-      that.yfHandmsg.ReFinanceId = this.yfcheckList[0].FrID;
-      that.yfHandmsg.Rate = this.yfcheckList[0].Rate;
-      var msg = {}
-      // msg = JSON.stringify(that.yfHandmsg);
-      if(item){
-        msg = {
-          OtherType: 65,
-          ReFinanceId: that.yfHandmsg.ReFinanceId,
-          czState: that.yfHandmsg.czState
-        }
-      }else{
-        msg = {
-          OtherType: 7,
-          ReFinanceId: that.yfHandmsg.ReFinanceId,
-          czState: that.yfHandmsg.czState
-        }
-      }
-
-      let routeData = this.$router.resolve({
-        name: "ChoiceAddFinancialDocuments",
-        query: {
-          czmsg: JSON.stringify(msg),
-          orderObj: JSON.stringify(orderObj),
-          companyID: this.OutBranchId,
-          Type: 2,
-          searchTitle: "分摊"
-        }
-      });
-      window.open(routeData.href, "_blank");
-    },
-    ckeckOne() {
-      if (this.yfcheckList.length == 2) {
-        this.yfcheckList.splice(0, 1);
-      }
-      if (this.yfcheckList.length > 1) {
-        this.Error("只能选择一项！");
-      }
     },
       clickGetList(type) {
         this.msg.pageIndex = 1
         this.currentPage = 1
         this.msg.FinanceStatus = type
         this.getList()
+      this.getTotalData()
+      },
+      getTotalData() { // 获取统计数据
+            this.totalData = {}
+      if(this.msg.OutDate && this.msg.OutDate.length) {
+        this.msg.StartTime = this.msg.OutDate[0]
+        this.msg.EndTime = this.msg.OutDate[1]
+      }
+        this.apipost('customer_post_GetSigningCustomerStatistics', this.msg, res => {
+          if (res.data.resultCode == 0) {
+            this.loading = false;
+            this.totalData = {}
+          } else {
+            this.totalData = res.data.data;
+            this.loading = false;
+          }
+        }, err => {})
       },
       getList() { // 获取列表数据
+            this.czList = []
       if(this.msg.OutDate && this.msg.OutDate.length) {
         this.msg.StartTime = this.msg.OutDate[0]
         this.msg.EndTime = this.msg.OutDate[1]
@@ -665,6 +646,7 @@
     mounted() {
       this.msg.CustomerId = this.$route.query.id
       this.getList()
+      this.getTotalData()
     }
   }
 

src/components/SalesModule/signedFinanceALL.vue

@@ -514,7 +514,7 @@ input[type="number"] {
       <li :class="active == 1 ? '_active' : ''" @click="getActive(1, 0, -1)">
         所有客户
       </li>
-      <li :class="active == 3 ? '_active' : ''" @click="getActive(3, 1)">
+      <li :class="active == 2 ? '_active' : ''" @click="getActive(3, 1)">
         待结算
       </li>
       <li :class="active == 2 ? '_active' : ''" @click="getActive(2, 2, -1)">
@@ -566,7 +566,7 @@ input[type="number"] {
           <th>未结算申请数</th>
           <th>总收客数</th>
           <th>签约截止时间</th>
-          <th>操作</th>
+          <th v-if="active == 2">操作</th>
         </tr>
         <tr v-for="(item, index) in DataList" :key="index">
           <td>{{ item.customerName }}</td>
@@ -578,7 +578,7 @@ input[type="number"] {
           <td>{{ item.WaringAudit }}</td>
           <td>{{ item.totalGuestNum }}</td>
           <td>{{ item.signingEndTime }}</td>
-          <td><el-button @click="financeCheck(item)">审核</el-button></td>
+          <td v-if="active == 2"><el-button size="mine" type="primary" @click="financeCheck(item)">审核</el-button></td>
         </tr>
         <tr v-if="DataList.length == 0">
           <td colspan="12" style="text-align: center">暂无数据</td>