Przeglądaj źródła

feature:bug修复

chenqilong 2 lat temu
rodzic
commit
d29e3b4f3a

+ 1 - 2
src/views/supply/engin/components/engin_detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <!-- <el-page-header @back="goBack" content="详情"></el-page-header> -->
+    <el-page-header @back="goBack" content="详情"></el-page-header>
 
     <div class="main-title">
       <div class="title">工程信息单</div>
@@ -328,7 +328,6 @@ export default {
       }).then(res => {
         this.$successMsg(status ? '关闭' : '启用')
         this.goBack()
-        
       })
     },
     // 直调完结

+ 2 - 3
src/views/supply/engin/components/engin_examine.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <!-- <el-page-header content="审批" @back="goBack" /> -->
+    <el-page-header content="审批" @back="goBack" />
 
     <div class="main-title">
       <div class="title">工程信息单</div>
@@ -767,7 +767,6 @@ export default {
             .then(res => {
               this.$successMsg('审批成功')
               this.goBack()
-              
             })
             .finally(res => {
               this.formLoading = false
@@ -811,7 +810,7 @@ export default {
       //           .then(res => {
       //             this.$successMsg('审批成功')
       //             this.goBack()
-      //          
+      //
       //           })
       //           .finally(res => {
       //             this.formLoading = false

+ 1 - 4
src/views/supply/engin/components/engin_form.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <!-- <el-page-header :content="listItem ? '编辑' : '新增'" @back="goBack" /> -->
+    <el-page-header :content="listItem ? '编辑' : '新增'" @back="goBack" />
 
     <div class="main-title">
       <div class="title">工程信息单</div>
@@ -964,7 +964,6 @@ export default {
               editEngin(params).then(res => {
                 this.$successMsg('编辑成功')
                 this.goBack()
-                
               })
             } else {
               params.customerNumber = this.mainForm.jxsNum
@@ -973,7 +972,6 @@ export default {
               addEngin(params).then(res => {
                 this.$successMsg('保存成功')
                 this.goBack()
-                
               })
             }
           } else {
@@ -987,7 +985,6 @@ export default {
             submitEngin(params).then(res => {
               this.$successMsg('提交审核成功')
               this.goBack()
-              
             })
           }
         }

+ 15 - 16
src/views/supply/engin/engin_list.vue

@@ -13,8 +13,8 @@
     :replaceOrNotMap="false"
   >
     <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" />
-    <Popu v-if="!showPage">
-      <el-page-header slot="head" :content="content" @back="handleClose" />
+    <Popu v-if="isShowDetail || isShowForm || isShowExamine">
+      <!-- <el-page-header slot="head" :content="content" @back="handleClose" /> -->
       <EnginDetail v-if="isShowDetail" :list-item="queryItem" @backListFormDetail="backList" />
       <EnginForm v-if="isShowForm" :list-item="queryItem" @backListFormDetail="backList" />
       <EnginExamine v-if="isShowExamine" :list-item="queryItem" @backListFormDetail="backList" />
@@ -25,7 +25,7 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import Popu from '@/components/template/popu.vue'
-import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+// import add_callback_mixin from '@/components/template/add_callback_mixin.js'
 
 import {
   getEnginList,
@@ -46,15 +46,14 @@ import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
-  mixins: [add_callback_mixin],
+  // mixins: [add_callback_mixin],
   components: {
     EnginDetail,
     EnginForm,
     EnginExamine,
     EditDateDialog,
     TemplatePage,
-    Popu,
-    add_callback_mixin
+    Popu
   },
   filters: {
     statusFilter(val) {
@@ -64,23 +63,23 @@ export default {
   },
   data() {
     return {
-      showPage: true,
-      content: '商用工程信息单',
-      // 关闭新增弹窗
-      handleClose: this.addOff(() => {
-        this.showPage = true
-        this.isShowForm = false
-        this.$refs.pageRef.refreshList()
-      }),
+      // showPage: true,
+      // content: '商用工程信息单',
+      // // 关闭新增弹窗
+      // handleClose: this.addOff(() => {
+      //   this.showPage = true
+      //   this.isShowForm = false
+      //   this.$refs.pageRef.refreshList()
+      // }),
       // 事件组合
       optionsEvensGroup: [
         [
           [
             {
               name: '新增',
-              click: this.addOn(() => {
+              click: () => {
                 this.toForm()
-              })
+              }
             }
           ]
         ]

+ 8 - 3
src/views/supply/engin/home_list.vue

@@ -245,9 +245,14 @@ export default {
     // getList: v2EnginOrderHomeList,
     async getList(...p) {
       this.$refs.pageRef.showTable = false
-      let res = await v2EnginOrderHomeCountList(...p)
-      this.numSum.totalC = res.data.totalC
-      this.numSum.amountC = res.data.amountC
+      try {
+        let res = await v2EnginOrderHomeCountList(...p)
+        this.numSum.totalC = res.data.totalC
+        this.numSum.amountC = res.data.amountC
+      } catch (error) {
+        // console.log(error)
+      }
+
       return v2EnginOrderHomeList(...p)
     },
     // 列表导出函数

+ 11 - 1
src/views/supply/price/difference_modify_list.vue

@@ -260,7 +260,17 @@ export default {
       return v2ProductUpdPriceList(params)
     },
     // 列表导出函数
-    exportList: v2ProductUpdPriceListExport,
+    // exportList: v2ProductUpdPriceListExport,
+    exportList(...p) {
+      let params = {
+        moduleId: p[0].moduleId,
+        orderBy: p[0].orderBy,
+        pageNum: p[0].pageNum,
+        pageSize: p[0].pageSize,
+        params: [...p[0].params, { param: 'a.bill_type', compare: '=', value: 'DIFF' }]
+      }
+      return v2ProductUpdPriceListExport(params, p[1])
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData

+ 13 - 1
src/views/supply/price/modify_list.vue

@@ -256,10 +256,22 @@ export default {
         pageSize: p[0].pageSize,
         params: [...p[0].params, { param: 'a.bill_type', compare: '=', value: 'HOME' }]
       }
+
       return v2ProductUpdPriceList(params)
     },
     // 列表导出函数
-    exportList: v2ProductUpdPriceListExport,
+    // exportList: v2ProductUpdPriceListExport,
+    exportList(...p) {
+      let params = {
+        moduleId: p[0].moduleId,
+        orderBy: p[0].orderBy,
+        pageNum: p[0].pageNum,
+        pageSize: p[0].pageSize,
+        params: [...p[0].params, { param: 'a.bill_type', compare: '=', value: 'HOME' }]
+      }
+
+      return v2ProductUpdPriceListExport(params, p[1])
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData