0403 10:25lhj

src/components/Finance/PayReceived.vue

@@ -54,7 +54,7 @@
                 >
                     <el-table-column
                     label="付款时间"
-                    width="160">
+                    width="165">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"
@@ -88,7 +88,7 @@
                     </el-table-column>
                     <el-table-column
                         label="到款时间"
-                        width="160">
+                        width="165">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -3,7 +3,7 @@
         <div class="mcr-box">
             <div class="mcr-head">
                 <!-- 预计出团量 -->
-                <div style="display: flex;margin-bottom: 10px;">
+                <!-- <div style="display: flex;margin-bottom: 10px;">
                     <div style="width:24%">
                         预计出团:<span>{{ preDele }}</span>
                     </div>
@@ -16,7 +16,7 @@
                     <div style="width:24%">
                         已出团总量:<span>{{ groupNumber.finlishedDeleAll }}</span>
                     </div>
-                </div>
+                </div> -->
 
 
                 <div>
@@ -76,28 +76,29 @@
             </div>
             <div class="mcr-table">
                 <el-table :data="PageList" border @select="handleSelect" style="width: 100%">
-                    <el-table-column prop="client" label="单位" width="140">
+                    <el-table-column prop="weight" label="权重"  width="50">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.weight == '393'">A</span>
+                            <span v-else-if="scope.row.weight == '392'">B</span>
+                            <span v-else-if="scope.row.weight == '391'">C</span>
+                        </template>
                     </el-table-column>
-                    <el-table-column prop="contact" label="联系人">
+                    <el-table-column prop="client" label="单位" width="230">
                     </el-table-column>
-                    <el-table-column prop="job" label="职位">
+                    <el-table-column prop="contact" label="联系人" width="90">
                     </el-table-column>
-                    <el-table-column prop="telephone" label="手机号">
+                    <el-table-column prop="job" label="职位" width="110">
                     </el-table-column>
-                    <el-table-column prop="phone" label="座机号">
+                    <el-table-column prop="telephone" label="手机号" width="120">
                     </el-table-column>
-                    <el-table-column prop="location" label="所在区域">
+                    <el-table-column prop="phone" label="座机号" width="120">
                     </el-table-column>
-                    <el-table-column prop="birthday" label="生日">
+                    <el-table-column prop="location" label="所在区域" width="130">
                     </el-table-column>
-                    <el-table-column prop="weight" label="权重">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.weight == '393'">A</span>
-                            <span v-else-if="scope.row.weight == '392'">B</span>
-                            <span v-else-if="scope.row.weight == '391'">C</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="ascribedDepartment" label="业务归属">
+                    <!-- <el-table-column prop="birthday" label="生日">
+                    </el-table-column> -->
+                    
+                    <el-table-column prop="ascribedDepartment" label="业务归属" width="80">
                         <template slot-scope="scope">
                             <el-tooltip class="item" effect="dark" placement="top">
                                 <span style="color:royalblue">查看</span>
@@ -110,7 +111,7 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="ascribedUser" label="负责人">
+                    <el-table-column prop="ascribedUser" label="负责人" width="85">
                         <template slot-scope="scope">
                             <!-- <el-tooltip class="item" effect="dark" placement="top">
                                 <span style="color:royalblue">查看</span>
@@ -143,16 +144,15 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="preDele" label="预计出团">
+                    <!-- <el-table-column prop="preDele" label="预计出团">
                     </el-table-column>
                     <el-table-column prop="finlishedDele" label="已出团">
-                    </el-table-column>
-                    <el-table-column label="操作">
+                    </el-table-column> -->
+                    <el-table-column label="操作" width="200">
                         <template slot-scope="scope">
                             <el-button type="primary" size="mini" @click="Edit(scope.row)">编
                                 辑</el-button>
-                            <br>
-                            <br>
+                           
                             <el-button type="danger" size="mini" @click="Del(scope.row)">删
                                 除</el-button>
                         </template>

src/components/OP/CarTouristGuideGrounContent.vue

@@ -5,7 +5,7 @@
                 <div>OP费用填写明细</div>
             </div>
         </div>
-        <el-popover placement="right" trigger="hover">
+        <el-popover class="oprompts" placement="right" trigger="hover">
             <el-table :data="budgeting" border>
                 <el-table-column width="100" property="date" label="日期"></el-table-column>
                 <el-table-column width="100" label="车费用">
@@ -110,9 +110,9 @@
                                 <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sidName }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="datePrice" label="日期" width="160">
+                        <el-table-column prop="datePrice" label="日期" width="170">
                             <template slot-scope="scope">
-                                <el-date-picker style="width: 100%;" v-model="scope.row.datePrice" type="date"
+                                <el-date-picker size="small" style="width: 100%;" v-model="scope.row.datePrice" type="date"
                                     :picker-options="startPickerOptions" value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="选择日期">
                                 </el-date-picker>
@@ -150,7 +150,7 @@
                             <template slot-scope="scope">
                                 <!-- <el-input size="small" style="width: 100%;" placeholder="选择单位" v-model="scope.row.units"
                                     @change="PriceChange"></el-input> -->
-                                <el-select v-model="scope.row.units" filterable placeholder="选择单位">
+                                <el-select size="small" v-model="scope.row.units" filterable placeholder="选择单位">
                                     <el-option v-for="item in unitsArr" :key="item.id" :label="item.name"
                                         :value="item.id">
                                     </el-option>
@@ -678,6 +678,11 @@ export default {
     position: fixed;
     top: 150px;
     right: 70px;
-    z-index: 99999;
+    z-index: 2014;
+}
+.oprompts .el-button--primary {
+    color: #FFF;
+    background-color: #007dff;
+    border-color: #007dff;
 }
 </style>

