页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -185,8 +185,8 @@
                       <el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
                         <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
                         </el-option>
-                        <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
-                          :value="item.EmployeeId" :key="item.EmployeeId"></el-option>
+                        <el-option v-for="(item,index) in queryCommonData.EmployeeList" :label="item.EmName"
+                          :value="item.EmployeeId" :key="index"></el-option>
                       </el-select>
                     </div>
                     <div>

src/components/WebSet/WebSiteService.vue

@@ -14,6 +14,16 @@
   <div class="WebSiteService">
     <div class="query-box">
       <ul>
+        <li>
+          <label>状态</label>
+          <el-select class="wp40 accountList" v-model="msg.DemandStatus" placeholder="请选择">
+            <el-option :key="0" label="待处理" :value="0"> </el-option>
+            <el-option :key="1" label="处理中" :value="1"> </el-option>
+            <el-option :key="2" label="已完成" :value="2"> </el-option>
+            <el-option :key="3" label="转订单" :value="3"> </el-option>
+            <el-option :key="4" label="已取消" :value="4"> </el-option>
+          </el-select>
+        </li>
         <li>
           <label>稱呼</label>
           <el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.native.enter="getData" class="w210">
@@ -22,7 +32,7 @@
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
             @click="resetPageIndex(),getData()" />
-          <input type="button" class="normalBtn" @click="outerVisible=true,clearMsg()" value="添加服务" />
+          <!-- <input type="button" class="normalBtn" @click="outerVisible=true,clearMsg()" value="添加服务" /> -->
         </li>
       </ul>
     </div>
@@ -41,7 +51,7 @@
         </el-table-column>
         <el-table-column prop="TCNUM" label="團位編號" sortable>
         </el-table-column>
-        <el-table-column prop="Name" label="需求者" sortable>
+        <el-table-column prop="CreateByName" label="需求者" sortable>
         </el-table-column>
         <el-table-column prop="Mobile" label="手機號碼" sortable>
         </el-table-column>
@@ -51,6 +61,8 @@
         </el-table-column>
         <el-table-column prop="CreateDateStr2" label="提出時間" sortable>
         </el-table-column>
+        <el-table-column prop="DemandStatusStr" label="状态" sortable>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
@@ -68,24 +80,71 @@
       </el-pagination>
     </div>
 
