提交达沃特、统计、账单

src/api/landTransportation/index.js

@@ -366,7 +366,7 @@ export function checkAttachment(data) {
 //更新账单
 export function generateBill(data) {
     return request({
-        url: ' /api/blade-land/order/generateBill',
+        url: '/api/blade-land/order/generateBill',
         method: 'get',
         params:data
     })

src/components/finance/financialAccount.vue

@@ -409,7 +409,6 @@ export default {
           }
         }
       }
-
     },
     async submit() {
       for (let i = 0; i < this.data.length; i++) {

src/views/exportTrade/customerInquiry/index.vue

@@ -179,6 +179,7 @@ export default {
       itemOption: {
         align: "center",
         header: false,
+        border: true,
         menu: false,
         column: [
           {

src/views/exportTrade/salesContract/index.vue

@@ -177,6 +177,7 @@ export default {
       itemOption: {
         align: "center",
         header: false,
+        border: true,
         menu: false,
         column: [
           {

src/views/financialManagement/collectionSettlement/receiptSettleDetailsPage.vue

@@ -616,9 +616,11 @@
               message: "操作成功!"
             });
             this.dataList.splice(index, 1);
+            this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
           })
         } else {
           this.dataList.splice(index, 1);
+          this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
         }
       },
       searchReset() {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -523,9 +523,11 @@ export default {
               message: "操作成功!"
             });
             this.dataList.splice(index, 1);
+            this.$set(this.form, 'srcOrderno', Array.from(new Set(this.dataList.map(item => { if (item.srcOrderno) { return item.srcOrderno } }))).join(','))
           })
         } else {
           this.dataList.splice(index, 1);
+          this.$set(this.form, 'srcOrderno', Array.from(new Set(this.dataList.map(item => { if (item.srcOrderno) { return item.srcOrderno } }))).join(','))
         }
     },
     searchReset() {

src/views/financialManagement/paymentSettlement/paymentSettleDetailsPage.vue

@@ -597,10 +597,12 @@ export default {
               message: "操作成功!"
             });
             this.dataList.splice(index, 1);
+            this.$set(this.form, 'srcOrderno', Array.from(new Set(this.dataList.map(item => { if (item.srcOrderno) { return item.srcOrderno } }))).join(','))
             this.calculation(this.dataList)
           })
         } else {
           this.dataList.splice(index, 1);
+        this.$set(this.form, 'srcOrderno', Array.from(new Set(this.dataList.map(item => { if (item.srcOrderno) { return item.srcOrderno } }))).join(','))
           this.calculation(this.dataList)
         }
     },

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -605,9 +605,11 @@
               message: "操作成功!"
             });
             this.dataList.splice(index, 1);
+            this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
           })
         } else {
           this.dataList.splice(index, 1);
+          this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
         }
       },
       searchReset() {

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -44,6 +44,15 @@
               v-if="goodsForm.status > 0 && roleName.indexOf('admin') !== -1 || roleName.indexOf('业务员') !== -1 || roleName.indexOf('分管调度') !== -1"
               :disabled="
             !(roleName.indexOf('业务员') !== -1||roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
+              @click="updateFee"
+          >更新账单</el-button>
+          <el-button
+              type="warning"
+              size="small"
+              :loading="type"
+              v-if="goodsForm.status > 0 && roleName.indexOf('admin') !== -1 || roleName.indexOf('业务员') !== -1 || roleName.indexOf('分管调度') !== -1"
+              :disabled="
+            !(roleName.indexOf('业务员') !== -1||roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
@@ -1056,7 +1065,7 @@ import website from "@/config/website";
 import {gaude, location} from "@/api/gaude";
 //地图回放
 import trackPlayback from "@/components/trackPlayback"
-import {fleetList, telephone} from "@/api/landTransportation";
+import {fleetList, generateBill, telephone} from "@/api/landTransportation";
 import {getDictionary} from "@/api/system/dictbiz";
 import {allCropList, customerList} from "@/api/basicData/customerInformation";
 import {contrastList, contrastObj} from "@/util/contrastData";
@@ -2867,6 +2876,20 @@ export default {
         }
       })
     },
