telephone-clients 3.0.103-7 → 3.0.103-71

package/src/components/workorder/CompletedRepair.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="repair-bg" id="repair-first">
     <!--<div class="app-botton" @click="back()">-->
-      <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
     <!--</div>-->
     <div class="bq-parent">
       <blockquote class="blockquote">
@@ -13,53 +13,109 @@
     </div>
     <div class="panel panel-default repair-info-content auto">
       <div class="panel-body">
-        <div class="row">
-          <input  type="text"  v-model="username" placeholder='用户姓名'  :size="username ? username.length : 6"/>
-          <input  type="text"  v-model="address" placeholder='用户地址'  :size="address ? address.length : 12"/>
-          <br>
-          <datepicker
-            placeholder="开始时间"
-            :value.sync="f_start_date"
-            v-model="f_start_date"
-            :format="'yyyy-MM-dd'"
-          ></datepicker>
-          <datepicker
-            placeholder="结束时间"
-            :value.sync="f_finish_date"
-            v-model="f_finish_date"
-            :format="'yyyy-MM-dd'"
-          ></datepicker>
-          <button type="button" name="button" class="btn btn-primary" @click="init()">重置</button>
-          <button type="button" name="button" class="btn btn-primary" @click='ifsearch()' >查询</button>
-        </div>
+        <!--        <div class="row">
+                  <input  type="text"  v-model="username" placeholder='用户姓名'  :size="username ? username.length : 6"/>
+                  <input  type="text"  v-model="address" placeholder='用户地址'  :size="address ? address.length : 12"/>
+                  <br>
+                  <datepicker
+                    placeholder="开始时间"
+                    :value.sync="f_start_date"
+                    v-model="f_start_date"
+                    :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                  <datepicker
+                    placeholder="结束时间"
+                    :value.sync="f_finish_date"
+                    v-model="f_finish_date"
+                    :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                  <button type="button" name="button" class="btn btn-primary" @click="init()">重置</button>
+                  <button type="button" name="button" class="btn btn-primary" @click='ifsearch()' >查询</button>
+                </div>-->
+        <form>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <img src="../../assets/用户姓名-蓝色.png" style="width: 20px;margin-bottom: 5px" alt="">
+              <label class="font text-left">用户姓名:</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font"
+                     v-model="username" condition="f_user_name like '{}%'" placeholder="  请输入用户姓名" />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <img src="../../assets/小区蓝色.png" style="width: 20px;margin-bottom: 5px" alt="">
+              <label class="font text-left">用户地址:</label>
+            </div>
+            <div class="col-xs-8">
+              <input type="text" class="search_input input-font" v-model="address"
+                     style="width: 60%" placeholder="  请输入用户地址" condition="f_address like '{}%'">
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <img src="../../assets/开始时间.png" style="width: 20px;margin-bottom: 5px" alt="">
+              <label class="font text-left">开始日期:</label>
+            </div>
+            <div class="col-xs-8">
+              <datepicker
+                class="select_list select"
+                placeholder='开始日期' style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :value.sync="f_start_date"
+                v-model="f_start_date">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <img src="../../assets/结束时间.png" style="width: 20px;margin-bottom: 5px" alt="">
+              <label class="font text-left">结束日期:</label>
+            </div>
+            <div class="col-xs-8">
+              <datepicker
+                class="select_list select"
+                placeholder='结束日期' style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :value.sync="f_finish_date"
+                v-model="f_finish_date">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row app-row" style="height: 10px;"></div>
+          <div class="row text-center app-row">
+            <button type="button"  class="btn btn-lg btn-font btn-color" @click="ifsearch()" style="min-width: 25%;">查询</button>
+            <button type="button"  class="btn btn-lg btn-font btn-color" @click="init()" style="min-width: 25%;">重置</button>
+          </div>
+          <div class="row app-row" style="height: 10px;"></div>
+        </form>
         <!--<div class="media-right">-->
-          <!--<img @click="search" src="../../assets/shuaxindaiban.png" class="img-responsive media-object"-->
-               <!--style="width: 40px;padding: 5px;">-->
+        <!--<img @click="search" src="../../assets/shuaxindaiban.png" class="img-responsive media-object"-->
+        <!--style="width: 40px;padding: 5px;">-->
         <!--</div>-->
         <div class="panel panel-default well" v-for="row in rows">
           <div class="panel-body bg-info">
             <div class="row form-group">
