bug

MrShi

2025-01-12 8932133e2ee2e5708e3506bee3d01d59bff5f1d2

bug

 company/.env.development

@@ -12,4 +12,4 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'

# ä»»åº·
VUE_APP_API = 'http://192.168.0.162:10030/'
VUE_APP_API = 'http://192.168.0.137:10030/'

 company/.env.developmentCom

@@ -9,6 +9,6 @@

# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'

VUE_APP_API = 'http://192.168.0.162:10031/'
VUE_APP_API = 'http://192.168.0.137:10031/'

# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

 company/.env.developmentShop

@@ -6,9 +6,9 @@
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-商户端'
VUE_APP_CONTEXT_PATH = '/yyb_shop'
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'

# VUE_APP_API = 'http://192.168.0.162:10032/'
VUE_APP_API = 'http://192.168.0.137:10032/'

#VUE_APP_API = 'http://localhost:10032/'


 company/src/api/business/member.js

@@ -12,6 +12,11 @@
    return request.post('/business/member/create', data)
}

// ä¿®æ”¹
export function updateById (data) {
    return request.post('/business/member/updateById', data)
}

// æ•°æ®åˆ—表
export function findListByDTO (data) {
    return request.post('/business/member/findListByDTO', data)

 company/src/components/business/EditMemberWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
<template>
    <GlobalWindow
        :title="title"
        width="40%"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm"
    >
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="员工名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入员工名称" v-trim/>
            </el-form-item>
        </el-form>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'EditMemberWindow',
    extends: BaseOpera,
    components: { GlobalWindow },
    data () {
      return {
        // è¡¨å•æ•°æ®
        form: {
          id: null,
          name: ''
        },
        // éªŒè¯è§„则
        rules: {
          name: [
            { required: true, message: '请输入合同名称' }
          ]
        }
      }
    },
    created () {
      this.config({
        api: '/business/member',
        'field.id': 'id'
      })
    },
    methods: {
      open (title, target) {
        this.title = title
        this.visible = true
        // ç¼–辑
        this.$nextTick(() => {
          for (const key in this.form) {
            this.form[key] = target[key]
          }
        })
      }
    }
  }
</script>

 company/src/components/business/OperaCompanyUserApplyWindow.vue

@@ -22,9 +22,10 @@
                    v-model="form.companyIds"
                    multiple
                    filterable
                    :filter-method="customFilterMethod"
                    placeholder="请选择">
                    <el-option
                        v-for="item in company"
                        v-for="item in searchCompany"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id">