+    updateFee(){
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
+      generateBill({id:this.goodsForm.id}).then(res=>{
+        this.$message.success("更新账单成功")
+        loading.close();
+      }).catch(()=>{
+        loading.close();
+      })
+    },
     //确认变更
     confirmChange() {
       // validChange({id:this.id}).then(res => {

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -32,8 +32,7 @@
               type="warning"
               size="small"
               @click="updateFee"
-              v-if="goodsForm.synchronization == 1"
-          >更新费用</el-button>
+          >更新账单</el-button>
         </div>
       </div>
     </div>
@@ -1652,8 +1651,17 @@ export default {
   },
   methods: {
     updateFee(){
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
       generateBill({id:this.goodsForm.id}).then(res=>{
-        this.$message.success("同步成功");
+        this.$message.success("更新账单成功")
+        loading.close();
+      }).catch(()=>{
+        loading.close();
       })
     },
     schedulingFileSaving() {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -38,6 +38,15 @@
       <div>
         <div class="el-button&#45;&#45;small-yh add-customer-btn" v-if="!(roleName.indexOf('总经理') !== -1)">
           <el-button
+              type="success"
+              size="small"
+              v-if="goodsForm.id"
+              :disabled="
+            !((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
+              @click="generateBill"
+          >生成账单
+          </el-button>
+          <el-button
               type="warning"
               size="small"
               v-if="goodsForm.status > 0"
@@ -610,7 +619,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove
+  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove, generateBill
 } from "@/api/landTransportation";
 import {getDeptTree} from "@/api/system/dept";
 import website from "@/config/website";
@@ -2107,6 +2116,21 @@ export default {
         }
       })
     },
+    //生成账单
+    generateBill(){
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
+      generateBill({id:this.goodsForm.id}).then(res=>{
+        this.$message.success("生成账单成功")
+        loading.close();
+      }).catch(()=>{
+        loading.close();
+      })
+    },
     //确认变更
     confirmChange() {
       // validChange({id:this.id}).then(res => {

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -864,18 +864,17 @@ export default {
     },
     //商品编辑
     rowCell(row, index) {
-      if (row.$cellEdit && this.form.id) {
-        itemSubmit({...row,pid: this.form.id}).then(res => {
-          this.$message.success('保存成功')
-          this.$refs.crudContact.rowCell(row, index);
-        })
-      } else {
+      // if (row.$cellEdit && this.form.id) {
+        // itemSubmit({...row,pid: this.form.id}).then(res => {
+        //   this.$message.success('保存成功')
+        //   this.$refs.crudContact.rowCell(row, index);
+        // })
+      // } else {
         this.$refs.crudContact.rowCell(row, index);
-      }
+      // }
     },
     //买赠编辑
     rowCellE(row, index) {
-      console.log(row);
       this.$refs.crudContactE.rowCell(row, index);
     },
     //修改商品信息触发

src/views/statisticAnalysis/profitStatistics/index.vue

@@ -38,7 +38,7 @@ export default {
       },
       form: {},
       search: {
-        data:`${new Date().getFullYear()}-${(new Date().getMonth()+1)}-1 00:00:00`,
+        date:`${new Date().getFullYear()}-${(new Date().getMonth()+1)}-1 00:00:00`,
         whetherStatistics:0
       },
       condition: {},
@@ -128,13 +128,13 @@ export default {
           format: "yyyy-MM",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
-          label: "应收今额",
+          label: "应收金额",
           prop: "receivableAmount"
         }, {
           label: "已收金额",
           prop: "receivedAmount"
         }, {
-          label: "应付今额",
+          label: "应付金额",
           prop: "answerPayAmount"
         }, {
           label: "已付金额",
@@ -149,6 +149,7 @@ export default {
           type: 'select',
           showColumn: false,
           hide: true,
+          searchValue:0,
           dicData:[{
             label:'合同号',
             value:0