0425lhj

src/components/Enroll.vue

@@ -11,15 +11,15 @@
       >
         <div class="form-li">
           <el-form-item label="中文名称" prop="mandarinName">
-            <el-input @blur="emailpj" v-model="ruleForm.mandarinName"></el-input>
+            <el-input @blur="emailpj" v-model="ruleForm.mandarinName" placeholder="与企业微信名称一致"></el-input>
           </el-form-item>
           <el-form-item label="英文名称" prop="eflName">
-            <el-input @blur="emailpj" v-model="ruleForm.eflName"></el-input>
+            <el-input @blur="emailpj" v-model="ruleForm.eflName" placeholder="请输入英文名称"></el-input>
           </el-form-item>
         </div>
         <div class="form-li">
           <el-form-item label="邮箱" prop="email">
-            <el-input v-model="ruleForm.email">
+            <el-input v-model="ruleForm.email" placeholder="会自动识别">
               <template slot="append">@pan-american-intl.com</template>
             </el-input>
           </el-form-item>
@@ -32,23 +32,23 @@
         </div>
         <div class="form-li">
           <el-form-item label="手机号" prop="phone">
-            <el-input v-model="ruleForm.phone"></el-input>
+            <el-input v-model="ruleForm.phone" placeholder="与企业微信注册的手机号一致"></el-input>
           </el-form-item>
           <el-form-item label="紧急电话" prop="urgentphone">
-            <el-input v-model="ruleForm.urgentphone"></el-input>
+            <el-input v-model="ruleForm.urgentphone" placeholder="不能与使用的手机号相同"></el-input>
           </el-form-item>
         </div>
         <div class="form-li">
           <el-form-item label="密码" prop="pass">
-            <el-input v-model="ruleForm.pass" show-password></el-input>
+            <el-input v-model="ruleForm.pass" show-password placeholder="输入密码"></el-input>
           </el-form-item>
           <el-form-item label="确认密码" prop="checkPass">
-            <el-input v-model="ruleForm.checkPass" show-password></el-input>
+            <el-input v-model="ruleForm.checkPass" show-password placeholder="确认密码"></el-input>
           </el-form-item>
         </div>
         <div class="form-li">
           <el-form-item label="身份证号" prop="IDnumber">
-            <el-input v-model="ruleForm.IDnumber"></el-input>
+            <el-input v-model="ruleForm.IDnumber" placeholder="输入身份证号"></el-input>
           </el-form-item>
           <el-form-item label="入职时间" prop="datebirth">
             <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.datebirth" style="width: 100%;"></el-date-picker>
@@ -67,10 +67,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="专业" prop="specialized">
-            <el-input v-model="ruleForm.specialized"></el-input>
+            <el-input v-model="ruleForm.specialized" placeholder="输入专业"></el-input>
           </el-form-item>
           <el-form-item label="毕业院校" prop="school">
-            <el-input v-model="ruleForm.school"></el-input>
+            <el-input v-model="ruleForm.school" placeholder="输入毕业院校"></el-input>
           </el-form-item>
           <el-form-item label="教育类型" prop="recruitment">
             <el-select v-model="ruleForm.recruitment" placeholder="请选择教育类型">
@@ -79,15 +79,15 @@
             </el-select>
           </el-form-item>
           <el-form-item label="婚姻状况" prop="maritalstatus">
-            <el-input v-model="ruleForm.maritalstatus"></el-input>
+            <el-input v-model="ruleForm.maritalstatus" placeholder="输入婚姻状况"></el-input>
           </el-form-item>
           <el-form-item label="居住住址" prop="address">
-            <el-input v-model="ruleForm.address"></el-input>
+            <el-input v-model="ruleForm.address" placeholder="输入居住住址"></el-input>
           </el-form-item>
         </div>
         <div class="form-li">
           <el-form-item label="家庭地址" prop="homeAddress">
