Merge branch 'test' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

public/static/views/publiAccount.html

@@ -269,25 +269,24 @@
                 }else if (lockFlag == 'add') { // 查看预算跳转过来
 					$('#monthSelect').hide()
                 }
-                let r = window.top.location.href.split('?')[1];
-                if(r == 'type=2'){
-                    if(powerFlag == 1){
-                        $('#saves').hide();
-                        $('#imports').hide();
-                    }
-                    $('#monthSelect').hide();
-                }
-                if(r == 'type=3'){
-                    $('#imports').hide();
-                    $('#monthSelect').hide();
-                    $('#saves').hide();
-                }
+                // let r = window.top.location.href.split('?')[1];
+                // if(r == 'type=2'){
+                //     if(powerFlag == 1){
+                //         $('#saves').hide();
+                //         $('#imports').hide();
+                //     }
+                //     $('#monthSelect').hide();
+                // }
+                // if(r == 'type=3'){
+                //     $('#imports').hide();
+                //     $('#monthSelect').hide();
+                //     $('#saves').hide();
+                // }
                 initHandel()
             }
             // 绑定按钮事件
             function initHandel() {
                 $("#fullScreen").on("click", function () {
-					console.log(document.getElementById('container'))
                     fullScreen();
                 })
                 //退出全屏

src/pages/main/advReleaseAppro/index.vue

@@ -820,7 +820,8 @@
                             });
                             return
                         }
