no message

src/api/masterManagement.js

@@ -103,3 +103,27 @@ export function workerManagerDetail(params) {
     params
   })
 }
+
+export function workerManagerUpdate(data) {
+  return request({
+    url: '/workerManager/update',
+    method: 'post',
+    data
+  })
+}
+
+export function workerManagerExamineWait(data) {
+  return request({
+    url: '/workerManager/examineWait',
+    method: 'post',
+    data
+  })
+}
+
+export function workerManagerExamine(data) {
+  return request({
+    url: '/workerManager/examine',
+    method: 'post',
+    data
+  })
+}

src/views/setting/networkSigning/networkContractSigning/index.vue

@@ -31,6 +31,21 @@
               </zj-form-module>
             </zj-form-container>
           </zj-page-fill>
+          <div>
+            <el-button
+              v-if="formData.status == 'WAIT' && && adminWebsitIds.includes(formDat.parentId)"
+              type="text"
+              :click="
+                () => {
+                  $nextTick(() => {
+                    shenheBool = true
+                  })
+                }
+              "
+            >
+              审核
+            </el-button>
+          </div>
         </zj-page-container>
       </el-dialog>
     </div>
@@ -347,19 +362,6 @@ export default {
                                 下载合同
                               </el-button>
                             ) : null}
-                            {row.contractStatus == 'WAIT' && this.adminWebsitIds.includes(this.formData?.parentId) ? (
-                              <el-button
-                                type="text"
-                                onClick={() => {
-                                  this.form = { ...row }
-                                  this.$nextTick(() => {
-                                    this.shenheBool = true
-                                  })
-                                }}
-                              >
-                                审核
-                              </el-button>
-                            ) : null}
                           </div>
                         )
                       }