-            <el-input v-model="ruleForm.homeAddress"></el-input>
+            <el-input v-model="ruleForm.homeAddress" placeholder="输入家庭地址"></el-input>
           </el-form-item>
           <el-form-item label="所属公司" prop="corporation">
             <el-select v-model="ruleForm.corporation" value-key="id" @change="changeCorporation" placeholder="请选择所属公司">
@@ -120,7 +120,7 @@
             </el-select>
           </el-form-item>
         </div>
-        <el-form-item label="工作经历" prop="desc">
+        <el-form-item label="工作经历">
           <el-input type="textarea" v-model="ruleForm.desc"></el-input>
         </el-form-item>
         <div class="enroll-btn">

src/components/Finance/Cost.vue

@@ -25,9 +25,9 @@
                         <el-button type="primary" @click="GetPriceCheckWord">生成收款账单</el-button>
                         <el-button type="primary" @click="GetClientWord">导出客户报表</el-button>
                         <el-button type="primary" @click="GetGroupCostExcel">导出成本</el-button>
-                        <el-button type="primary" @click="save">保存设置</el-button>
                         <el-button type="primary">一键复制</el-button>
                         <el-button type="primary" @click="GroupIsShare">成本通知</el-button>
+                        <el-button type="primary" @click="save">保存设置</el-button>
                     </div>
                 </div>
                 <div class="cost-input">
@@ -243,12 +243,12 @@
                 <el-checkbox v-for="(  item, index  ) in    checkOptions  " :key="index" :title="item.tips"
                     :label="item.label" @change="(val) => { topcheckboxChange(val, item.label) }"></el-checkbox>
             </el-checkbox-group>
-            <el-table :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true"
+            <el-table class="tables" style="font-size:10px" :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true"
                 size="small" row-class-name="row" cell-class-name="column" :highlight-current-row="true" :fit="true"
                 :height="centerheight">
                 <template v-for="(  item, index  ) in      tableLabel     ">
                     <el-table-column :key="index" :prop="item.prop"
-                        :width="item.width == 150 ? columnWidth : item.width" :label="item.label"
+                        :width="item.width == 140 ? columnWidth : item.width" :label="item.label"
                         v-if="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues.includes(item.label)">
                         <!-- eslint-disable-next-line -->
                         <template slot="header" slot-scope="scope">
@@ -274,7 +274,7 @@
                                         v-model="scope.row[item.prop]"
                                         @change="dateChange(scope.row[item.prop], scope.$index)">
                                     </el-input> -->
-                                    <el-date-picker size="mini" v-model="scope.row[item.prop]" type="date"
+                                    <el-date-picker :clearable="false" size="mini" v-model="scope.row[item.prop]" type="date"
                                         value-format="yyyy-MM-dd" placeholder="选择日期">
                                     </el-date-picker>
                                 </span>
@@ -296,8 +296,8 @@
                                         点</el-button>
                                 </el-row>
                             </div>
-                            <div v-else-if="item.width == 200">
-                                <el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="scope.row[item.prop]">
+                            <div v-else-if="item.width == 100">
+                                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="scope.row[item.prop]">
                                 </el-input>
                             </div>
                             <div v-else-if="item.prop == 'b' || item.prop == 'l' || item.prop == 'd'">
@@ -347,14 +347,14 @@
                         </template>
                     </el-table-column>
                 </template>
-                <el-table-column class="czbtn" label="操作" :width="200">
+                <el-table-column class="czbtn" label="操作" :width="100">
                     <!-- eslint-disable-next-line -->
                     <template slot-scope="scope">
                         <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'UP')"
                             type="primary">插入行
                             ↑</el-button>
                         <br />
-                        <el-button class="czbtn" style="margin: 10px;" size="mini"
+                        <el-button class="czbtn" style="margin: 10px 0;" size="mini"
                             @click="handleDelete(scope.$index, scope.row, tableData)" type="danger">删除<i
                                 class="el-icon-delete"></i></el-button>
                         <br />
