行程特色颜色调整

src/components/busManagement/busDriver.vue

+<style>
+  @import "../../assets/css/comSupplier.css";
+
+</style>
+<template>
+  <div class="flexOne suppierManage">
+    <div class="query-box">
+      <ul>
+        <li>
+          <span>
+            <em>{{$t('system.quety_area')}}</em>
+            <el-select v-model="msg.CountryStr" clearable class="w150" filterable
+              @change="getProvinceList(msg.CountryStr,1)" :placeholder="$t('hotel.hotel_country')">
+              <el-option v-for='item in countryList' :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
+            </el-select>
+            <el-select v-model="msg.ProvinceStr" class="w150" filterable @change="getProvinceList(msg.ProvinceStr,2)"
+              :placeholder="$t('hotel.hotel_province')">
+              <el-option v-for='item in provinceList' :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
+            </el-select>
+            <el-select v-model="msg.CityStr" class="w150" filterable @change="getProvinceList(msg.CityStr,3)"
+              :placeholder="$t('hotel.hotel_city')">
+              <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
+            </el-select>
+            <el-select v-model="msg.DistrictStr" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
+              <el-option v-for='item in district' :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('hotel.suplier_name')}}</em>
+            <el-input maxlength="50" v-model="msg.Name" class="permiss-input w150" @keyup.native.enter="initData"
+              :placeholder="$t('pub.pleaseImport')"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('hotel.suplier_contact')}}</em>
+            <el-input maxlength="50" v-model="msg.Contact" class="permiss-input w150" @keyup.native.enter="initData"
+              :placeholder="$t('pub.pleaseImport')"></el-input>
+          </span>
+        </li>
+        <li>
+          <button class="hollowFixedBtn" type="button"
+            @click="resetPageIndex(),initData()">{{$t('pub.searchBtn')}}</button>
+          <button class="normalBtn" type="button"
+            @click="clearinputInfo(),outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.tianjaigys')">{{$t('pub.addBtn')}}</button>
+        </li>
+      </ul>
+      <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center>
+        <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+          <el-form-item :label="$t('hotel.suplier_name')" prop="Name">
+            <el-input type="text" class="w300" maxlength="50" v-model="addMsg.Name"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('hotel.table_tel')" p>
+            <el-input type="text" class="w300" maxlength="50" v-model="addMsg.Mobile"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('hotel.suplier_contact')">
+            <el-input type="text" class="w300" maxlength="50" v-model="addMsg.WeChatName"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn"
+            @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
+          <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.sureBtn')}}</button>
+        </div>
+      </el-dialog>
+    </div>
+    <div class="supplierList clearfix" v-loading="loading">
+      <div class="supList" v-for="item in tableList" :key="item.subCode">
+        <div class="suTop">
+          <img src="../../assets/img/suplier.jpg">
+          <div class="topCircle">{{item.Number}}</div>
+        </div>
+        <div class="supTitle">{{item.Name}}</div>
+        <div class="telNumber">{{item.Mobile}}</div>
+        <div class="Address">
+          <div v-show="item.WeChatName">
+            <i class="iconfont icon-img_dz"></i>
+            <el-tooltip class="item" effect="dark" :content="item.WeChatName" placement="top-start">
+              <div class="AddressInner">{{item.WeChatName}}</div>
+            </el-tooltip>
+          </div>
+        </div>
+        <div class="updataBtn">
+          <button class="normalBtn UPBtn"
+            @click="outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.xiugaigonys'),updateInfo(item.ID)">{{$t('pub.updateMsg')}}</button>
+          <button class="hollowFixedBtn UPBtn" @click="isdelete(item)">{{$t('system.table_delete')}}</button>
+        </div>
+      </div>
+    </div>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        total: 0,
+        currentPage: 1,
+        tableList: "",
+        outerVisible: false,
+        loading: true,
+        dialogTitle: "",
+        msg: {
+          pageIndex: 1,
+          pageSize: 10,
+          Name: "",
+          Mobile: "",
+          WeChatName: "",
+          SupplierId: 0,
+        },
+        addMsg: {
+          DetailsId: 0,
+          SupplierId: 0,
+          Name: "",
+          Mobile: "",
+          WeChatName: "",
+        },
+        rules: {
+          Name: [{
+            required: true,
+            message: this.$t('visaT.qsrgysname'),
+            trigger: "blur"
+          }],
+        }
+      };
+    },
+    methods: {
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.initData();
+      },
+      resetPageIndex() {
+        this.msg.pageIndex = 1;
+        this.currentPage = 1;
+      },
+      initData() {
+        this.loading = true;
+        this.apipost(
+          "supplier_post_GetBusSupplierManPage",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.tableList = res.data.data.pageData;
+              this.total = res.data.data.count;
+            }
+          },
+          null
+        );
+      },
+      isdelete(item) {
+        var that = this;
+        this.Confirm("是否删除此司机?", function () {
+          that.delsuppli(item);
+        });
+      },
+      delsuppli(item) {
+        let msg = {
+          DetailsId: item.DetailsId
+        };
+        this.apipost(
+          "supplier_post_RemoveBusSupplierMan",
+          msg,
+          response => {
+            if (response.data.resultCode == 1) {
+              this.Success(this.$t('tips.shanchuchenggong'));
+              this.initData();
+            } else {
+              this.Error(response.data.message);
+            }
+          },
+          null
+        );
+      },
+      saveInfo() {
+        this.apipost(
+          "supplier_post_SetBusSupplierMan",
+          this.addMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.initData();
+              this.Success(this.$t('tips.saveYes'));
+              this.outerVisible = false;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      clearinputInfo() {
+        this.addMsg.Name = "";
+        this.addMsg.Mobile = "";
+        this.addMsg.WeChatName = "";
+      },
+      updateInfo(ID) {
+        let msg = {
+          DetailsId: ID
+        };
+        this.apipost(
+          "supplier_post_GetBusSupplierMan",
+          msg,
+          res => {
+            var tempData = res.data.data;
+            this.addMsg.DetailsId = tempData.DetailsId;
+            this.addMsg.Name = tempData.Name;
+            this.addMsg.Mobile = tempData.Mobile;
+            this.addMsg.WeChatName = tempData.WeChatName;
+          },
+          null
+        );
+      },
+      submitForm(addMsg) {
+        //提交创建、修改表单
+        let that = this;
+        that.$refs[addMsg].validate(valid => {
+          if (valid) {
+            that.saveInfo();
+          } else {
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+    },
+    created() {
+      if (this.$route.query.SupplierId && this.$route.query.SupplierId > 0) {
+        this.addMsg.SupplierId = this.$route.query.SupplierId;
+        this.msg.SupplierId = this.$route.query.SupplierId;
+      }
+    },
+    mounted() {
+      this.initData();
+    }
+  };
+</script>
\ No newline at end of file

src/components/commonPage/busSurveyDetails.vue

+<template>
+  <div class="BusFeedback">
+    <div class="main NewSurveyList" v-loading="loading">
+      <div class="">
+        <div style="text-align:center;font-size:20px;font-weight:bold;"><template
+            v-if="surveyInfo&&surveyInfo.Title&&surveyInfo.Title!=''">{{surveyInfo.Title}}</template>
+        </div>
+        <div style="text-indent:2em;"><template
+            v-if="surveyInfo&&surveyInfo.SubTitle&&surveyInfo.SubTitle!=''">{{surveyInfo.SubTitle}}</template>
+        </div>
+        <table id="table">
+
+          <template v-for="(item, index) in busDetailsList">
+            <tr :key="`t_`+index">
+              <td class="_name">{{index+1}}、{{item.Title}}</td>
+            </tr>
+            <tr :key="`a_`+index">
+              <template v-if="item.SurveyType === 1">
+                <td>
+                  <el-rate v-model="item.ScoreNum" show-text :texts="texts" disabled>
+                  </el-rate>
+                </td>
+              </template>
+              <template v-if="item.SurveyType === 2">
+                <td>
+                  <el-radio-group v-model="item.ScoreNum">
+                    <el-radio v-for="(radio, rIndex) in item.SurveyOptionsList" :label="radio.ID" :key="rIndex"
+                      disabled>
+                      {{radio.OptionsName}}</el-radio>
+                  </el-radio-group>
+                </td>
+              </template>
+              <template v-if="item.SurveyType === 3">
+                <td>
+                  <el-checkbox v-for="(radio, rIndex) in item.SurveyOptionsList" :checked="radio.IsCheck=='1'"
+                    :label="radio.ID" :key="rIndex" rea>
+                    {{radio.OptionsName}}</el-checkbox>
+                </td>
+              </template>
+              <template v-if="item.SurveyType === 4">
+                <td>
+                  <el-input type="textarea" :rows="2" :placeholder="$t('fnc.qsrneirong')" v-model="item.TextContent"
+                    disabled>
+                  </el-input>
+                </td>
+              </template>
+            </tr>
+          </template>
+        </table>
+      </div>
+      <div style="margin: 20px 0; text-align: right;">
+        <button class="normalBtn" @click="closeDialog">{{$t('pub.closeSel')}}</button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: ["TCID"],
+    components: {},
+    data() {
+      return {
+        loading: false,
+        wqList: [],
+        texts: [
+          this.$t('objFill.pingfens')[0],
+          this.$t('objFill.pingfens')[1],
+          this.$t('objFill.pingfens')[2],
+          this.$t('objFill.pingfens')[3],
+          this.$t('objFill.pingfens')[4]
+        ],
+        surveyInfo: {}, //问卷信息
+        busDetailsList: [], //车问卷详情
+      }
+    },
+    created() {
+      this.GetBusSurveyInfo()
+    },
+    mounted() {
+      this.GetSurveyShowList();
+      this.showBusSurveyInfo();
+    },
+    methods: {
+      //显示车行详情
+      showBusSurveyInfo() {
+        this.loading = true;
+        var postMsg = {
+          TCID: this.TCID
+        }
+        this.apipost("survey_post_GetBusSurveyDetails", postMsg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.busDetailsList = res.data.data;
+          }
+        })
+      },
+      //获取文件标题和描述
+      GetBusSurveyInfo() {
+        this.apipost("survey_post_GetBusSurveyInfo", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.surveyInfo = res.data.data;
+          }
+        });
+      },
+      GetSurveyShowList() {
+        let data = {
+          IsShow: 1,
+          SurveyType: -1
+        }
+        this.apipost('survey_post_GetBusSurveyShowList', data, res => {
+          if (res.data.resultCode === 1) {
+            let data = res.data.data
+            data.map(item => {
+              if (item.SurveyType === 2) {
+                item.SurveyOptionsList.map((cItem, cIndex) => {
+                  cItem.IsCheckS = false
+                })
+              }
+              if (item.SurveyType === 3) {
+                item.SurveyOptionsList.map((cItem, cIndex) => {
+                  cItem.IsCheckS = false
+                })
+              }
+              if (item.SurveyType === 1) {
+                item.ScoreNum = 5;
+              }
+            })
+            this.wqList = data;
+          }
+        }, null)
+      },
+      closeDialog() {
+
+      },
+    }
+  }
+
+</script>
+<style scoped>
+  .Feedback ul>li {
+    display: inline-block;
+    font-size: 12px;
+    color: #666;
+    margin: 20px 30px 0px 0;
+  }
+
+  .Feedback .singeRowTable {
+    margin-top: 20px;
+  }
+
+  .NewSurveyList.main {
+    padding: 1.5rem;
+  }
+
+  .NewSurveyList .tit {
+    font-size: 2rem;
+    text-align: center;
+    margin-bottom: .5rem;
+  }
+
+  .NewSurveyList .sub_tit {
+    font-size: 1.4rem;
+    margin-bottom: .4rem;
+  }
+
+  .NewSurveyList .indet_2 {
+    text-indent: 2.4rem;
+  }
+
+  .NewSurveyList .tit_det {
+    text-indent: 2.4rem;
+    font-size: 1rem;
+  }
+
+  .NewSurveyList table {
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+
+  .NewSurveyList table {
+    margin-top: 1rem;
+    width: 100%;
+  }
+
+  .NewSurveyList tr td {
+    padding: .5rem;
+    border: 1px solid #5b5653;
+    font-size: 1rem;
+  }
+
+  .NewSurveyList .qianming {
+    margin-top: 2.5rem;
+  }
+
+  .NewSurveyList .qianming label {
+    margin-right: .2rem;
+  }
+
+  .NewSurveyList.main {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .NewSurveyList #table td,
+  .NewSurveyList .qianming span {
+    color: #111;
+  }
+
+  .NewSurveyList #table td._name,
+  .NewSurveyList .qianming label {
+    color: #5d5d5d;
+  }
+
+  .go_regis {
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+</style>

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -368,6 +368,7 @@
       getConfig(configObj) {
         this.PostConfig = configObj;
         this.PostConfig.TripColor = configObj.TripColor ? configObj.TripColor : '#CC6900' //#CC0066
+        this.FeatureData.TripColor=this.PostConfig.TripColor;
         //没有报价单根据线路设置直采和非直采方式生成线路行程
         if (this.IsHaveOffer == 0) {
           this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;