04081532lhj

src/components/Finance/DailyFeeedit.vue

@@ -70,7 +70,7 @@
                     </el-form>
                 </div>
             </div>
-            <el-form-item style="margin-left: 0px;">
+            <el-form-item style="text-align: right;">
                 <el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button>
                 <el-button @click="resetForm('ruleForm')">返 回</el-button>
             </el-form-item>
@@ -450,7 +450,6 @@ export default {
         -webkit-user-select: none;
         -moz-user-select: none;
         user-select: none;
-        font-family: cursive;
         background-color: #FFF;
         background-image: none;
         border-radius: 4px;

src/components/Finance/LncomingBills.vue

@@ -95,7 +95,7 @@
                     label="币 种"
                     width="100">
                         <template slot-scope="scope">
-                            <el-select v-model="scope.row.currency">
+                            <el-select filterable v-model="scope.row.currency">
                                 <el-option
                                         v-for="item in currencyoptions"
                                         :key="item.id"
@@ -226,7 +226,7 @@ export default {
                 addingWay:0,//添加方式
                 remark:""//备注
             }
-            var url = "/api/Financial/PostReceivablesOperate"
+            var url = "/api/Financial/PostReceivablesSave"
             var that = this
             this.$axios({
                 method: 'post',

src/components/Finance/PaymentFiled.vue

@@ -2,7 +2,7 @@
     <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="paymentfiled-all">
             <div class="paymentfiled-haed">
-                <el-date-picker v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
+                <el-date-picker style="width:400px" v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
                     start-placeholder="开始日期" end-placeholder="结束日期" @change="datechange"
                     :picker-options="pickerOptions">
                 </el-date-picker>

src/components/Login.vue

@@ -202,7 +202,7 @@ export default {
 }
 
 .login-all {
-    background-image: url("../assets/back.png");
+    background-image: url("../../static/bj111.jpg");
     background-repeat: no-repeat;
     background-size: 100% 100%;
 }

src/components/MCR/MarketCustomerResourcesOperation.vue

@@ -1,9 +1,6 @@
 <template>
     <div class="operationMCR-Box">
-        <div class="operationMCR-topOper">
-            <el-button type="primary" @click="Getback">返回</el-button>
-            <el-button type="primary" @click="save">{{ BtnTitle }}</el-button>
-        </div>
+        <div class="operationMCRtitle">保存公司客户资料</div>
         <div>
             <el-form :model="requestData" label-width="110px" :rules="rules" ref="BindData">
                 <div>
@@ -170,7 +167,7 @@
                 </div>
                 <div id="BiTian">
                     <el-row>
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="负责人:">
                                     <el-select v-model="requestData.ascribedUser" multiple placeholder="请选择">
@@ -180,7 +177,7 @@
                                 </el-form-item>
                             </div>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="业务归属:">
                                     <el-select v-model="requestData.ascribedDepartment" multiple placeholder="请选择"
@@ -208,6 +205,10 @@
                 </div>
             </el-form>
         </div>
+        <div class="operationMCR-topOper">
+            <el-button type="primary" @click="Getback">返回</el-button>
+            <el-button type="primary" @click="save">{{ BtnTitle }}</el-button>
+        </div>
     </div>
 </template>
 
@@ -416,6 +417,7 @@ body {
     background-color: #fff;
     padding: 30px 30px 20px 0px;
     border-radius: 10px;
+    min-height: 800px;
 }
 
 .operationMCR-topOper {
@@ -424,8 +426,17 @@ body {
 
 }
 
-#BiTian .el-select {
-    width: 400px;
-
+.operationMCR-Box .el-date-editor.el-input{
+    width: 100%;
+}
+.operationMCR-Box .el-select{
+    width: 100%;
+}
+.operationMCRtitle{
+    font-size: 17px;
+    font-weight: 600;
+    color: #555;
+    margin-left:30px ;
+    margin-bottom: 25px;
 }
 </style>

src/components/OP/CarTouristGuideGrounContent.vue

@@ -677,8 +677,8 @@ export default {
 .oprompt{
     position: fixed;
     top: 150px;
-    right: 70px;
-    z-index: 2014;
+    right: 57px;
+    z-index: 2;
 }
 .oprompts .el-button--primary {
     color: #FFF;

src/components/OP/OpDecreasePayments.vue

@@ -108,7 +108,7 @@
                     </div>
                 </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
+                    <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
                         <router-link to='/home/DecreasePayments'>
                             <el-button>取消</el-button>

src/components/Resource/CarDataAdd.vue

@@ -68,11 +68,9 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="23">
-                        <el-form-item label="其他信息" prop="OtherInfo">
-                            <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.OtherInfo"></el-input>
-                        </el-form-item>
-                    </el-col>
+                    <el-form-item style="width:100%" label="其他信息" prop="OtherInfo">
+                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.OtherInfo"></el-input>
+                    </el-form-item>
                 </el-row>
                 <div class="appraise-box">
                     <el-form-item label="有相关的车辆资质" prop="QualificationScore" label-width="130px">
@@ -148,7 +146,7 @@
                     </el-form-item>
                 </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
+                    <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
                         <router-link to='/home/CarData'>
                             <el-button>取消</el-button>
@@ -337,6 +335,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    
 }
 
 .car_add .communal-title {

src/components/Resource/InvitationOfficialActivityData.vue

@@ -8,15 +8,23 @@
                 <div class="communal-box" style="margin-top: 10px;">
                     <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="Country" :fetch-suggestions="querySearchCountry"
                         placeholder="请输入国家" clearable></el-autocomplete>
-                    <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="UnitName" :fetch-suggestions="querySearchUnitName"
+                    <el-autocomplete style="margin-right: 10px;" class="inline-input" v-model="UnitName" :fetch-suggestions="querySearchUnitName"
                         placeholder="请输入邀请方" clearable></el-autocomplete>
-                    <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="Contact" :fetch-suggestions="querySearchContact"
+                    <el-autocomplete style="margin-right: 10px;" class="inline-input" v-model="Contact" :fetch-suggestions="querySearchContact"
                         placeholder="联系人" clearable></el-autocomplete>
                     <el-select  v-model="Delegation" clearable filterable placeholder="团组名称" style="width: 20%;margin-right: 15px;">
-                        <el-option v-for="item in restaurantDelegation" :key="item.id" :label="item.teamName"
-                            :value="item.id">
+                        <el-option v-for="(items,index) in restaurantDelegation" :key="index" :label="items.teamName"
+                            :value="items.id">
                         </el-option>
                     </el-select>
+                    <el-select style="margin-right: 10px;width:218px;" v-model="CreateUserId" placeholder="录入者" filterable clearable>
+                        <el-option v-for="item in CreateUserList" :key="item.id" :label="item.cnName" :value="item.id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker style="width:448px;margin-right: 10px;" v-model="InviteTime" type="daterange" align="right" unlink-panels format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" range-separator="至" start-placeholder="邀请开始日期" end-placeholder="邀请结束日期"
+                        :picker-options="pickerOptions">
+                    </el-date-picker>
                     <el-autocomplete class="inline-input" v-model="Field" :fetch-suggestions="querySearchField"
                         placeholder="领域" clearable></el-autocomplete>
                     <el-button type="primary" @click="QueryData" style="margin-left: 10px;">查询</el-button>
@@ -27,15 +35,7 @@
                     </div>
                 </div>
                 <div class="communal-box" style="margin-top: 10px;">
-                    <el-select style="margin-right: 15px;width:218px;" v-model="CreateUserId" placeholder="录入者" filterable clearable>
-                        <el-option v-for="item in CreateUserList" :key="item.id" :label="item.cnName" :value="item.id">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker style="width:448px;" v-model="InviteTime" type="daterange" align="right" unlink-panels format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" range-separator="至" start-placeholder="邀请开始日期" end-placeholder="邀请结束日期"
-                        :picker-options="pickerOptions">
-                    </el-date-picker>
-                    <el-button type="primary" @click="QueryCount" style="margin-left: 10px;">查询录入数量</el-button>
+                    <!-- <el-button type="primary" @click="QueryCount" style="margin-left: 10px;">查询录入数量</el-button> -->
                     <!-- <div style="display: flex;align-items: center;justify-content: center">
                         查询结果：该人员在以上条件共录入<span style="color: red;">{{ dataCount }}</span>条数据
                     </div> -->
@@ -240,6 +240,7 @@ export default {
         },
 
         QueryData() {
+            this.currentPage = 1;
             this.QueryInvitationOfficialActivityData()
         },
         //基础数据
@@ -397,53 +398,7 @@ export default {
                 that.$message.error("网络错误，请稍后重试");
             });
         },
-        //录入者数据
-        GetUserNameList() {
-            var url = "/api/System/GetUserNameList"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    PortType: 1
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-                    that.CreateUserList = res.data.data;
-
-                }
-            }).catch(function (error) {
-                that.$message.error("网络错误，请稍后重试");
-            });
-        },
-        //团组数据
-        GetGroupNameList() {
-
-            var url = "api/Business/GetGroupNameList"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    PortType: 1
-                }
-            }).then(function (res) {
-                console.log(res)
-                if (res.data.code == 200) {
-                    that.restaurantDelegation = res.data.data;
-
-                }
-            }).catch(function (error) {
-                that.loading = false
-                that.$message.error("网络错误，请稍后重试");
-            });
-        },
+        
         del(index, row) {
             this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',
@@ -499,9 +454,6 @@ export default {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.QueryInvitationOfficialActivityData();
-        this.GetUserNameList();
-        this.GetGroupNameList();
-
     }
 }
 </script>