@@ -726,42 +726,42 @@ export default {
             ],
             tableLabel: [
                 { label: 'DAY', width: '85', prop: 'day', describe: '天数(DAY)' },
-                { label: 'DATE', width: '151', prop: 'date', describe: '时间(DATE)' },
-                { label: 'ITIN', width: '200', prop: 'itin', describe: '行程描述(ITINERARY)' },
-                { label: 'VA', width: '85', prop: 'sale', describe: '车服务区域(Vehicle Area)' }, // ??????????????
-                { label: 'VT', width: '200', prop: 'carType', describe: '车型(VEHICLE TYPE)' },
-                { label: 'VF', width: '150', prop: 'carCost', describe: '车费用(VEHICLE FEES)' },
-                { label: 'VN', width: '150', prop: 'carNumber', describe: '车数量(VEHICLE Number)' },
-                { label: 'VRD', width: '150', prop: 'carTiming', describe: '用车时间(VEHICLE RENTAL DURATION)' },
-                { label: 'T/G S', width: '150', prop: 'tgs', describe: '导游工资(TOUR GUIDE SALARY)' },
-                { label: 'T/G N', width: '150', prop: 'tgn', describe: '导游数量(TOUR GUIDE Number' },
-                { label: 'T/G WH', width: '150', prop: 'tgwh', describe: '导游工作时间(导游工作时间)' },
-                { label: 'T/G OF', width: '150', prop: 'tgof', describe: '导游超时费用(TOUR GUIDE OVERTIME FEES)' },
-                { label: 'T/G M', width: '150', prop: 'tgm', describe: '导游餐补(TOUR GUIDE MEALS)' },
-                { label: 'T/G A', width: '150', prop: 'tga', describe: '导游房补(TOUR GUIDE ACCOMMODATION)' },
-                { label: 'T/G TF', width: '150', prop: 'tgtf', describe: '导游交通费(TOUR GUIDE TRANSPORATION FEES)' },
-                { label: 'T/G EF', width: '150', prop: 'tgef', describe: '导游景点费(TOUR GUIDE ENTRANCE FEES)' },
-                { label: 'C/F M', width: '150', prop: 'cfm', describe: '司机餐补(CHAUFFEUR MEALS)' },
-                { label: 'C/F OF', width: '150', prop: 'cfof', describe: '司机超时费用(CHAUFFEUR OVERTIME FEES)' },
-                { label: 'B', width: '150', prop: 'b', describe: '早餐(BREAKFAST) #个人成本' },
-                { label: 'L', width: '150', prop: 'l', describe: '午餐(LUNCH) #个人成本' },
-                { label: 'D', width: '150', prop: 'd', describe: '晚餐(DINNER) #个人成本' },
-                { label: 'TBR', width: '150', prop: 'tbr', describe: '双人间(TWIN BED ROOM) #个人成本' },
-                { label: 'SGR', width: '150', prop: 'sgr', describe: '单间(SINGLE ROOM) #个人成本' },
-                { label: 'JS/ES', width: '150', prop: 'jS_ES', describe: '小套房/豪华套房(JUNIOR SUITE/EXECUTIVE SUITE) #个人成本' },
-                { label: 'SUITE', width: '150', prop: 'suite', describe: '套房(SUITE) #个人成本' },
-                { label: 'ACCO N', width: '200', prop: 'accon', describe: '住宿地名称(ACCOMMODATION NAME)' },
-                { label: 'T/V', width: '150', prop: 'tv', describe: '公务活动费用(T/V)' },
-                { label: '1/L', width: '150', prop: 'iL', describe: '邀请函相关费用(1/L)' },
-                { label: 'I/F', width: '150', prop: 'if', describe: '公务翻译费用(INTERPRETER FEES)' },
-                { label: 'EF', width: '150', prop: 'ef', describe: '景点门票(ENTRANCE FEE) #个人成本' },
-                { label: 'B/R/F', width: '150', prop: 'b_R_F', describe: '饮料零食水果(BEVERAGE/RRESHMENT/FRUIT)' },
-                { label: 'TE', width: '150', prop: 'te', describe: '出行物资(TRAVELLLING ESSENTIALS) #个人成本' },
-                { label: 'T/G T', width: '150', prop: 'tgTips', describe: '导游小费(T/G TIPS) #个人成本' },
-                { label: 'DRV T', width: '150', prop: 'drvTips', describe: '司机小费(DRIVER TIPS #个人成本)' },
-                { label: 'P/C', width: '150', prop: 'pc', describe: '零用金(PETTY CASH) #个人成本' },
-                { label: 'T/L F', width: '150', prop: 'tlf', describe: '领队费(TOUR LEADER FEES)' },
-                { label: 'E/C T', width: '150', prop: 'ect', describe: '会务费(EXPO/CONFERENCE TICKET)' }
+                { label: 'DATE', width: '85', prop: 'date', describe: '时间(DATE)' },
+                { label: 'ITIN', width: '100', prop: 'itin', describe: '行程描述(ITINERARY)' },
+                { label: 'VA', width: '77', prop: 'sale', describe: '车服务区域(Vehicle Area)' }, // ??????????????
+                { label: 'VT', width: '100', prop: 'carType', describe: '车型(VEHICLE TYPE)' },
+                { label: 'VF', width: '140', prop: 'carCost', describe: '车费用(VEHICLE FEES)' },
+                { label: 'VN', width: '140', prop: 'carNumber', describe: '车数量(VEHICLE Number)' },
+                { label: 'VRD', width: '140', prop: 'carTiming', describe: '用车时间(VEHICLE RENTAL DURATION)' },
+                { label: 'T/G S', width: '140', prop: 'tgs', describe: '导游工资(TOUR GUIDE SALARY)' },
+                { label: 'T/G N', width: '140', prop: 'tgn', describe: '导游数量(TOUR GUIDE Number' },
+                { label: 'T/G WH', width: '140', prop: 'tgwh', describe: '导游工作时间(导游工作时间)' },
+                { label: 'T/G OF', width: '140', prop: 'tgof', describe: '导游超时费用(TOUR GUIDE OVERTIME FEES)' },
+                { label: 'T/G M', width: '140', prop: 'tgm', describe: '导游餐补(TOUR GUIDE MEALS)' },
+                { label: 'T/G A', width: '140', prop: 'tga', describe: '导游房补(TOUR GUIDE ACCOMMODATION)' },
+                { label: 'T/G TF', width: '140', prop: 'tgtf', describe: '导游交通费(TOUR GUIDE TRANSPORATION FEES)' },
+                { label: 'T/G EF', width: '140', prop: 'tgef', describe: '导游景点费(TOUR GUIDE ENTRANCE FEES)' },
+                { label: 'C/F M', width: '140', prop: 'cfm', describe: '司机餐补(CHAUFFEUR MEALS)' },
+                { label: 'C/F OF', width: '140', prop: 'cfof', describe: '司机超时费用(CHAUFFEUR OVERTIME FEES)' },
+                { label: 'B', width: '140', prop: 'b', describe: '早餐(BREAKFAST) #个人成本' },
+                { label: 'L', width: '140', prop: 'l', describe: '午餐(LUNCH) #个人成本' },
+                { label: 'D', width: '140', prop: 'd', describe: '晚餐(DINNER) #个人成本' },
+                { label: 'TBR', width: '140', prop: 'tbr', describe: '双人间(TWIN BED ROOM) #个人成本' },
+                { label: 'SGR', width: '140', prop: 'sgr', describe: '单间(SINGLE ROOM) #个人成本' },
+                { label: 'JS/ES', width: '140', prop: 'jS_ES', describe: '小套房/豪华套房(JUNIOR SUITE/EXECUTIVE SUITE) #个人成本' },
+                { label: 'SUITE', width: '140', prop: 'suite', describe: '套房(SUITE) #个人成本' },
+                { label: 'ACCO N', width: '100', prop: 'accon', describe: '住宿地名称(ACCOMMODATION NAME)' },
+                { label: 'T/V', width: '140', prop: 'tv', describe: '公务活动费用(T/V)' },
+                { label: '1/L', width: '140', prop: 'iL', describe: '邀请函相关费用(1/L)' },
+                { label: 'I/F', width: '140', prop: 'if', describe: '公务翻译费用(INTERPRETER FEES)' },
+                { label: 'EF', width: '140', prop: 'ef', describe: '景点门票(ENTRANCE FEE) #个人成本' },
+                { label: 'B/R/F', width: '140', prop: 'b_R_F', describe: '饮料零食水果(BEVERAGE/RRESHMENT/FRUIT)' },
+                { label: 'TE', width: '140', prop: 'te', describe: '出行物资(TRAVELLLING ESSENTIALS) #个人成本' },
+                { label: 'T/G T', width: '140', prop: 'tgTips', describe: '导游小费(T/G TIPS) #个人成本' },
+                { label: 'DRV T', width: '140', prop: 'drvTips', describe: '司机小费(DRIVER TIPS #个人成本)' },
+                { label: 'P/C', width: '140', prop: 'pc', describe: '零用金(PETTY CASH) #个人成本' },
+                { label: 'T/L F', width: '140', prop: 'tlf', describe: '领队费(TOUR LEADER FEES)' },
+                { label: 'E/C T', width: '140', prop: 'ect', describe: '会务费(EXPO/CONFERENCE TICKET)' }
             ],
             statisticsArr: [
                 { label: 'DAY', total: '', individual: '' },
@@ -4618,6 +4618,7 @@ export default {
         }
     },
     mounted() {
+       
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.loadData(-1);
@@ -4762,6 +4763,8 @@ export default {
 
 .cost-box .el-table .cell {
     text-align: center;
+    padding-left: 5px;
+    padding-right: 5px;
 }
 
 .figures-btn {
@@ -4771,7 +4774,7 @@ export default {
 }
 
 .figures-btn .el-button--mini {
-    width: 70px;
+    width: 67px;
     margin: 2px 0;
     margin-left: 0;
 }
@@ -4818,4 +4821,23 @@ export default {
 .czbtn {
     width: 70px;
 }
+.tables .el-textarea{
+    font-size: 10px;
+}
+.tables .el-button--mini{
+    font-size: 12px;
+}
+.tables .el-textarea__inner{
+    padding: 0;
+}
+.tables .el-input--suffix .el-input__inner{
+    padding-right: 0px;
+    padding-left: 0px;
+}
+.tables .el-date-editor .el-icon-date {
+    display: none;
+}
+.form-ss .el-checkbox__label{
+    font-size: 10px;
+}
 </style>

src/components/Finance/LncomingBills.vue

@@ -72,7 +72,7 @@
                     <el-table-column
                     prop="createTime"
                     label="时间"
-                    width="200">
+                    width="210">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"
@@ -84,7 +84,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column
-                    label="费用名称"
+                    label="单位名称"
                     width="240">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.priceName"></el-input>
@@ -134,10 +134,10 @@
                     </el-table-column>
                     <el-table-column
                     label="应收金额"
-                    width="120">
-                    <template slot-scope="scope">
-                        <div class="sub-box">{{scope.row.itemSumPrice=(scope.row.price*scope.row.count*scope.row.rate).toFixed(2)}}</div>
-                    </template>
+                    width="200">
+                        <template slot-scope="scope">
+                            <div class="sub-box">{{scope.row.itemSumPrice=(scope.row.price*scope.row.count*scope.row.rate).toFixed(2)}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column    
                     prop="remark"

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -63,12 +63,12 @@
                      
                     <div class="btnOp">
                         <div>
-                            <el-button type="primary" @click="Add">新 增</el-button>
+                            <el-button type="primary" @click="QueryData">查 询</el-button>
                         </div>
                         <div style="height: 10px;">
                         </div>
                         <div>
-                            <el-button type="primary" @click="QueryData">查 询</el-button>
+                            <el-button type="primary" @click="Add">新 增</el-button>
                         </div>
                     </div>
                 </div>

src/components/OP/Customers.vue

@@ -17,11 +17,11 @@
                                 </el-option>
                             </el-select>
                         </div>
-                        <div style="width: 25%;margin-left: 10px;"><el-input v-model="VisaClient" placeholder="请输入客户名称" clearable></el-input>
+                        <!-- <div style="width: 25%;margin-left: 10px;"><el-input v-model="VisaClient" placeholder="请输入客户名称" clearable></el-input>
                         </div>
                         <div style="width: 25%;margin-left: 10px;"><el-button type="primary"
                                 @click="QueryByVisaClient">查询</el-button>
-                        </div>
+                        </div> -->
                     </div>
                     <div style="width: 20%;text-align: right;">
                         <el-button type="primary" style="" @click="addIf">新增</el-button>

src/components/OP/EntryDetails.vue

@@ -577,7 +577,7 @@ export default {
                 vaccinefees:0,//疫苗费
                 nucleicfees:0,//核酸检测费
                 serviceCharge:0,//服务费
-                insurance:0,//保险费
+                insurance:500,//保险费
                 ticketsExhibitionL:0,//参展门票
                 total:0
             },
@@ -682,6 +682,7 @@ export default {
         },
         //获取费用标注
         GetNationalTravelFeeData(){
+            this.fullscreenLoading=true;
             var url = "/api/Groups/GetNationalTravelFeeData"
             var that = this
             this.$axios({
@@ -708,6 +709,7 @@ export default {
             })
         },
         GetEnterExitCostInfobyDiId(){
+            
             //初始化数据
             
             // this.currencys=[]
@@ -722,7 +724,7 @@ export default {
                 vaccinefees:0,//疫苗费
                 nucleicfees:0,//核酸检测费
                 serviceCharge:0,//服务费
-                insurance:0,//保险费
+                insurance:500,//保险费
                 ticketsExhibitionL:0,//参展门票
                 total:0
             }
@@ -1972,5 +1974,6 @@ export default {
 .Entry-all .el-checkbox__inner::after{
     height: 10px;
     left: 6px;
+    
 }
 </style>

src/components/OP/OpCustomers.vue

@@ -238,7 +238,7 @@
                 <div v-else></div>
                 <div style="display:flex;flex-wrap: wrap;">
                     <div style="width: 390px;">
-                        <el-form-item label="收款方:" prop="payee" label-width="160px">
+                        <el-form-item label="收款方:" label-width="160px">
                             <el-input placeholder="对方姓名:" v-model="OpCustomersData.payee">
                             </el-input>
                         </el-form-item>
@@ -308,7 +308,7 @@ export default {
                 attachment: '',
                 createUserId: 0,
                 remark: '',
-                payDId: 72,
+                payDId: 1057,
                 consumptionPatterns: '',
                 consumptionDate: '',
                 ctdId: '',

src/components/OP/OpLtinerary.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="opltinerary-all">
             <div class="opltinerary-head">
                 <div class="opltinerary-head-li">
@@ -161,11 +161,13 @@ export default {
             ],
             itineraryinfo:{},
             userid:'',
+            fullscreenLoading:false
         }
     },
     methods:{
         //行程单接口
         InitOpTravel() {
+            this.fullscreenLoading=true;
             var url = "/api/Groups/InitOpTravel"
             var that = this
             this.$axios({
@@ -185,11 +187,14 @@ export default {
                     }
                     that.itineraryinfo=res.data.data.groupInfo;
                     that.tablearrr=res.data.data.opTravelList;
+                    that.fullscreenLoading=false;
                 }else{
                     that.$message.error(res.data.msg);
+                    that.fullscreenLoading=false;
                 }
             }).catch(function (error) {
                 that.$message.error(error);
+                that.fullscreenLoading=false;
             });
         },
         //删除本团行程

src/components/OP/OpVisaPriec.vue

@@ -246,7 +246,7 @@
                 <div v-else></div>
                 <div style="display:flex;">
                     <div style="width: 25%;">
-                        <el-form-item label="收款方:" prop="payee" label-width="160px">
+                        <el-form-item label="收款方:" label-width="160px">
                             <el-input placeholder="对方姓名:" v-model="OpVisaPriceData.payee">
                             </el-input>
                         </el-form-item>
@@ -531,6 +531,9 @@ export default {
                 console.log(res);
                 if (res.data.code == 200) {
                     that.fliterClient = res.data.data;
+                    for(var i=0;i<that.fliterClient.length;i++){
+                        that.OpVisaPriceData.visaClient.push(that.fliterClient[i].id)
+                    }
                 }
             })
         },

src/components/OP/VisaPriec.vue

@@ -2,12 +2,10 @@
     <div>
         <div class="communal-list">
             <div>
-
                 <div class="communal-title">
                     <div>签证费用录入列表</div>
                 </div>
                 <div style="display: flex;justify-content: space-between;">
-
                     <div style="width: 80%;display: flex;">
                         <div style="width: 25%;">
                             <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="visaSelect"
@@ -17,11 +15,11 @@
                                 </el-option>
                             </el-select>
                         </div>
-                        <div style="width: 25%;margin-left: 10px;"><el-input v-model="VisaClient" placeholder="请输入费用名称" clearable></el-input>
+                        <!-- <div style="width: 25%;margin-left: 10px;"><el-input v-model="VisaClient" placeholder="请输入费用名称" clearable></el-input>
                         </div>
                         <div style="width: 25%;margin-left: 10px;"><el-button type="primary"
                                 @click="QueryByVisaClient">查询</el-button>
-                        </div>
+                        </div> -->
                     </div>
                     <div style="width: 20%;text-align: right;">
                         <el-button type="primary" style="" @click="addIf">新增</el-button>

src/components/Resource/CarDataEdit.vue

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

src/components/Resource/LocalGuideOperation.vue

@@ -158,7 +158,7 @@
                 <el-form-item>
                     <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
-                        <router-link to='/home/CarData'>
+                        <router-link to='/home/LocalGuide'>
                             <el-button>取消</el-button>
                         </router-link>
                     </div>

src/components/home.vue

@@ -74,7 +74,8 @@
           <div class="nei-avatar">
             <div class="avatar">
               <div class="avatar-img">
-                <img src="../assets/avatar.jpg" alt="" />
+                <img v-if="sex==1" src="../assets/nv.png" alt="" />
+                <img v-else src="../assets/nan.png" alt="" />
               </div>
               <div v-if="panduan" class="avatar-text">
                 <div class="avatar-name">员工: {{ userinif.userInfo.cnName }}</div>
@@ -126,7 +127,8 @@
             </div>
             <div class="user-inif" @click="instrumentclick('.user-operate', $event)">
               <div class="user-inifs">
-                <img src="../assets/avatar.jpg" alt="" />
+                <img v-if="sex==1" src="../assets/nv.png" alt="" />
+                <img v-else src="../assets/nan.png" alt="" />
               </div>
             </div>
           </div>
@@ -207,7 +209,8 @@
             <div class="operate-title">
               <div class="avatar">
                 <div class="avatar-img">
-                  <img src="../assets/avatar.jpg" alt="" />
+                  <img v-if="sex==1" src="../assets/nv.png" alt="" />
+                  <img v-else src="../assets/nan.png" alt="" />
                 </div>
                 <div class="avatar-text">
                   <div class="avatar-name">姓名:{{ userinif.userInfo.cnName }} 部门: {{ userinif.userInfo.depName }}</div>
@@ -278,7 +281,8 @@ export default {
       panduans:false,
       iconfont:'iconfont ',
       gaodu:'',
-      gptdialog:false
+      gptdialog:false,
+      sex:0
     };
   },
   // components: {
@@ -679,6 +683,7 @@ export default {
   },
   created() {
     this.userId=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+    this.sex=JSON.parse(localStorage.getItem('userinif')).userInfo.sex;
     this.token=JSON.parse(localStorage.getItem('userinif')).token;
     this.userinif = JSON.parse(localStorage.getItem('userinif'));
     this.PotsMessageUnreadTotalCount();

src/components/system/AssignTasks.vue

@@ -213,7 +213,11 @@ export default {
     methods: {
         // 失去焦点
         onEditorBlur(editor) {
-            this.content=this.contents
+            // this.content=this.contents
+            // this.$refs.myTextEditor.quill.enable(false);
+            // setTimeout(()=>{
+            //     this.$refs.myTextEditor.quill.enable(true);
+            // },1000)
         },
         // 获得焦点
         onEditorFocus(editor) {},
@@ -333,7 +337,6 @@ export default {
         //新增api
         PostTaskAllocationAddOrEdit(){
             var id=this.id;
-            console.log(id)
             if(id==undefined){
                 id=0
             }else{
@@ -341,58 +344,43 @@ export default {
             }
             var url = "/api/PersonnelModule/PostTaskAllocationAddOrEdit"
             var that = this
-            var data={
-                    portType:1,
-                    userId: 5,
-                    pageId: that.pageId,
-                    id: id,
-                    depId: that.taskform.department,
-                    diId: that.taskform.Thegroup,
-                    taskPriority:that.taskform.value,
-                    taskName:that.taskform.taskname,
-                    taskContent: that.contents,
-                    userIds: that.taskform.staff,
-                    predictBeginTime: that.transferdate(that.taskform.schedulerules[0]),
-                    predictEndTime: that.transferdate(that.taskform.schedulerules[1]),
-                    isIntoPerformance: that.taskform.staff?1:0,
-                }
-                console.log(JSON.stringify(data))
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + that.userId
-                },
-                data:{
-                    portType:1,
-                    userId: 5,
-                    pageId: that.pageId,
-                    id: id,
-                    depId: that.taskform.department,
-                    diId: that.taskform.Thegroup,
-                    taskPriority:that.taskform.value,
-                    taskName:that.taskform.taskname,
-                    taskContent: that.contents,
-                    userIds: that.taskform.staff,
-                    predictBeginTime: that.transferdate(that.taskform.schedulerules[0]),
-                    predictEndTime: that.transferdate(that.taskform.schedulerules[1]),
-                    isIntoPerformance: that.taskform.staff?1:0,
-                }
-            }).then(function (res) {
-                console.log(res)
-                if(res.data.code==200){
-                    that.$message({
-                        type: 'success',
-                        message: res.data.msg,
-                        duration:'3000'
-                    });
-                    that.goback();
-                }else{
-                    that.$message.error(res.data.msg);
-                }
-            }).catch(function (error) {
-                that.$message.error("获取数据源失败！");
-            });
+            console.log(that.contents);
+            // this.$axios({
+            //     method: 'post',
+            //     url: url,
+            //     headers: {
+            //         Authorization: 'Bearer ' + that.userId
+            //     },
+            //     data:{
+            //         portType:1,
+            //         userId: 5,
+            //         pageId: that.pageId,
+            //         id: id,
+            //         depId: that.taskform.department,
+            //         diId: that.taskform.Thegroup,
+            //         taskPriority:that.taskform.value,
+            //         taskName:that.taskform.taskname,
+            //         taskContent: that.contents,
+            //         userIds: that.taskform.staff,
+            //         predictBeginTime: that.transferdate(that.taskform.schedulerules[0]),
+            //         predictEndTime: that.transferdate(that.taskform.schedulerules[1]),
+            //         isIntoPerformance: that.taskform.staff?1:0,
+            //     }
+            // }).then(function (res) {
+            //     console.log(res)
+            //     if(res.data.code==200){
+            //         that.$message({
+            //             type: 'success',
+            //             message: res.data.msg,
+            //             duration:'3000'
+            //         });
+            //         that.goback();
+            //     }else{
+            //         that.$message.error(res.data.msg);
+            //     }
+            // }).catch(function (error) {
+            //     that.$message.error("获取数据源失败！");
+            // });
         },
     },
     computed: {
@@ -401,6 +389,7 @@ export default {
         }
     },
     mounted(){
+        
         this.id = this.$route.query.id;
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
         this.pageId=Number(localStorage.getItem('indexs').split('-')[1]);//页面id

src/components/system/Department.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>