linwenxin 1 år sedan
förälder
incheckning
1b60eed8ea

+ 10 - 1
src/api/applicationWithoutFee.js

@@ -87,4 +87,13 @@ export function enginMaterialListWechatExport(data, name) {
     data,
     name
   })
-}
+}
+
+export function enginMaterialLineSettlementHui(params) {
+  return request({
+    url: `/engin/material/lineSettlementHui`,
+    method: 'post',
+    params
+  })
+}
+

+ 5 - 2
src/views/engineeringMaintenance/feeSettlementIncluded/pages/collect.vue

@@ -8,7 +8,7 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import { enginMaterialListPageSettlementV2, enginMaterialPageSettlementExport, enginMaterialDetail } from "@/api/applicationWithoutFee.js"
+import { enginMaterialListPageSettlementV2, enginMaterialPageSettlementExport, enginMaterialDetail, enginMaterialLineSettlementHui } from "@/api/applicationWithoutFee.js"
 import { EventBus } from '@/utils/eventBus'
 export default {
   components: {
@@ -56,9 +56,12 @@ export default {
           }
         },
         settle: {
+          prompt:"是否确认结算!",
           click: ({ row, index, column }) => {
             var { websitId, workerId } = row
-            EventBus.$emit("tabTypeCkChange", { websitId, workerId, status: "WAIT", tabTypeCk: "offline" })
+            enginMaterialLineSettlementHui({ websitId, workerId }).then(res => {
+              this.$refs.pageRef.refreshList()
+            })
           }
         },
       })

+ 1 - 1
src/views/engineeringMaintenance/feeSettlementIncludedwx/index.vue

@@ -6,7 +6,7 @@
         <zj-page-container v-if="formBool">
           <zj-page-fill class="neibuview" v-if="formBool">
             <zj-form-container ref="formRef" v-if="formBool" :formAttributes="{ 'label-position': 'top' }">
-              <zj-form-module v-if="formBool" title="费用信息" :form-data="formData" :form-items="formItems">
+              <zj-form-module title="费用信息" :form-data="formData" :form-items="formItems">
               </zj-form-module>
             </zj-form-container>
           </zj-page-fill>

+ 1 - 1
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/pandanxinxi.js

@@ -213,7 +213,7 @@ export default {
   },
   created() {
     // 普通工单选择网点数据
-    if (this.workOrderType == 0) {
+    if (this.workOrderType == 0 && this.isAllWebsit) {
       getWebsit({ type: "C", status: true, isAll: this.isAllWebsit || this.id ? true : false }).then(res => {
         this.websitList = res.data.map(item => ({
           label: item.name,