0401LHJ

src/components/Finance/DailyFeePayment.vue

@@ -93,7 +93,7 @@
                     <el-table-column
                         prop="instructions"
                         label="费用描述"
-                        width="220">
+                        width="420">
                     </el-table-column>
                     <el-table-column
                         prop="sumPrice"

src/components/Finance/DailyFeeedit.vue

@@ -51,10 +51,10 @@
                                 <el-input-number :disabled="thesame" :min="1" v-model="item.quantity"></el-input-number>
                             </template>
                         </el-form-item>
-                        <el-form-item label="单价(RNB):">
+                        <el-form-item label="单价(CNY):">
                             <el-input-number :disabled="thesame" :controls="false" v-model="item.price" :precision="2"></el-input-number>
                         </el-form-item>
-                        <el-form-item label="小计(RNB):">
+                        <el-form-item label="小计(CNY):">
                             <div class="sub-box">{{item.itemTotal=(item.quantity*item.price).toFixed(2)}}</div>
                         </el-form-item>
                         <el-form-item label="备注:">

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -405,12 +405,12 @@ export default {
         debugger
         if (this.OpCarTouristGuideGroundData.id != null && this.OpCarTouristGuideGroundData.id != undefined && this.OpCarTouristGuideGroundData.id != 0) {
             this.QueryCarTouristGuideGroundById();
-            this.title = "修改签证费用";
+            this.title = "修改Op费用";
             this.OpCarTouristGuideGroundData.status = 2
             this.isShow = true
         } else {
             this.OpCarTouristGuideGroundData.status = 1
-            this.title = "新增签证费用"
+            this.title = "新增Op费用"
             this.isShow = false
         }
 

src/components/Resource/OfficialActivities.vue

@@ -82,6 +82,7 @@ export default {
             token: '',
             userId: 0,
             DiId: '',
+            diids:'',
             delegationInfoList: [],
             delegationInfo: {},
 
@@ -108,15 +109,21 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
-                    diid: that.diId
+                    portType: 1,
+                    pageIndex: 1,
+                    pageSize: 10000
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     that.delegationInfoList = res.data.data.delegation;
-                    that.DiId = that.delegationInfoList[0].id;
-                    that.delegationInfo = that.delegationInfoList[0];
-                    that.QueryOfficialActivitiesByDiId()
+                    if(that.diids!=that.diids){
+                        that.DiId = that.delegationInfoList[0].id;
+                        that.delegationInfo = that.delegationInfoList[0];
+                    }else{
+                        that.DiId=that.diids;
+                    }
+                    that.delegationSelectChange();
+                    // that.QueryOfficialActivitiesByDiId();
                 }
             }).catch(function (error) {
                 that.$message.error("网络错误，请稍后重试");
@@ -135,7 +142,6 @@ export default {
         QueryOfficialActivitiesByDiId() {
             var url = "/api/Resource/QueryOfficialActivitiesByDiId"
             var that = this
-            debugger
             if (that.DiId == "" && that.DiId == null && that.DiId == undefined) { that.DiId = 0 }
             this.$axios({
                 method: 'post',
@@ -150,9 +156,7 @@ export default {
                     diId: that.DiId
                 }
             }).then(function (res) {
-                debugger
                 if (res.data.code == 200) {
-                    debugger
                     that.tableDatas = res.data.data;
                     that.tableData = that.tableDatas
                     if (that.tableDatas.length != 0) {
@@ -168,7 +172,6 @@ export default {
             });
         },
         upDate(index, row) {
-
             this.$router.push({
                 path: "/home/OpOfficialActivities",
                 query: {
@@ -222,10 +225,14 @@ export default {
             });
         },
     },
-    mounted() {
+    created(){
+        this.diids = Number(this.$route.query.DiId);
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.GetGroupAllList();
+    },
+    mounted() {
+        
         //this.AirTicketResList()
     }
 }

src/components/Resource/OpOfficialActivities.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="car_add">
+    <div class="car_add visit-box">
         <div>
             <div class="communal-title">
                 <div>{{ title }}</div>
@@ -12,7 +12,7 @@
                     <div style="width: 25%;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="DiId" clearable filterable placeholder="团组选择" @change="DiIdChang"
-                                :disabled="isShow" style="width: 220px;">
+                                :disabled="isShow">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
                                 </el-option>
@@ -91,13 +91,14 @@
                             </el-input>
                         </el-form-item>
                     </div>
-                    <el-form-item label="公务形式:" prop="officialForm" label-width="160px">
-                        <el-select v-model="OpOfficialActivitiesDto.officialForm" clearable filterable placeholder="公务形式"
-                            style="width: 220px;">
-                            <el-option v-for="item in OfficialFormList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <div style="width: 25%;">
+                        <el-form-item label="公务形式:" prop="officialForm" label-width="160px">
+                            <el-select v-model="OpOfficialActivitiesDto.officialForm" clearable filterable placeholder="公务形式">
+                                <el-option v-for="item in OfficialFormList" :key="item.id" :label="item.name" :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
                 </div>
                 <div style="display: flex;">
                     <div style="width: 25%;">
@@ -157,55 +158,56 @@
                         </el-form-item>
                     </div>
                 </div>
+                <div>
+                    <div>
+                        <div class="communal-title">
+                            <div>公务文件</div>
+                        </div>
+                    </div>
+                    <span style="color: red;">上传、删除文件时请谨慎！！！</span>
+                    <hr style='background-color:#5555; height:1px; border:none;' />
+                    <div style="display: flex;">
+                        <div style="width: 33%;">
+                            公务方简介:
+                            <el-upload :file-list="uploadFiles1" ref="upload1" :on-success="upLoadSuccess1" :on-error="upLoadError1"
+                                :before-remove="beforeRemove1" :on-change="onChange1" :limit="1" :on-exceed="exceed1"
+                                :action="uploadURL" :headers="headers1" :auto-upload="false" :on-preview="onPreview1">
+                                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                                <el-button style="margin-left: 10px;" size="small" type="success"
+                                    @click="submitUpload1">上传</el-button>
+                            </el-upload>
+                        </div>
+                        <div style="width: 33%;">
+                            公务活动图片:
+                            <el-upload :file-list="uploadFiles2" ref="upload2" :on-success="upLoadSuccess2" :on-error="upLoadError2"
+                                :before-remove="beforeRemove2" :on-change="onChange2" :limit="1" :on-exceed="exceed2"
+                                :action="uploadURL" :headers="headers2" :auto-upload="false" :on-preview="onPreview2">
+                                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+        
+                                <el-button style="margin-left: 10px;" size="small" type="success"
+                                    @click="submitUpload2">上传</el-button>
+                            </el-upload>
+                        </div>
+                        <div style="width: 33%;">
+                            发票:
+                            <el-upload :file-list="uploadFiles3" ref="upload3" :on-success="upLoadSuccess3" :on-error="upLoadError3"
+                                :before-remove="beforeRemove3" :on-change="onChange3" :limit="1" :on-exceed="exceed3"
+                                :action="uploadURL" :headers="headers3" :auto-upload="false" :on-preview="onPreview3">
+                                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                                <el-button style="margin-left: 10px;" size="small" type="success"
+                                    @click="submitUpload3">上传</el-button>
+                            </el-upload>
+                        </div>
+                    </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/OfficialActivities'>
-                            <el-button>取消</el-button>
-                        </router-link>
+                        <el-button @click="returnbtn">取消</el-button>
                     </div>
                 </el-form-item>
             </el-form>
-            <div>
-                <div class="communal-title">
-                    <div>公务文件</div>
-                </div>
-            </div>
-            <span style="color: red;">上传、删除文件时请谨慎！！！</span>
-            <hr style='background-color:#5555; height:1px; border:none;' />
-            <div style="display: flex;">
-                <div style="width: 33%;">
-                    公务方简介:
-                    <el-upload :file-list="uploadFiles1" ref="upload1" :on-success="upLoadSuccess1" :on-error="upLoadError1"
-                        :before-remove="beforeRemove1" :on-change="onChange1" :limit="1" :on-exceed="exceed1"
-                        :action="uploadURL" :headers="headers1" :auto-upload="false" :on-preview="onPreview1">
-                        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                        <el-button style="margin-left: 10px;" size="small" type="success"
-                            @click="submitUpload1">上传</el-button>
-                    </el-upload>
-                </div>
-                <div style="width: 33%;">
-                    公务活动图片:
-                    <el-upload :file-list="uploadFiles2" ref="upload2" :on-success="upLoadSuccess2" :on-error="upLoadError2"
-                        :before-remove="beforeRemove2" :on-change="onChange2" :limit="1" :on-exceed="exceed2"
-                        :action="uploadURL" :headers="headers2" :auto-upload="false" :on-preview="onPreview2">
-                        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-
-                        <el-button style="margin-left: 10px;" size="small" type="success"
-                            @click="submitUpload2">上传</el-button>
-                    </el-upload>
-                </div>
-                <div style="width: 33%;">
-                    发票:
-                    <el-upload :file-list="uploadFiles3" ref="upload3" :on-success="upLoadSuccess3" :on-error="upLoadError3"
-                        :before-remove="beforeRemove3" :on-change="onChange3" :limit="1" :on-exceed="exceed3"
-                        :action="uploadURL" :headers="headers3" :auto-upload="false" :on-preview="onPreview3">
-                        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                        <el-button style="margin-left: 10px;" size="small" type="success"
-                            @click="submitUpload3">上传</el-button>
-                    </el-upload>
-                </div>
-            </div>
+            
         </div>
     </div>
 </template>
@@ -363,7 +365,9 @@ export default {
                     that.delegationInfoList = res.data.data.delegation;
                     that.OfficialFormList = res.data.data.setData;
                     if (that.OfficialFormList.length != 0) {
-                        that.OpOfficialActivitiesDto.officialForm = that.OfficialFormList[0].id
+                        if(that.id!=that.id){
+                            that.OpOfficialActivitiesDto.officialForm = that.OfficialFormList[0].id
+                        }
                     }
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
                         if (that.delegationInfoList[index].id == parseInt(that.DiId)) {
@@ -452,7 +456,7 @@ export default {
                                 message: res.data.msg,
                                 type: 'success'
                             });
-
+                            that.returnbtn();
                             that.loading = true;
                         } else {
                             that.$message.error(res.data.msg);
@@ -643,6 +647,15 @@ export default {
             a.remove();
             //window.location.href = "http://132.232.92.186:24/Office/GrpFile/商邀相关文件/" + file.name
         },
+        //返回
+        returnbtn(){
+            this.$router.push({
+                path: "/home/OfficialActivities",
+                query: {
+                    DiId: this.DiId,
+                }
+            })
+        }
     },
 
     mounted() {
@@ -680,13 +693,6 @@ export default {
 }
 </script>
 <style>
-.communal-list {
-    background-color: #fff;
-    padding: 10px;
-    box-shadow: 0 0 5px #0005;
-    border-radius: 10px;
-}
-
 .car_add .communal-title {
     display: flex;
     font-size: 17px;
@@ -722,8 +728,14 @@ export default {
     padding: 20px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 810px;
+}
+.visit-box .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width: 100%;
+}
+.visit-box .el-select{
+    width: 100%;
 }
-
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;