Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/LncomingBills.vue

@@ -156,7 +156,7 @@
                             <el-button
                             v-if="scope.row.status==1"
                             size="mini"
-                            type="info"
+                            type="success"
                             title="已确认">
                             <i class="el-icon-check"></i></el-button>
                             <el-button
@@ -479,7 +479,7 @@ export default {
         },
         //判断id
         judgmentId(val){
-            if(val==233||val==21||val==20){
+            if(val==233||val==21||val==22){
                 return true
             }
         },

src/components/OP/CarTouristGuideGroundId.vue

@@ -8,7 +8,7 @@
                 </div>
                 <div style="display: flex;justify-content: space-between;">
 
-                    <div style="width: 80%;display: flex;">
+                    <div style="width: 50%;display: flex;">
                         <div style="width: 25%;">
                             <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="deleSelect"
                                 style="width: 100%;">
@@ -18,27 +18,42 @@
                             </el-select>
                         </div>
                     </div>
-                    <div style="width: 20%;text-align: right;">
-                        <el-button type="primary" style="" @click="exportPriceDetail">导出费用明细</el-button>
-                        <el-button type="primary" style="" @click="addIf">新增</el-button>
+                    <div style="width: 50%;display: flex;align-items: flex-start;justify-content: end;">
+                        <el-button size="small" type="primary" style="" @click="exportPriceDetail">导出费用明细</el-button>
+                        <el-button style="margin-right: 10px;" size="small" type="primary"  @click="addIf">新增</el-button>
+                        <!-- <el-upload
+                        class="upload-demo"
+                        action="http://132.232.92.186:8888/api/Groups/CommonSaveFile"
+                        :on-preview="handlePreview"
+                        :on-remove="handleRemove"
+                        :before-remove="beforeRemove"
+                        multiple
+                        :limit="3"
+                        :data="datas"
+                        :on-exceed="handleExceed"
+                        :file-list="fileList"
+                        name="files">
+                        <el-button size="small" type="primary">点击上传</el-button>
+                        <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                        </el-upload> -->
                     </div>
                 </div>
             </div>
-            <div style="margin:10px 0;color:#606266;">
+            <div :style="delegationInfo.teamLevSId=='VIP'||delegationInfo.teamLevSId=='VVIP'?'margin:10px 0;color:red;':'margin:10px 0;color:#606266;'">
                 <span style="font-weight: bold;font-size:14px;">团队名称：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="font-size:14px;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:14px;">客户级别：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.teamLevSId }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="font-size:14px;">{{ delegationInfo.teamLevSId }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:14px;">客户：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; {{
+                <span style="font-size:14px;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; {{
 }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:14px;">出访国家：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="font-size:14px;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:14px;">起止日期：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate
+                <span style="font-size:14px;">{{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate
                 }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:14px;">天数/人数：</span>
-                <span style="color:#606266;font-size:14px;">{{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人</span>
+                <span style="font-size:14px;">{{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人</span>
             </div>
 
             <template>
@@ -146,6 +161,11 @@ export default {
             VisaClient: '',
             delegationInfoList: [],
             delegationInfo: {},
+            datas:{},
+            fileList: [
+                // {name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, 
+                // {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}
+            ]
         }
     },
     methods: {
@@ -187,8 +207,9 @@ export default {
                             }
                         }
                     }
-
-                    that.QueryCarTouristGuideGroundByDiId()
+                    
+                    that.QueryCarTouristGuideGroundByDiId();
+                    that.handledatas();
                 }
             }).catch(function (error) {
                 that.$message.error("网络错误，请稍后重试");
@@ -336,6 +357,28 @@ export default {
             }).catch(function (error) {
                 that.$message.error("网络错误，请稍后重试");
             });
+        },
+        //票据上传
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePreview(file) {
+            console.log(file);
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+        },
+        beforeRemove(file, fileList) {
+            return this.$confirm(`确定移除 ${ file.name }？`);
+        },
+        //处理datas
+        handledatas(){
+            this.datas={
+                Ctable:79,
+                Diid:this.DiId,
+                Cid:0,
+                Userid:this.userId
+            }
         }
     },
     mounted() {