Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/report-dialog/main.vue

@@ -84,6 +84,9 @@ export default {
     },
     reportId: {
       type: String
+    },
+    searchValue:{
+      type:Object
     }
   },
   filters: {
@@ -117,9 +120,29 @@ export default {
       });
     },
     goReport(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}`
-      });
+      let tenantId = this.$store.getters.userInfo.tenant_id
+      if(this.reportName == "同海-统计列表"){
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
+          &tenantId=${this.searchValue.tenantId}
+          &status=${this.searchValue.status}
+           &cornId=${this.searchValue.cornId}
+      &deptid=${this.searchValue.deptid}
+      &pname=${this.searchValue.pname}
+      &projectType=${this.searchValue.projectType}
+      &payStartTime=${this.searchValue.payStartTime}
+      &payEndTime=${this.searchValue.payEndTime}
+      &userName=${this.searchValue.userName}`
+        });
+      }else if(name == "客户资料-客户资料.ureport.xml"){
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}&tenantId=${tenantId}`
+        });
+      }else{
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}`
+        });
+      }
       this.$emit("onClose", false);
     }
   },

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -33,6 +33,10 @@
     {
       "name": "invoiceWeight",
       "type": "sum"
+    },
+    {
+      "name": "purchaseTotalAmount",
+      "type": "sum"
     }
   ],
   "column":[

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -230,6 +230,7 @@
           itemType="发货"
           feeUrl="/blade-deliver-goods/deliveryfees/update"
           @beforeFinance="beforeFinance"
+          :corpId="form.corpId"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->

src/views/businessManagement/deliveryNotice/index.vue

@@ -182,7 +182,7 @@ export default {
     })
   },
   activated() {
-    this.isShow = true;
+    // this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -170,6 +170,7 @@
           optionType="GN"
           itemType="收货"
           feeUrl="/blade-deliver-goods/deliveryfees/update"
+          :corpId="form.corpId"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->

src/views/businessManagement/receipt/index.vue

@@ -184,7 +184,7 @@ export default {
     })
   },
   activated() {
-    this.isShow = true;
+    // this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2060,7 +2060,7 @@ export default {
           orderItemIds: lsit
         }
         generateShipment(data).then(res => {
-          // this.$router.$avueRouter.closeTag("/businessManagement/deliveryNotice/index");
+          this.$router.$avueRouter.closeTag("/businessManagement/deliveryNotice/index");
           this.$router.push({
             path: "/businessManagement/deliveryNotice/index",
             query: {

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -135,11 +135,6 @@
           billId: row.id,
           no: localStorage.getItem('browserID')
         }
-        this.inDetailsKey(this.$route.name, {
-          moduleName: 'ff',
-          tableName: 'finance_settlement',
-          billId: row.id,
-        })
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {
             this.detailData = {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -602,11 +602,11 @@
               settlementType:1
             }
 // 如果有id解锁，没有跳过
-            this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+//             this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
             saveOrEdit(params).then(res=>{
               this.$message.success("操作成功!")
-              this.detailData.disabled = true
-              this.editDisable = true
+              // this.detailData.disabled = true
+              // this.editDisable = true
               this.afterEcho(res.data.data)
               done();
             }).finally(()=>{
@@ -682,12 +682,12 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
-            this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+            !this.editDisable && this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
             this.$emit("goBack");
             this.leaveDetailsKey(this.$route.name)
           })
         }else{
-          this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
+          !this.editDisable && this.form.id && this.unLock({moduleName: 'ff',tableName: 'finance_settlement', billId: this.form.id})
           this.$emit("goBack");
           this.leaveDetailsKey(this.$route.name)
         }
@@ -712,6 +712,11 @@
           if (res.data.code == 200) {
             this.onLock(data).then(response => {
             })
+            this.inDetailsKey(this.$route.name, {
+              moduleName: 'ff',
+              tableName: 'finance_settlement',
+              billId: this.form.id,
+            })
             this.detailData.disabled = false;
             this.editDisable = false;
             this.buttonLoading = true

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -122,11 +122,6 @@
           billId: row.id,
           no: localStorage.getItem('browserID')
         }
-        this.inDetailsKey(this.$route.name, {
-          moduleName: 'sf',
-          tableName: 'finance_settlement',
-          billId: row.id,
-        })
         this.checkLock(data).then(res => {
           if (res.data.code == 200) {
             this.detailData = {

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -620,11 +620,11 @@
             }
 
             // 如果有id解锁，没有跳过
-            this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+            // this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
             saveOrEdit(params).then(res=>{
               this.$message.success("操作成功!")
-              this.detailData.disabled = true
-              this.editDisable = true
+              // this.detailData.disabled = true
+              // this.editDisable = true
               this.afterEcho(res.data.data)
             }).finally(()=>{
               this.buttonLoading = false
@@ -699,12 +699,12 @@
           }).then(() => {
             this.saveSettlement()
           }).catch(()=>{
-            this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+            !this.editDisable && this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
             this.$emit("goBack");
             this.leaveDetailsKey(this.$route.name)
           })
         }else{
-          this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
+          !this.editDisable && this.form.id && this.unLock({moduleName: 'sf',tableName: 'finance_settlement', billId: this.form.id})
           this.$emit("goBack");
           this.leaveDetailsKey(this.$route.name)
         }
@@ -739,6 +739,11 @@
           if (res.data.code == 200) {
             this.onLock(data).then(response => {
             })
+            this.inDetailsKey(this.$route.name, {
+              moduleName: 'sf',
+              tableName: 'finance_settlement',
+              billId: this.form.id,
+            })
             this.detailData.disabled = false;
             this.editDisable = false;
             this.buttonLoading = true

src/views/workManagement/receipt/statisticalList.vue

@@ -26,6 +26,14 @@
           @click.stop="downFile"
         >导 出
         </el-button>
+        <el-button
+          icon="el-icon-printer"
+          size="small"
+          type="primary"
+          :loading="exportLoading"
+          @click.stop="statement"
+        >报表
+        </el-button>
       </template>
       <template slot="cornIdSearch">
         <select-component
@@ -65,8 +73,8 @@
     </avue-crud>
     <report-dialog
       :switchDialog="switchDialog"
-      :reportId="form.id"
-      reportName="统计列表"
+      :searchValue="statementData"
+      :reportName="'同海-统计列表'"
       @onClose="onClose()"
     ></report-dialog>
   </basic-container>
@@ -87,6 +95,7 @@
         loading:false,
         form: {},
         search:{},
+        statementData:{},
         exportLoading:false,
         option: option,
         parentId:0,
@@ -162,6 +171,18 @@
             this.exportLoading = false
         })
       },
+      statement(){
+        this.statementData = this.paramsAdjustment(this.search)
+        if(this.statementData.status === "0,1,2,3,4,5,6,7,8"){
+          this.statementData.status = ""
+        }
+        if(this.statementData.payTime && this.statementData.payTime.length === 0){
+          this.statementData.payStartTime = ""
+          this.statementData.payEndTime = ""
+        }
+        this.statementData.tenantId = this.$store.getters.userInfo.tenant_id
+        this.switchDialog =! this.switchDialog;
+      },
       rowDel() {
 
       },