-              <div class="col-sm-10">
-                <div class="row">
-                  <div class="col-sm-6">
-                    工单编号: {{row.f_service_id}}
-                  </div>
-                  <div class="col-sm-6">
-                    工单时间: {{row.f_created_date}}
-                  </div>
-                  <div class="col-sm-6">
-                    客户姓名: {{row.f_user_name}}
-                  </div>
-                  <div class="col-sm-6">
-                    联系电话: {{row.f_contact_phone}}&nbsp;&nbsp;<span class="glyphicon glyphicon-earphone" v-on:click.stop.prevent='makeAPhoneCall(row.f_contact_phone)'></span>
-                  </div>
-                  <div class="col-sm-6">
-                    客户地址: {{row.f_address}}
-                  </div>
+              <div class="row">
+                <div class="col-sm-6">
+                  工单编号: {{row.f_service_id}}
+                </div>
+                <div class="col-sm-6">
+                  工单时间: {{row.f_created_date}}
+                </div>
+                <div class="col-sm-6">
+                  客户姓名: {{row.f_user_name}}
+                </div>
+                <div class="col-sm-6">
+                  联系电话: {{row.f_contact_phone}}&nbsp;&nbsp;<span class="glyphicon glyphicon-earphone" v-on:click.stop.prevent='makeAPhoneCall(row.f_contact_phone)'></span>
+                </div>
+                <div class="col-sm-6">
+                  客户地址: {{row.f_address}}
                 </div>
               </div>
-              <div class="col-sm-2">
-                <button type="button" name="button" class="btn btn-primary" @click="selected(row)">查看</button>
+              <div class="row">
+                <button type="button" name="button" class="btn btn-primary" style="float: right" @click="selected(row)">查看</button>
               </div>
             </div>
           </div>
@@ -71,165 +127,195 @@
   </div>
 </template>
 <script>
-  import * as Util from "../Util";
+import * as Util from "../Util";
 
