07231651

src/components/Finance/billUploading.vue

@@ -302,7 +302,7 @@ export default {
         },
         //panduan
         panduanuserid(val){
-            if(val==187||val==21||val==22||val==233){
+            if(val==187||val==21||val==22||val==233||val==258){
                 this.panduanbtn=true;
                 return -1
             }else{

src/components/Resource/OpOfficialActivities.vue

@@ -78,10 +78,15 @@
                     </div>
                     <div style="width: 385px;">
                         <el-form-item label="邀请方:" prop="type" label-width="160px">
-                            <el-radio-group v-model="OpOfficialActivitiesDto.type">
+                            <el-select v-model="OpOfficialActivitiesDto.type" clearable filterable placeholder="邀请方选择">
+                                <el-option v-for="item in yqfarr" :key="item.id" :label="item.name"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                            <!-- <el-radio-group v-model="OpOfficialActivitiesDto.type">
                                 <el-radio :label=1>是</el-radio>
                                 <el-radio :label=0>否</el-radio>
-                            </el-radio-group>
+                            </el-radio-group> -->
                         </el-form-item>
                     </div>
                 <!-- </div>
@@ -282,7 +287,7 @@ export default {
                 status: 0,
                 id: 0,
                 diId: "",
-                type: 0,
+                type: "",
                 client: "",
                 date: "",
                 time: "",
@@ -368,6 +373,10 @@ export default {
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
                 ],
+                type: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
             },
             uploadURL: "http://localhost:5256/api/Resource/UploadOfficialActivities",
             uploadFiles1: [],
@@ -391,6 +400,7 @@ export default {
                 DiId: 0,
                 CreateUserId: 0,
             },
+            yqfarr:[],
         }
     },
 
@@ -458,9 +468,30 @@ export default {
                 // that.$message.error("网络错误，请稍后重试");
             });
         },
+        //获取邀请方
+        QuerySetData(){
+            var that = this;
+            var url = "/api/System/QuerySetData"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    dataType:85
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.yqfarr=res.data.data;
+                    console.log(that.yqfarr);
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //获取公务请示范例提示
         PostOfficialActivitiesReqReqSampleTips(){
-            
             var that = this;
             var url = "/api/Resource/PostOfficialActivitiesReqReqSampleTips"
             this.$axios({
@@ -784,6 +815,7 @@ export default {
 
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        this.QuerySetData();
         this.id = this.$route.query.id
         this.DiId = parseInt(this.$route.query.DiId)
         this.headers1.DiId = this.DiId

src/components/statistics/Reportstbale.vue

@@ -487,9 +487,21 @@
                                     label="状态"
                                     width="50">
                                         <template slot-scope="scope">
-                                            {{ scope.row.isPay==-1?'未选择':scope.row.isPay==1?'已付款':'未付款' }}
+                                            <el-popover
+                                                placement="top"
+                                                trigger="hover">
+                                                <div v-html="scope.row.payTips"></div>
+                                                    <span slot="reference">{{ scope.row.isPay==-1?'未选择':scope.row.isPay==1?'已付款':scope.row.isPay==2?'其它费用子项未付款':'未付款' }}</span>
+                                            </el-popover>
                                         </template>
                                     </el-table-column>
+                                    <!-- <el-table-column
+                                    label="状态"
+                                    width="50">
+                                        <template slot-scope="scope">
+                                            {{ scope.row.isPay==-1?'未选择':scope.row.isPay==1?'已付款':'未付款' }}
+                                        </template>
+                                    </el-table-column> -->
                                     <el-table-column
                                     prop="applicant"
                                     label="申请人"