Bläddra i källkod

商邀部分修改

yuanrf 1 år sedan
förälder
incheckning
627df5093c

+ 6 - 6
src/components/MCR/MarketCustomerResourcesHome.vue

@@ -80,7 +80,7 @@
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人">
                     </el-table-column>
-                    <el-table-column prop="mcr" label="职位">
+                    <el-table-column prop="job" label="职位">
                     </el-table-column>
                     <el-table-column prop="telephone" label="手机号">
                     </el-table-column>
@@ -102,7 +102,7 @@
                             <el-tooltip class="item" effect="dark" placement="top">
                                 <span style="color:royalblue">查看</span>
                                 <div slot="content">
-                                    <div v-for="(yw,index) in scope.row.ascribedDepartment" :key="index"
+                                    <div v-for="(yw, index) in scope.row.ascribedDepartment" :key="index"
                                         style="text-align: center; width: 100px;padding: 5px;">
                                         {{ yw.name }}
                                     </div>
@@ -121,7 +121,7 @@
                                     </div>
                                 </div>
                             </el-tooltip> -->
-                            <div v-for="(yw,index) in scope.row .ascribedUser" :key="index" style="text-align: center;">
+                            <div v-for="(yw, index) in scope.row.ascribedUser" :key="index" style="text-align: center;">
                                 {{ yw.cnName }}
                             </div>
                         </template>
@@ -205,7 +205,7 @@ export default {
                 "business": "",
                 "Range": 0,
                 "Category": 0,
-                "operationUserId":0
+                "operationUserId": 0
             },
             groupNumber: {
                 preDeleAll: '',
@@ -237,7 +237,7 @@ export default {
         },
         pageload() {
             var that = this;
-            that.pageloadData.operationUserId=that.userId
+            that.pageloadData.operationUserId = that.userId
             //初始化界面数据
             console.log(that.pageloadData)
             this.$axios.post('/api/MarketCustomerResources/QueryNewClientData', that.pageloadData, {
@@ -298,7 +298,7 @@ export default {
         Del(row) {
             var that = this;
             var delData = {
-                "portType":1,
+                "portType": 1,
                 "id": row.id,
                 "deleteUserId": this.userId
             }

+ 2 - 6
src/components/OP/InvitationOfficialActivities.vue

@@ -58,9 +58,9 @@
                     </el-table-column>
                     <el-table-column prop="inviteTime" label="邀请时间" width="200">
                     </el-table-column>
-                    <el-table-column prop="inviteCosts,currency" label="邀请费用" width="150" sortable>
+                    <el-table-column prop="inviteCost,currency" label="邀请费用" width="150" sortable>
                         <template slot-scope="scope">
-                            {{ scope.row.inviteCosts }}({{ scope.row.currency }})
+                            {{ scope.row.inviteCost }}({{ scope.row.currency }})
                         </template>
                     </el-table-column>
                     <el-table-column prop="isGoOfficaiaBussiness" label="是否到场" width="150">
@@ -343,10 +343,6 @@ export default {
     align-items: center;
 }
 
-.el-input {
-    width: 80%;
-}
-
 .communal-box {
     display: flex;
 }

+ 1 - 2
src/components/OP/OpAirTicketRes.vue

@@ -506,7 +506,7 @@ export default {
                 otherSideNo: '',
                 otherSideName: '',
                 mfOperator: 0,
-                mfOperatorDate: this.transformDateFormat(new Date()),
+                mfOperatorDate: '',
                 diId: this.DiId,
                 payThenMoney: 0,
                 payee: '',
@@ -704,7 +704,6 @@ export default {
                     })
 
                 }).catch(err => {
-                    console.log("err", err.message);
                     this.$message.error('请完善信息在保存!');
                     return false;
                 })

+ 77 - 27
src/components/OP/OpInvitationOfficialActivities.vue

@@ -56,8 +56,8 @@
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="邀请时间:" prop="inviteTime" label-width="160px">
-                            <el-date-picker v-model="InvitationOfficialActivities.inviteTime" type="date"
-                                placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="InvitationOfficialActivities.inviteTime"
+                                type="date" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </div>
@@ -112,16 +112,26 @@
                 </div>
                 <div style="display:flex ;">
                     <div style="width: 25%;">
-                        <el-form-item label="邀请费用:" prop="inviteCosts" label-width="160px">
-                            <el-input placeholder="邀请费用" v-model="InvitationOfficialActivities.inviteCosts"
-                                style="width: 58%;">
-                            </el-input>
-                            <el-select v-model="InvitationOfficialActivities.currency" style="width: 40%;">
-                                <el-option key="48" label="CNY" :value="48"></el-option>
-                                <el-option key="49" label="USD" :value="49"></el-option>
-                                <el-option key="51" label="EUR" :value="51"></el-option>
-                            </el-select>
-                        </el-form-item>
+                        <div style="display: flex;">
+                            <div style="width: 72%;">
+                                <el-form-item label="邀请费用:" prop="inviteCost" label-width="160px">
+                                    <el-input placeholder="邀请费用" v-model="InvitationOfficialActivities.inviteCost">
+                                    </el-input>
+                                    <!-- <el-select v-model="InvitationOfficialActivities.inviteCurrency" style="width: 40%;">
+                                    <el-option v-for="item in rateList" :key="item.currencyId" :label="item.currencyCode"
+                                        :value="item.currencyId"></el-option>
+                                </el-select> -->
+                                </el-form-item>
+                            </div>
+                            <div style="width: 28%;">
+                                <el-form-item prop="inviteCurrency" label-width="5px">
+                                    <el-select v-model="InvitationOfficialActivities.inviteCurrency" placeholder="币种">
+                                        <el-option v-for="item in rateList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </div>
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="收款方:" prop="payee" label-width="160px">
@@ -151,10 +161,10 @@
                 </div>
 
                 <div style="display: flex;">
-                    <div style="width: 25%;">
+                    <div style="width: 25%;" class="ExpressPirce">
                         <el-form-item label="快递费:" prop="sendCost" label-width="160px">
-                            <el-input placeholder="快递费" v-model="InvitationOfficialActivities.sendCost">
-                            </el-input>
+                            <el-input-number v-model="InvitationOfficialActivities.sendCost" :controls='false'
+                                :min="0"></el-input-number>
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">
@@ -223,8 +233,8 @@ export default {
                 inviter: '',
                 inviteTime: this.transformDateFormat(new Date()),
                 attachment: '',
-                inviteCosts: 0,
-                currency: 48,
+                inviteCost: 0,
+                inviteCurrency: '',
                 sendCost: 0,
                 isGoOfficaiaBussiness: 0,
                 createUserId: 0,
@@ -242,9 +252,9 @@ export default {
                 TypeName: "B"
             },
             InvitationOfficialActivitiesRules: {
-                inviteCosts: [
+                inviteCost: [
                     { required: true, message: '请输入费用金额', trigger: 'blur' },
-                    { pattern: /^(([1-9]?\d{0,8}(\.\d{1,2})?)|999999999|999999999\.(0){1,2})$/, message: '请输入正确的金额(最多2位小数)' }
+                    { pattern: /^(([1-9]?\d{0,8}(\.\d{1,2})?)|999999999|999999999\.(0){1,2})$/, message: '请输入正确的金额' }
                 ],
                 inviterArea: [
                     { required: true, message: '请输入邀请方地区', trigger: 'change' },
@@ -274,9 +284,13 @@ export default {
                     { required: true, message: '请输入收款方', trigger: 'change' },
                     { required: true, message: '请输入收款方', trigger: 'blur' },
                 ],
+                inviteCurrency: [
+                    { required: true, message: '请选择币种', trigger: 'change' },
+                    { required: true, message: '请选择币种', trigger: 'blur' },
+                ],
 
-            }
-
+            },
+            rateList: [],
         }
     },
     methods: {
@@ -337,8 +351,8 @@ export default {
                     that.InvitationOfficialActivities.inviteTime = res.data.data._Invitation.inviteTime
                     that.InvitationOfficialActivities.attachment = res.data.data._Invitation.attachment
                     that.projectName = res.data.data._Invitation.attachment
-                    that.InvitationOfficialActivities.inviteCosts = res.data.data._Invitation.inviteCosts
-                    that.InvitationOfficialActivities.currency = res.data.data._Invitation.currency
+                    that.InvitationOfficialActivities.inviteCost = res.data.data._Invitation.inviteCost
+                    that.InvitationOfficialActivities.inviteCurrency = res.data.data._Invitation.inviteCurrency
                     that.InvitationOfficialActivities.sendCost = res.data.data._Invitation.sendCost
                     that.InvitationOfficialActivities.isGoOfficaiaBussiness = res.data.data._Invitation.isGoOfficaiaBussiness
                     that.InvitationOfficialActivities.remark = res.data.data._Invitation.remark
@@ -413,7 +427,7 @@ export default {
                                     that.loading = true;
                                     setTimeout(() => {
                                         that.$router.push('/home/InvitationOfficialActivities')
-                                    }, 3000);
+                                    }, 500);
                                 } else {
                                     that.$message.error(res.data.msg);
                                 }
@@ -459,7 +473,7 @@ export default {
                                         that.loading = true;
                                         setTimeout(() => {
                                             that.$router.push('/home/InvitationOfficialActivities')
-                                        }, 3000);
+                                        }, 500);
                                     } else {
                                         that.$message.error(res.data.msg);
                                     }
@@ -482,6 +496,7 @@ export default {
                     break;
                 }
             }
+            this.QueryRate();
         },
 
         //上传
