Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -113,7 +113,6 @@
                 <em>提成方式</em>
                 <el-select v-model="msg.Way" class="w200 HworkInput"
                 @change="handleCurrentChange(1)">
-                  <el-option label="不限" :value="-1"></el-option>
                   <el-option v-for="item in WayTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
                 </el-select>
               </li>

src/components/SalesModule/Common/productOrderList.vue

 <style>
 @import "../../../assets/css/newTravelManager.css";
-
+.people-item {
+  margin-top: 5px;
+  font-size: 14px;
+}
+.people-item-title {
+  font-size: 12px;
+  color: #666;
+  margin-right: 4px;
+}
 .productQueryList {
   width: 100%;
   min-width: 1366px;
@@ -532,8 +540,29 @@
               }}{{ $t("salesModule.PeoPle") }})
             </p>
           </div>
-          <div class="d5">联运人数: {{ item.IntermodalCount }}
-          <div>签证人数: {{ item.VisaNum==-1 ? item.NeedVisaNum : item.VisaNum }}</div></div>
+          <div class="d5">
+            <span style="font-size: 12px"><span class="people-item-title">联运人数: </span>{{ item.IntermodalCount }}</span>
+            <div class="people-item">
+              <span class="people-item-title">签证人数:</span>
+              {{ item.VisaNum == -1 ? item.NeedVisaNum : item.VisaNum }}
+            </div>
+            <div class="people-item" v-if="!isVisa">
+              <span class="people-item-title">团OP:</span>
+              {{ item.OpName }}
+            </div>
+            <div class="people-item" v-if="!isVisa">
+              <span class="people-item-title">助手:</span>
+              {{ item.AssistantList && item.AssistantList.map(item => item.Name).join(',') }}
+            </div>
+            <div class="people-item">
+              <span class="people-item-title">签证OP:</span>
+              {{ item.VisaOPName }}
+            </div>
+            <div class="people-item">
+              <span class="people-item-title">签证助手:</span>
+              {{ item.VisaAssistantList && item.VisaAssistantList.map(item => item.Name).join(',') }}
+            </div>
+          </div>
           <div class="d5">出团公司: {{ item.OutBranchName }}</div>
           <div>
             <div class="flex-center">
@@ -548,7 +577,12 @@
     <div class="noData" v-else>
       {{ $t("system.content_noData") }}
     </div>
-    <el-dialog title="编辑" :visible.sync="showDialog" width="600px" height="40%">
+    <el-dialog
+      title="编辑"
+      :visible.sync="showDialog"
+      width="600px"
+      height="40%"
+    >
       <div v-if="!isVisa">
         <span style="width: 15%; display: inline-block">团OP</span>
         <el-select
@@ -587,6 +621,7 @@
       <div style="margin-top: 10px">
         <span style="width: 15%; display: inline-block">签证OP</span>
         <el-select
+          filterable
           style="width: 80%"
           v-model="queryData.VisaOPId"
           :placeholder="$t('pub.pleaseSel')"
@@ -628,7 +663,9 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showDialog = false">取 消</el-button>
-        <el-button style="margin-right: 24px" type="primary" @click="submitOP">确 定</el-button>
+        <el-button style="margin-right: 24px" type="primary" @click="submitOP"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -739,12 +776,12 @@ export default {
           params.AssistantId = this.queryData.AssistantId.join(",");
         }
       }
-        if (!this.queryData.VisaOPId) {
-          this.$message.error("请选择签证OP");
-          return;
-        } else {
-          params.VisaOPId = this.queryData.VisaOPId;
-        }
+      if (!this.queryData.VisaOPId) {
+        this.$message.error("请选择签证OP");
+        return;
+      } else {
+        params.VisaOPId = this.queryData.VisaOPId;
+      }
       if (
         !this.queryData.VisaAssistantId ||
         !this.queryData.VisaAssistantId.length
@@ -758,8 +795,8 @@ export default {
         if (!this.queryData.VisaNum) {
           this.$message.error("请填写签证人数");
           return;
-        } else if(this.queryData.VisaNum > this.editObj.NeedVisaNum) {
-          this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + '人');
+        } else if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
+          this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
           return;
         } else {
           params.VisaNum = this.queryData.VisaNum;
@@ -780,14 +817,20 @@ export default {
     },
     editItem(item) {
       this.TCIDs = item.TCID;
-      this.editObj = item
+      this.editObj = item;
       console.log("editItem", item);
       this.queryData = {
-OPId: item.OPId || "",
-AssistantId:(!item.AssistantId || item.AssistantId == '0') ?[]:  item.AssistantId.split(',').map(item => Number(item)),
-VisaOPId: item.VisaOPId || "",
-VisaAssistantId:(!item.VisaAssistantId || item.VisaAssistantId == '0') ?[]: item.VisaAssistantId.split(',').map(item => Number(item)),
-VisaNum: item.VisaNum==-1 ? item.NeedVisaNum : item.VisaNum
+        OPId: item.OPId || "",
+        AssistantId:
+          !item.AssistantId || item.AssistantId == "0"
+            ? []
+            : item.AssistantId.split(",").map((item) => Number(item)),
+        VisaOPId: item.VisaOPId || "",
+        VisaAssistantId:
+          !item.VisaAssistantId || item.VisaAssistantId == "0"
+            ? []
+            : item.VisaAssistantId.split(",").map((item) => Number(item)),
+        VisaNum: item.VisaNum == -1 ? item.NeedVisaNum : item.VisaNum,
       };
       this.editNum = true;
       this.showDialog = true;
@@ -812,7 +855,8 @@ VisaNum: item.VisaNum==-1 ? item.NeedVisaNum : item.VisaNum
     //根据当前员工所在部门获取该部门及子部门员工信息
     getEmployeeList() {
       this.apipost(
-        "admin_get_EmployeeGetList", {},
+        "admin_get_EmployeeGetList",
+        {},
         (res) => {
           if (res.data.resultCode == 1) {
             this.EmployeeList = res.data.data;

src/plug/index.js

@@ -120,8 +120,8 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
-        domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-        //  domainUrl = "http://192.168.10.226:8015";
+        // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
+         domainUrl = "http://192.168.10.226:8015";
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";