Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

hejianhao

2025-03-19 6138c2b6a56372dd237f74e0995ee8778d310764

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/dispatchWorkOrder/dispatchWorkOrder.vue

@@ -120,21 +120,24 @@
                    })
                    return
                }
                uni.showLoading({
                    mask: true
                })
                saveDispatch({
                    complaintId: this.id,
                    comment: this.content,
                    dispatchId: this.value
                }).then(res => {
                    this.showPop = false
                    uni.hideLoading()
                    if (res.code == 200) {
                        uni.showToast({
                            icon: 'none',
                            title: '下派成功'
                        })
                        setTimeout(() => {
                            uni.navigateBack({
                                delta: 2
                            })
                        }, 1500)
                        uni.navigateBack({
                            delta: 2
                        })
                    }
                })
            }

 management/src/pages/appeal-management/detail.jsx

@@ -27,7 +27,7 @@
        {
            key: '1',
            label: '述求状态',
            children: ['正在办理', '延期办理', '超时办理', '已办结', '待审核', '上报待审核'][detail.status],
            children: ['正在办理', '延期办理', '超时办理', '已办结', '待审核', '上报待审核'][detail.status] || '已办结',
        },
        {
            key: '2',

 management/src/pages/appeal-management/index.jsx

@@ -51,6 +51,9 @@
                3: '已办结',
                4: '上报待审核',
            },
            render: (text, record) => {
                return Number(record.status) == 0 ? '正在办理' : record.status == 1 ? '延期办理' : record.status == 2 ? '超时办理' : record.status == 3 ? '已办结' : record.status == 4 ? '上报待审核' : '已办结';
            }
        },
        {
            title: '操作',

 management/src/pages/party/audit/index.jsx

@@ -81,26 +81,26 @@
            {record.auditStatus == 0 && (
              <>
                <Access accessible={access['/party_member_audit/audit']}>
                <Button
                  type="link"
                  onClick={() => {
                    addViewRef.current.refreshData({ type: 'sure', id: record.id });
                    handleModalVisible(true);
                  }}
                >
                  通过
                </Button>
                  <Button
                    type="link"
                    onClick={() => {
                      addViewRef.current.refreshData({ type: 'sure', id: record.id });
                      handleModalVisible(true);
                    }}
                  >
                    通过
                  </Button>
                </Access>
                <Access accessible={access['/party_member_audit/audit']}>
                <Button
                  type="link"
                  onClick={() => {
                    addViewRef.current.refreshData({ type: 'refuse', id: record.id });
                    handleModalVisible(true);
                  }}
                >
                  拒绝
                </Button>
                  <Button
                    type="link"
                    onClick={() => {
                      addViewRef.current.refreshData({ type: 'refuse', id: record.id });
                      handleModalVisible(true);
                    }}
                  >
                    拒绝
                  </Button>
                </Access>
              </>
            )}
@@ -145,7 +145,10 @@
          const success = await sendRequest(audit, fileds);
          if (success) {
            handleModalVisible(false);
            message.success('当前党员信息审核已通过');
            if (fileds.type == 'sure') {
              message.success('当前党员信息审核已通过');
            }

            addViewRef.current.clean()
            actionRef.current.reload();
          }