修改客户来源 修改清空条件 确认对账

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -441,13 +441,13 @@
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '已结'"
+                        <span v-if="row.stlDrStatusDescr == '结清'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
-                            已结
+                            结清
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '部分结'"
+                        <span v-if="row.stlDrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
-                            部分结
+                            部分
                         </span>
                     </div>
                 </template>
@@ -457,29 +457,29 @@
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span v-if="row.stlCrStatusDescr == '已结'"
+                        <span v-if="row.stlCrStatusDescr == '结清'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
-                            已结
+                            结清
                         </span>
-                        <span v-if="row.stlCrStatusDescr == '部分结'"
+                        <span v-if="row.stlCrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
-                            部分结
+                            部分
                         </span>
                     </div>
                 </template>
                 <template slot="invoiceDrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span v-if="row.invoiceDrStatusDescr == '未结'"
+                        <span v-if="row.invoiceDrStatusDescr == '未开'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
-                            未结
+                            未开
                         </span>
-                        <span v-if="row.invoiceDrStatusDescr == '已结'"
+                        <span v-if="row.invoiceDrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
-                            已结
+                            部分
                         </span>
-                        <span v-if="row.invoiceDrStatusDescr == '部分结'"
+                        <span v-if="row.invoiceDrStatusDescr == '全开'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
-                            部分结
+                            全开
                         </span>
                     </div>
                 </template>

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -132,18 +132,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="客户来源" prop="sourceType">
+                <el-form-item label="业务来源" prop="sourceType">
                   <el-row :gutter="10">
                     <el-col :span="10">
-                      <!-- <search-query :datalist="sourceTypeData" :selectValue="formData.sourceType" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择客户来源"
+                      <search-query :datalist="sourceTypeData" :selectValue="formData.sourceType" :filterable="true"
+                        :clearable="true" :remote="true" :buttonIf="false" placeholder="请选择业务来源"
                         @corpChange="sourceCorp($event, 'sourceType')">
-                      </search-query> -->
-                      <el-select v-model="formData.sourceType" size="small" placeholder="请选择客户来源" clearable
-                        :style="{ width: '100%' }" @change="sourceCorp($event, 'sourceType')">
-                        <el-option v-for="(item, index) in sourceTypeData" :key="index" :label="item.dictValue"
-                          :value="item.dictKey"></el-option>
-                      </el-select>
+                      </search-query>
                     </el-col>
                     <el-col :span="13">
                       <search-query :datalist="srcData" :selectValue="formData.srcCnName" :filterable="true"
@@ -154,7 +149,7 @@
                       </search-query>
                     </el-col>
                   </el-row>
-                  <!--<el-input v-model="formData.sourceType" placeholder="请输入客户来源" clearable :style="{ width: '100%' }">-->
+                  <!--<el-input v-model="formData.sourceType" placeholder="请输入业务来源" clearable :style="{ width: '100%' }">-->
                   <!--</el-input>-->
 
                 </el-form-item>
