问题修改

CallCenterWeb.UI/src/api/commodityManagement/commodityList.js

@@ -61,4 +61,12 @@ export function updateCommodityTag(params) {
   })
 }
 
+// 更改商品是否赠品
+export function updateCommodityIsSale(params) {
+  return request({
+    url: 'api/Product/updateSale',
+    method: 'post',
+    params
+  })
+}
 

CallCenterWeb.UI/src/components/Teloperation/index.vue

@@ -4,65 +4,44 @@
       <div class="call_icon">
         <transition-group type="transition" name="slide-list">
           <svg-icon v-show="!telIsLogin" key="0" icon-class="guaduan" />
-          <i
-            v-show="telIsLogin && (telSeatState===2 && telLineState===1)"
-            key="1"
-            class="calli free"
-          />
+          <i v-show="telIsLogin && telSeatState === 2 && telLineState === 1" key="1" class="calli free" />
           <!-- <svg-icon v-show="telIsLogin && (telSeatState===2 && telLineState===1)" icon-class="xiuxi" /> -->
-          <svg-icon
-            v-show="telIsLogin && (telSeatState===5 && telLineState===1)"
-            key="2"
-            icon-class="manglu01"
-          />
-          <svg-icon
-            v-show="telIsLogin && (telLineState===2)"
-            key="3"
-            icon-class="fenji"
-            class="ringing"
-          />
-          <svg-icon
-            v-show="telIsLogin && (telLineState===3)"
-            key="4"
-            icon-class="huchu"
-            class="ringing"
-          />
+          <svg-icon v-show="telIsLogin && telSeatState === 5 && telLineState === 1" key="2" icon-class="manglu01" />
+          <svg-icon v-show="telIsLogin && telLineState === 2" key="3" icon-class="fenji" class="ringing" />
+          <svg-icon v-show="telIsLogin && telLineState === 3" key="4" icon-class="huchu" class="ringing" />
           <!-- <svg-icon v-show="telIsLogin && (telLineState===4)" icon-class="zhenling" class="ringing" /> -->
           <!-- <svg-icon v-show="telIsLogin && (telLineState===6)" icon-class="tonghuazhong01" class="incall" /> -->
           <!-- <svg-icon v-show="telIsLogin && (telLineState===10)" icon-class="tonghuazhong01" class="incall" /> -->
-          <i v-show="telIsLogin && (telLineState===4)" key="5" class="calli callringing" />
-          <i v-show="telIsLogin && (telLineState===6)" key="6" class="calli incalling" />
-          <i v-show="telIsLogin && (telLineState===10)" key="7" class="calli incalling" />
+          <i v-show="telIsLogin && telLineState === 4" key="5" class="calli callringing" />
+          <i v-show="telIsLogin && telLineState === 6" key="6" class="calli incalling" />
+          <i v-show="telIsLogin && telLineState === 10" key="7" class="calli incalling" />
         </transition-group>
       </div>
       <div class="call_content">
         <p class="call_text">
           <!-- <transition-group type="transition" name="fade-text"> -->
           <span v-show="!telIsLogin" key="8">还未开始工作</span>
-          <span v-show="telIsLogin && (telSeatState===2 && telLineState===1)" key="9">空闲中</span>
-          <span v-show="telIsLogin && (telSeatState===5 && telLineState===1)" key="10">忙碌中</span>
-          <span v-show="telIsLogin && (telLineState===2)" key="11">摘机中</span>
-          <span v-show="telIsLogin && (telLineState===3)" key="12">拨号中</span>
-          <span v-show="telIsLogin && (telLineState===4)" key="13">振铃中</span>
-          <span v-show="telIsLogin && (telLineState===6)" key="14">通话中</span>
-          <span v-show="telIsLogin && (telLineState===10)" key="15">保持中</span>
+          <span v-show="telIsLogin && telSeatState === 2 && telLineState === 1" key="9">空闲中</span>
+          <span v-show="telIsLogin && telSeatState === 5 && telLineState === 1" key="10">忙碌中</span>
+          <span v-show="telIsLogin && telLineState === 2" key="11">摘机中</span>
+          <span v-show="telIsLogin && telLineState === 3" key="12">拨号中</span>
+          <span v-show="telIsLogin && telLineState === 4" key="13">振铃中</span>
+          <span v-show="telIsLogin && telLineState === 6" key="14">通话中</span>
+          <span v-show="telIsLogin && telLineState === 10" key="15">保持中</span>
           <!-- </transition-group>	 -->
           <svg-icon v-show="telIsLogin" icon-class="xinhao" />
         </p>
-        <p
-          v-show="(telSeatState===2 && telLineState < 6)|| (telSeatState === 5 && telLineState < 6)"
-          class="call_time"
-        >--:--:--</p>
-        <p v-show="telIsLogin && (telLineState===6 || telLineState===10)" class="call_time">
+        <p v-show="(telSeatState === 2 && telLineState < 6) || (telSeatState === 5 && telLineState < 6)" class="call_time">--:--:--</p>
+        <p v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" class="call_time">
           <span v-show="Number(telCallTime.hh) === 0">{{ telCallTime.hh }}</span>
           <span v-show="Number(telCallTime.hh) > 0 && Number(telCallTime.hh) < 10">
-            <span>{{ telCallTime.hh.substr(0,1) }}</span>
+            <span>{{ telCallTime.hh.substr(0, 1) }}</span>
             <span class="blue_color">{{ telCallTime.hh.substr(1) }}</span>
           </span>
           <span v-show="Number(telCallTime.hh) > 9" class="blue_color">{{ telCallTime.hh }}</span>
           <span v-show="Number(telCallTime.mm) === 0">:{{ telCallTime.mm }}</span>
           <span v-show="Number(telCallTime.mm) > 0 && Number(telCallTime.mm) < 10">
-            <span>:{{ telCallTime.mm.substr(0,1) }}</span>
+            <span>:{{ telCallTime.mm.substr(0, 1) }}</span>
             <span class="blue_color">{{ telCallTime.mm.substr(1) }}</span>
           </span>
           <span v-show="Number(telCallTime.mm) > 9" class="blue_color">:{{ telCallTime.mm }}</span>
@@ -71,160 +50,70 @@
       </div>
     </div>
     <div v-show="telIsLogin" class="call_middle">
-      <el-input
-        :class="{no_write: true}"
-        :readonly="true"
-        v-model="telCallNum"
-        size="small"
-        placeholder
-      />
-      <i
-        v-show="telSeatState===2 && telLineState===1"
-        slot="reference"
-        class="dialicon"
-        @click="makeCall"
-      />
-      <el-popover
-        :value="telIsVisCallout"
-        :disabled="false"
-        trigger="manual"
-        popper-class="dial_popover"
-        placement="bottom-start"
-        width="300"
-        transition="fade-in-linear"
-        @after-leave="afterLeave"
-      >
+      <el-input :class="{ no_write: true }" :readonly="true" v-model="telCallNum" size="small" placeholder />
+      <i v-show="(telSeatState === 2 && telLineState === 1) || (telSeatState === 5 && telLineState === 1)" slot="reference" class="dialicon" @click="makeCall" />
+      <el-popover :value="telIsVisCallout" :disabled="false" trigger="manual" popper-class="dial_popover" placement="bottom-start" width="300" transition="fade-in-linear" @after-leave="afterLeave">
         <Dialplate />
       </el-popover>
     </div>
     <div class="call_right">
       <transition-group type="transition" name="fade-list">
-        <button
-          v-waves
-          v-show="!telIsLogin"
-          key="27"
-          type="button"
-          class="start_btn"
-          @click="signIn"
-        >开始工作</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telSeatState===2 && telLineState===1)"
-          key="17"
-          type="button"
-          class="call_btn"
-          @click="setBusy"
-        >置忙</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telSeatState===5 && telLineState===1)"
-          key="18"
-          type="button"
-          class="call_btn"
-          @click="setFree"
-        >置闲</button>
-        <button
-          v-waves
-          v-show="telIsLogin && ((telSeatState===2 || telSeatState===5) && telLineState===1)"
-          key="19"
-          type="button"
-          class="call_btn"
-          @click="signOut"
-        >签出</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState===6)"
-          key="20"
-          type="button"
-          class="call_btn yellow_bg"
-          @click="holdBack"
-        >保持通话</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState===10)"
-          key="21"
-          type="button"
-          class="call_btn green_bg"
-          @click="retrieveBack"
-        >接回通话</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState===6 || telLineState===10)"
-          key="24"
-          type="button"
-          class="call_btn"
-          @click="transferCall"
-        >转接</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState===6 || telLineState===10)"
-          key="25"
-          type="button"
-          class="call_btn"
-          @click="meetingCall"
-        >多方通话</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState>2)"
-          key="22"
-          type="button"
-          class="call_btn"
-          @click="btn_IVR"
-        >转IVR</button>
-        <button
-          v-waves
-          v-show="telIsLogin && (telLineState>2)"
-          key="23"
-          type="button"
-          class="call_btn red_bg"
-          @click="dropCall"
-        >挂断</button>
+        <button v-waves v-show="!telIsLogin" key="27" type="button" class="start_btn" @click="signIn">开始工作</button>
+        <button v-waves v-show="telIsLogin && telSeatState === 2 && telLineState === 1" key="17" type="button" class="call_btn" @click="setBusy">置忙</button>
+        <button v-waves v-show="telIsLogin && telSeatState === 5 && telLineState === 1" key="18" type="button" class="call_btn" @click="setFree">置闲</button>
+        <button v-waves v-show="telIsLogin && (telSeatState === 2 || telSeatState === 5) && telLineState === 1" key="19" type="button" class="call_btn" @click="signOut">签出</button>
+        <button v-waves v-show="telIsLogin && telLineState === 6" key="20" type="button" class="call_btn yellow_bg" @click="holdBack">保持通话</button>
+        <button v-waves v-show="telIsLogin && telLineState === 10" key="21" type="button" class="call_btn green_bg" @click="retrieveBack">接回通话</button>
+        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="24" type="button" class="call_btn" @click="transferCall">转接</button>
+        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="25" type="button" class="call_btn" @click="meetingCall">多方通话</button>
+        <button v-waves v-show="telIsLogin && telLineState > 2" key="22" type="button" class="call_btn" @click="btn_IVR">转IVR</button>
+        <button v-waves v-show="telIsLogin && telLineState > 2" key="23" type="button" class="call_btn red_bg" @click="dropCall">挂断</button>
       </transition-group>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import store from '@/store'
-import { Send } from '@/utils/telWebsocket'
-import Dialplate from '@/components/Dialplate'
+import { mapGetters } from "vuex"
+import store from "@/store"
+import { Send } from "@/utils/telWebsocket"
+import Dialplate from "@/components/Dialplate"
 export default {
-  name: 'Teloperation',
+  name: "Teloperation",
   components: {
-    Dialplate
+    Dialplate,
   },
-  data () {
+  data() {
     return {
       scoketDatas: {}, // 发送的数据
-      telNumber: '',
-      telTimer: null // 时间定时器
+      telNumber: "",
+      telTimer: null, // 时间定时器
     }
   },
   computed: {
     ...mapGetters([
-      'usercode', // 工号
-      'extension', // 分机号
-      'groupcode', // 坐席组code
-      'telIsLogin', // 是否签入
-      'telSeatState', // 坐席状态
-      'telLineState', // 线路状态
-      'telCallNum', // 电话号码
-      'telIsVisCallout', // 外呼操作面板是否显示
-      'telCallTime', // 通话时间
-      'telMessageData' // telwebsocket 接收的数据
-    ])
+      "usercode", // 工号
+      "extension", // 分机号
+      "groupcode", // 坐席组code
+      "telIsLogin", // 是否签入
+      "telSeatState", // 坐席状态
+      "telLineState", // 线路状态
+      "telCallNum", // 电话号码
+      "telIsVisCallout", // 外呼操作面板是否显示
+      "telCallTime", // 通话时间
+      "telMessageData", // telwebsocket 接收的数据
+    ]),
   },
   watch: {
     // 如果 `telLineState` 发生改变，这个函数就会运行
     telLineState: function (newT, oldT) {
       // console.log(newT, oldT);
       this.watchTelLineState(newT, oldT)
-    }
+    },
   },
   methods: {
     // 签入
-    signIn () {
+    signIn() {
       console.log(this.groupcode)
       console.log(this.extension)
       // if(!this.groupcode){
@@ -232,121 +121,122 @@ export default {
       //   return false
       // }
       if (!this.extension) {
-        this.$confirm('如果您想进行话务操作，请重新登录并且输入分机号, 是否重新登录？', '提示', {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          type: 'warning'
-        }).then(() => {
-          this.$store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$confirm("如果您想进行话务操作，请重新登录并且输入分机号, 是否重新登录？", "提示", {
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+          type: "warning",
+        })
+          .then(() => {
+            this.$store.dispatch("FedLogOut").then(() => {
+              location.reload() // 为了重新实例化vue-router对象 避免bug
+            })
           })
-        }).catch(() => {
-         })
+          .catch(() => {})
         return
       }
       this.scoketDatas = {
-        'Type': 'Login',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension,
-        'AgentGroup': window.localStorage.getItem("groupCode"), // 坐席组id  
-        'AgentType': '0',
-        'DisposeTime': '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
+        Type: "Login",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
+        AgentGroup: window.localStorage.getItem("groupCode"), // 坐席组id
+        AgentType: "0",
+        DisposeTime: "0", // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
       }
       Send(this.scoketDatas)
     },
     // 签出
-    signOut () {
+    signOut() {
       this.scoketDatas = {
-        'Type': 'Logout',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "Logout",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
-      store.dispatch('UpdateCalloutScreen', false)
+      store.dispatch("UpdateCalloutScreen", false)
     },
     // 置忙
-    setBusy () {
+    setBusy() {
       this.scoketDatas = {
-        'Type': 'SayBusy',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "SayBusy",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
     },
     // 置闲
-    setFree () {
+    setFree() {
       this.scoketDatas = {
-        'Type': 'SayFree',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "SayFree",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
     },
     // 转IVR
-    btn_IVR () {
+    btn_IVR() {
       this.scoketDatas = {
-        'Type': 'TurnIvr',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension,
-        'IvrName': 'MYD_ZXZ',
-        'IvrPos': '1'
+        Type: "TurnIvr",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
+        IvrName: "MYD_ZXZ",
+        IvrPos: "1",
       }
       Send(this.scoketDatas)
     },
     // 挂断
-    dropCall () {
+    dropCall() {
       this.scoketDatas = {
-        'Type': 'DropCall',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "DropCall",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
-      store.dispatch('UpdateCalloutScreen', false)
+      store.dispatch("UpdateCalloutScreen", false)
     },
     // 保持通话
-    holdBack () {
+    holdBack() {
       this.scoketDatas = {
-        'Type': 'Hold',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "Hold",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
     },
     // 接回通话
-    retrieveBack () {
+    retrieveBack() {
       this.scoketDatas = {
-        'Type': 'Retrieve',
-        'AgentID': this.usercode,
-        'AgentExten': this.extension
+        Type: "Retrieve",
+        AgentID: this.usercode,
+        AgentExten: this.extension,
       }
       Send(this.scoketDatas)
     },
     // 外呼
-    makeCall () {
-      store.dispatch('ChangeCallType', 'MakeCall')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+    makeCall() {
+      store.dispatch("ChangeCallType", "MakeCall")
+      store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout)
     },
     // 转接
-    transferCall () {
-      store.dispatch('ChangeCallType', 'Transfer')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+    transferCall() {
+      store.dispatch("ChangeCallType", "Transfer")
+      store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout)
     },
     // 多方通话
-    meetingCall () {
-      store.dispatch('ChangeCallType', 'Meeting')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+    meetingCall() {
+      store.dispatch("ChangeCallType", "Meeting")
+      store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout)
     },
     // 外呼操作面板 关闭后
-    afterLeave () {
-      store.dispatch('ChangeCallType', 'MakeCall')
+    afterLeave() {
+      store.dispatch("ChangeCallType", "MakeCall")
     },
     // 通话时间
-    callTime () {
+    callTime() {
       // 通话时间重置为00:00:00
-      store.dispatch('UpdateCallTime', {
-        hh: '00',
-        mm: '00',
-        ss: '00'
+      store.dispatch("UpdateCallTime", {
+        hh: "00",
+        mm: "00",
+        ss: "00",
       })
       // 时间 计时
       let _n = 0
@@ -356,23 +246,23 @@ export default {
       this.telTimer = setInterval(() => {
         _n++
 
-        store.dispatch('UpdateCallTime', {
-          hh: this.toDub(parseInt(_n / 60 / 60 % 60)), // 小时
-          mm: this.toDub(parseInt(_n / 60 % 60)), // 分钟
-          ss: this.toDub(parseInt(_n % 60)) // 秒
+        store.dispatch("UpdateCallTime", {
+          hh: this.toDub(parseInt((_n / 60 / 60) % 60)), // 小时
+          mm: this.toDub(parseInt((_n / 60) % 60)), // 分钟
+          ss: this.toDub(parseInt(_n % 60)), // 秒
         })
       }, 1000)
     },
     // 清除定时器
-    clearInter () {
+    clearInter() {
       clearInterval(this.telTimer)
     },
     // 小于10补0
-    toDub (i) {
-      return i < 10 ? '0' + i : '' + i
+    toDub(i) {
+      return i < 10 ? "0" + i : "" + i
     },
     // 监听 线路状态
-    watchTelLineState (newT, oldT) {
+    watchTelLineState(newT, oldT) {
       // 外呼
       if (newT === 6 && oldT === 4) {
         this.callTime()
@@ -393,8 +283,8 @@ export default {
           // 						});
         }
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
@@ -483,8 +373,7 @@ export default {
         background: url(../../assets/imgs/incalling.gif) center center no-repeat;
       }
       .callringing {
-        background: url(../../assets/imgs/callringing.gif) center center
-          no-repeat;
+        background: url(../../assets/imgs/callringing.gif) center center no-repeat;
       }
 
       .svg-icon {

CallCenterWeb.UI/src/utils/telWebsocket.js

@@ -295,6 +295,7 @@ function LineStateAgentBack (linedata) {
   switch (linedata.Result) {
     case '空闲':
       store.dispatch('ChangeLineState', 1)
+      store.dispatch('ChangeSeatState', 2) // 坐席状态
       store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
       store.dispatch('ChangeTrunkNumber', '') // 中继号（''）
       break
@@ -322,6 +323,10 @@ function LineStateAgentBack (linedata) {
     case '通话保持中':
       store.dispatch('ChangeLineState', 10)
       break
+    case '小休':
+      store.dispatch('ChangeLineState', 1)
+      store.dispatch('ChangeSeatState', 5) // 坐席状态
+      store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
   }
 
 }

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -59,21 +59,21 @@
             <span>{{ stockQuantity.stockOne }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="山西仓可配量">
             <span>{{ stockQuantity.configurationQuantityOne }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="新乡仓">
             <span>{{ stockQuantity.stockTwo }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="新乡仓可配量">
             <span>{{ stockQuantity.configurationQuantityTwo }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-form-item>
         <el-button type="primary" @click="addCommodity" :disabled="isAddCommodity">添加商品</el-button>
@@ -104,7 +104,6 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column prop="actname" label="活动名称" align="center"></el-table-column>
           <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
-          <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
         </el-table>
       </el-form-item>
       <el-row>
@@ -855,6 +854,11 @@ export default {
       let index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
+      if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.getActivityAccountList()
+      } else {
+        this.activityAccountData = []
+      }
     },
     activityAccountSelectionChange(selection) {
       this.ruleForm.UseActList = selection

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -65,21 +65,21 @@
                 <span>{{ stockQuantity.stockOne }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="山西仓可配量">
                 <span>{{ stockQuantity.configurationQuantityOne }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="新乡仓">
                 <span>{{ stockQuantity.stockTwo }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="新乡仓可配量">
                 <span>{{ stockQuantity.configurationQuantityTwo }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-form-item>
@@ -124,7 +124,6 @@
                   <el-table-column type="selection" width="55" />
                   <el-table-column prop="actname" label="活动名称" align="center"></el-table-column>
                   <el-table-column prop="money" label="优惠金额" align="center" />
-                  <el-table-column prop="gift" label="赠品" align="center" />
                 </el-table>
               </el-form-item>
             </el-col>
@@ -918,6 +917,11 @@ export default {
       const index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
+      if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.getActivityAccountList()
+      } else {
+        this.activityAccountData = []
+      }
     },
     activityAccountSelectionChange(selection) {
       this.ruleForm.UseActList = selection

CallCenterWeb.UI/src/views/callScreen/index.vue

@@ -56,14 +56,17 @@ export default {
   mounted() {},
   methods: {
     addTab() {
-      if (this.editableTabs.some((v) => v.name === this.telCallNum)) return
-      const newTabName = this.telCallNum
-      this.editableTabs.push({
-        title: newTabName,
-        name: newTabName,
-        // content: newTabName%2 == 0 ? 'test' : 'test2'
-      })
-      this.editableTabsValue = newTabName
+      if (this.editableTabs.some((v) => v.name === this.telCallNum)) {
+        this.editableTabsValue = this.telCallNum
+      } else {
+        const newTabName = this.telCallNum
+        this.editableTabs.push({
+          title: newTabName,
+          name: newTabName,
+          // content: newTabName%2 == 0 ? 'test' : 'test2'
+        })
+        this.editableTabsValue = newTabName
+      }
     },
     removeTab(targetName) {
       const tabs = this.editableTabs

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/addOrEdit.vue

@@ -97,7 +97,7 @@
           <el-form-item label="是否赠品" prop="IsSale">
             <el-select v-model="ruleForm.IsSale" placeholder="是否赠品" class="form_select">
               <el-option label="赠品" value="0"></el-option>
-              <el-option label="不是赠品" value="1"></el-option>
+              <el-option label="正常" value="1"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -350,7 +350,6 @@ export default {
           this.ruleForm.MemberPrice = res.F_MemberPrice //会员价格
           this.ruleForm.SpecialPrice = res.F_SpecialPrice //特惠价格
           this.ruleForm.PinyinShort = res.F_PinyinShort //拼音简写
-          this.ruleForm.tag = res.F_Tag && res.F_Tag.split(",") //商品标签
           this.ruleForm.Address = res.F_Address //产地
           this.ruleForm.Des = res.F_Des //描述
           this.ruleForm.F_MinimumStock = res.F_MinimumStock //销售不能下单数量
@@ -360,6 +359,7 @@ export default {
           this.ruleForm.OnSaleEnd = res.F_OnSaleEnd //下架时间
           this.ruleForm.IsSale = res.F_IsSale + "" //是否赠品
           this.ruleForm.F_Specifications = res.F_Specifications //商品规格
+          this.ruleForm.tag = res.F_Tag == "" ? [] : res.F_Tag.split(",") //商品标签
         }
       })
     },

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/isSale.vue

@@ -0,0 +1,87 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="order_form">
+      <el-form-item label="是否赠品" prop="isSale">
+        <el-select v-model="ruleForm.isSale" placeholder="请选择是否赠品" class="form_select" clearable>
+          <el-option label="赠品" value="0"></el-option>
+          <el-option label="正常" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { updateCommodityIsSale } from "@/api/commodityManagement/commodityList"
+
+export default {
+  name: 'EditLabel',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        orderids: "",
+        isSale: "", //商品标签
+      },
+      rules: {
+        isSale: [{
+          required: true,
+          trigger: 'change',
+          message: '请选择是否赠品',
+        }]
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.orderids = this.rowid
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          const params = {
+            orderids: this.ruleForm.orderids,
+            IsSale: this.ruleForm.isSale
+          }
+          updateCommodityIsSale(params).then(response => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.$parent.getList() // 重新加载父级数据
+              this.$message.success('修改成功!')
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+          return
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select{
+	width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -9,11 +9,17 @@
     <el-select v-model="searchDatas.tag" placeholder="请选择商品标签" class="filter-item form_select" clearable>
       <el-option v-for="item in commodityLabelLists" :key="item.F_ID" :label="item.F_TagName" :value="item.F_TagName" />
     </el-select>
+    <el-select v-model="searchDatas.IsSale" placeholder="请选择是否赠品" class="filter-item form_select">
+      <el-option label="全部" value="-1" />
+      <el-option label="赠品" value="0" />
+      <el-option label="正常" value="1" />
+    </el-select>
     <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
     <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     <el-button v-permission="'HY_change_product_category'" type="primary" class="filter-item" @click="btn_change_product_category">更改商品分类</el-button>
     <el-button v-permission="'HY_change_shipping_template'" type="primary" class="filter-item" @click="btn_change_shipping_template">更改运费模板</el-button>
     <el-button v-permission="'HY_batch_label'" type="primary" class="filter-item" @click="btn_batch_label">批量更改标签</el-button>
+    <el-button v-permission="'HY_batch_issale'" type="primary" class="filter-item" @click="btn_batch_issale">批量更改是否赠品</el-button>
     <el-button v-permission="'HY_unified_inventory'" type="primary" class="filter-item" @click="btn_unified_inventory">统一库存</el-button>
     <el-button v-permission="'HY_bulk_listing'" type="primary" class="filter-item" @click="btn_bulk_listing">批量上架</el-button>
     <el-button v-permission="'HY_bulk_removal'" type="primary" class="filter-item" @click="btn_bulk_removal">批量下架</el-button>
@@ -34,6 +40,7 @@ import unifiedInventory from "./unifiedInventory"
 import bulkListing from "./bulkListing"
 import bulkRemoval from "./bulkRemoval"
 import importFile from "./importFile"
+import isSale from "./isSale"
 
 export default {
   name: "SearchFilter",
@@ -51,6 +58,7 @@ export default {
           productNumber: "", //商品编码
           productShortName: "", //商品简码
           tag: "", //商品标签
+          IsSale: "", //
         }
       },
     },
@@ -139,6 +147,25 @@ export default {
         title: "标签",
       })
     },
+    btn_batch_issale() {
+      if (this.selectedId.length <= 0) {
+        this.$message({
+          message: '请选择数据',
+          type: 'warning'
+        });
+        return
+      }
+      const ids = this.selectedId.join(",")
+      this.$layer.iframe({
+        content: {
+          content: isSale,
+          parent: this,
+          data: { rowid: ids },
+        },
+        area: ["30%", "30%"],
+        title: "是否赠品",
+      })
+    },
     btn_unified_inventory() {
       this.$layer.iframe({
         content: {

CallCenterWeb.UI/src/views/commodityManagement/commodityList/index.vue

@@ -57,6 +57,7 @@ export default {
         productNumber: "", //商品编码
         productShortName: "", //商品副标题
         tag: "", //商品标签
+        IsSale: "-1", //是否赠品
       },
       multipleSelection: [], // 选中的数据
       selectedId: [], //选中的id
@@ -87,7 +88,7 @@ export default {
           ProductNumber: this.searchDatas.productNumber,
           ProductShortName: this.searchDatas.productShortName,
           tag: this.searchDatas.tag,
-          issale: -1,
+          IsSale: Number(this.searchDatas.IsSale),
           Stock: 0, //是否显示库存 0-不显示 1-显示
         }
         getCommodityList(params).then((response) => {

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceRhyme/index.vue

@@ -16,7 +16,6 @@
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
-      <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件退回</el-button>
       <el-button v-permission="'HY_import_goback'" type="primary" class="filter-item" @click="btn_import_goback">导入附件退回</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">

CallCenterWeb.UI/src/views/layout/components/Navbar.vue

@@ -3,6 +3,9 @@
     <teloperation v-if="seatflag" />
     <!-- <outboundTask v-if="seatflag && telIsLogin" class="navar_item"/> -->
     <div v-if="seatflag" class="navar_item telState">
+      <span class="personalInfoText">登陆账号:{{ usercode }}</span>
+      <span class="personalInfoText">姓名:{{ username }}</span>
+      <span class="personalInfoText">分机号:{{ extension }}</span>
       <svg-icon :class="{ state_normal: telTopRightLamp, state_abnormal: !telTopRightLamp }" icon-class="zhuangtai" />
       {{ telTopRightState }}
     </div>
@@ -21,8 +24,8 @@
       </div>
     </el-popover>
     <div v-if="seatflag" class="navar_item close">
-      <!-- <svg-icon icon-class="el-icon-circle-close-outline" /> -->
-      <i class="el-icon-close" @click="logout"></i>
+      <span class="" @click="logout">退出</span>
+      <!-- <i class="el-icon-close">退出</i> -->
     </div>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
@@ -68,6 +71,7 @@ export default {
     ...mapGetters([
       "usercode", // 工号
       "extension", // 分机号
+      "username", // 姓名
       "sidebar",
       "avatar",
       "seatflag",
@@ -184,6 +188,11 @@ export default {
       font-size: 16px;
       vertical-align: -0.17em;
     }
+    .personalInfoText {
+      margin-right: 12px;
+      font-size: 14px;
+      z-index: -1;
+    }
   }
   .seatState {
     font-size: 14px;
@@ -206,7 +215,8 @@ export default {
     width: 60px;
     right: 60px;
     cursor: pointer;
-    i {
+    span {
+      font-size: 14px;
       color: #ffffff;
     }
   }

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -141,7 +141,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-        <!-- <el-form-item label="邮编" prop="F_Postcode">
+          <!-- <el-form-item label="邮编" prop="F_Postcode">
           <el-input v-model="ruleForm.F_Postcode" placeholder="请输入邮编"/>
         </el-form-item> -->
         </el-col>
@@ -156,7 +156,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-        <!-- <el-form-item label="会员积分" prop="F_Score" >
+          <!-- <el-form-item label="会员积分" prop="F_Score" >
           <el-input v-model="ruleForm.F_Score" placeholder="请输入会员积分" onkeyup="value=value.replace(/[^\d.]/g,'')" />
         </el-form-item> -->
         </el-col>
@@ -469,7 +469,7 @@ export default {
         this.ruleForm.F_Type = res.F_Label
         // this.ruleForm.F_Class = res.F_Class
         this.ruleForm.F_RecommenderID = res.F_RecommenderID + ""
-        this.ruleForm.F_Recommender = res.F_Recommender
+        this.ruleForm.F_RecommendName = res.F_Recommender
         this.ruleForm.F_RecommenderTel = res.F_RecommenderTel
         if (res.F_Mobile) {
           for (let i = 0; i < res.F_Mobile.split(",").length; i++) {

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -65,21 +65,21 @@
                 <span>{{ stockQuantity.stockOne }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="山西仓可配量">
                 <span>{{ stockQuantity.configurationQuantityOne }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="新乡仓">
                 <span>{{ stockQuantity.stockTwo }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="新乡仓可配量">
                 <span>{{ stockQuantity.configurationQuantityTwo }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-form-item>
@@ -124,7 +124,7 @@
                   <el-table-column type="selection" width="55" />
                   <el-table-column prop="actname" label="活动名称" align="center"></el-table-column>
                   <el-table-column prop="money" label="优惠金额" align="center" />
-                  <el-table-column prop="gift" label="赠品" align="center" />
+                  <!-- <el-table-column prop="gift" label="赠品" align="center" /> -->
                 </el-table>
               </el-form-item>
             </el-col>
@@ -904,9 +904,15 @@ export default {
     btn_editCommodity() {},
     // 删除商品
     btn_deleteCommodity(val) {
+      console.log(val)
       const index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
+      if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.getActivityAccountList()
+      } else {
+        this.activityAccountData = []
+      }
     },
     activityAccountSelectionChange(selection) {
       this.ruleForm.UseActList = selection

CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -59,21 +59,21 @@
             <span>{{ stockQuantity.stockOne }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="山西仓可配量">
             <span>{{ stockQuantity.configurationQuantityOne }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="新乡仓">
             <span>{{ stockQuantity.stockTwo }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="新乡仓可配量">
             <span>{{ stockQuantity.configurationQuantityTwo }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-form-item>
         <el-button type="primary" @click="addCommodity" :disabled="isAddCommodity">添加商品</el-button>
@@ -104,7 +104,6 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column prop="actname" label="活动名称" align="center"></el-table-column>
           <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
-          <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
         </el-table>
       </el-form-item>
       <el-row>
@@ -856,6 +855,11 @@ export default {
       let index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
+      if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.getActivityAccountList()
+      } else {
+        this.activityAccountData = []
+      }
     },
     activityAccountSelectionChange(selection) {
       this.ruleForm.UseActList = selection

CallCenterWeb.UI/src/views/personalInfo/index.vue

@@ -5,32 +5,22 @@
         <h1 class="title">基本资料</h1>
         <div class="clearfix">
           <el-col :md="4">
-            <img :src="!avatar ? '/static/img/user.png' : avatar" class="avatar" alt="头像">
+            <img :src="!avatar ? '/static/img/user.png' : avatar" class="avatar" alt="头像" />
             <div>
               <el-tooltip class="item" effect="dark" content="修改头像" placement="top-start">
                 <el-button type="text" class="btn_avat" @click="toggleShow">修改头像</el-button>
               </el-tooltip>
-              <avatar-upload
-                v-model="uploadAvatar.show"
-                :url="uploadUrl"
-                :params="uploadAvatar.params"
-                :width="200"
-                :height="200"
-                :no-rotate="false"
-                img-format="png"
-                :headers = "uploadData.uploadHeader"
-                @crop-success="cropSuccess"
-                @crop-upload-success="cropUploadSuccess"/>
+              <avatar-upload v-model="uploadAvatar.show" :url="uploadUrl" :params="uploadAvatar.params" :width="200" :height="200" :no-rotate="false" img-format="png" :headers="uploadData.uploadHeader" @crop-success="cropSuccess" @crop-upload-success="cropUploadSuccess" />
             </div>
           </el-col>
           <el-col :md="20">
             <p class="head_con">登录账号：{{ usercode }}</p>
             <p class="head_con">姓名：{{ username }}</p>
-            <p class="head_con">用户角色：{{ rolename }}</p>
+            <!-- <p class="head_con">用户角色：{{ rolename }}</p> -->
             <p v-if="seatflag" class="head_con">分机号：{{ extension }}</p>
           </el-col>
         </div>
-        <hr class="division">
+        <hr class="division" />
         <ul class="lists">
           <li class="list_item clearfix">
             <el-col :md="3">
@@ -46,7 +36,9 @@
               <label class="item_label">手机号码</label>
             </el-col>
             <el-col :md="21">
-              <span class="item_span">您已绑定了手机 <b>{{ mobile }}</b></span>
+              <span class="item_span"
+                >您已绑定了手机 <b>{{ mobile }}</b></span
+              >
               <!-- <el-tooltip class="item" effect="dark" content="暂未处理" placement="top-start">
                 <el-button type="text" class="btn_tel">修改</el-button>
               </el-tooltip> -->
@@ -70,47 +62,35 @@
 </template>
 
 <script>
-import { updateAvatar } from '@/api/systemSetup/roleSetting/userManage'
-import modifyPass from './components/modifyPass'
-import avatarUpload from 'vue-image-crop-upload'
-import { mapGetters } from 'vuex'
+import { updateAvatar } from "@/api/systemSetup/roleSetting/userManage"
+import modifyPass from "./components/modifyPass"
+import avatarUpload from "vue-image-crop-upload"
+import { mapGetters } from "vuex"
 
 export default {
-  name: 'PersonalInfo',
+  name: "PersonalInfo",
   components: {
-    'avatar-upload': avatarUpload
+    "avatar-upload": avatarUpload,
   },
   data() {
     return {
-      uploadUrl: this.$store.getters.serverConfig.BASE_API + 'Api/Upload',
+      uploadUrl: this.$store.getters.serverConfig.BASE_API + "Api/Upload",
       uploadData: {
         uploadHeader: {
-          Authorization: '',
+          Authorization: "",
         },
       },
       uploadAvatar: {
         show: false,
         params: {
-          uploadtype: 'avatar'
+          uploadtype: "avatar",
         },
-        imgDataUrl: '' // 头像剪切后生成的 datebase64格式的url
-      }
-
+        imgDataUrl: "", // 头像剪切后生成的 datebase64格式的url
+      },
     }
   },
   computed: {
-    ...mapGetters([
-      'token',
-      'userid',
-      'avatar',
-      'username',
-      'usercode',
-      'userRole',
-      'seatflag',
-      'extension',
-      'mobile',
-      'rolename',
-    ])
+    ...mapGetters(["token", "userid", "avatar", "username", "usercode", "userRole", "seatflag", "extension", "mobile", "rolename"]),
   },
   created() {
     this.uploadData.uploadHeader.Authorization = this.token
@@ -125,18 +105,18 @@ export default {
       // this.uploadAvatar.imgDataUrl = imgDataUrl;
     },
     cropUploadSuccess(jsonData, field) {
-      console.log("jsonData",jsonData)
-      if (jsonData.state.toLowerCase() === 'success') {
+      console.log("jsonData", jsonData)
+      if (jsonData.state.toLowerCase() === "success") {
         const avatarData = {
           usercode: this.usercode,
           headimg: jsonData.data[0].fileurl, //头像
           // head_img: jsonData.data[0].head_img, // 头像大图
           // head_small_img: jsonData.data[0].head_small_img // 头像缩略图
         }
-        updateAvatar(avatarData).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        updateAvatar(avatarData).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             // 更新头像
-            this.$store.dispatch('SetAvatar', jsonData.data[0].head_img)
+            this.$store.dispatch("SetAvatar", jsonData.data[0].head_img)
             this.$message.success(`恭喜你，用户(${this.usercode}-${this.username})的头像修改成功!`)
           }
         })
@@ -148,80 +128,78 @@ export default {
         content: {
           content: modifyPass, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': editId, 'ispersonal': true }// props
+          data: { rowid: editId, ispersonal: true }, // props
         },
-        area: ['40%', '360px'],
-        title: '修改密码'
+        area: ["40%", "360px"],
+        title: "修改密码",
       })
-    }
-
-  }
+    },
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.personal{
-		height: 100%;
-		.title {
-			font-size: 18px;
-			padding-left: 10px;
-			border-left: 2px solid #069BFF;
-		}
-		.avatar{
-			width: 110px;
-			height: 110px;
-			background-color: #0086B3;
-			border-radius: 50%;
-		}
-		.btn_avat{
-			margin-left: 30px;
-		}
-		.head_con{
-			font-size: 12px;
-			color: #4c4c4c;
-			margin: 18px 0;
-		}
-		.division{
-			background-color: #d9e1eb;
-			height: 1px;
-			border: none;
-		}
-		.lists{
-			margin: 0;
-			padding: 0;
-			list-style: none;
-			.list_item{
-				border-bottom: 1px dashed #d9e1eb;
-				line-height: 70px;
-				.item_label{
-					padding-left: 10px;
-					font-size: 12px;
-					font-weight: bold;
-					color: #333333;
-				}
-				.item_span{
-					font-size: 14px;
-				}
-				.btn_pass{
-					margin-left: 70px;
-				}
-				.btn_tel{
-					margin-left: 44px;
-				}
-				.btn_trans{
-					margin-left: 54px;
-				}
-				.red{
-					color: #ff0000;
-				}
-			}
-		}
-	}
-
-	@media only screen and (max-width: 768px) {
-		.personal{
-			height: auto;
-		}
-	}
+.personal {
+  height: 100%;
+  .title {
+    font-size: 18px;
+    padding-left: 10px;
+    border-left: 2px solid #069bff;
+  }
+  .avatar {
+    width: 110px;
+    height: 110px;
+    background-color: #0086b3;
+    border-radius: 50%;
+  }
+  .btn_avat {
+    margin-left: 30px;
+  }
+  .head_con {
+    font-size: 12px;
+    color: #4c4c4c;
+    margin: 18px 0;
+  }
+  .division {
+    background-color: #d9e1eb;
+    height: 1px;
+    border: none;
+  }
+  .lists {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    .list_item {
+      border-bottom: 1px dashed #d9e1eb;
+      line-height: 70px;
+      .item_label {
+        padding-left: 10px;
+        font-size: 12px;
+        font-weight: bold;
+        color: #333333;
+      }
+      .item_span {
+        font-size: 14px;
+      }
+      .btn_pass {
+        margin-left: 70px;
+      }
+      .btn_tel {
+        margin-left: 44px;
+      }
+      .btn_trans {
+        margin-left: 54px;
+      }
+      .red {
+        color: #ff0000;
+      }
+    }
+  }
+}
 
+@media only screen and (max-width: 768px) {
+  .personal {
+    height: auto;
+  }
+}
 </style>

CallCenterWeb.UI/src/views/telCall/seatMonitor/index.vue

@@ -97,8 +97,9 @@
                         <svg-icon v-show="item.isListen" icon-class="weibiaoti3" class="seat_listen el-icon-view" />
                       </el-col>
                     </div>
-                    <ul v-show="item.visible && (item.ext_state === '小休' || item.ext_state === '通话中' || item.ext_state === '来电振铃')" class="oparate_btn_lists">
-                      <li v-show="item.ext_state === '小休'" class="oparate_btn" @click="oparateSeats(item, 'ForceAgentState')"><svg-icon class="oparate_icon" icon-class="icon-test" />置闲</li>
+                    <ul v-show="item.visible && (item.ext_state === '小休' || item.ext_state === '通话中' || item.ext_state === '来电振铃' || item.ext_state === '空闲')" class="oparate_btn_lists">
+                      <li v-show="item.ext_state === '小休'" class="oparate_btn" @click="oparateSeats(item, 'ForceAgentState', '2')"><svg-icon class="oparate_icon" icon-class="icon-test" />置闲</li>
+                      <li v-show="item.ext_state === '空闲'" class="oparate_btn" @click="oparateSeats(item, 'ForceAgentState', '5')"><svg-icon class="oparate_icon" icon-class="manglu01" />置忙</li>
                       <li v-show="item.ext_state === '通话中'" class="oparate_btn" @click="oparateSeats(item, 'Listen')"><svg-icon class="oparate_icon" icon-class="erji" />监听</li>
                       <li v-show="item.ext_state === '来电振铃'" class="oparate_btn" @click="oparateSeats(item, 'Instead')"><svg-icon class="oparate_icon" icon-class="zhuanjie" />代接</li>
                       <li v-show="item.ext_state === '通话中'" class="oparate_btn oparate_divider" @click="oparateSeats(item, 'Insert')"><svg-icon class="oparate_icon" icon-class="qiangzhixiaxian" />强插</li>
@@ -428,7 +429,7 @@ export default {
         return
       }
       console.log(item.ext_state)
-      if (item.ext_state === "小休" || item.ext_state === "通话中" || item.ext_state === "来电振铃") {
+      if (item.ext_state === "小休" || item.ext_state === "通话中" || item.ext_state === "来电振铃" || item.ext_state === "空闲") {
         item.visible = !item.visible
         this.seatCardLists.forEach((v, i) => {
           if (item.id !== v.id) {
@@ -441,16 +442,21 @@ export default {
     },
 
     // 置闲 监听 代接 强插 拦截 强拆
-    oparateSeats(item, angenttype) {
+    oparateSeats(item, angenttype, targetAgentState) {
       // if (angenttype === 'Instead') {
       //   item.usercode = '8001'
       // }
-
+      if (targetAgentState) {
+        const targetAgentState = targetAgentState
+      } else {
+        const targetAgentState = ""
+      }
       this.scoketDatas = {
         AgentID: this.usercode,
         AgentExten: this.extension,
         Type: angenttype,
         TargetAgentID: item.usercode, // 目标座席工号
+        TargetAgentState: targetAgentState
       }
       Send(this.scoketDatas)
       item.visible = !item.visible