Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-10-28 68bffb1927df90548f7674f4a9e0f3e8c26a7f1f

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

 company/.env

@@ -5,8 +5,8 @@

# 项目上下文路径
VUE_APP_CONTEXT_PATH = '/yyb_admin'
VUE_APP_CONTEXT_PATH = '/yyb_web'
VUE_APP_CONTEXT_PATH = '/yyb_shop'
# VUE_APP_CONTEXT_PATH = '/yyb_web'
# VUE_APP_CONTEXT_PATH = '/yyb_shop'

# 接口前缀
VUE_APP_API_PREFIX = '/api'

 company/.env.development

@@ -2,13 +2,13 @@
NODE_ENV = 'development'

# 接口前缀
# VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-平台端'

VUE_APP_COOKIE_NAME='dmplat-auth-token'

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

VUE_APP_API = 'http://localhost:10030/'
#VUE_APP_API = 'http://192.168.0.135:10030/'
#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
# VUE_APP_API = 'http://localhost:10030/'
# VUE_APP_API = 'http://192.168.0.135:10030/'
# VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'

 company/package-lock.json

@@ -1871,63 +1871,6 @@
          "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
          "dev": true
        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "ssri": {
          "version": "8.0.1",
          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1935,28 +1878,6 @@
          "dev": true,
          "requires": {
            "minipass": "^3.1.1"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        },
        "vue-loader-v16": {
          "version": "npm:vue-loader@16.8.3",
          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
          "dev": true,
          "optional": true,
          "requires": {
            "chalk": "^4.1.0",
            "hash-sum": "^2.0.0",
            "loader-utils": "^2.0.0"
          }
        }
      }
@@ -13742,6 +13663,87 @@
        }
      }
    },
    "vue-loader-v16": {
      "version": "npm:vue-loader@16.8.3",
      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
      "dev": true,
      "optional": true,
      "requires": {
        "chalk": "^4.1.0",
        "hash-sum": "^2.0.0",
        "loader-utils": "^2.0.0"
      },
      "dependencies": {
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        }
      }
    },
    "vue-pdf": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",

 company/src/components/common/tagsview.vue

@@ -15,8 +15,8 @@
        <!-- 这个地方一定要click加个stop阻止，不然会因为事件冒泡一直触发父元素的点击事件，无法跳转另一个路由 -->
        <span v-if="tags.length > 1" class="el-icon-close tagsicon" @click.stop="handleClose(item,index)"></span>
         <ul v-show="visible" class="contextmenu" :style="{left:left+'px',top:top+'px'}">
<!--          <li @click.stop="rightClose()">关闭</li>-->
<!--          <li @click.stop="cleartags($route.path)">全部关闭</li>-->
          <li @click.stop="rightClose()">关闭</li>
          <li @click.stop="cleartags($route.path)">全部关闭</li>
          <li @click.stop="cleartags()">关闭其他</li>
        </ul>
      </div>
@@ -250,7 +250,7 @@
  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
  li {
    margin: 0;
    padding: 7px 16px;
    padding: 0 16px;
    cursor: pointer;
    &:hover {
      background: #eee;

 company/src/store/index.js

@@ -48,11 +48,16 @@
  },
  //  tags
  pushtags(state,val){
    //如果等于-1说明tabs不存在那么插入，否则什么都不做
    //findindex找角标，循环判断一下，如果等于那么就代表有相同的，就不必添加，如果找不到那就是-1.就添加
    // 如果等于-1说明tabs不存在那么插入，否则什么都不做
    // findindex找角标，循环判断一下，如果等于那么就代表有相同的，就不必添加，如果找不到那就是-1.就添加
    let result = state.tags.findIndex(item => item.label === val.label)
    if (result === -1) {
      state.tags.push({...val, keepAlive: false})
      if (state.tags.length === 5) {
        state.tags.shift();
        state.tags.push({...val, keepAlive: false})
      } else {
        state.tags.push({...val, keepAlive: false})
      }
    } else {
      state.tags[result]= {...val, keepAlive: true}
    }

 company/src/views/business/applyChange.vue

@@ -15,7 +15,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
              :key="item.id"
@@ -25,7 +25,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionsId">
        <el-select v-model="searchForm.baseSolutionsId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
              :key="item.baseId"

 company/src/views/business/applyChangeShop.vue

@@ -16,7 +16,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
              :key="item.id"
@@ -26,7 +26,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionsId">
        <el-select v-model="searchForm.baseSolutionsId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
              :key="item.baseId"

 company/src/views/business/dispatchUnitReview.vue

@@ -3,7 +3,7 @@
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
          <el-form-item label="所属企业" prop="companyId">
            <el-select v-model="searchForm.companyId"  placeholder="请选择" @change="search">
            <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
              <el-option
                  v-for="item in companyList"
                  :key="item.id"

 company/src/views/business/insuranceApply.vue

@@ -15,7 +15,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in companyList"
                        :key="item.id"
@@ -25,7 +25,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="保险方案" prop="baseSolutionId">
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.baseSolutionId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.baseId"

 company/src/views/business/insuranceApplyShop.vue

@@ -15,7 +15,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in companyList"
                        :key="item.id"
@@ -25,7 +25,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="保险方案" prop="baseSolutionId">
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.baseSolutionId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.baseId"

 company/src/views/business/member.vue

@@ -9,7 +9,7 @@
                <el-input v-model="searchForm.idcardNo" placeholder="请输入" maxlength="18" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="保险方案" prop="solutionsId">
                <el-select v-model="searchForm.solutionsId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.solutionsId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutions"
                        :key="item.baseId"
@@ -25,7 +25,7 @@
                </el-select>
            </el-form-item>
            <el-form-item  v-if="userInfo.type === 0" label="所属企业" prop="companyId">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="(item, index) in companyList"
                        :key="index"

 company/src/views/business/settleClaims.vue

@@ -9,7 +9,7 @@
                <el-input v-model="searchForm.memberIdcardNo" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="报案单位" prop="companyId" v-if="userInfo.type === 0">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in companyList"
                        :key="item.id"
@@ -19,7 +19,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="保险方案" prop="baseSolutionId">
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.baseSolutionId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.baseId"

 company/src/views/business/switchCourt.vue

@@ -15,7 +15,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
              :key="item.id"
@@ -25,7 +25,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionsId">
        <el-select v-model="searchForm.baseSolutionsId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
              :key="item.baseId"

 company/src/views/business/switchCourtShop.vue

@@ -17,7 +17,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
              :key="item.id"
@@ -27,7 +27,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionsId">
        <el-select v-model="searchForm.baseSolutionsId" placeholder="请选择" @change="search">
        <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
              :key="item.baseId"

 company/src/views/business/taxes.vue

@@ -22,7 +22,7 @@
                </el-date-picker>
            </el-form-item>
            <el-form-item label="申请开票企业" prop="companyId" v-if="userInfo.type === 0">
              <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
              <el-select v-model="searchForm.companyId" filterable placeholder="请选择" @change="search">
                <el-option
                    v-for="item in companyList"
                    :key="item.id"

 company/src/views/business/unionApply.vue

@@ -12,7 +12,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="保险方案" prop="solutionId">
                <el-select v-model="searchForm.solutionId" clearable  placeholder="请选择" @change="search">
                <el-select v-model="searchForm.solutionId" filterable clearable  placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.id"