@@ -512,6 +464,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 830px;
+    text-align: right;
 }
 .communal-list .block{
     margin-top: 15px;

src/components/Resource/LocalGuideOperation.vue

@@ -8,7 +8,7 @@
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="导游地接" prop="StaffType">
-                            <el-select v-model="addData.StaffType" placeholder="导游地接">
+                            <el-select style="width:100%" v-model="addData.StaffType" placeholder="导游地接">
                                 <el-option :key="0" label="公司" :value="0"></el-option>
                                 <el-option :key="1" label="个人" :value="1"></el-option>
 
@@ -17,7 +17,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="服务评分" prop="Score">
-                            <el-select v-model="addData.Score" placeholder="服务评分">
+                            <el-select style="width:100%" v-model="addData.Score" placeholder="服务评分">
                                 <el-option key="1" label="1分" value="1"></el-option>
                                 <el-option key="2" label="2分" value="2"></el-option>
                                 <el-option key="3" label="3分" value="3"></el-option>
@@ -28,9 +28,9 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="单位地区" prop="UnitArea">
-                            <el-autocomplete class="inline-input" v-model="addData.UnitArea"
+                            <el-autocomplete style="width:100%" class="inline-input" v-model="addData.UnitArea"
                                 :fetch-suggestions="querySearch" placeholder="请输入单位地区" @select="handleSelect"
-                                style="width: 290px;"></el-autocomplete>
+                                ></el-autocomplete>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -77,7 +77,7 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="23">
+                    <el-col :span="24">
                         <el-form-item label="其他信息" prop="OtherInfo">
                             <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.OtherInfo"></el-input>
                         </el-form-item>
@@ -156,7 +156,7 @@
 
                 </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
+                    <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
                         <router-link to='/home/CarData'>
                             <el-button>取消</el-button>

src/components/Resource/OfficialActivities.vue

@@ -13,9 +13,9 @@
                             </el-option>
                         </el-select>
                     </div>
-                    <div style="width: 82%;text-align: right;margin-right: 10%;">
+                    <div style="width: 82%;text-align: right;">
                         <router-link :to="{ path: '/home/OpOfficialActivities', query: { DiId } }">
-                            <el-button type="primary" style="margin-left: 10px;">新增</el-button>
+                            <el-button type="primary">新增</el-button>
                         </router-link>
                     </div>
                 </div>

src/components/Resource/OpInvitationOfficialActivityData.vue

@@ -145,7 +145,7 @@
 
                 </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
+                    <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
                         <router-link to='/home/InvitationOfficialActivityData'>
                             <el-button>取消</el-button>

src/components/child/PageConfig.vue

@@ -72,10 +72,10 @@
             </span>
         </el-dialog>
 
-        <Modal :title="dialogTitle" :height="500" :width="700" :show.sync="showModal" restrict-to=".is-vertical"
+        <Modal style="z-index:2012" :title="dialogTitle" :height="500" :width="700" :show.sync="showModal" restrict-to=".is-vertical"
             @close="showModal = false">
             <template v-slot:content>
-                <div style="    padding: 10px;">
+                <div style="padding: 10px;">
                     <el-form label-position="left" label-width="80px" :model="pageBind" :rules="rules" ref="pageBind">
                         <el-row :gutter="20">
                             <el-col :span="8">

src/components/child/PageFunction.vue

@@ -50,7 +50,7 @@
             </div>
         </div>
 
-        <Modal :title="dialogTitle" :height="300" :width="400" :show.sync="showModal" restrict-to=".is-vertical"
+        <Modal  style="z-index:2012" :title="dialogTitle" :height="300" :width="400" :show.sync="showModal" restrict-to=".is-vertical"
             @close="showModal = false">
             <template v-slot:content>
                 <div style="    padding: 10px;">

src/components/system/JobPost.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="addDepartment()" type="primary">新增</el-button>
                 </div>
             </div>

src/components/system/User.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>
                 </div>
             </div>
             <template>
@@ -57,7 +57,7 @@
                 </el-pagination>
             </div>
         </div>
-        <el-dialog title="修改员工" :visible.sync="upUserVisible" width="30%" :before-close="handleClose">
+        <el-dialog  style="z-index:2013" title="修改员工" :visible.sync="upUserVisible" width="30%" :before-close="handleClose">
             <div>
                 <el-form :model="upData" :rules="rules" ref="upData" label-width="100px" class="demo-ruleForm">
                     <el-form-item label="姓名" prop="cnName">