@@ -457,7 +459,7 @@ export default {
     },
     shenhequeding() {
       websitContractSignConfirm({
-        id: this.form.id,
+        id: this.formData.id,
         remark: this.form.remark,
         status: this.form.status
       }).then(res => {

src/views/userManagement/masterManagement/index.vue

@@ -37,7 +37,10 @@
           </div>
         </template-page>
       </div>
-      <div v-if="~['examine', 'detail'].indexOf(activeKey)" style="box-sizing: border-box; padding: 16px">
+      <div
+        v-if="~['detail', 'edit', 'entryAudit', 'insuranceAudit'].indexOf(activeKey)"
+        style="box-sizing: border-box; padding: 16px"
+      >
         <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
           <zj-form-module
             title="详情"
@@ -71,7 +74,7 @@
           <el-button v-if="formData.examineStatus == 'WAIT' && activeKey == 'examine'" size="mini" type="danger"
             >审核驳回</el-button
           >
-          <el-button v-if="activeKey == 'detail'" size="mini" type="primary">保存</el-button>
+          <el-button v-if="activeKey == 'edit'" size="mini" type="primary" @click="submit">保存</el-button>
           <el-button size="mini" @click="data.removeTab()">取 消</el-button>
         </div>
       </div>
@@ -84,17 +87,16 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
 import {
-  memberSlaveBind,
   memberListPageV2,
   memberPageExport,
   workerManagerDetail,
-  memberAudit,
-  memberInner,
-  update,
   workerManagerActivation,
   workerManagerAgainQuit,
   workerManagerQuit,
-  workerManagerStop
+  workerManagerStop,
+  workerManagerUpdate,
+  workerManagerExamineWait,
+  workerManagerExamine
 } from '@/api/masterManagement'
 import operation_mixin from '@/components/template/operation_mixin.js'
 import ImageUpload from '@/components/file-upload'
@@ -134,7 +136,8 @@ export default {
         workerImgsCp: [{ type: '', number: '', startTime: '', endTime: '', reexamineTime: '', filesList: [] }],
         workerPolicies: []
       },
-      examineStatus: ''
+      examineStatus: '',
+      openType: 0
     }
   },
   computed: {
@@ -208,7 +211,7 @@ export default {
           md: 12,
           isShow: true,
           name: 'el-input',
-          attributes: { placeholder: '请输入' },
+          attributes: { placeholder: '请输入', disabled: true },
           formItemAttributes: {
             label: '入驻网点',
             prop: 'websitName',
@@ -219,7 +222,7 @@ export default {
           md: 6,
           isShow: true,
           name: 'el-input',
-          attributes: { placeholder: '请输入' },
+          attributes: { placeholder: '请输入', disabled: true },
           formItemAttributes: {
             label: '师傅编号',
             prop: 'workerNumber',
@@ -457,7 +460,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '保险公司名字',
-                    prop: 'company'
+                    prop: 'company',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -484,7 +488,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '购买类型',
-                    prop: 'type'
+                    prop: 'type',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -518,7 +523,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '保险单名称',
-                    prop: 'policyName'
+                    prop: 'policyName',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -545,7 +551,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '保单类型',
-                    prop: 'type'
+                    prop: 'policyType',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -580,7 +587,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '保单状态',
-                    prop: 'status'
+                    prop: 'status',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -592,7 +600,7 @@ export default {
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
                           <el-select
-                            disabled={row.type == 'IN'}
+                            disabled={true}
                             value={row[column.columnAttributes.prop]}
                             onInput={val => {
                               row[column.columnAttributes.prop] = val
@@ -615,7 +623,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '保险单号',
-                    prop: 'policyOrder'
+                    prop: 'policyOrder',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -642,7 +651,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '有效期开始日期',
-                    prop: 'startTime'
+                    prop: 'startTime',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -669,7 +679,8 @@ export default {
                 {
                   columnAttributes: {
                     label: '有效期结束日期',
-                    prop: 'endTime'
+                    prop: 'endTime',
+                    'min-width': '200px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
@@ -696,12 +707,13 @@ export default {
                 {
                   columnAttributes: {
                     label: '附件',
-                    prop: 'policyUrl'
+                    prop: 'policyUrl',
+                    'min-width': '440px'
                   },
                   render: (h, { row, column, index }) => {
                     return (
                       <div class="redbordererr">
-                        <ImageUpload fileList={row[column.columnAttributes.prop]} limit={1} isEdit={true} />
+                        <ImageUpload fileList={row[column.columnAttributes.prop]} limit={100} isEdit={true} />
                       </div>
                     )
                   }
@@ -727,7 +739,7 @@ export default {
                     policyType: '',
                     startTime: '',
                     status: '',
-                    type: '',
+                    type: 'LINE',
                     websitId: '',
                     websitName: '',
                     websitUserId: '',
@@ -799,6 +811,62 @@ export default {
     selectionChange(data) {
       this.recordSelected = data
     },
+    openWindows(row, cb) {
+      workerManagerDetail({ id: row.id }).then(res => {
+        this.formData = {
+          ...res.data,
+          user: {
+            ...res.data.user,
+            examineStatus_t: res.data.examineStatus
+          },
+          workerImgsCp: [
+            {
+              type: 'ID',
+              number: res.data?.user?.idCard || '',
+              startTime: res.data?.user?.idCardStartTime || '',
+              endTime: res.data?.user?.idCardEndTime || '',
+              reexamineTime: '',
+              positive:
+                (res.data?.workerImgs || [])
+                  .filter(item => item.type == 'ID')
+                  .map(item => ({
+                    name: item.imgName,
+                    url: item.imgUrl
+                  }))?.[0] || [],
+              negative:
+                (res.data?.workerImgs || [])
+                  .filter(item => item.type == 'ID')
+                  .map(item => ({
+                    name: item.imgName,
+                    url: item.imgUrl
+                  }))?.[1] || []
+            },
+            {
+              type: 'HIGHT',
+              number: res.data?.user?.number || '',
+              startTime: res.data?.user?.startTime || '',
+              endTime: res.data?.user?.endTime || '',
+              reexamineTime: res.data?.user?.hightExamineTime || '',
+              positive:
+                (res.data?.workerImgs || [])
+                  .filter(item => item.type == 'HIGHT')
+                  .map(item => ({
+                    name: item.imgName,
+                    url: item.imgUrl
+                  }))?.[0] || [],
+              negative:
+                (res.data?.workerImgs || [])
+                  .filter(item => item.type == 'HIGHT')
+                  .map(item => ({
+                    name: item.imgName,
+                    url: item.imgUrl
+                  }))?.[1] || []
+            }
+          ]
+        }
+        cb?.()
+      })
+    },
     // 表格操作列
     operation() {
       return this.operationBtn({
@@ -812,60 +880,9 @@ export default {
               label: '详情',
               triggerEvent: () => {
                 this.guanbi()
+                this.openType = 0
                 this.$nextTick(() => {
-                  workerManagerDetail({ id: row.id }).then(res => {
-                    this.formData = {
-                      ...res.data,
-                      user: {
-                        ...res.data.user,
-                        examineStatus_t: res.data.examineStatus
-                      },
-                      workerImgsCp: [
-                        {
-                          type: 'ID',
-                          number: res.data?.user?.idCard || '',
-                          startTime: res.data?.user?.idCardStartTime || '',
-                          endTime: res.data?.user?.idCardEndTime || '',
-                          reexamineTime: '',
-                          positive:
-                            (res.data?.workerImgs || [])
-                              .filter(item => item.type == 'ID')
-                              .map(item => ({
-                                name: item.imgName,
-                                url: item.imgUrl
-                              }))?.[0] || [],
-                          negative:
-                            (res.data?.workerImgs || [])
-                              .filter(item => item.type == 'ID')
-                              .map(item => ({
-                                name: item.imgName,
-                                url: item.imgUrl
-                              }))?.[1] || []
-                        },
-                        {
-                          type: 'HIGHT',
-                          number: res.data?.user?.number || '',
-                          startTime: res.data?.user?.startTime || '',
-                          endTime: res.data?.user?.endTime || '',
-                          reexamineTime: res.data?.user?.hightExamineTime || '',
-                          positive:
-                            (res.data?.workerImgs || [])
-                              .filter(item => item.type == 'HIGHT')
-                              .map(item => ({
-                                name: item.imgName,
-                                url: item.imgUrl
-                              }))?.[0] || [],
-                          negative:
-                            (res.data?.workerImgs || [])
-                              .filter(item => item.type == 'HIGHT')
-                              .map(item => ({
-                                name: item.imgName,
-                                url: item.imgUrl
-                              }))?.[1] || []
-                        }
-                      ]
-                    }
-                  })
+                  this.openWindows(row)
                 })
               },
               closeEvent: () => {}
@@ -878,7 +895,21 @@ export default {
           conditions: ({ row, index, column }) => {
             return ['OK', 'FAIL', 'STOP', 'QUIT'].includes(row.examineStatus)
           },
-          click: ({ row, index, column }) => {}
+          click: ({ row, index, column }) => {
+            this.$refs.tabPage.addTab({
+              activeKey: 'edit',
+              key: 'edit',
+              label: '编辑',
+              triggerEvent: () => {
+                this.guanbi()
+                this.openType = 1
+                this.$nextTick(() => {
+                  this.openWindows(row)
+                })
+              },
+              closeEvent: () => {}
+            })
+          }
         },
         // 入驻申请审核
         entryAudit: {
@@ -886,7 +917,21 @@ export default {
           conditions: ({ row, index, column }) => {
             return ['WAIT'].includes(row.examineStatus)
           },
-          click: ({ row, index, column }) => {}
+          click: ({ row, index, column }) => {
+            this.$refs.tabPage.addTab({
+              activeKey: 'entryAudit',
+              key: 'entryAudit',
+              label: '入驻申请审核',
+              triggerEvent: () => {
+                this.guanbi()
+                this.openType = 2
+                this.$nextTick(() => {
+                  this.openWindows(row)
+                })
+              },
+              closeEvent: () => {}
+            })
+          }
         },
         // 保险审核
         insuranceAudit: {
@@ -894,7 +939,21 @@ export default {
           conditions: ({ row, index, column }) => {
             return ['POLICY_WAIT'].includes(row.examineStatus)
           },
-          click: ({ row, index, column }) => {}
+          click: ({ row, index, column }) => {
+            this.$refs.tabPage.addTab({
+              activeKey: 'insuranceAudit',
+              key: 'insuranceAudit',
+              label: '保险审核',
+              triggerEvent: () => {
+                this.guanbi()
+                this.openType = 3
+                this.$nextTick(() => {
+                  this.openWindows(row)
+                })
+              },
+              closeEvent: () => {}
+            })
+          }
         },
         // 激活
         activate: {
@@ -968,48 +1027,77 @@ export default {
     guanbi() {
       this.$refs?.formRef?.$refs?.inlineForm?.clearValidate()
       this.$data.formData = this.$options.data().formData
+    },
+    getPam() {
+      return {
+        ...this.formData,
+        user: {
+          ...this.formData.user,
+          idCard: this.formData?.workerImgsCp?.find(item => item.type == 'ID')?.number,
+          idCardStartTime: this.formData?.workerImgsCp?.find(item => item.type == 'ID')?.startTime,
+          idCardEndTime: this.formData?.workerImgsCp?.find(item => item.type == 'ID')?.endTime,
+          number: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.number,
+          startTime: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.startTime,
+          endTime: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.endTime,
+          hightExamineTime: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.reexamineTime
+        },
+        workerImgs: [
+          {
+            type: 'ID',
+            imgName: '身份证正面',
+            imgUrl: this.formData?.workerImgsCp?.find(item => item.type == 'ID')?.positive?.[0]?.url || ''
+          },
+          {
+            type: 'ID',
+            imgName: '身份证反面',
+            imgUrl: this.formData?.workerImgsCp?.find(item => item.type == 'ID')?.negative?.[0]?.url || ''
+          },
+          {
+            type: 'HIGHT',
+            imgName: '高空证正面',
+            imgUrl: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.positive?.[0]?.url || ''
+          },
+          {
+            type: 'HIGHT',
+            imgName: '高空证反面',
+            imgUrl: this.formData?.workerImgsCp?.find(item => item.type == 'HIGHT')?.negative?.[0]?.url || ''
+          }
+        ]
+      }
+    },
+    submit() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          workerManagerUpdate(this.getPam()).then(res => {
+            this.$message({ type: 'success', message: `保存成功!` })
+            this.guanbi()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
+    },
+    examineWait() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          workerManagerExamineWait(this.getPam()).then(res => {
+            this.$message({ type: 'success', message: `保存成功!` })
+            this.guanbi()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
+    },
+    workerManagerExamine() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          workerManagerExamine(this.getPam()).then(res => {
+            this.$message({ type: 'success', message: `保存成功!` })
+            this.guanbi()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
     }
-    // audit(examineStatusEnum, removeTab) {
-    //   memberAudit({
-    //     userId: this.formData.userId,
-    //     websitId: this.formData.websitId,
-    //     bankAccount: this.formData.bankAccount,
-    //     workerNumber: this.formData.workerNumber,
-    //     isEs: this.formData.isEs,
-    //     idCard: this.formData.idCard,
-    //     idCardImg: this.formData.idCardImg[0].url,
-    //     name: this.formData.nickName,
-    //     examineStatus: examineStatusEnum,
-    //     examineRemark: this.formData.examineRemark,
-    //     id: this.formData.id
-    //   }).then(res => {
-    //     this.$message({ type: 'success', message: '审核成功!' })
-    //     removeTab('list')
-    //     this.$refs.pageRef.refreshList()
-    //   })
-    // },
-    // update(removeTab) {
-    //   console.log(this.formData)
-    //   return
-    //   this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
-    //     if (valid) {
-    //       update({
-    //         userId: this.formData.userId,
-    //         websitId: this.formData.websitId,
-    //         bankAccount: this.formData.bankAccount,
-    //         workerNumber: this.formData.workerNumber,
-    //         isEs: this.formData.isEs,
-    //         idCard: this.formData.idCard,
-    //         idCardImg: this.formData.idCardImg[0].url,
-    //         name: this.formData.nickName
-    //       }).then(res => {
-    //         this.$message({ type: 'success', message: '保存成功!' })
-    //         removeTab('list')
-    //         this.$refs.pageRef.refreshList()
-    //       })
-    //     }
-    //   })
-    // }
   }
 }
 </script>