02111000

src/components/Finance/DailyFeeedit.vue

@@ -31,6 +31,16 @@
                         <el-option v-for="(item,index) in nameset" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item v-if="ruleForm.type==104" label="关联团组:" prop="groupId" label-width="85px">
+                    <el-select v-model="ruleForm.groupId" filterable placeholder="请选择">
+                        <el-option
+                          v-for="item in grouplist"
+                          :key="item.id"
+                          :label="item.groupName"
+                          :value="item.id">
+                        </el-option>
+                      </el-select>
+                </el-form-item>
                 <el-form-item label="申请公司:" prop="company" label-width="85px">
                     <el-select :disabled="thesame" v-model="ruleForm.company" placeholder="请选择申请公司">
                         <el-option v-for="(item,index) in companyset" :key="index" :label="item.companyName" :value="item.id"></el-option>
@@ -93,6 +103,7 @@ export default {
         return{
             editid:'',
             userid:'',
+            grouplist:[],
             token:'',
             banned:true,
             bannedtype:true,
@@ -101,6 +112,7 @@ export default {
                 transferation:'',
                 identification: '',
                 type: '',
+                groupId:'',
                 name: '',
                 company: '',
                 desc:''
@@ -233,16 +245,34 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                     that.Transferlogo=res.data.data.feeMarkTypeData;
                     that.feeMarkSubTypeData=res.data.data.feeMarkSubTypeData;
                     that.typeset=res.data.data.feeTypeData;
                     that.feeSubTypeData=res.data.data.feeSubTypeData;
                     that.companyset=res.data.data.companyNameData;
+                    that.GetGroupNameList();
                 }
             })
         },
+        //获取团组
+        GetGroupNameList() {
+            this.grouplist=[];
+            var url = "/api/Business/GetGroupNameList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data: {
+                    portType: 1,
+                }
+            }).then(function (res) {
+               that.grouplist=res.data.data;
+            })
+        },
         trans(){
             this.identificationset=[];
             this.ruleForm.identification='';
@@ -258,6 +288,11 @@ export default {
             }
         },
         typechange(){
+            if (this.ruleForm.type!=104) {
+                this.ruleForm.groupId=''
+            }
+            console.log(this.ruleForm.type);
+            console.log(this.ruleForm.groupId);
             this.nameset=[];
             this.ruleForm.name='';
             console.log(this.feeSubTypeData)
@@ -275,16 +310,6 @@ export default {
         AddDailyPayment(){
             var url = "/api/Financial/PostAddDailyPayment"
             var that = this
-            var data={
-                UserId:that.userid,
-                Instructions:that.ruleForm.desc,
-                SumPrice:that.SumPrice,
-                TransferTypeId:that.ruleForm.identification,
-                PriceTypeId:that.ruleForm.name,
-                CompanyId:that.ruleForm.company,
-                FeeContents:that.itemsArr
-            }
-            console.log(data)
             this.$axios({
                 method: 'post',
                 url: url,
@@ -327,6 +352,7 @@ export default {
                     Id:that.editid,
                     UserId:that.userid,
                     Instructions:that.ruleForm.desc,
+                    groupId:that.ruleForm.groupId==""?0:that.ruleForm.groupId,
                     SumPrice:that.SumPrice,
                     TransferTypeId:that.ruleForm.identification,
                     PriceTypeId:that.ruleForm.name,
@@ -384,7 +410,6 @@ export default {
         },1000,true),
         getPostSearchDailyPaymentInfo(){
             if(this.editid!=undefined){
-                console.log("jing")
                 this.fullscreenLoading=true;
                 var url = "/api/Financial/PostSearchDailyPaymentInfo"
                 var that = this
@@ -418,6 +443,7 @@ export default {
                             }
                             that.typechange()
                             that.ruleForm.name=res.data.data.priceTypeId;
+                            that.ruleForm.groupId=res.data.data.groupId;
                             that.fullscreenLoading=false;
                             
                             if(that.userid!=res.data.data.createUserId){
@@ -465,6 +491,10 @@ export default {
     .dailyedit-set{
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
+    }
+    .dailyedit-set .el-form-item{
+        width: 285px;
     }
     .items-li{
         border-bottom: 1px #DCDFE6 solid;

src/components/Resource/PerformanceT.vue

@@ -49,7 +49,7 @@
                 class="demo-ruleForm">
                 <div class="allocation-form">
                     <el-form-item prop="assessmentSettingId" label="分配菜单">
-                        <el-select filterable clearable @change="caidanchange" v-model="allocationArgument.id"
+                        <el-select filterable clearable @change="caidanchange" v-model="allocationArgument.assessmentSettingId"
                             placeholder="请选择上级菜单">
                             <el-option v-for="(item,index) in parentmenuarr" :key="index" :label="item.name"
                                 :value="item.id"></el-option>
@@ -1008,6 +1008,7 @@ export default {
         //分配api
         AssessmentSettingOperationContent(){
             console.log(this.allocationArgument);
+            this.allocationArgument.id=0
             var url = "/api/PersonnelModule/AssessmentSettingOperationContent"
             var that = this
             this.$axios({