commit

src/main/resources/views/platform/welfare/userChoose.html

@@ -107,8 +107,8 @@ layout("/layouts/platform.html"){
                         </template>
 
                         <template scope="{row}" v-else-if="column.prop=='isChoose'">
-                            <span v-if="row.isChoose"><el-tag type="success">已选择</el-tag></span>
-                            <span v-else><el-tag type="warning">未选择</el-tag></span>
+                            <span v-if="row.isChoose" class="text-primary">已选择</span>
+                            <span class="text-danger" v-else>未选择</span>
                         </template>
 
                         <template scope="{row}" v-else-if="column.prop=='gist_list'">
@@ -227,7 +227,7 @@ layout("/layouts/platform.html"){
                                                     fit="contain"
                                             ></el-image>
                                             <div style="width:calc(100% - 150px);padding-left: 20px;position: relative">
-                                                <!--<div style="white-space: nowrap;display: flex">
+                                                <div style="white-space: nowrap;display: flex">
                                                     <span class="desc_label">服务专线</span>
                                                     <el-tooltip placement="top" :content="option.supplier">
                                                         <span class="desc_value"
@@ -235,7 +235,7 @@ layout("/layouts/platform.html"){
                                                             {{option.supplier}}
                                                         </span>
                                                     </el-tooltip>
-                                                </div>-->
+                                                </div>
                                                 <div v-if="option.simpleDesc">
                                                     <span class="desc_label">备&emsp;&emsp;注</span>
                                                     <span class="desc_value">
@@ -430,8 +430,6 @@ layout("/layouts/platform.html"){
     </el-dialog>
 
 </div>
-
-<script src="${base!}/assets/platform/js/chengSh.js"></script>
 <script>
     const vue = new Vue({
         el: '#app',
@@ -680,24 +678,7 @@ layout("/layouts/platform.html"){
                 this.descData = val.description
                 this.descDialogVisible = true
             },
-            parseJSONOnce(jsonString){
-                try {
-                    // 尝试解析JSON字符串
-                    return JSON.parse(jsonString);
-                } catch (error) {
-                    // 如果解析失败，打印错误信息
-                    console.error("Invalid JSON format:", error.message);
-                }
-            },
             async openChoose(row) {
-                if(row.isAnnualFestival){
-                    const unionIdList = this.parseJSONOnce(row.unionIdList)
-                    if (!unionIdList.includes(row.welfareUnitId)){
-                        this.$message.warning('您不在选择范围内，系统已为您默认选择完毕，可将鼠标移动到左侧所属福利列表，查看选取详情')
-                        return
-                    }
-                }
-
                 this.isView = false
                 if (this.confirmButtonInfo(row).disabled) {
                     this.$message.warning("当前时间段无法选择")