@@ -533,7 +548,7 @@ export default {
                         that.loading = true;
                         setTimeout(() => {
                             that.$router.push('/home/InvitationOfficialActivities')
-                        }, 3000);
+                        }, 500);
                     } else {
                         that.$message.error(res.data.msg);
                     }
@@ -563,7 +578,37 @@ export default {
         onChange(file, fileList) {
             debugger
             this.projectName = file.name
-        }
+        },
+        QueryRate() {
+            var url = "/api/Business/PostGroupTeamRateByDiIdAndCTableId"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    "portType": 1,
+                    "diId": this.DiIdSelect ? this.DiIdSelect : this.DiId,
+                    "cTable": 81 //商邀
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    //汇率
+                    console.log("汇率--", res.data.data);
+                    that.rateList = res.data.data.teamRates;
+                }
+            })
+        },
+        back() {
+            this.$router.push({
+                path: "/home/InvitationOfficialActivities",
+                query: {
+                    DiId: this.DiIdSelect ? this.DiIdSelect : this.DiId,
+                }
+            })
+        },
 
     },
 
@@ -584,6 +629,7 @@ export default {
             this.isShow = false
         }
         this.DiId = this.$route.query.DiId
+        this.QueryRate();
     }
 }
 </script>
@@ -632,6 +678,10 @@ export default {
     border-radius: 10px;
 }
 
+.ExpressPirce .el-input input {
+    text-align: left;
+}
+
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;