-                        if (this.suppinfo.surplusSum < this.allSum) {
+                        // if (this.suppinfo.surplusSum < this.allSum) {
+                        if (this.suppinfo.surplusSum < this.otherinfo.contractAdvCost) {
                             this.$message({
                                 message: '供应商剩余预算不足!',
                                 type: 'error'
@@ -836,7 +837,8 @@
                             },
                             data: {},
                         }).then((res) => {
-                            if (res.data.data[0].surplusSum < this.allSum) {
+                            // if (res.data.data[0].surplusSum < this.allSum) {
+                            if (res.data.data[0].surplusSum < this.otherinfo.contractAdvCost) {
                                 this.$message({
                                     message: '地市预算不足!',
                                     type: 'error'

src/pages/main/advertising/materialApplicationDetail.vue

@@ -353,7 +353,7 @@ export default {
                     options: []
                 }
             ],
-            tooltit: "物料申请审核",
+            tooltit: "物料申请查看",
             fullscreen: false,
             total: 0,
             pageSize: 1,

src/pages/main/advertising/materialApplicationExa.vue

@@ -601,7 +601,7 @@ export default {
                 ]
             },
             
-            tooltit: this.isBtnShow ? "物料申请审核" : "确认结果",
+            
             fullscreen: false,
             total: 0,
             pageSize: 1,
@@ -691,6 +691,7 @@ export default {
             ],
             isSupplierShow: false,
             isBtnShow: false,
+            tooltit: '',
         };
     },
     computed: {
@@ -1252,17 +1253,19 @@ export default {
             this.params.btnS = this.$route.query.btnS;
             
             // this.params.countryWoId = this.$route.query.countyWoId;
+            // tooltit: this.isBtnShow ? "确认结果" : "物料申请审核",
 
             if(this.params.btnS == 1){
                 
                 this.isBtnShow = true
                 this.params.cityWoId = this.$route.query.cityWoId;
-
+                this.tooltit = "物料申请审核"
                 
             }else if(this.params.btnS == 2){
                 //确认结果路由
                 this.isBtnShow = false;
                 this.params.cityWoId = this.$route.query.cityWoId;
+                 this.tooltit = "确认结果"
             }
             
         }

src/pages/main/advertising/materialApplicationadd.vue

@@ -292,12 +292,18 @@
                     <el-form-item prop="regionCode">
                         <span>地市名称</span>
                         <el-select
-                            @change="verifcheck"
+                            @change="verifcheck(1, $event)"
                             clearable
                             multiple
                             v-model="infolist.regionCode"
                             placeholder="地市名称"
-                        >
+                        >   
+                            <!-- <el-option
+                                label="全选"
+                                value="selAllCity"
+                            >
+                            </el-option> -->
+                            <el-checkbox v-model="isSelAllCity" @change='selectAllCity' class="checkboxStyle">全选</el-checkbox>
                             <el-option
                                 v-for="item in regionOpt"
                                 :key="item.compId"
@@ -314,8 +320,14 @@
                             v-model="infolist.countyCode"
                             placeholder="区县名称"
                             multiple
-                            @change="verifcheck(2)"
+                            @change="verifcheck(2, $event)"
                         >
+                            <!-- <el-option
+                                label="全选"
+                                value="selAllCounty"
+                            >
+                            </el-option> -->
+                            <el-checkbox v-model="isSelAllCounty" @change='selectAllCounty' class="checkboxStyle">全选</el-checkbox>
                             <el-option
                                 v-for="item in countyOpt"
                                 :key="item.compId"
@@ -333,6 +345,7 @@
                             v-model="infolist.channelCode"
                             placeholder="渠道名称"
                         >
+                            <el-checkbox v-model="isSelAllChannel" @change='selectAllChannel' class="checkboxStyle">全选</el-checkbox>
                             <el-option
                                 v-for="(items, index) in channelOpt"
                                 :key="index"
@@ -676,6 +689,10 @@ export default {
             list: {},
             companyFlag: "",
             // approvalDirection: 1,
+            //地市,区县,渠道 是否全选
+            isSelAllCity: false,
+            isSelAllCounty: false,
+            isSelAllChannel: false
         };
     },
     computed: {
@@ -776,13 +793,81 @@ export default {
         //         this.infolist.channelName = "";
         //     }
         // },
-        verifcheck(v) {
-            if (v == 2) {
-                // for (let i = 0; i < this.countyOpt.length; i++) {
-                //     if (this.countyOpt[i].compId === this.infolist.countyCode) {
-                //         this.infolist.countyCode = this.countyOpt[i].compName;
-                //     }
-                // }
+        selectAllCity(){
+            this.infolist.regionCode = []
+            if(this.isSelAllCity){
+                this.regionOpt.map(item=>{
+                    this.infolist.regionCode.push(item.compId)
+                })
+                let countyOpt2 = [];
+                for (let i = 0; i < this.regionOpt.length; i++) {
+                    for (let j = 0; j < this.infolist.regionCode.length; j++) {
+                        if (
+                            this.regionOpt[i].compId ===
+                            this.infolist.regionCode[j]
+                        ) {
+                            this.infolist.regionName = this.regionOpt[i].compName;
+                            this.$http({
+                                url: "/sysmgr/regionComp/queryList",
+                                method: "post",
+                                headers: {
+                                    "Content-Type": "application/json"
+                                },
+                                data: {
+                                    parentCompId: this.regionOpt[i].compId
+                                }
+                            }).then(res => {
+                                countyOpt2 = countyOpt2.concat(res.data);
+                                this.countyOpt = countyOpt2;
+                                
+                            });
+                        }
+                    }
+                }
+            }else{
+                this.infolist.regionCode = []
+                this.countyOpt = [];
+            }
+        },
+        selectAllCounty(){
+            this.infolist.countyCode = []
+            if(this.isSelAllCounty){
+                this.countyOpt.map(item=>{
+                    this.infolist.countyCode.push(item.compId)
+                })
+                this.$http({
+                    url: "/market/cadvBusiMetirial/queryChannel",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    data: this.infolist.countyCode
+                }).then(res => {
+                    this.channelOpt = res.data;
+                });
+            }else{
+                this.infolist.countyCode = []
+                this.channelOpt = [];
+            }
+        },
+        selectAllChannel(){
+            this.infolist.channelCode = []
+            if(this.isSelAllChannel){
+                this.channelOpt.map(item=>{
+                    this.infolist.channelCode.push(item.channel_code)
+                })
+            }else{
+                this.infolist.channelCode = []
+            }
+        },
+        verifcheck(v, ev) {
+           if (v == 2) {
+                if(ev.length === this.countyOpt.length){
+                    this.isSelAllCounty = true
+                }else{
+                    this.isSelAllCounty = false
+                    
+                }
                 this.$http({
                     url: "/market/cadvBusiMetirial/queryChannel",
                     method: "post",
@@ -794,7 +879,15 @@ export default {
                     this.channelOpt = res.data;
                 });
             } else {
+
                 this.infolist.countyCode = [];
+                
+                if(ev.length === this.regionOpt.length){
+                    this.isSelAllCity = true
+                }else{
+                    this.isSelAllCity = false
+                    this.countyOpt = [];
+                }
                 let countyOpt2 = [];
                 for (let i = 0; i < this.regionOpt.length; i++) {
                     for (let j = 0; j < this.infolist.regionCode.length; j++) {
@@ -802,9 +895,7 @@ export default {
                             this.regionOpt[i].compId ===
                             this.infolist.regionCode[j]
                         ) {
-                            this.infolist.regionName = this.regionOpt[
-                                i
-                            ].compName;
+                            this.infolist.regionName = this.regionOpt[i].compName;
                             this.$http({
                                 url: "/sysmgr/regionComp/queryList",
                                 method: "post",
@@ -817,10 +908,13 @@ export default {
                             }).then(res => {
                                 countyOpt2 = countyOpt2.concat(res.data);
                                 this.countyOpt = countyOpt2;
+                                
                             });
                         }
                     }
                 }
+                
+                
             }
         },
         //获取物料类型
@@ -1514,4 +1608,10 @@ export default {
         margin-bottom: 5px;
     }
 }
+.checkboxStyle{
+    padding: 0 20px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+}
 </style>

src/pages/main/memberFamily/empInfoFilling.vue

@@ -41,7 +41,7 @@
                 <el-table class="com-table" ref="multipleTable" :data="infodata" tooltip-effect="dark" size="small"
                     border style="width: 100%">
 
-                    <el-table-column prop="memberRelation" label="成员关系" width="200">
+                    <el-table-column prop="memberRelation" label="成员关系">
                         <template slot-scope="scope">
                             <el-select clearable v-model="scope.row.memberRelation" :disabled="disableStatus">
                                 <el-option v-for="items in relationopt" :key="items.dataCode" :label="items.dataName"
@@ -50,19 +50,19 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="memberName" label="成员姓名" width="200">
+                    <el-table-column prop="memberName" label="成员姓名">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.memberName" :disabled="disableStatus"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="bornDate" label="成员出生日期" width="250">
+                    <!-- <el-table-column prop="bornDate" label="成员出生日期" width="250" >
                         <template slot-scope="scope">
                             <el-date-picker v-model="scope.row.bornDate" type="date"
-                                :disabled="disableStatus">
+                                disabled>
                                 </el-date-picker>
                         </template>
-                    </el-table-column>
-                    <el-table-column prop="memberSex" label="成员性别" width="200">
+                    </el-table-column> -->
+                    <el-table-column prop="memberSex" label="成员性别">
                         <template slot-scope="scope">
                             <el-select clearable v-model="scope.row.memberSex" :disabled="disableStatus">
                                 <el-option v-for="items in sexopt" :key="items.dataCode" :label="items.dataName"
@@ -71,14 +71,14 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="idCard" label="成员身份证号" width="200">
+                    <el-table-column prop="idCard" label="成员身份证号">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.idCard" :disabled="disableStatus" @change="sfzyz(scope.row)"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="memberEdu" label="成员学历" width="200">eduBack
+                    <!-- <el-table-column prop="memberEdu" label="成员学历" width="200">eduBack
                         <template slot-scope="scope">
-                            <el-select clearable v-model="scope.row.memberEdu" :disabled="disableStatus">
+                            <el-select clearable v-model="scope.row.memberEdu" disabled>
                                 <el-option v-for="items in eduBackopt" :key="items.dataCode" :label="items.dataName"
                                     :value="items.dataCode">
                                 </el-option>
@@ -87,7 +87,7 @@
                     </el-table-column>
                     <el-table-column prop="partyGroup" label="成员政治面貌" width="200">
                         <template slot-scope="scope">
-                            <el-select clearable v-model="scope.row.partyGroup" :disabled="disableStatus">
+                            <el-select clearable v-model="scope.row.partyGroup" disabled>
                                 <el-option v-for="items in partyGroupopt" :key="items.dataCode" :label="items.dataName"
                                     :value="items.dataCode">
                                 </el-option>
@@ -96,7 +96,7 @@
                     </el-table-column>
                     <el-table-column prop="memberNation" label="成员民族信息" width="200">
                         <template slot-scope="scope">
-                            <el-select clearable v-model="scope.row.memberNation" :disabled="disableStatus">
+                            <el-select clearable v-model="scope.row.memberNation" disabled>
                                 <el-option v-for="items in nationopt" :key="items.dataCode" :label="items.dataName"
                                     :value="items.dataCode">
                                 </el-option>
@@ -105,42 +105,42 @@
                     </el-table-column>
                     <el-table-column prop="workUnit" label="成员工作单位" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.workUnit" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.workUnit" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="workDuty" label="成员职位职务" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.workDuty" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.workDuty" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="emerContact" label="是否为紧急联系人" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.emerContact" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.emerContact" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="memberTel" label="成员联系电话" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.memberTel" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.memberTel" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="interiorStaff" label="是否移动系统内工作" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.interiorStaff" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.interiorStaff" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="staffName" label="系统内员工职务" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.staffName" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.staffName" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="isMove" label="是否移居海外" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.isMove" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.isMove" disabled></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="immiType" label="移居类型" width="200">
                         <template slot-scope="scope">
-                            <el-select clearable v-model="scope.row.immiType" :disabled="disableStatus">
+                            <el-select clearable v-model="scope.row.immiType" disabled>
                                 <el-option v-for="items in immiTypeopt" :key="items.dataCode" :label="items.dataName"
                                     :value="items.dataCode">
                                 </el-option>
@@ -149,10 +149,10 @@
                     </el-table-column>
                     <el-table-column prop="memberAddress" label="成员联系地址" width="200">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.memberAddress" :disabled="disableStatus"></el-input>
+                            <el-input v-model="scope.row.memberAddress" disabled></el-input>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120px" align="center" v-if="!disableStatus" fixed="right">
+                    </el-table-column> -->
+                    <el-table-column label="操作" align="center" v-if="!disableStatus">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary" @click="choline(1,scope)" v-if="!scope.row.id">添加
                             </el-button>
@@ -273,13 +273,13 @@
                     });
                     return
                 }
-                if(!n.row.bornDate){
-                    this.$message({
-                        message: '请填写成员出生日期',
-                        type: 'error'
-                    });
-                    return
-                }
+                // if(!n.row.bornDate){
+                //     this.$message({
+                //         message: '请填写成员出生日期',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
                 
                 if(!n.row.memberSex){
                     this.$message({
@@ -295,48 +295,48 @@
                     });
                     return
                 }
-                if(!n.row.partyGroup){
-                    this.$message({
-                        message: '请填写成员政治面貌',
-                        type: 'error'
-                    });
-                    return
-                }
-                if(!n.row.workUnit){
-                    this.$message({
-                        message: '请填写成员工作单位',
-                        type: 'error'
-                    });
-                    return
-                }
-                if(!n.row.memberTel){
-                    this.$message({
-                        message: '请填写成员联系电话',
-                        type: 'error'
-                    });
-                    return
-                }
-                if(!n.row.memberAddress){
-                    this.$message({
-                        message: '请填写成员联系地址',
-                        type: 'error'
-                    });
-                    return
-                }
-                if(!n.row.interiorStaff){
-                    this.$message({
-                        message: '请填写是否移动系统内工作',
-                        type: 'error'
-                    });
-                    return
-                }
-                if(!n.row.staffName){
-                    this.$message({
-                        message: '请填写系统内员工职务',
-                        type: 'error'
-                    });
-                    return
-                }
+                // if(!n.row.partyGroup){
+                //     this.$message({
+                //         message: '请填写成员政治面貌',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
+                // if(!n.row.workUnit){
+                //     this.$message({
+                //         message: '请填写成员工作单位',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
+                // if(!n.row.memberTel){
+                //     this.$message({
+                //         message: '请填写成员联系电话',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
+                // if(!n.row.memberAddress){
+                //     this.$message({
+                //         message: '请填写成员联系地址',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
+                // if(!n.row.interiorStaff){
+                //     this.$message({
+                //         message: '请填写是否移动系统内工作',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
+                // if(!n.row.staffName){
+                //     this.$message({
+                //         message: '请填写系统内员工职务',
+                //         type: 'error'
+                //     });
+                //     return
+                // }
                 this.$http({
                     url: url,
                     method: "post",

src/pages/main/memberFamily/employeeInfo.vue

@@ -11,12 +11,12 @@
                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading" >
 				<!-- 	<el-table-column type="selection" width="55">
 					</el-table-column> -->
-                    <el-table-column prop="regionName" label="地市公司名称">
+                    <!-- <el-table-column prop="regionName" label="地市公司名称">
                     </el-table-column>
                     <el-table-column prop="areaName" label="区县名称">
-                    </el-table-column>
-					<el-table-column prop="fillName" label="员工姓名">
-                    </el-table-column>
+                    </el-table-column> -->
+					<!-- <el-table-column prop="fillName" label="员工姓名">
+                    </el-table-column> -->
 					<el-table-column prop="memberName" label="成员姓名">
                         <template slot-scope="scope">
                            {{$desensitization(scope.row.memberName,1)}}
@@ -24,8 +24,8 @@
                     </el-table-column>
 					<el-table-column prop="memberRelation" label="成员关系">
 					</el-table-column>
-					<el-table-column prop="bornDate" label="成员出生日期">
-                    </el-table-column>
+					<!-- <el-table-column prop="bornDate" label="成员出生日期">
+                    </el-table-column> -->
                     <el-table-column prop="memberSex" label="成员性别">
                     </el-table-column>
 					<el-table-column prop="idCard" label="成员身份证号">
@@ -33,7 +33,7 @@
                            {{$desensitization(scope.row.idCard,3)}}
                         </template>
                     </el-table-column>
-					<el-table-column prop="memberEdu" label="成员学历">
+					<!-- <el-table-column prop="memberEdu" label="成员学历">
                     </el-table-column>
 					<el-table-column prop="partyGroup" label="成员政治面貌">
 					</el-table-column>
@@ -59,7 +59,7 @@
 					<el-table-column prop="immiType" label="移居类型">
 					</el-table-column>
 					<el-table-column prop="memberAddress" label="成员联系地址">
-					</el-table-column>
+					</el-table-column> -->
                 </el-table>
                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
                     :total="total">