@@ -80,7 +81,8 @@
        },
        account: [],
        fileList: [],
        company: []
        company: [],
        searchCompany: []
      }
    },
    created () {
@@ -90,6 +92,9 @@
      })
    },
    methods: {
        customFilterMethod(query) {
            this.searchCompany = this.company.filter(item => item.name === query)
        },
      __confirmCreate () {
        this.$refs.form.validate((valid) => {
          if (!valid) {

 company/src/components/business/OperaSolutionsBaseWindow.vue

@@ -87,46 +87,45 @@
                    placeholder="请选择批改提醒时间">
                </el-time-picker>
            </el-form-item>
            <div style="display: flex; align-items: center;">
                <el-button type="primary" @click="add" style="margin-bottom: 10px;">添加工种</el-button>
                <el-button type="primary" @click="impor" style="margin-bottom: 10px;">导入工种</el-button>
                <el-button type="text" @click="exprot">导入模版xls</el-button>
            <div style="width: 100%; padding: 10px; box-sizing: border-box; border: 1px solid #ececec;">
                <div style="display: flex; align-items: center; margin-bottom: 10px;">
                    <el-select filterable multiple style="width: 800px;" v-model="worktypeId" placeholder="请选择">
                        <el-option
                            v-for="item in typeWorkCopy"
                            :key="item.id"
                            :label="item.name"
                            :value="item.id">
                        </el-option>
                    </el-select>
                    <el-button type="primary" @click="add" :disabled="worktypeId.length === 0" style="margin-left: 10px;">添加工种</el-button>
                    <el-button type="primary" @click="impor">导入工种</el-button>
                    <el-button type="text" @click="exprot">导入模版xls</el-button>
                </div>
                <u-table
                    :data="form.worktypeIdList"
                    border
                    use-virtual
                    style="width: 100%; margin-bottom: 20px;">
                    <u-table-column
                        label="序号"
                        width="80">
                        <template slot-scope="scope">
                            <span>{{scope.$index + 1}}</span>
                        </template>
                    </u-table-column>
                    <u-table-column
                        prop="worktypeName"
                        label="所属工种">
                    </u-table-column>
                    <u-table-column
                        label="操作"
                        width="100">
                        <template slot-scope="scope">
                            <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">删除</el-button>
                        </template>
                    </u-table-column>
                </u-table>
            </div>
            <el-table
                :data="form.worktypeIdList"
                border
                style="width: 100%; margin-bottom: 20px;">
                <el-table-column
                    label="序号"
                    align="center"
                    width="80">
                    <template slot-scope="scope">
                        <span>{{scope.$index + 1}}</span>
                    </template>
                </el-table-column>
                <el-table-column
                    align="center"
                    label="所属工种">
                    <template slot-scope="{row}">
                        <el-select filterable v-model="row.worktypeId" placeholder="请选择">
                            <el-option
                                v-for="item in typeWork"
                                :key="item.id"
                                :label="item.name"
                                :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column
                    label="操作"
                    align="center"
                    width="100">
                    <template slot-scope="scope">
                        <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <el-form-item label="特别约定" prop="specialAgreement">
                <RichEditor :richData="form.specialAgreement" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor" :readonly="false"/>
            </el-form-item>
@@ -152,10 +151,11 @@
  import UploadFile from '@/components/common/UploadFile'
  import { numRule } from '@/utils/form'
  import RichEditor from '@/components/common/RichEditor'
  import { UTable, UTableColumn } from 'umy-ui'
  export default {
    name: 'OperaSolutionsBaseWindow',
    extends: BaseOpera,
    components: { GlobalWindow, UploadFile, RichEditor },
    components: { GlobalWindow, UploadFile, RichEditor, UTable, UTableColumn },
    data () {
      var validType = (rule, value, callback) => {
        if (this.form.validType === 0 && !value) {
@@ -192,8 +192,9 @@
          delOnlyReplace: 0,
          canAdd: 0,
          correctWarnTime: '',
          worktypeIdList: [{ worktypeId: '' }]
          worktypeIdList: []
        },
        worktypeId: [],
        // éªŒè¯è§„则
        rules: {
          name: [
@@ -229,7 +230,8 @@
        },
        shops: [],
        company: [],
        typeWork: []
        typeWork: [],
        typeWorkCopy: []
      }
    },
    created () {
@@ -246,14 +248,13 @@
        formdate.append('insuranceId', this.form.insuranceId)
        importExcelForSolution(formdate)
          .then(res => {
            console.log(res)
            res.forEach(id => {
              if (this.form.worktypeIdList.length === 1 && !this.form.worktypeIdList[0].worktypeId) {
                this.form.worktypeIdList[0].worktypeId = id
              } else {
                this.form.worktypeIdList.push({ worktypeId: id })
              }
            let arr = []
            res.forEach(item => {
              arr.push({ worktypeId: item.id, worktypeName: item.name })
            })
            this.form.worktypeIdList = [...arr, ...this.form.worktypeIdList]
            let valData = this.form.worktypeIdList.map(item => item.worktypeName)
            this.typeWorkCopy = this.typeWorkCopy.filter(item => !valData.includes(item.name))
          })
          .catch(err => {
            this.$message.error(err.message)
@@ -263,7 +264,7 @@
          })
      },
      impor() {
        if (!this.form.insuranceId) return this.$message.warning('请先选择企业')
        if (!this.form.insuranceId) return this.$message.warning('请先选择保险公司')
        this.$refs.upload.click()
      },
      // å¯¼å‡ºæ¨¡æ¿
@@ -302,7 +303,7 @@
      },
      // åˆ‡æ¢å…¬å¸
      getAllWorktype1 () {
        this.form.worktypeIdList = [{ worktypeId: '' }]
        this.form.worktypeIdList = []
        this.getAllWorktype()
      },
      changeValidType(e) {
@@ -362,7 +363,9 @@
        this.form.delOnlyReplace = 0
        this.form.delValidDays = 0
        this.form.canAdd = 0
        this.form.worktypeIdList = [{ worktypeId: '' }]
        this.form.worktypeIdList = []
        this.typeWork = []
        this.typeWorkCopy = []
        // this.$refs['$upload'].clearFiles()//初始化导入组件
        this.allCompany()
        this.allShops()
@@ -373,7 +376,7 @@
            this.form.maxAge = ''
            this.form.validTypeNum = ''
            this.form.fanganFile = null
            this.form.worktypeIdList = [{ worktypeId: '' }]
            this.form.worktypeIdList = []
            this.form[this.configData['field.id']] = null
          })
          return
@@ -389,7 +392,8 @@
              if (res.worktypeList) {
                this.form.worktypeIdList = res.worktypeList.map(item => {
                  return {
                    worktypeId: item.worktypeId
                    worktypeId: item.worktypeId,
                    worktypeName: item.worktypeName
                  }
                })
              }
@@ -400,9 +404,16 @@
      // æŸ¥è¯¢ä¿é™©å…¬å¸ä¸‹å…¨éƒ¨å·¥ç§
      getAllWorktype () {
        allWorktype({
          insuranceId: this.form.insuranceId
          insuranceId: this.form.insuranceId,
          dataType: 2
        }).then(res => {
          this.typeWork = res
            this.typeWork = res
            if (!this.form.id) {
                this.typeWorkCopy = res
            } else {
                let valData = this.form.worktypeIdList.map(item => item.worktypeName)
                this.typeWorkCopy = res.filter(item => !valData.includes(item.name))
            }
        })
      },

@@ -410,25 +421,35 @@
      allCompany () {
        all({ dataType: 2, status: 0 })
          .then(res => {
            console.log(res)
            this.company = res
          })
      },
      allShops () {
        shopList({ type: 1, status: 0 })
          .then(res => {
            console.log(res)
            this.shops = res
          })
      },
      add () {
        this.form.worktypeIdList.push({ worktypeId: '' })
          let arr = this.typeWorkCopy.filter(item => this.worktypeId.includes(item.id))
          let dataVal = arr.map(item => {
              return {
                  worktypeId: item.id,
                  worktypeName: item.name
              }
          })
          this.form.worktypeIdList = [ ...dataVal, ...this.form.worktypeIdList ]
          let valData = this.form.worktypeIdList.map(item => item.worktypeName)
          this.typeWorkCopy = this.typeWorkCopy.filter(item => !valData.includes(item.name))
          this.worktypeId = []
      },
      dele (index) {
        if (this.form.worktypeIdList.length === 1) {
          this.$message.warning('至少要保留一项')
          return
        }
        let row = this.typeWork.filter(item => item.name === this.form.worktypeIdList[index].worktypeName)
        this.typeWorkCopy.unshift(row[0])
        this.form.worktypeIdList.splice(index, 1)
      }
    }

 company/src/components/business/detailsEntrustedInsurance.vue

@@ -202,7 +202,7 @@
              <template slot-scope="{row}">
                <span v-if="row.applyStatus === 0" style="color: #00BA92;">保障中</span>
                <span v-if="row.applyStatus === 1" style="color: #999;">不在保</span>
                <span v-if="row.applyStatus === 2" style="color: #00BA92;">待生效</span>
                <span v-if="row.applyStatus === 2" style="color: #f95601;">待生效</span>
              </template>
            </el-table-column>
            <el-table-column

 company/src/components/enterprise/OperaDispatchUnitWindow.vue

@@ -51,7 +51,7 @@
                            prop="name"
                            label="所属工种">
                            <template slot-scope="scope">
                                <el-select v-model="scope.row.workTypeId" @change="changeGZ($event, index, scope.$index)" placeholder="请选择">
                                <el-select v-model="scope.row.workTypeId" filterable @change="changeGZ($event, index, scope.$index)" placeholder="请选择">
                                    <el-option
                                        v-for="item in item.typeWork"
                                        :key="item.id"

 company/src/views/business/member.vue

@@ -96,6 +96,7 @@
                     fixed="right"
                     min-width="120px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.editMemberWindow.open('编辑', row)" v-if="userInfo.type === 0">编辑</el-button>
                        <el-button type="text" @click="$refs.insuranceRecords.open('投保记录', row)">投保记录</el-button>
                    </template>
                </el-table-column>
@@ -109,6 +110,8 @@
        </template>
        <!-- æ–°å»º/修改 -->
        <OperaMemberWindow ref="operaMemberWindow" @success="handlePageChange" />
        <!--    ç¼–辑    -->
        <EditMemberWindow ref="editMemberWindow" @success="handlePageChange" />
        <!--    æŠ•ä¿è®°å½•    -->
        <insuranceRecords ref="insuranceRecords" @success="handlePageChange" />
    </TableLayout>
@@ -119,6 +122,7 @@
    import TableLayout from '@/layouts/TableLayout'
    import Pagination from '@/components/common/Pagination'
    import OperaMemberWindow from '@/components/business/OperaMemberWindow'
    import EditMemberWindow from '@/components/business/EditMemberWindow'
    import insuranceRecords from '@/components/enterprise/insuranceRecords'
    import { all } from '@/api/business/solutions'
    import { findListByDTO } from '@/api/business/dispatchUnit'
@@ -128,7 +132,7 @@
    export default {
        name: 'Member',
        extends: BaseTable,
        components: { TableLayout, Pagination, OperaMemberWindow, insuranceRecords },
        components: { TableLayout, Pagination, OperaMemberWindow, EditMemberWindow, insuranceRecords },
        data () {
            return {
                // æœç´¢