vue2-client 1.15.84 → 1.15.85

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

@@ -33,6 +33,24 @@
     </WorkflowDetail>
     <!--  地址选择器  -->
     <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议新增功能  -->
+    <add-contract
+      ref="addContract"
+      table="报建流程"
+      @upFormData="upFormData"
+    ></add-contract>
+    <!--  协议作废功能  -->
+    <cancel-contract ref="cancelContract"></cancel-contract>
+    <!--  增值收费新增  -->
+    <add-charge ref="addCharge"></add-charge>
+    <!--  新增/编辑 用户信息  -->
+    <add-user ref="addUser"></add-user>
+    <!--  新增 收费信息  -->
+    <add-apply-charge ref="addApplyCharge"></add-apply-charge>
+    <!--  增值收费撤销  -->
+    <cancel ref="cancel"></cancel>
+    <!--  增值收费批量撤销  -->
+    <batch-refund ref="batchRefund"></batch-refund>
   </div>
 </template>
 
@@ -67,6 +85,7 @@ export default {
         updateFormData: this.updateFormData,
         chargeCancel: this.chargeCancel,
         chargeBatchRefund: this.chargeBatchRefund,
+        updateContractFormData: this.updateContractFormData,
       }
     }
   },
@@ -117,7 +136,8 @@ export default {
     },
     toDetail (record, id) {
       this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
+        workflowId: record.ab_f_workflow_id,
+        stepId: record.ws_f_step_id
       })
     },
     handleFormItemEvent (func, data, value) {
@@ -131,19 +151,19 @@ export default {
     },
     nextClick ({ form, formStep, workflowId }) {
       console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
-      }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
-        res => {
-          if (res) {
-            // this.$message.success('提交成功！')
-            this.$refs.xFormTable.refreshTable(true)
-          }
-        }
-      )
+      // const data = {
+      //   workflowId,
+      //   form,
+      //   formStep
+      // }
+      // runLogic('applySubmitAfter', data, 'af-apply').then(
+      //   res => {
+      //     if (res) {
+      //       // this.$message.success('提交成功！')
+      //       this.$refs.xFormTable.refreshTable(true)
+      //     }
+      //   }
+      // )
     },
     // 协议作废
     setCancel (record, refreshFn) {
@@ -166,8 +186,8 @@ export default {
       this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
     },
     // 编辑用户
-    editUser (record, refreshFn) {
-      this.$refs.addUser.editUser(record, refreshFn)
+    editUser (record, refreshFn, showForm) {
+      this.$refs.addUser.editUser(record, refreshFn, showForm)
     },
     // 新增收费
     addcharge (refreshFn) {
@@ -175,15 +195,17 @@ export default {
     },
     // 报装缴费页面初始化
     updateFormData (workflowId) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
-        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
-        })
-      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
-        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
-        })
-      }
+      runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+      })
+    },
+    // 合同签订页面初始化
+    updateContractFormData (param) {
+      this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(param)
+    },
+    // 补充协议回更表单数据
+    upFormData (record) {
+      this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(record)
     },
     // 增值收费单个数据的撤销功能
     chargeCancel (record, refreshFn) {

package/src/pages/WorkflowDetail/WorkflowPageDetail/TrimTextTail.vue

@@ -1,23 +1,23 @@
-<template>
-  <span v-if="text.length < length">{{ text }}</span>
-  <a-tooltip v-else>
-    <span slot="title">{{ text }}</span>
-    <span>{{ text.substring(0, length - 1) }}......</span>
-  </a-tooltip>
-</template>
-
-<script>
-export default {
-  name: 'TrimTextTail',
-  props: {
-    text: {
-      type: String,
-      default: ''
-    },
-    length: {
-      type: Number,
-      default: 10
-    }
-  }
-}
-</script>
+<template>
+  <span v-if="text.length < length">{{ text }}</span>
+  <a-tooltip v-else>
+    <span slot="title">{{ text }}</span>
+    <span>{{ text.substring(0, length - 1) }}......</span>
+  </a-tooltip>
+</template>
+
+<script>
+export default {
+  name: 'TrimTextTail',
+  props: {
+    text: {
+      type: String,
+      default: ''
+    },
+    length: {
+      type: Number,
+      default: 10
+    }
+  }
+}
+</script>