-  export default {
-    title: '已办工单',
-    data() {
-      return {
-        // rows: Object
-        rows: [],
-        editshow: false,
-        row: {
-          type: Object
-        },
-        address:'',
-        username:'',
-        f_start_date:Util.toStandardDateString(),
-        f_finish_date:Util.toStandardDateString()
+export default {
+  title: '已办工单',
+  data() {
+    return {
+      // rows: Object
+      rows: [],
+      editshow: false,
+      row: {
+        type: Object
+      },
+      address:'',
+      username:'',
+      f_start_date:Util.toStandardDateString(),
+      f_finish_date:Util.toStandardDateString()
+    }
+  },
+  props: {
+    // 控制工单类型，进行各自工作
+    worktype:{
+      type:String,
+      default:'报修单'
+    },
+    sourcet:{
+      type:String,
+      default:'横屏'
+    },
+    tabname:{
+      type:String
+    }
+  },
+  methods: {
+    ifsearch(){
+      let condition = `1 = 1 and tsw.f_workorder_type = '${this.worktype}'`
+      if(this.username != ''){
+        condition += " and tsw.f_user_name like '%" + this.username + "%'"
+      }
+      if(this.address != ''){
+        condition += " and tsw.f_address like  '%" + this.address + "%'"
+      }
+      if(this.f_start_date != ''){
+        condition += `and ts.f_date >='${this.f_start_date} 00:00:00'`
+      }
+      if(this.f_finish_date != ''){
+        condition += `and ts.f_date <='${this.f_finish_date} 23:59:59'`
+      }
+      let result =  this.$androidUtil.bzLogic('searchRepairDone', {condition})
+      if (result.code === 200) {
+        this.rows = result.data
       }
     },
-    props: {
-      // 控制工单类型，进行各自工作
-      worktype:{
-        type:String,
-        default:'报修单'
-      },
-      sourcet:{
-        type:String,
-        default:'横屏'
-      },
-      tabname:{
-        type:String
+    selected(rowOne) {
+      var prpdata = {
+        _this:this,
+        title:'内容查看',
+        safe:false
+      }
+      this.$dispatch('gotoson',prpdata)
+      let condition = `id='${rowOne.id}'`
+      let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
+      let row = result.data[0]
+      if(this.sourcet == '横屏'){
+        this.$goto('repair-order', {row: row, repair: row,worktype:this.worktype,issee:true})
+      }else{
+        this.$goto('repair-orderV', {row: row, repair: row,worktype:this.worktype,issee:true})
       }
     },
-    methods: {
-      ifsearch(){
-        let condition = `1 = 1 and tsw.f_workorder_type = '${this.worktype}'`
-        if(this.username != ''){
-          condition += " and tsw.f_user_name like '%" + this.username + "%'"
-        }
-        if(this.address != ''){
-          condition += " and tsw.f_address like  '%" + this.address + "%'"
-        }
-        if(this.f_start_date != ''){
-          condition += `and ts.f_date >='${this.f_start_date} 00:00:00'`
-        }
-        if(this.f_finish_date != ''){
-          condition += `and ts.f_date <='${this.f_finish_date} 23:59:59'`
-        }
-        let result =  this.$androidUtil.bzLogic('searchRepairDone', {condition})
+    closeEdit() {
+      this.editshow = false
+    },
+    editsuccess() {
+      this.editshow = false
+
+    },
+    search() {
+      // 测试环境异步，真实环境同步
+      var condition = '1 = 1'
+      if (this.$androidUtil.isTest) {
+        this.$androidUtil.path({'alias': 'getCompletedInfo','data': {f_workorder_type: this.worktype,condition:condition}}).then((ret) => {
+          this.rows = ret.data
+        })
+      } else {
+        let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
+        //tag
         if (result.code === 200) {
           this.rows = result.data
-        }
-      },
-      selected(rowOne) {
-        var prpdata = {
-          _this:this,
-          title:'内容查看',
-          safe:false
-        }
-        this.$dispatch('gotoson',prpdata)
-        let condition = `id='${rowOne.id}'`
-        let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
-        let row = result.data[0]
-        if(this.sourcet == '横屏'){
-          this.$goto('repair-order', {row: row, repair: row,worktype:this.worktype,issee:true})
-        }else{
-          this.$goto('repair-orderV', {row: row, repair: row,worktype:this.worktype,issee:true})
-        }
-      },
-      closeEdit() {
-        this.editshow = false
-      },
-      editsuccess() {
-        this.editshow = false
-
-      },
-      search() {
-        // 测试环境异步，真实环境同步
-        var condition = '1 = 1'
-        if (this.$androidUtil.isTest) {
-          this.$androidUtil.path({'alias': 'getCompletedInfo','data': {f_workorder_type: this.worktype,condition:condition}}).then((ret) => {
-            this.rows = ret.data
-          })
         } else {
-          let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
-          //tag
-          if (result.code === 200) {
-            this.rows = result.data
-          } else {
-            //tag)
-          }
+          //tag)
         }
-      },
-      sumsearch() {
-        // 测试环境异步，真实环境同步
-        var condition = '1 = 1'
-        if (this.$androidUtil.isTest) {
-          this.$androidUtil.path({'alias': 'getCompletedInfo','data': {f_workorder_type: this.worktype,condition:condition}}).then((ret) => {
-            for(var i = 0;i<this.$parent.tabs.length;i++){
-              if(this.$parent.tabs[i].name == this.tabname){
-                this.$parent.tabs[i].servicesum = ret.data.length
-                return
-              }
+      }
+    },
+    sumsearch() {
+      // 测试环境异步，真实环境同步
+      var condition = '1 = 1'
+      if (this.$androidUtil.isTest) {
+        this.$androidUtil.path({'alias': 'getCompletedInfo','data': {f_workorder_type: this.worktype,condition:condition}}).then((ret) => {
+          for(var i = 0;i<this.$parent.tabs.length;i++){
+            if(this.$parent.tabs[i].name == this.tabname){
+              this.$parent.tabs[i].servicesum = ret.data.length
+              return
             }
-          })
-        } else {
-          let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
-          //tag
-          if (result.code === 200) {
-            for(var i = 0;i<this.$parent.tabs.length;i++){
-              if(this.$parent.tabs[i].name == this.tabname){
-                this.$parent.tabs[i].servicesum = result.data.length
-                return
-              }
+          }
+        })
+      } else {
+        let result = this.$androidUtil.path({'alias': 'getCompletedInfo', 'data': {f_workorder_type: this.worktype,condition:condition}})
+        //tag
+        if (result.code === 200) {
+          for(var i = 0;i<this.$parent.tabs.length;i++){
+            if(this.$parent.tabs[i].name == this.tabname){
+              this.$parent.tabs[i].servicesum = result.data.length
+              return
             }
-          } else {
-            //tag)
           }
+        } else {
+          //tag)
         }
-      },
-      upload() {
-        this.$goto('up-load')
-      },
-      back () {
-        this.$back()
-      },
-      init () {
-        this.address = ''
-        this.username = ''
-        this.f_finish_date = ''
-        this.f_start_date = ''
       }
     },
-    ready() {
-      this.ifsearch()
-      // var _this = this;
-      // this.timeoutHandle = window.setInterval(function() {
-      //   _this.sumsearch()
-      // }, 60000)
+    upload() {
+      this.$goto('up-load')
     },
-    components: {
-      'delay-apply': (resolve) => {
-        require(['./DelayApply'], resolve)
-      }
+    back () {
+      this.$back()
+    },
+    init () {
+      this.address = ''
+      this.username = ''
+      this.f_finish_date = ''
+      this.f_start_date = ''
+    }
+  },
+  ready() {
+    this.ifsearch()
+    // var _this = this;
+    // this.timeoutHandle = window.setInterval(function() {
+    //   _this.sumsearch()
+    // }, 60000)
+  },
+  components: {
+    'delay-apply': (resolve) => {
+      require(['./DelayApply'], resolve)
     }
-
   }
+
+}
 </script>
-<style lang="less">
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
+<style lang="less" scoped>
+.app-botton {
+  position:fixed;
+  background: #87b2dd;
+  color: #FFF;
+  padding: 8px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity:0.5;
+  bottom: 50px;
+  margin-top: -10px;
+  height: 40px;
+}
+.app-row {
+  background-color: white;
+  padding: 5px 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/FaultAll.vue

@@ -428,15 +428,15 @@ export default {
           this.$showMessage(`请录入${isfinish.msg}信息！`, ['confirm'])
           return
         }
-        // if(!(this.msg.serviceacitivity[0].f_signname)) {
-        //   this.$showMessage(`请完成客户签名！`, ['confirm'])
-        //   return
-        // }
-        // let imgflag = this.checkzhihuanimg()
-        // if(!(imgflag.check)){
-        //   this.$showMessage(`${imgflag.title}未拍照！`, ['confirm'])
-        //   return
-        // }
+        if(!(this.msg.serviceacitivity[0].f_signname) && Vue.config.telephone.FaultAll.signature?Vue.config.telephone.FaultAll.signature:false) {
+          this.$showMessage(`请完成客户签名！`, ['confirm'])
+          return
+        }
+        let imgflag = this.checkzhihuanimg()
+        if(!(imgflag.check) && Vue.config.telephone.FaultAll.photograph?Vue.config.telephone.FaultAll.photograph:false){
+          this.$showMessage(`${imgflag.title}未拍照！`, ['confirm'])
+          return
+        }
       }
       // }
       // 用户基本信息转字符串

package/src/components/workorder/PhoneUpDetail.vue

@@ -571,6 +571,9 @@
         //   this.$showMessage(checked.msg)
         //   return
         // }
+        for (let i = 0; i < this.model.length; i++) {
+          this.model[i].f_user_id = this.userinfo.meterinfo[0].f_user_id
+        }
         this.$showMessage('确定是否修改上传设备信息？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             this.excessive = true

package/src/components/workorder/RepairFirstV.vue

@@ -94,7 +94,7 @@
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户姓名: {{row.f_user_name}}
                   </div>
-                  <div v-show="false" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                  <div  class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     来电电话: {{row.f_phone}}
                     <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>
                   </div>

package/src/filiale/kelai/pc/WorkCenterList.vue

@@ -81,6 +81,13 @@
                         :size="model.f_attendant ? model.f_order_man.length : 6" style="width: 80%;">
               </div>
 
+              <div class="col-sm-3">
+                <v-select :value.sync="model.f_state"
+                          v-model="model.f_state"
+                          :width="'80%'"
+                          :options='$parent.$parent.states' placeholder='是否退单'
+                          close-on-select  style="width: 80%;"></v-select>
+              </div>
               <!-- <div class="form-group"  style="float: left;margin-right: 3px">
                 <datepicker id="endDate" placeholder="接单日期"
                   v-model="model.f_order_date"
@@ -122,15 +129,15 @@
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'serviceDelete',row)" style="min-width: 30px;">撤销</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '报修单'">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '报修单'">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resend', row)" style="min-width: 30px;">重派</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '置换通气单' ">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '置换通气单' ">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resendzhihuan', row)" style="min-width: 30px;">重派</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '安装单' ">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '安装单' ">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resendinstall', row)" style="min-width: 30px;">重派</button>
               </div>
@@ -170,6 +177,7 @@ export default {
     return {
       model: new PagedList('rs/path/allService', 20),
       row: null,
+      states:[{label: '全部', value: ''}, {label: '是', value: '是'},{label: '否', value: '否'}],
       modifyOrder: null
 	    // defname: [{label: '全部', value: ''}, ...this.$appdata.getParam('工单状态')]
     }
@@ -201,6 +209,15 @@ export default {
       data.condition = this.$refs.paged.$refs.criteria.condition?this.$refs.paged.$refs.criteria.condition:'1=1'
       // data.condition += `and f_filiale_id  =  '${this.$login.f.orgid}'`
       data.sign = this.$refs.paged.$refs.criteria.select.defname[0]?`defname = '${this.$refs.paged.$refs.criteria.select.defname[0]}'`:'1=1'
+
+      if (this.$refs.paged.$refs.criteria.model.f_state.length > 0){
+        if (this.$refs.paged.$refs.criteria.model.f_state[0] == '是'){
+          data.condition += ` and f_state = '撤销' `
+        }else {
+          data.condition += ` and f_state = null `
+        }
+      }
+
       return this.model.search(data)
     },
     selfsearch(){