02181620

src/components/MarketplacePick.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="marketplacepick-all">
+        <div class="marketplacepick-form">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm" >
+                <div class="marketplacepick-form-ul">
+                    <div class="marketplacepick-form-li"  v-for="(item,index) in controlarr" :key="index" >
+                        <el-form-item :label="item.fieldName">
+                            <el-input v-if="item.fieldTypeName=='文本'" v-model="item.newValue"></el-input>
+                            <el-input-number id="marketplacepicknumber" v-if="item.fieldTypeName=='数字'" :controls="false" v-model="item.newValue" ></el-input-number>
+                            <el-radio-group v-if="item.fieldTypeName=='单选按钮'" v-model="item.newValue">
+                                <el-radio label="是"></el-radio>
+                                <el-radio label="否"></el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item v-if="item.isRemark">
+                            <el-input type="textarea" v-model="item.remark"></el-input>
+                        </el-form-item>
+                    </div>
+                </div>
+                <!-- <el-form-item>
+                    <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+                    <el-button @click="resetForm('ruleForm')">重置</el-button>
+                </el-form-item> -->
+            </el-form>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            ruleForm: {
+                name: '',
+                region: '',
+                date1: '',
+                date2: '',
+                delivery: false,
+                type: [],
+                resource: '',
+                desc: ''
+            },
+            rules: {
+                name: [
+                    { required: true, message: '请输入活动名称', trigger: 'blur' },
+                    { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                region: [
+                    { required: true, message: '请选择活动区域', trigger: 'change' }
+                ],
+                date1: [
+                    { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+                ],
+                date2: [
+                    { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+                ],
+                type: [
+                    { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+                ],
+                resource: [
+                    { required: true, message: '请选择活动资源', trigger: 'change' }
+                ],
+                desc: [
+                    { required: true, message: '请填写活动形式', trigger: 'blur' }
+                ]
+            },
+            formid:0,
+            tempId:1404,
+            controlarr:[],
+            tempDatas:[],
+        }
+    },
+    methods:{
+        submitForm(formName) {
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    alert('submit!');
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        resetForm(formName) {
+            this.$refs[formName].resetFields();
+        },
+        //或取基础数据
+        GroupOrderPreInfos() {
+            var url = "/api/Groups/GroupOrderPreInfo/"
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+            }).then(function (res) {
+                if (res.data.code==200) {
+                    that.tempDatas=res.data.data.tempDatas;
+                    that.tempId=that.tempDatas[0].id;
+                    that.GroupOrderPreInfo();
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //获取表单
+        GroupOrderPreInfo() {
+            var url = "/api/Groups/GroupOrderPreInfo/"+this.formid+"/"+this.tempId
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+            }).then(function (res) {
+                if (res.data.code==200) {
+                    that.controlarr=res.data.data.items;
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+    },
+    mounted(){
+        this.GroupOrderPreInfos();
+        // this.GroupOrderPreInfo();
+    }
+}
+</script>
+<style>
+.marketplacepick-form{
+    max-width: 1200px;
+    min-width: 375px;
+}
+.marketplacepick-form .el-select{
+    width: 100%;
+}
+.marketplacepick-form-li .el-input-number{
+    width: 100%;
+}
+.marketplacepick-form-li .el-input-number .el-input__inner{
+    text-align: left;
+}
+.marketplacepick-form-ul{
+    display: flex;
+    flex-wrap: wrap;
+}
+.marketplacepick-form-li{
+    width: 365px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    padding: 0px 5px;
+    border: 1px dashed #b0b1b3;
+}
+</style>

src/components/OP/EntryDetails.vue

@@ -169,12 +169,8 @@
                         </div>
                         <span v-if="JSON.stringify(TicketJudgment) == '{}'" class="redzhu">(机票数据未录入)</span>
                         <div v-else>
-                            <span
-                                v-if="TicketJudgment.jjcCurrentRate != TotalExpenses.EconomyClass || TicketJudgment.gwcCurrentRate != TotalExpenses.BusinessClass"
-                                class="redzhu">{{ TicketJudgment.remark }}</span>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <el-button
-                                v-if="TicketJudgment.jjcCurrentRate != TotalExpenses.EconomyClass || TicketJudgment.gwcCurrentRate != TotalExpenses.BusinessClass"
-                                type="primary" @click="Fillin" size="mini">填 入</el-button>
+                            <span class="redzhu">{{ TicketJudgment.remark }}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+                            <el-button type="primary" @click="Fillin" size="mini">填 入</el-button>
                         </div>
                     </div>
                     <div class="Entry-li-inif">
@@ -828,6 +824,13 @@ export default {
                 }).then(function (res) {
                     if (res.data.code == 200) {
                         that.TicketJudgment = res.data.data.airData;
+                        console.log(that.TotalExpenses.EconomyClass);
+                        if (that.TotalExpenses.EconomyClass==0) {
+                            that.TotalExpenses.EconomyClass = that.TicketJudgment.jjcCurrentRate;
+                        }
+                        if (that.TotalExpenses.BusinessClass==0) {
+                            that.TotalExpenses.BusinessClass = that.TicketJudgment.gwcCurrentRate;
+                        }
                         that.visainfo = res.data.data.visaData;
                         that.currencyss = res.data.data.reteInfos;
                         if (that.DomesticFees.visafees != res.data.data.visaData.feeTotal && res.data.data.visaData.feeTotal != 0) {

src/components/OP/EntryQuotation.vue

@@ -0,0 +1,50 @@
+<template>
+    <div class="entryquotation-all">
+        <div class="entryquotation-title">出入境报价表</div>
+        <div class="entryquotation-form">
+            <div class="entryquotation-form-li">
+                <div class="entryquotation-form-title">
+                    国际旅费（公务舱和经济舱分别罗列）
+                </div>
+                <div class="entryquotation-form-content">
+                    6人全程机票：112864元
+                    公务舱：27509元/人*1人        
+                    经济舱：17071元/人*5人       
+                    城市间交通费用：
+                    8000元/人*6人
+                    以上小计：160864元
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style>
+.entryquotation-all {
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    height: 100%;
+    min-height: 840px;
+}
+.entryquotation-title{
+    text-align: center;
+    font-size: 17px;
+    font-weight: 600;
+}
+.entryquotation-form{
+    border: 1px solid #ebeef5;
+}
+.entryquotation-form-li{
+    display: flex;
+}
+.entryquotation-form-title{
+    padding: 10px;
+    
+}
+</style>

src/components/OP/SuppliesInventory.vue

@@ -473,7 +473,7 @@
                     <el-form-item label="关联团组" prop="groupId">
                         <el-select size="small" v-model="ClaimsruleForm.groupId" clearable filterable
                             placeholder="请选择">
-                            <el-option :style="item.id==0||item.id==-1?'color:#67c23a;':''" v-for="item in groupNameData" :key="item.id" :label="item.groupName"
+                            <el-option :style="item.id==0||item.id==-1||item.id==-2?'color:#67c23a;':''" v-for="item in groupNameData" :key="item.id" :label="item.groupName"
                                 :value="item.id">
                             </el-option>
                         </el-select>

src/router/index.js

@@ -6,6 +6,7 @@ import home from '@/components/home'
 import Enroll from '@/components/Enroll'
 import expenseMobile from '@/components/expenseMobile'
 import expenseMobileinfo from '@/components/expenseMobileinfo'
+import MarketplacePick from '@/components/MarketplacePick'
 import Sankunginfo from '@/components/Sankunginfo'
 import index from '@/components/child/index'
 import Aideindex from '@/components/child/Aideindex'
@@ -132,6 +133,7 @@ import WorldMap from '@/components/ConferenceModule/WorldMap';
 import EntryDetailsdraft from '@/components/OP/EntryDetailsdraft';
 import mealrecord from '@/components/OP/mealrecord';
 import enterpriseprofit from '@/components/statistics/enterpriseprofit';
+import EntryQuotation from '@/components/OP/EntryQuotation';
 
 Vue.use(Router)
 
@@ -793,6 +795,11 @@ export default new Router({
           name: 'enterpriseprofit',
           component: enterpriseprofit
         },
+        {
+          path: '/home/EntryQuotation',
+          name: 'EntryQuotation',
+          component: EntryQuotation
+        },
       ]
     },
     {
@@ -819,6 +826,11 @@ export default new Router({
       path: '/EvaluationForm',
       name: 'EvaluationForm',
       component: EvaluationForm
+    },
+    {
+      path: '/MarketplacePick',
+      name: 'MarketplacePick',
+      component: MarketplacePick
     }
   ]
 })