完善

src/utils/dict.js

@@ -325,6 +325,7 @@ DictCache.TYPE = {
   // 筹建
   LONG_YAN_PURCHASE_ORDER_PLAN_TYPE: 'LONG_YAN_PURCHASE_ORDER_PLAN_TYPE',
   PREPARATION_PARENT: 'PREPARATION_PARENT',
+  PREPARATION_NODE: 'PREPARATION_NODE', // 节点
   // 隐患管理
   PROFESSOR_TYPE: 'PROFESSOR_TYPE',
   CHECK_LEVEL: 'CHECK_LEVEL',

src/views/preparation/preparation/modules/Detail.vue

@@ -54,9 +54,9 @@
       <a-button
         v-if="DictCache.VALUE.REPAIR_PREPARATION_STATUS.NOT_ALLOCATED === model.status ||
           DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_MANAGER_VERIFY_SUCCESS === model.status ||
-DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_LEADER_VERIFY_SUCCESS === model.status ||
-DictCache.VALUE.REPAIR_PREPARATION_STATUS.FIRST_PROCESSING_VERIFYING === model.status ||
-DictCache.VALUE.REPAIR_PREPARATION_STATUS.SECOND_PROCESSING_VERIFYING === model.status"
+          DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_LEADER_VERIFY_SUCCESS === model.status ||
+          DictCache.VALUE.REPAIR_PREPARATION_STATUS.FIRST_PROCESSING_VERIFYING === model.status ||
+          DictCache.VALUE.REPAIR_PREPARATION_STATUS.SECOND_PROCESSING_VERIFYING === model.status"
         style="margin-left: 16px"
         type="default"
         @click="handleVerify()">审核</a-button>
@@ -162,13 +162,13 @@ export default {
       // 派单审核
       if (this.model.status === DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_LEADER_VERIFY_SUCCESS) { // 执行主管派单
         const modal = this.$refs.dispatchForm
-        modal.base({ id: this.model.id })
+        modal.base(this.model)
       } else if (this.model.status === DictCache.VALUE.REPAIR_PREPARATION_STATUS.FIRST_PROCESSING_VERIFYING) { // 申请费用审核
         const modal = this.$refs.feeVerifyForm
-        modal.base({ id: this.model.id, fee: this.model.fee })
+        modal.base(this.model)
       } else { // 其他审核
         const modal = this.$refs.verifyForm
-        modal.base({ status: this.model.status, id: this.model.id })
+        modal.base(this.model)
       }
     },
     handleFinish () {

src/views/preparation/preparation/modules/DispatchForm.vue

@@ -60,6 +60,22 @@
             </a-select>
           </a-form-item>
         </row-item>
+        <row-item v-if="verifyStatus===3">
+          <a-form-item
+            label="回退节点"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-select v-decorator="['nodeNum', { rules: [{required: true, message: '回退节点为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({label,value}) in nodeMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="备注"
@@ -82,6 +98,7 @@
 </template>
 
 <script>
+import DictCache from '@/utils/dict'
 import pick from 'lodash.pick'
 import { dispatchModelByDTO } from '@/api/preparation/preparation'
 import { queryUserByRoleNameAndDept } from '@/api/upms/user'
@@ -100,7 +117,8 @@ export default {
       // 下拉框map
       model: null,
       verifyRemark: '派单',
-      dispatchFlag: true
+      dispatchFlag: true,
+      nodeMap: []
     }
   },
   components: {
@@ -144,6 +162,7 @@ export default {
       this.visible = true
       this.model = record
       this.modalTitle = '审核派单'
+      this.nodeMap = DictCache.getChildrenList(DictCache.TYPE.PREPARATION_NODE).filter(item => this.model.nodeNum > item.value)
       const { form: { setFieldsValue } } = this
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
@@ -174,6 +193,7 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false
+      this.verifyStatus = 1
       this.form.resetFields()
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok')

src/views/preparation/preparation/modules/FeeVerifyForm.vue

@@ -25,6 +25,22 @@
             </a-radio-group>
           </a-form-item>
         </row-item>
+        <row-item v-if="verifyStatus===3">
+          <a-form-item
+            label="回退节点"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-select v-decorator="['nodeNum', { rules: [{required: true, message: '回退节点为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({label,value}) in nodeMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="费用预算"
@@ -57,6 +73,7 @@
 </template>
 
 <script>
+import DictCache from '@/utils/dict'
 import pick from 'lodash.pick'
 import { handleVerifyByDTO } from '@/api/preparation/preparation'
 export default {
@@ -70,7 +87,9 @@ export default {
       verifyStatus: 1,
       // 下拉框map
       model: null,
-      verifyRemark: '通过'
+      verifyRemark: '通过',
+      nodeMap: []
+
     }
   },
   components: {
@@ -94,6 +113,7 @@ export default {
       this.visible = true
       this.model = record
       this.modalTitle = '费用审核'
+      this.nodeMap = DictCache.getChildrenList(DictCache.TYPE.PREPARATION_NODE).filter(item => this.model.nodeNum > item.value)
       const { form: { setFieldsValue } } = this
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
@@ -125,6 +145,7 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false
+      this.verifyStatus = 1
       this.form.resetFields()
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok')

src/views/preparation/preparation/modules/VerifyForm.vue

@@ -25,6 +25,22 @@
             </a-radio-group>
           </a-form-item>
         </row-item>
+        <row-item v-if="verifyStatus===3">
+          <a-form-item
+            label="回退节点"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+          >
+            <a-select v-decorator="['nodeNum', { rules: [{required: true, message: '回退节点为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({label,value}) in nodeMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="审核备注"
@@ -59,9 +75,11 @@ export default {
       form: this.$form.createForm(this),
       visible: false,
       verifyStatus: 1,
+      nodeNum: 0,
       // 下拉框map
       model: null,
-      verifyRemark: '同意'
+      verifyRemark: '同意',
+      nodeMap: []
     }
   },
   components: {
@@ -69,6 +87,7 @@ export default {
   props: {
   },
   created () {
+
   },
   methods: {
     changeOpinion (e) {
@@ -86,6 +105,8 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
+      this.nodeMap = DictCache.getChildrenList(DictCache.TYPE.PREPARATION_NODE).filter(item => this.model.nodeNum > item.value)
+      console.log(this.nodeMap)
       if (record.status === DictCache.VALUE.REPAIR_PREPARATION_STATUS.NOT_ALLOCATED) {
         this.modalTitle = '申请部门主管审核'
       } else if (record.status === DictCache.VALUE.REPAIR_PREPARATION_STATUS.APPLY_MANAGER_VERIFY_SUCCESS) {
@@ -127,6 +148,7 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false
+      this.verifyStatus = 1
       this.form.resetFields()
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok')