telephone-clients 4.0.0-1-4 → 4.0.0-1-5

package/src/components/workorder/PhoneStandWork.vue

@@ -58,9 +58,9 @@
                   <div v-show="false" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="worktype == '置换通气单'||worktype == '安装单'">
                     预约时间: {{row.f_yuyue_date}}
                   </div>
-<!--                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="worktype == '报修单'">
-                    报修类型: {{row.f_servicerepair_type}}
-                  </div>-->
+                  <!--                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="worktype == '报修单'">
+                                      报修类型: {{row.f_servicerepair_type}}
+                                    </div>-->
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="row.f_repairtype">
                     报修类型: {{row.f_repairtype}}
                   </div>
@@ -113,13 +113,28 @@
         </div>
         <div slot="modal-body" class="modal-body">
           <div class="row" style="margin-top: 6px">
-            <label class="col-xs-4 col-md-4 control-label font text-left">接单人</label>
+            <label class="col-xs-4 col-md-4 control-label font text-left">派单方式</label>
+            <div class="col-xs-8">
+              <v-select :value="f_handlingtype" :value-single="true" v-model="f_handlingtype"
+                        :options='repairerType' placeholder='请选择派单方式'
+                        close-on-select></v-select>
+            </div>
+          </div>
+          <div class="row" style="margin-top: 6px" v-if=" f_handlingtype == '转维修员' ">
+            <label class="col-xs-4 col-md-4 control-label font text-left">维修员</label>
             <div class="col-xs-8">
               <v-select :value="sendselected.serviceacitivity[0].f_reciever" :value-single="true"
-                        :options='repairers' placeholder='请选择接单人'
+                        :options='repairers' placeholder='请选择维修员'
                         close-on-select v-on:change="repiarmancg"></v-select>
             </div>
           </div>
+          <div class="row" style="margin-top: 6px" v-if=" f_handlingtype == '转站点' ">
+            <label class="col-xs-4 col-md-4 control-label font text-left">站点</label>
+            <input style="width: 60%" type="text" v-show="false" v-model="sendselected.serviceacitivity[0].f_reciever">
+            <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择站点管理员">
+
+            </right-tree>
+          </div>
           <div class="row" style="margin-top: 6px">
             <label class="control-label font text-left col-md-4 col-xs-4">备注</label>
             <div class="col-xs-8 col-md-8">
@@ -153,247 +168,264 @@
   </div>
 </template>
 <script>
-  import FailureShow from '../pc/FailureShow'
-  import { HttpResetClass } from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from "../Util";
+import FailureShow from '../pc/FailureShow'
+import { HttpResetClass } from 'vue-client'
+import Vue from 'vue'
+import * as Util from "../Util";
 
-  export default{
-    title: '移动端站点派发',
-    data () {
-      return {
-        // rows: Object
-        //结案备注
-        f_caseremarks:'',
-        selectone:'',
-        rows: [],
-        username:'',
-        address:'',
-        sendshow:false,
-        repairers: [],
-        caseshow:false,
-        sendselected:{
-          serviceacitivity:[
-            {
-              f_service_acitivity_type: '派单',
-              f_reciever:''
-            }
-          ],
-          f_advice:''
-        },
-        number:0,
-        listData: {
-          list: [],
-          isEnd: true,
-          index: 0
-        }
+export default{
+  title: '移动端站点派发',
+  data () {
+    return {
+      userid: Vue.user.id,
+      source:
+        'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+        'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
+      repairName: '',
+      f_handlingtype:'转维修员',
+      repairerType:[{label: '转维修员', value: '转维修员'}, {label: '转站点', value: '转站点'}],
+      repairerStands:[],
+      f_caseremarks:'',
+      selectone:'',
+      rows: [],
+      username:'',
+      address:'',
+      sendshow:false,
+      repairers: [],
+      caseshow:false,
+      sendselected:{
+        serviceacitivity:[
+          {
+            f_service_acitivity_type: '派单',
+            f_reciever:''
+          }
+        ],
+        f_advice:''
+      },
+      number:0,
+      listData: {
+        list: [],
+        isEnd: true,
+        index: 0
       }
+    }
+  },
+  props: {
+  },
+  methods: {
+    reres(val){
+      if(val.res == undefined || val.res[0] == undefined || val.res[0] == ''){
+        return
+      }
+      this.model.serviceacitivity[0].f_meetunit = val.res[0]
+      this.model.f_meetunit = val.res[0]
+      this.model.f_filiale_id = val.orgobj[0].parentid
+      this.model.f_filiale = val.orgobj[0].parentname
+      this.model.f_outlets = val.res[0]
+      this.model.serviceacitivity[0].f_reciever = val.resids[0]
     },
-    props: {
+    caseend(val){
+      this.selectone = val
+      this.caseshow = true
     },
-    methods: {
-      caseend(val){
-        this.selectone = val
-        this.caseshow = true
-      },
-      // 结案确认
-      caseok(){
-        // 工单结案操作
-        let data = {model: this.selectone, loginUser: {name: Vue.user.name, ename: Vue.user.ename},f_caseremarks:this.f_caseremarks}
-        let HttpReset1 = new HttpResetClass()
-        // 将数据发送给业务逻辑
-        HttpReset1.load('POST',`${this.$androidUtil.getProxyUrl()}/af-telephone/rs/logic/serviceCase`, data).then((res) => {
-          this.f_caseremarks = ''
-          this.caseshow = false
-          this.ifsearch()
-        })
-      },
-      // 结案返回
-      caseclose(){
+    // 结案确认
+    caseok(){
+      // 工单结案操作
+      let data = {model: this.selectone, loginUser: {name: Vue.user.name, ename: Vue.user.ename},f_caseremarks:this.f_caseremarks}
+      let HttpReset1 = new HttpResetClass()
+      // 将数据发送给业务逻辑
+      HttpReset1.load('POST',`${this.$androidUtil.getProxyUrl()}/af-telephone/rs/logic/serviceCase`, data).then((res) => {
         this.f_caseremarks = ''
         this.caseshow = false
-        this.selectone = ''
-      },
-      worksend () {
-        if (!this.sendselected.serviceacitivity[0].f_reciever) {
-          this.$showMessage(`请选择接单人员!`, ['confirm'])
+        this.ifsearch()
+      })
+    },
+    // 结案返回
+    caseclose(){
+      this.f_caseremarks = ''
+      this.caseshow = false
+      this.selectone = ''
+    },
+    worksend() {
+      if (!this.sendselected.serviceacitivity[0].f_reciever) {
+        this.$showMessage(`请选择接单人员!`, ['confirm'])
+        return
+      }
+      let data = {
+        model: this.sendselected,
+        loginUser: {name: Vue.user.name, ename: Vue.user.ename},
+        f_handlingtype: this.f_handlingtype
+      }
+      let HttpReset = new HttpResetClass()
+      // 将数据发送给业务逻辑
+      HttpReset.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/logic/siteSend`, data).then((res) => {
+        if (res.data.code == 300) {
+          this.sendshow = false
+          this.sendselected = {
+            serviceacitivity: [
+              {
+                f_service_acitivity_type: '派单',
+                f_reciever: ''
+              }
+            ],
+            f_advice: ''
+          }
+          this.ifsearch()
+          this.$showMessage(`该单已被派发!`, ['confirm'])
           return
-        }
-        let data = {
-          model: this.sendselected,
-          loginUser: {name: Vue.user.name, ename: Vue.user.ename},
-          f_handlingtype:'转维修员'
-        }
-        let HttpReset = new HttpResetClass()
-        // 将数据发送给业务逻辑
-        HttpReset.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/logic/siteSend`, data).then((res) => {
-          if (res.data.code == 300) {
-            this.sendshow = false
-            this.sendselected ={
-              serviceacitivity:[
-                {
-                  f_service_acitivity_type: '派单',
-                  f_reciever:''
-                }
-              ],
-              f_advice:''
-            }
-            this.ifsearch()
-            this.$showMessage(`该单已被派发!`, ['confirm'])
-            return
-          } else {
-            this.sendshow = false
-            this.sendselected ={
-              serviceacitivity:[
-                {
-                  f_service_acitivity_type: '派单',
-                  f_reciever:''
-                }
-              ],
-              f_advice:''
-            }
-            this.ifsearch()
-            this.$showMessage(`派发成功!`, ['confirm'])
-            return
+        } else {
+          this.sendshow = false
+          this.sendselected = {
+            serviceacitivity: [
+              {
+                f_service_acitivity_type: '派单',
+                f_reciever: ''
+              }
+            ],
+            f_advice: ''
           }
-        })
-      },
-      repiarmancg(val){
-        this.sendselected.serviceacitivity[0].f_reciever = val
-      },
-      // 获取维修员
-      getEmp () {
-        // 获取接单人数组
-        let http = new HttpResetClass()
-        var val = {source: `this.getParentByType($organization$).getChildByName($维修员$).getUsers()`, userid: `${Vue.user.id}`}
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          res.data.forEach((item) => {
-            this.repairers.push({label: `${item.name}`, value: item.name})
-          })
-        })
-      },
-      ifsearch(){
-        this.listData.list = []
-        this.listData.index = 0
-        this.listData.isEnd = true
-        var condition = `1 = 1  and tswo.f_workorder_type = '报修单'`
-        if(this.username != ''){
-          condition += " and tswo.f_user_name like '%" + this.username + "%'"
-        }
-        if(this.address != ''){
-          condition += " and tswo.f_address like  '%" + this.address + "%'"
-        }
-        var val = {
-          condition:{
-            condition:condition,
-            sign:'1 = 1'
-          },
-          userid:Vue.user.name
-        }
-        //tag
-        //tag
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/operatorService`, {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.rows = res.data
-          this.showMore()
-        })
-      },
-      selected (row) {
-        this.sendselected = Object.assign({}, this.sendselected, row)
-        this.sendshow =true
-      },
-      undo(){
-        this.sendselected ={
-          serviceacitivity:[
-            {
-              f_service_acitivity_type: '派单',
-              f_reciever:''
-            }
-          ],
-          f_advice:''
-        }
-        this.sendshow = false
-        this.ifsearch()
-      },
-      makeAPhoneCall(phoneNumber) {
-        this.$androidUtil.makeAPhoneCall(phoneNumber)
-      },
-      showMore() {
-        if (!this.rows) {
+          this.ifsearch()
+          this.$showMessage(`派发成功!`, ['confirm'])
           return
         }
-        let endIndex = this.listData.index + 10
-        if (endIndex > this.rows.length) {
-          endIndex = this.rows.length
-        }
-        for (; this.listData.index < endIndex; this.listData.index++) {
-          this.listData.list.push(this.rows[this.listData.index])
-        }
-        if(this.listData.index == this.rows.length){
-          this.listData.isEnd = true
-        }else {
-          this.listData.isEnd = false
-        }
+      })
+    },
+    repiarmancg(val){
+      this.sendselected.serviceacitivity[0].f_reciever = val
+    },
+    // 获取维修员
+    getEmp () {
+      // 获取接单人数组
+      let http = new HttpResetClass()
+      var val = {source: `this.getParentByType($organization$).getChildByName($维修员$).getUsers()`, userid: `${Vue.user.id}`}
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.forEach((item) => {
+          this.repairers.push({label: `${item.name}`, value: item.name})
+        })
+      })
+    },
+    ifsearch(){
+      this.listData.list = []
+      this.listData.index = 0
+      this.listData.isEnd = true
+      var condition = `1 = 1  and tswo.f_workorder_type = '报修单'`
+      if(this.username != ''){
+        condition += " and tswo.f_user_name like '%" + this.username + "%'"
       }
+      if(this.address != ''){
+        condition += " and tswo.f_address like  '%" + this.address + "%'"
+      }
+      var val = {
+        condition:{
+          condition:condition,
+          sign:'1 = 1'
+        },
+        userid:Vue.user.name
+      }
+      //tag
+      //tag
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/operatorService`, {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.rows = res.data
+        this.showMore()
+      })
+    },
+    selected (row) {
+      this.sendselected = Object.assign({}, this.sendselected, row)
+      this.sendshow =true
     },
-    ready () {
-      this.getEmp()
+    undo(){
+      this.sendselected ={
+        serviceacitivity:[
+          {
+            f_service_acitivity_type: '派单',
+            f_reciever:''
+          }
+        ],
+        f_advice:''
+      }
+      this.sendshow = false
       this.ifsearch()
     },
-    components: {
-      FailureShow,
-      'failure-show': FailureShow
+    makeAPhoneCall(phoneNumber) {
+      this.$androidUtil.makeAPhoneCall(phoneNumber)
+    },
+    showMore() {
+      if (!this.rows) {
+        return
+      }
+      let endIndex = this.listData.index + 10
+      if (endIndex > this.rows.length) {
+        endIndex = this.rows.length
+      }
+      for (; this.listData.index < endIndex; this.listData.index++) {
+        this.listData.list.push(this.rows[this.listData.index])
+      }
+      if(this.listData.index == this.rows.length){
+        this.listData.isEnd = true
+      }else {
+        this.listData.isEnd = false
+      }
     }
+  },
+  ready () {
+    this.getEmp()
+    this.ifsearch()
+  },
+  components: {
+    FailureShow,
+    'failure-show': FailureShow
   }
+}
 </script>
 <style scoped>
-  .searBtn {
-    background: #FFFFFF;
-    color: #0096fb;
-    border: 1px solid #0096fb;
-    border-radius: 5px;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-  .bg {
-    background-color: #499edf;
-    height: 1px;
-    border: 0;
-  }
-  .app-row {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
-  .search_input {
-    border: 0;
-    outline: none;
-  }
-  .font{
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
-  .input-font{
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
-  .btn-font{
-    font:600 16px PingFang-SC-Bold;
-    color: #499EDF;
-  }
-  .btn-color{
-    background-color: #FFFFFF;
-    border-radius: 10px ;
-    border: 1px solid #499EDF;
-  }
-  .panel-blue-border {
-    border: 1px solid #499edf;
-    border-radius: 5px;
-  }
+.searBtn {
+  background: #FFFFFF;
+  color: #0096fb;
+  border: 1px solid #0096fb;
+  border-radius: 5px;
+  padding: 8px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity:0.5;
+  bottom: 50px;
+  margin-top: -10px;
+  height: 40px;
+}
+.bg {
+  background-color: #499edf;
+  height: 1px;
+  border: 0;
+}
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.panel-blue-border {
+  border: 1px solid #499edf;
+  border-radius: 5px;
+}
 </style>

package/src/components/workorder/RepairOrderV.vue

@@ -33,22 +33,14 @@
 <script>
 // 户内维修
 import Vue from 'vue'
-// import DoorService from './DoorService'
 import RepairInfo from './RepairInfo'
 import RepairDetails from './RepairDetails'
 import RepairUserInfo from './RepairUserInfo'
-import ChangeMeterPage from './ChangeMeterPage'
-// import Pipeline from './Pipeline'
-// import DeviceService from './DeviceService'
-// import TroubleRemoval from './TroubleRemoval'
-// import FirstGasCheck from './FirstGasCheck'
-// import RepairMatterInfo from './RepairMatterInfo'
-// import TelChangeMatter from './TelChangeMatter'
 import Outlay from './Outlay'
 import FaultAll from './FaultAll'
 import { HttpResetClass } from 'vue-client'
-import co from 'co'
 import * as Util from '../Util'
+
 let loadParamGem = async function (self) {
   await self.$LoadParams.loadParam()
 }