-    <el-dialog title="服务管理" :visible.sync="outerVisible" center width="500px">
+    <el-dialog title="需求单管理" :visible.sync="outerVisible" center width="500px">
       <el-form :model="addMsg" ref="addMsg" label-width="120px">
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="行程名稱">
+              <span>{{EditObj.TripTitle}}</span>
+            </el-form-item>
+            <el-form-item label="旅行社">
+              <span></span>
+            </el-form-item>
+            <el-form-item label="團位編號">
+              <span>{{EditObj.TCNUM}}</span>
+
+            </el-form-item>
+            <el-form-item label="出團日期">
+              <span>{{EditObj.TripStartDate}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="需求者">
+              <span>{{EditObj.CreateByName}}</span>
+            </el-form-item>
             <el-form-item label="稱呼">
-              <el-input type="text" v-model="addMsg.Name" maxlength="50" placeholder="稱呼">
-              </el-input>
+              <span>{{EditObj.Name}}</span>
+
             </el-form-item>
-            <el-form-item label="聯絡電話">
-              <el-input type="text" v-model="addMsg.Mobile" maxlength="50" placeholder="聯絡電話">
-              </el-input>
+            <el-form-item label="手機號碼">
+              <span>{{EditObj.Mobile}}</span>
+
             </el-form-item>
-            <el-form-item label="聯絡E-Mail">
-              <el-input type="text" v-model="addMsg.EMail" maxlength="50" placeholder="聯絡E-Mail">
-              </el-input>
+            <el-form-item label="電子信箱">
+              <span>{{EditObj.EMail}}</span>
+
+            </el-form-item>
+            <el-form-item label="提出時間">
+              <span>{{EditObj.CreateDateStr2}}</span>
+
             </el-form-item>
             <el-form-item label="備註">
-              <el-input type="textarea" :autosize="{ minRows: 10}" placeholder="備註" v-model="addMsg.Remarks">
+              <span>{{EditObj.Remarks}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="状态">
+              <el-select class="wp40 accountList" v-model="addMsg.DemandStatus" @change="ChangeDemand()"
+                placeholder="请选择">
+                <el-option :key="0" label="待处理" :value="0"> </el-option>
+                <el-option :key="1" label="处理中" :value="1"> </el-option>
+                <el-option :key="2" label="已完成" :value="2"> </el-option>
+                <el-option :key="3" label="转订单" :value="3"> </el-option>
+                <el-option :key="4" label="已取消" :value="4"> </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="客服人員">
+              <el-select class="wp40 accountList" v-model="addMsg.SalesmanId" filterable placeholder="请选择">
+                <el-option :label="$t('pub.unlimitedSel')" :value="0">
+                </el-option>
+                <el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                  :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="承辦人員備註">
+              <el-input type="textarea" :rows="4" maxlength='50' placeholder="承辦人員備註" v-model='addMsg.SalesManRemark'>
               </el-input>
             </el-form-item>
           </el-col>
@@ -96,6 +155,25 @@
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
+
+    <el-dialog title="需求单转订单" :visible.sync="isShowDemandOrder" width="1000px" append-to-body>
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成人">
+              <el-input placeholder="成人数量" class="wp40" v-model="addMsg.ManNum" />
+            </el-form-item>
+            <el-form-item label="小孩">
+              <el-input placeholder="小孩数量" class="wp40" v-model="addMsg.ChirdNum" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isShowDemandOrder = false" size="small">取 消</el-button>
+        <el-button type="danger" size="small" @click="TransOrder()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -107,7 +185,9 @@
           Name: '', //名称
           pageSize: 15,
           pageIndex: 1,
+          DemandStatus: 0,
         },
+        isShowDemandOrder: false, //需求单转订单
         total: 0,
         currentPage: 1,
         //弹窗
@@ -115,17 +195,47 @@
         dataList: [],
         addMsg: {
           Id: 0, //编号         
-          Name: '', //名称
-          Mobile: '', //电话
-          EMail: '', //邮箱
-          Remarks: "" //备注
+          SalesmanId: 0, //销售人员
+          SalesManRemark: "", //销售备注
+          DemandStatus: 0, //状态(需求单状态(0-待处理，1-处理中，2-已完成，3-已转订单，4-已取消))
+          ManNum: 0, //成人人数
+          ChirdNum: 0, //儿童人数
         },
+        EditObj: {},
+        EmployeeList: [], //员工列表
+
       }
     },
     mounted() {
+      this.getEmployeeList();
       this.getData();
     },
     methods: {
+      ChangeDemand() {
+        if (this.addMsg.DemandStatus == 3) {
+          this.isShowDemandOrder = true;
+        }
+      },
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        let userInfo = this.getLocalStorage();
+        let msg = {
+          GroupId: userInfo.RB_Group_id,
+          BranchId: "-1",
+          DepartmentId: "-1",
+          PostId: "-1",
+          IsLeave: "0"
+        };
+        this.apipost(
+          "admin_get_EmployeeGetList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
       //获取配置
       getData() {
         //获取现有线路列表
@@ -156,7 +266,6 @@
         this.msg.pageIndex = 1;
         this.currentPage = 1;
       },
-
       //修改
       updateData(item) {
         this.apipost(
@@ -166,11 +275,11 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
+              this.EditObj = tempData;
               this.addMsg.Id = tempData.Id;
-              this.addMsg.Name = tempData.Name;
-              this.addMsg.Mobile = tempData.Mobile;
-              this.addMsg.EMail = tempData.EMail;
-              this.addMsg.Remarks = tempData.Remarks;
+              this.addMsg.DemandStatus = tempData.DemandStatus;
+              this.addMsg.SalesmanId = tempData.SalesmanId;
+              this.addMsg.SalesManRemark = tempData.SalesManRemark;
             } else {
               this.Error(res.data.message);
             }
@@ -201,21 +310,40 @@
       //清空数据
       clearMsg() {
         this.addMsg.Id = 0;
-        this.addMsg.Name = "";
-        this.addMsg.Mobile = "";
-        this.addMsg.EMail = "";
-        this.addMsg.Remarks = "";
+        this.addMsg.SalesmanId = 0;
+        this.addMsg.SalesManRemark = "";
+        this.addMsg.DemandStatus = 0;
+        this.addMsg.ManNum = 0;
+        this.addMsg.ChirdNum = 0;
       },
-      //新增、修改广告
+      //修改需求单状态
       submitForm(addMsg) {
         this.apipost(
-          "ws_post_SetService", this.addMsg,
+          "ws_post_SetServiceDemandStatusService", this.addMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.getData();
+              this.clearMsg();
+              this.Success(res.data.message);
+              this.outerVisible = false;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+      //需求单转订单
+      TransOrder() {
+        this.apipost(
+          "ws_post_TransformOrderService", this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
               this.getData();
               this.clearMsg();
               this.Success(res.data.message);
               this.outerVisible = false;
+              this.isShowDemandOrder = false;
             } else {
               this.Error(res.data.message);
             }