@@ -1110,11 +1105,24 @@ export default {
   data() {
     return {
       psRateData: [], // ps 规则数据
-      // 客户来源
-      sourceTypeData: [],
-      // 客户来源下级配置
+      // 业务来源
+      sourceTypeData: [
+        {
+          label: '公司',
+          value: 'OWN'
+        },
+        {
+          label: '代理',
+          value: 'AGENT'
+        },
+        {
+          label: '业务员',
+          value: 'SALES'
+        }
+      ],
+      // 业务来源下级配置
       sourceforParameter: {},
-      // 客户来源下级
+      // 业务来源下级
       srcData: [],
       maintenanceStaffData: [], // 维护人员
       // tab标签
@@ -1348,9 +1356,6 @@ export default {
     getWorkDicts('bcorps-credit-level').then((res) => {
       this.creditLevelDict = res.data.data
     });
-    getWorkDicts('source_type').then((res) => {
-      this.sourceTypeData = res.data.data
-    });
     getWorkDicts('bcorps-enterprise-type').then((res) => {
       this.enterpriseTypeDict = res.data.data
       // 没有id 取第一个
@@ -1403,7 +1408,7 @@ export default {
         }
       }
     },
-    // 客户来源下拉
+    // 业务来源下拉
     sourceCorp(value, name) {
       if (name == 'srcCnName') {
         if (!value) {
@@ -1448,7 +1453,7 @@ export default {
         } else { }
       } else { }
     },
-    // 客户来源接口
+    // 业务来源接口
     sourceRemote(value, name) {
       if (name == 'srcCnName') {
         if (this.formData.sourceType == 'OWN') {
@@ -1591,9 +1596,9 @@ export default {
     submitForm() {
       this.$refs['userDataForm'].validate(valid => {
         if (!valid) return
-        // 判断客户来源是否填写
+        // 判断业务来源是否填写
         if (!this.formData.sourceType) {
-          this.$message.warning('请填写客户来源')
+          this.$message.warning('请填写业务来源')
           return;
         }
         // 判断来源明细是否填写

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -603,6 +603,13 @@ export default {
                 isExchangeToCny: 0,
                 invoiceDate: getCurrentDate(),
             }
+            getRateList({ current: 1, size: 30 }).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.code == "USD") {
+                        this.$set(this.form, 'exrate', item.exrate)
+                    }
+                }
+            })
         },
         // 开票明细编辑完成保存
         invoiceSavefun(row) {

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -601,6 +601,13 @@ export default {
                 isExchangeToCny: 0,
                 invoiceDate: getCurrentDate(),
             }
+            getRateList({ current: 1, size: 30 }).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.code == "USD") {
+                        this.$set(this.form, 'exrate', item.exrate)
+                    }
+                }
+            })
         },
         // 开票明细编辑完成保存
         invoiceSavefun(row) {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -786,13 +786,22 @@ export default {
                     this.saveLoading = false
                 })
             } else if (type == '对账') {
-                finstlbillsSubmit(this.form).then(res => {
-                    this.$message.success('操作成功');
-                    this.finstlbillsDetailfun(res.data.data.id)
-                }).finally(() => {
-                    this.pageLoading = false
-                    this.saveLoading = false
-                })
+                this.$confirm("确定进行对账操作?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    finstlbillsSubmit(this.form).then(res => {
+                        this.form = res.data.data
+                        this.finstlbillsConfirmReconciliationfun()
+                    }).catch(() => {
+                        this.pageLoading = false
+                        this.saveLoading = false
+                    })
+                }).catch(() => {
+                        this.pageLoading = false
+                        this.saveLoading = false
+                    })
             } else {
                 finstlbillsSubmit(this.form).then(res => {
                     this.$message.success('操作成功');

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -281,7 +281,8 @@ export default {
                     type: "date",
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
-                }, {
+                }, 
+                {
                     label: '出库开始',
                     prop: 'dateStart',
                     overHidden: true,

src/views/tirePartsMall/financialManagement/salesAnalysis/index.vue

@@ -76,7 +76,7 @@ export default {
                 menu: false,
                 height: "auto",
                 border: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -163,6 +163,27 @@ export default {
                     searchOrder: 5
                 },
                 {
+                    label: '出库开始',
+                    prop: 'dateStart',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 5.1,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, {
+                    label: '出库结束',
+                    prop: 'dateEnd',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 5.2,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                },
+                {
                     label: '业务类型',
                     prop: "bsType",
                     type: 'select',

src/views/tirePartsMall/financingManagement/financingManagement/detailsPage.vue

@@ -31,9 +31,10 @@
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <tempalte slot="fundingPartyName" slot-scope="{ row }">
-                        <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname" res="records"
-                            url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true" :remote="true"
-                            dataName="cname" :disabled="form.fundingItemList.length>0" @selectChange="dicChange('fundingPartyName', $event)"></dic-select>
+                        <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname"
+                            res="records" url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true"
+                            :remote="true" dataName="cname" :disabled="form.fundingItemList.length > 0"
+                            @selectChange="dicChange('fundingPartyName', $event)"></dic-select>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -127,6 +128,14 @@ export default {
                 //     disabled: true
                 // },
                 {
+                    label: '资金占用',
+                    prop: "interest",
+                    type: 'number',
+                    controls: false,
+                    precision: 2
+                    // disabled: true
+                },
+                {
                     label: '可用金额',
                     prop: "availableAmount",
                     disabled: true
@@ -286,7 +295,7 @@ export default {
                     });
                 }
             }
-            if (row.type == "融资销售退货-撤销入库"||row.type == "融资销售退货-入库确认") {
+            if (row.type == "融资销售退货-撤销入库" || row.type == "融资销售退货-入库确认") {
                 if (this.$store.getters.inboundAndOutbound) {
                     this.$alert("出入库工单已存在,请关闭出入库工单再进行操作", "温馨提示", {
                         confirmButtonText: "确定",

src/views/tirePartsMall/financingManagement/financingManagement/index.vue

@@ -84,6 +84,21 @@ export default {
           }, {
             name: 'availableAmount',
             type: 'sum',
+          }, {
+            name: 'amount',
+            type: 'sum',
+          }, {
+            name: 'fundingAmount',
+            type: 'sum',
+          }, {
+            name: 'bondAmount',
+            type: 'sum',
+          }, {
+            name: 'surplusFundingAmount',
+            type: 'sum',
+          }, {
+            name: 'interest',
+            type: 'sum',
           }],
         column: [
           {
@@ -127,6 +142,11 @@ export default {
             overHidden: true,
           },
           {
+            label: '资金占用',
+            prop: "interest",
+            overHidden: true,
+          },
+          {
             label: '可用金额',
             prop: "availableAmount",
             overHidden: true,

src/views/wel/home/xindongPower/xindongPower.vue

@@ -232,31 +232,35 @@
                                 <div class="bottomFlex" style="justify-content: space-around">
                                     <div>
                                         <div style="color: #81B337">
-                                            <span>融资金额:</span>
-                                            <span class="weightnum">{{ overviewForm.primaryFundingAmount }}</span>
+                                            <span>订单金额:</span>
+                                            <span class="weightnum">¥{{ overviewForm.totalMoney }}元</span>
                                         </div>
                                     </div>
                                     <div>
                                         <div style="color: #6BBCD1">
-                                            <span>入库金额:</span>
-                                            <span class="weightnum">¥{{ overviewForm.sumAmount }}元</span>
+                                            <span>配额:</span>
+                                            <span class="weightnum">¥{{ overviewForm.fundingAmount }}元</span>
                                         </div>
                                     </div>
                                     <div>
                                         <div style="color: #808bbd">
-                                            <span>在库金额:</span>
-                                            <span class="weightnum">¥{{ overviewForm.surplusFundingAmount }}元</span>
+                                            <span>保证金:</span>
+                                            <span class="weightnum">¥{{ overviewForm.bondAmount }}元</span>
                                         </div>
                                     </div>
                                     <div>
                                         <div style="color: #b3373f">
-                                            <span>可用金额:</span>
-                                            <span class="weightnum">¥{{ overviewForm.availableAmount }}元</span>
+                                            <span>还款:</span>
+                                            <span class="weightnum">¥{{ overviewForm.repayment }}元</span>
                                         </div>
                                     </div>
                                     <div style="color: #8dab14">
-                                        <span>保证金:</span>
-                                        <span>¥{{ overviewForm.bondAmount }}元</span>
+                                        <span>允许提货金额:</span>
+                                        <span>¥{{ overviewForm.amount }}元</span>
+                                    </div>
+                                    <div style="color: #f09d68">
+                                        <span>资金占用:</span>
+                                        <span>¥{{ overviewForm.interest }}元</span>
                                     </div>
                                 </div>
                             </div>
@@ -344,7 +348,7 @@ export default {
                     if (e.paramValue == 1) {
                         this.inShow = true
                         this.commoDity3Datafun()
-                        realTimeOverview().then(res => {
+                        realTimeOverview({ date: Number(this.annual4) }).then(res => {
                             this.overviewForm = res.data.data
                         })
                     }
@@ -422,6 +426,9 @@ export default {
                 this.numberList3 = res.data.data.number
                 this.primaryFundingAmount3 = res.data.data.primaryFundingAmount
                 this.commoDity3()
+                realTimeOverview({ date: Number(this.annual4) }).then(res => {
+                    this.overviewForm = res.data.data
+                })
             })
         },
         //获取所有路由信息id
@@ -577,7 +584,7 @@ export default {
                 toolbox: {
                 },
                 legend: {
-                    data: ['订单数量', '入库金额', '融资金额']
+                    data: ['订单数量', '订单金额', '配额']
                 },
                 xAxis: [
                     {
@@ -612,7 +619,7 @@ export default {
                     },
                     {
                         type: 'value',
-                        name: '入库金额(元)',
+                        name: '订单金额(元)',
                         position: 'right',
                         min: 0,
                         axisLine: {
@@ -630,7 +637,7 @@ export default {
                     },
                     {
                         type: 'value',
-                        name: '融资金额(元)',
+                        name: '配额(元)',
                         position: 'right',
                         offset: 80,
                         min: 0,
@@ -661,7 +668,7 @@ export default {
                         data: this.numberList3
                     },
                     {
-                        name: '入库金额',
+                        name: '订单金额',
                         type: 'bar',
                         yAxisIndex: 1,
                         tooltip: {
@@ -672,7 +679,7 @@ export default {
                         data: this.amountList3
                     },
                     {
-                        name: '融资金额',
+                        name: '配额',
                         type: 'bar',
                         yAxisIndex: 2,
                         tooltip: {