src/components/OP/CarTouristGuideGroundId.vue

@@ -96,12 +96,12 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button-group>
+                            <!-- <el-button-group> -->
                                 <el-button type="primary" size="mini" icon="el-icon-edit"
                                     @click="upDate(scope.$index, scope.row)"></el-button>
-                                <el-button type="danger" size="mini" icon="el-icon-delete"
+                                <el-button style="margin-left: 0px;" type="danger" size="mini" icon="el-icon-delete"
                                     @click="del(scope.$index, scope.row)"></el-button>
-                            </el-button-group>
+                            <!-- </el-button-group> -->
                         </template>
                     </el-table-column>
                 </el-table>

src/components/OP/EntryDetails.vue

@@ -1350,9 +1350,8 @@ export default {
     -khtml-user-select: none;
     -webkit-user-select: none;
     -moz-user-select: none;
-    font-size: 14px;
+    font-size: 12px;
     user-select: none;
-    font-family: cursive;
     background-color: #FFF;
     background-image: none;
     border-radius: 4px;

src/components/OP/OPgroup.vue

@@ -42,13 +42,18 @@
                     <el-table-column
                         prop="tourCode"
                         width="100"
-                        label="团 号">
+                        label="所属部门">
                     </el-table-column>
                     <el-table-column
+                        prop="tourCode"
+                        width="100"
+                        label="团 号">
+                    </el-table-column>
+                    <!-- <el-table-column
                         width="100" 
                         prop="salesQuoteNo"
                         label="销售报价号">
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                         prop="teamType"
                         label="团组类型"

src/components/OP/OpDecreasePayments.vue

@@ -50,7 +50,7 @@
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="费用金额:" prop="price" label-width="160px">
-                            <el-input placeholder="费用金额" v-model="DecreasePaymentsData.price" style="width: 58%;">
+                            <el-input placeholder="费用金额" v-model="DecreasePaymentsData.price" style="width: 56%;">
                             </el-input>
                             <el-select v-model="DecreasePaymentsData.currency" style="width: 40%;">
                                 <el-option v-for="item in rateList" :key="item.currencyId" :label="item.currencyCode"
@@ -128,7 +128,7 @@ export default {
             uploadURL: "http://132.232.92.186:8888/api/Groups/UploadProject",
             uploadFiles: [],//上传的文件列表
             DelfileName: "",
-            title: "新增团组增减款项费用",
+            title: "新增其他款项",
             token: '',
             userId: 0,
             id: '',
@@ -496,12 +496,12 @@ export default {
         this.id = this.$route.query.id
         if (this.id != null && this.id != undefined && this.id != 0) {
             this.QueryDecreasePaymentsById();
-            this.title = "修改团组增减款项费用";
+            this.title = "修改其他款项";
             this.DecreasePaymentsData.status = 2
             this.isShow = true
         } else {
             this.DecreasePaymentsData.status = 1
-            this.title = "新增团组增减款项费用"
+            this.title = "新增其他款项"
             this.isShow = false
         }
 

src/components/OP/PickupList.vue

@@ -35,6 +35,7 @@
                 </div>
             </div>
             <div class="pickuplist-Upload-box"> 
+                <div slot="tip" class="el-upload__tip">只能识别jpg/png文件&nbsp;&nbsp;&nbsp;</div>
                 <el-upload 
                 class="upload-demo" 
                 ref="upload" 
@@ -47,7 +48,6 @@
                 :auto-upload="false">
                     <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                     <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">识别图片</el-button>
-                    <div slot="tip" class="el-upload__tip">只能识别jpg/png文件</div>
                 </el-upload>
             </div>
             <div class="pickuplist-table">

src/components/OP/VisaPriec.vue

@@ -68,12 +68,10 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button-group>
-                                <el-button type="primary" size="mini" icon="el-icon-edit"
-                                    @click="upDate(scope.$index, scope.row)"></el-button>
-                                <el-button type="danger" size="mini" icon="el-icon-delete"
-                                    @click="del(scope.$index, scope.row)"></el-button>
-                            </el-button-group>
+                            <el-button type="primary" size="mini" icon="el-icon-edit"
+                                @click="upDate(scope.$index, scope.row)"></el-button>
+                            <el-button type="danger" size="mini" icon="el-icon-delete"
+                                @click="del(scope.$index, scope.row)"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>

src/components/Resource/InvitationOfficialActivityData.vue

@@ -36,9 +36,9 @@
                         :picker-options="pickerOptions">
                     </el-date-picker>
                     <el-button type="primary" @click="QueryCount" style="margin-left: 10px;">查询录入数量</el-button>
-                    <div style="display: flex;align-items: center;justify-content: center">
+                    <!-- <div style="display: flex;align-items: center;justify-content: center">
                         查询结果：该人员在以上条件共录入<span style="color: red;">{{ dataCount }}</span>条数据
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <template>

src/components/Resource/OpOfficialActivities.vue

@@ -158,7 +158,7 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div>
+                <!-- <div>
                     <div>
                         <div class="communal-title">
                             <div>公务文件</div>
@@ -199,7 +199,7 @@
                             </el-upload>
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <el-form-item>
                     <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>

src/components/system/Company.vue

@@ -7,7 +7,7 @@
                 <div class="communal-box">
                     <el-input @input="Inquireclick()" placeholder="请输入内容" v-model="input" clearable>
                     </el-input>
-                    <el-button @click="Inquireclick()" type="primary"><i class="icon-sousuo"></i></el-button>
+                    <el-button @click="Inquireclick()" type="primary"><i class="iconfont icon-sousuo"></i></el-button>
                     <el-button @click="addcompany()" type="primary">新增</el-button>
                 </div>
             </div>