telephone-clients 3.0.105-21 → 3.0.105-23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.105-21",
+  "version": "3.0.105-23",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/android/ImgArea.vue

@@ -1,80 +1,104 @@
-<template>
-  <div>
-    <div class="row">
-      <button type="button" name="button" class="btn btn-primary" @click="takePic()">拍照</button>
-    </div>
-    <div class="row">
-      <div class="col-xs-4 col-sm-3 col-md-2" v-for="img in model" v-if="img.imgpath == sutitle ">
-        <img-self :src="getimgstr(img)" alt="维修照片" :width="150" :height="200"></img-self>
-        <button type="button" name="button" class="btn btn-default" @click="remove(img)">-</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import * as Util from '../../components/Util'
-
-  export default {
-  props: {
-    // 存放照片的数组
-    model: {
-      type: Array
-    },
-    sutitle:'维修照片'
-  },
-  data () {
-    return {
-      // 拍照时的文件名
-      fileName: '',
-      is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
-
-    }
-  },
-  methods: {
-    // 从图片中删除
-    remove (row) {
-      this.$androidUtil.delfile(row.android_file)
-      let pos = this.model.findIndex((value) => {
-        return value === row
-      });
-      this.model.splice(pos, 1)
-    },
-    // fileName: 回传文件名,传入的带安卓路径url
-    // prop: 传入的字段名，没做改动
-    cameraCallBack(prop, fileName) {
-      alert("callback!!!!!!!!!!!!!!!!!!--start")
-      // 当前this只能通过HostApp.__tis__获取
-      let self = this.$androidUtil.getCallBack(this)
-      // 添加新图片
-      self.model.push({
-        android_file: self.fileName,
-        path: fileName,
-        imgpath: this.sutitle
-      })
-      alert("callback!!!!!!!!!!!!!!!!!!--end")
-    },
-    takePic() {
-      const obj = HostApp.getGpsDetailAddress()
-      let jingweidu = ''
-      if (this.is_has_jingweidu == 'true'){
-        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
-      }
-      let prop = 'repair'
-      let idx = 'aofeng'
-      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName,this.sutitle+jingweidu)
-    },
-    getimgstr(val){
-      if(!val){
-        return ''
-      }
-      if(Vue.android){
-        return val.path + '?' + Math.random()
-      }
-      return 'rs/file/getfile/' + val.imgid
-    }
-  },
-}
-</script>
+<template>
+  <div>
+    <div class="row">
+      <button type="button" name="button" class="btn btn-primary" @click="takePic()">拍照</button>
+      <button v-if="isxiangce == '是'" type="button" name="button" class="btn btn-primary" @click="takePic1()">相册</button>
+    </div>
+    <div class="row">
+      <div class="col-xs-4 col-sm-3 col-md-2" v-for="img in model" v-if="img.imgpath == sutitle ">
+        <img-self :src="getimgstr(img)" alt="维修照片" :width="150" :height="200"></img-self>
+        <button type="button" name="button" class="btn btn-default" @click="remove(img)">-</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import * as Util from '../../components/Util'
+
+  export default {
+  props: {
+    // 存放照片的数组
+    model: {
+      type: Array
+    },
+    sutitle:'维修照片',
+    isxiangce:'否'
+  },
+  data () {
+    return {
+      // 拍照时的文件名
+      fileName: '',
+      is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
+
+    }
+  },
+  methods: {
+    // 从图片中删除
+    remove (row) {
+      this.$androidUtil.delfile(row.android_file)
+      let pos = this.model.findIndex((value) => {
+        return value === row
+      });
+      this.model.splice(pos, 1)
+    },
+    // fileName: 回传文件名,传入的带安卓路径url
+    // prop: 传入的字段名，没做改动
+    cameraCallBack(prop, fileName) {
+      alert("callback!!!!!!!!!!!!!!!!!!--start")
+      // 当前this只能通过HostApp.__tis__获取
+      let self = this.$androidUtil.getCallBack(this)
+      // 添加新图片
+      self.model.push({
+        android_file: self.fileName,
+        path: fileName,
+        imgpath: this.sutitle
+      })
+      alert("callback!!!!!!!!!!!!!!!!!!--end")
+    },
+    takePic() {
+      const obj = HostApp.getGpsDetailAddress()
+      let jingweidu = ''
+      if (this.is_has_jingweidu == 'true'){
+        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+      }
+      let prop = 'repair'
+      let idx = 'aofeng'
+      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName,this.sutitle+jingweidu)
+    },
+    takePic1() {
+      const obj = HostApp.getGpsDetailAddress()
+      let jingweidu = ''
+      if (this.is_has_jingweidu == 'true') {
+        jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
+      }
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let prop = 'repair'
+      let idx = 'aofeng'
+      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.ActionPickActivity',
+        param: {
+          file: this.fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+          watermark: this.sutitle+jingweidu + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+        }
+      })
+    },
+    getimgstr(val){
+      if(!val){
+        return ''
+      }
+      if(Vue.android){
+        return val.path + '?' + Math.random()
+      }
+      return 'rs/file/getfile/' + val.imgid
+    }
+  },
+}
+</script>

package/src/components/workorder/Outlay.vue

@@ -1,236 +1,237 @@
-<template>
-  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
-    <validator name="v">
-      <!-- 费用 -->
-
-      <div class="bq-parent" v-if="shutype == 'heng'">
-        <blockquote class="blockquote">
-          <p>费用<a  @click="mute()" style="float:right"  href="javascript:void(0)" class="repair-mute-class"><img src="../../assets/novoice.png" width="25px;" alt=""><span style="margin-left:10px;color: #304A66">关闭声音</span></a></p>
-        </blockquote>
-      </div>
-      <div class="auto repair-info-content compatible" v-if="materialsumshow">
-        <div class="row auto">
-          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8" :class="$v.f_cost_person.pattern ? 'has-error' : ''">-->
-          <!--<label class="text-justify lb-left" for="f_cost_person">人工费:</label>-->
-          <!--<span v-if="show">{{model.f_cost_person}}元</span>-->
-          <!--<template  v-if="!show">-->
-          <!--<input type="text" class="form-control" id="f_cost_person" v-model="model.f_cost_person" v-validate:f_cost_person="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">-->
-          <!--</template>-->
-          <!--</div>-->
-          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
-          <!--<label class="text-justify lb-left" for="costmatter">材料费:</label>-->
-          <!--<span v-if="show">{{model.f_cost_material}}元</span>-->
-          <!--<input type="text" class="form-control" id="costmatter" v-model="model.f_cost_material" v-if="!show">-->
-          <!--&lt;!&ndash;<button type="button" name="button" class="btn btn-primary"  @click="sumshow">明细</button>&ndash;&gt;-->
-          <!--</div>-->
-          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
-          <!--<label class="text-justify lb-left">操作员:</label>-->
-          <!--<span v-if="show" style="font-weight:bold">{{model.f_order_man}}</span>-->
-          <!--<input type="text" class="form-control" v-model="model.f_order_man" v-if="!show" :disabled="issee">-->
-          <!--</div>-->
-          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
-          <!--<label class="text-justify lb-left">派单员:</label>-->
-          <!--<span v-if="show" style="font-weight:bold">{{f_single_man}}</span>-->
-          <!--<input type="text" class="form-control"  v-model="f_single_man" v-if="!show" readonly >-->
-          <!--</div>-->
-          <!--<div class="col-xs-12 col-sm-12 col-md-12 form-input-group">-->
-          <!--<label class="text-justify lb-left">反馈建议:</label>-->
-          <!--<span v-if="show" style="font-weight:bold">{{model.f_service_idea}}</span>-->
-          <!--<textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_service_idea" v-if="!show" :disabled="issee"></textarea>-->
-          <!--</div>-->
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group">
-            <label class="text-justify lb-left">备注:</label>
-            <span v-if="show" style="font-weight:bold">{{model.f_remarks}}</span>
-            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_remarks" v-if="!show" :disabled="issee"></textarea>
-          </div>
-        </div>
-        <div class="row auto" v-if="imgtpe">
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group"  v-for="row in imgstype">
-            <label class="text-justify lb-left">{{row.title}}</label>
-            <img-area  :model="model.imgs"  :sutitle="getsutitle(row.title)"></img-area>
-          </div>
-        </div>
-        <img-area  :model="model.imgs" :sutitle="'总体照片'" v-if="!imgtpe" ></img-area>
-        <p style="font-size: 15px;font-weight: bold" v-if="model.f_sign_imgid">客户签名:</p>
-        <div v-if="!show && signType">
-          <Sign :signname="model.f_signname" @input="getSignValue"></Sign>
-        </div>
-        <div v-if="!show && !signType">
-          <new-sign :value="model.f_signname" @input="getSignValue"></new-sign>
-        </div>
-        <div v-if="show && model.f_sign_imgid">
-          <img :src="'rs/file/getfile/' + model.f_sign_imgid" :width="150" :height="200" >
-        </div>
-      </div>
-      <material-sum v-if="!materialsumshow" v-on:sumchange="sumchange"
-                    v-on:back="showchenge" :material="model.material" :f_cost_material="model.f_cost_material" :show="show">
-      </material-sum>
-    </validator>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  export default {
-    title: '费用',
-    props: {
-      // 本次维修, 包含照片数组  材料数组
-      model: {
-        type: Object
-      },
-      service: {
-        type: Object
-      },
-      show: {
-        type: Boolean,
-        default: false
-      },
-      f_single_man: {
-        type: Object
-      },
-      system: '',
-      shutype: 'heng',
-      issee:''
-    },
-    data () {
-      return {
-        signType:{
-          type: Boolean,
-          default: true
-        },
-        // 拍照时的文件名
-        imgurl: 'http://192.168.2.77:8081',
-        fileName: '',
-        materialsumshow: {        //  控制明细组件和费用层的 显示     fasle 明细组建显示
-          type: Boolean,
-          default: true
-        },
-        imgtpe:false,
-        imgstype:[]
-      }
-    },
-    methods: {
-      getSignValue(fileName){
-        //tag
-        //tag
-        this.model.f_signname = fileName
-        this.model.f_sign_path = this.$androidUtil.getFullFileName(fileName)
-      },
-      getsutitle(val){
-        return val
-      },
-      mute () {
-        HostApp.mute()
-      },
-      // 签名回调
-      signCallback(prop, fileName) {
-        // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
-        HostApp.__this__.$set('model.f_signname', fileName)
-        HostApp.__callback__ = null
-        HostApp.__this__ = null
-      },
-      // 用户签名
-      sign() {
-        this.delAudioFile('f_signname', this.model.f_signname)
-        let prop = 'f_signname'
-        let idx = 'aofeng'
-        let fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-        HostApp.__callback__ = this.signCallback
-        HostApp.__this__ = this
-        HostApp.getSignature({
-          file: fileName,
-          requestCode: 111,
-          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
-        })
-      },
-      delAudioFile(prop, fileName) {
-        if (!fileName)
-          return
-        else {
-          HostApp.delfile(fileName)
-          this.model[prop] = null
-        }
-      },
-      // 从图片中删除
-      remove (row) {
-        this.$androidUtil.delfile(row.android_file)
-        let pos = this.model.imgs.findIndex((value) => {
-          return value === row
-        })
-        this.model.imgs.splice(pos, 1)
-      },
-      // fileName: 回传文件名,传入的带安卓路径url
-      // prop: 传入的字段名，没做改动
-      cameraCallBack(prop, fileName) {
-        // 当前this只能通过HostApp.__tis__获取
-        let self = this.$androidUtil.getCallBack(this)
-        // 添加新图片
-        self.model.imgs.push({
-          android_file: self.fileName,
-          path: fileName
-        })
-      },
-      takePic() {
-        let prop = 'repair'
-        let idx = 'aofeng'
-        this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-        this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName)
-      },
-      // 明细组件显示
-      sumshow(){
-        this.materialsumshow = false
-      },
-      // 当材料明细发生变化  材料费随之变化
-      sumchange(val){
-        this.model.f_cost_material = val
-      },
-      //  返回 总材料费   关闭材料费详情界面
-      showchenge(val){
-        this.materialsumshow = true
-        if(!isNaN(val)) {
-          this.model.f_cost_material = val
-        }
-      }
-    },
-    ready(){
-      if(Vue.config.telephone.Outlay.data != undefined){
-        //tag
-        //tag)
-        if(this.service.f_user_type == '民用'){
-          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].civil)))
-        }else{
-          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].nocivil)))
-        }
-        if(this.imgstype.length>0){
-          this.imgtpe = true
-        }
-      }
-      if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
-        this.signType = false
-      }
-      if(this.model && this.model.f_single_man){
-        this.model.f_single_man = this.f_single_man
-      }
-      if(!this.show&&this.model){
-        if(Vue.user == undefined)
-          return
-        this.model.f_order_man = Vue.user.name
-        this.model.f_order_man_id = Vue.user.id
-      }
-      //tag
-      //tag
-      //tag
-    },
-    computed:{
-      Detail(){
-        if (this.model.imgs && this.model.servicerepair.length > 0) {
-          let result = this.model.servicerepair.find((row) => {
-            return row.f_type === this.repairitem.header
-          })
-          return result
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
+    <validator name="v">
+      <!-- 费用 -->
+
+      <div class="bq-parent" v-if="shutype == 'heng'">
+        <blockquote class="blockquote">
+          <p>费用<a  @click="mute()" style="float:right"  href="javascript:void(0)" class="repair-mute-class"><img src="../../assets/novoice.png" width="25px;" alt=""><span style="margin-left:10px;color: #304A66">关闭声音</span></a></p>
+        </blockquote>
+      </div>
+      <div class="auto repair-info-content compatible" v-if="materialsumshow">
+        <div class="row auto">
+          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8" :class="$v.f_cost_person.pattern ? 'has-error' : ''">-->
+          <!--<label class="text-justify lb-left" for="f_cost_person">人工费:</label>-->
+          <!--<span v-if="show">{{model.f_cost_person}}元</span>-->
+          <!--<template  v-if="!show">-->
+          <!--<input type="text" class="form-control" id="f_cost_person" v-model="model.f_cost_person" v-validate:f_cost_person="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">-->
+          <!--</template>-->
+          <!--</div>-->
+          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
+          <!--<label class="text-justify lb-left" for="costmatter">材料费:</label>-->
+          <!--<span v-if="show">{{model.f_cost_material}}元</span>-->
+          <!--<input type="text" class="form-control" id="costmatter" v-model="model.f_cost_material" v-if="!show">-->
+          <!--&lt;!&ndash;<button type="button" name="button" class="btn btn-primary"  @click="sumshow">明细</button>&ndash;&gt;-->
+          <!--</div>-->
+          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
+          <!--<label class="text-justify lb-left">操作员:</label>-->
+          <!--<span v-if="show" style="font-weight:bold">{{model.f_order_man}}</span>-->
+          <!--<input type="text" class="form-control" v-model="model.f_order_man" v-if="!show" :disabled="issee">-->
+          <!--</div>-->
+          <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group">-->
+          <!--<label class="text-justify lb-left">派单员:</label>-->
+          <!--<span v-if="show" style="font-weight:bold">{{f_single_man}}</span>-->
+          <!--<input type="text" class="form-control"  v-model="f_single_man" v-if="!show" readonly >-->
+          <!--</div>-->
+          <!--<div class="col-xs-12 col-sm-12 col-md-12 form-input-group">-->
+          <!--<label class="text-justify lb-left">反馈建议:</label>-->
+          <!--<span v-if="show" style="font-weight:bold">{{model.f_service_idea}}</span>-->
+          <!--<textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_service_idea" v-if="!show" :disabled="issee"></textarea>-->
+          <!--</div>-->
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group">
+            <label class="text-justify lb-left">备注:</label>
+            <span v-if="show" style="font-weight:bold">{{model.f_remarks}}</span>
+            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_remarks" v-if="!show" :disabled="issee"></textarea>
+          </div>
+        </div>
+        <div class="row auto" v-if="imgtpe">
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group"  v-for="row in imgstype">
+            <label class="text-justify lb-left">{{row.title}}</label>
+            <img-area  :model="model.imgs"  :sutitle="getsutitle(row.title)" :isxiangce="isxiangce"></img-area>
+          </div>
+        </div>
+        <img-area  :model="model.imgs" :sutitle="'总体照片'" v-if="!imgtpe" :isxiangce="isxiangce"></img-area>
+        <p style="font-size: 15px;font-weight: bold" v-if="model.f_sign_imgid">客户签名:</p>
+        <div v-if="!show && signType">
+          <Sign :signname="model.f_signname" @input="getSignValue"></Sign>
+        </div>
+        <div v-if="!show && !signType">
+          <new-sign :value="model.f_signname" @input="getSignValue"></new-sign>
+        </div>
+        <div v-if="show && model.f_sign_imgid">
+          <img :src="'rs/file/getfile/' + model.f_sign_imgid" :width="150" :height="200" >
+        </div>
+      </div>
+      <material-sum v-if="!materialsumshow" v-on:sumchange="sumchange"
+                    v-on:back="showchenge" :material="model.material" :f_cost_material="model.f_cost_material" :show="show">
+      </material-sum>
+    </validator>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  export default {
+    title: '费用',
+    props: {
+      // 本次维修, 包含照片数组  材料数组
+      model: {
+        type: Object
+      },
+      service: {
+        type: Object
+      },
+      show: {
+        type: Boolean,
+        default: false
+      },
+      f_single_man: {
+        type: Object
+      },
+      system: '',
+      shutype: 'heng',
+      issee:''
+    },
+    data () {
+      return {
+        signType:{
+          type: Boolean,
+          default: true
+        },
+        // 拍照时的文件名
+        imgurl: 'http://192.168.2.77:8081',
+        fileName: '',
+        materialsumshow: {        //  控制明细组件和费用层的 显示     fasle 明细组建显示
+          type: Boolean,
+          default: true
+        },
+        imgtpe:false,
+        isxiangce:this.$appdata.getSingleValue('维修-开启相册')?this.$appdata.getSingleValue('维修-开启相册'):'否',
+        imgstype:[]
+      }
+    },
+    methods: {
+      getSignValue(fileName){
+        //tag
+        //tag
+        this.model.f_signname = fileName
+        this.model.f_sign_path = this.$androidUtil.getFullFileName(fileName)
+      },
+      getsutitle(val){
+        return val
+      },
+      mute () {
+        HostApp.mute()
+      },
+      // 签名回调
+      signCallback(prop, fileName) {
+        // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
+        HostApp.__this__.$set('model.f_signname', fileName)
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      // 用户签名
+      sign() {
+        this.delAudioFile('f_signname', this.model.f_signname)
+        let prop = 'f_signname'
+        let idx = 'aofeng'
+        let fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+        HostApp.__callback__ = this.signCallback
+        HostApp.__this__ = this
+        HostApp.getSignature({
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
+        })
+      },
+      delAudioFile(prop, fileName) {
+        if (!fileName)
+          return
+        else {
+          HostApp.delfile(fileName)
+          this.model[prop] = null
+        }
+      },
+      // 从图片中删除
+      remove (row) {
+        this.$androidUtil.delfile(row.android_file)
+        let pos = this.model.imgs.findIndex((value) => {
+          return value === row
+        })
+        this.model.imgs.splice(pos, 1)
+      },
+      // fileName: 回传文件名,传入的带安卓路径url
+      // prop: 传入的字段名，没做改动
+      cameraCallBack(prop, fileName) {
+        // 当前this只能通过HostApp.__tis__获取
+        let self = this.$androidUtil.getCallBack(this)
+        // 添加新图片
+        self.model.imgs.push({
+          android_file: self.fileName,
+          path: fileName
+        })
+      },
+      takePic() {
+        let prop = 'repair'
+        let idx = 'aofeng'
+        this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+        this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName)
+      },
+      // 明细组件显示
+      sumshow(){
+        this.materialsumshow = false
+      },
+      // 当材料明细发生变化  材料费随之变化
+      sumchange(val){
+        this.model.f_cost_material = val
+      },
+      //  返回 总材料费   关闭材料费详情界面
+      showchenge(val){
+        this.materialsumshow = true
+        if(!isNaN(val)) {
+          this.model.f_cost_material = val
+        }
+      }
+    },
+    ready(){
+      if(Vue.config.telephone.Outlay.data != undefined){
+        //tag
+        //tag)
+        if(this.service.f_user_type == '民用'){
+          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].civil)))
+        }else{
+          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].nocivil)))
+        }
+        if(this.imgstype.length>0){
+          this.imgtpe = true
+        }
+      }
+      if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
+        this.signType = false
+      }
+      if(this.model && this.model.f_single_man){
+        this.model.f_single_man = this.f_single_man
+      }
+      if(!this.show&&this.model){
+        if(Vue.user == undefined)
+          return
+        this.model.f_order_man = Vue.user.name
+        this.model.f_order_man_id = Vue.user.id
+      }
+      //tag
+      //tag
+      //tag
+    },
+    computed:{
+      Detail(){
+        if (this.model.imgs && this.model.servicerepair.length > 0) {
+          let result = this.model.servicerepair.find((row) => {
+            return row.f_type === this.repairitem.header
+          })
+          return result
+        }
+      }
+    }
+  }
+</script>

package/src/components/workorder/TemporarySingle.vue

@@ -212,7 +212,7 @@
           'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
         userid: Vue.user.id,
         is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
-        failure: ['更换不锈钢波纹管'],
+        failure: [],
         model: {
           f_userinfo_id: '',
           f_userinfo_code: '',

package/src/filiale/yangchunboneng/android/TemporarySingle.vue

@@ -0,0 +1,541 @@
+<template>
+  <div style="height: auto;width: 100%">
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>用户姓名</label>
+      </div>
+      <div class="col-xs-8">
+        <input class="inputText4" v-model=model.f_user_name style="width: 100%"></input>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>联系电话</label>
+      </div>
+      <div class="col-xs-8">
+        <input class="input-font inputText4 " v-model=model.f_contact_phone style="width: 100%"></input>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>详细地址</label>
+      </div>
+      <div class="col-xs-8">
+        <input class="input-font inputText4 " v-model=model.f_address style="width: 100%"></input>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>用户类型</label>
+      </div>
+      <div class="col-xs-8">
+        <v-select id="f_user_type" :value.sync="model.f_user_type" class="input-font"
+                  :options='user_types' placeholder='请选择用户类型'
+                  class="inputText4"
+                  :width="'100%'"
+                  :value-single="true"
+                  v-model="model.f_user_type" close-on-select clear-button></v-select>
+
+      </div>
+
+    </div>
+
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>是否上报</label>
+      </div>
+      <div class="col-xs-8">
+        <v-select id="f_user_paidan" :value.sync="model.f_handlingtype" class="input-font"
+                  :options='handling_types' placeholder='请选择是否上报'
+                  class="inputText4"
+                  :width="'100%'"
+                  :value-single="true"
+                  v-model="model.f_handlingtype" close-on-select clear-button></v-select>
+      </div>
+
+    </div>
+    <div class="row app-row" v-if="model.f_handlingtype=='转站点'">
+      <div class="col-xs-4">
+        <label>选择站点</label>
+      </div>
+      <div class="col-xs-8">
+        <right-tree islist :userid="userid" :source="source" v-on:re-res="reres" v-ref:f_reciever width="100%"
+                    style="width: 100%">
+
+        </right-tree>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>报修类型</label>
+      </div>
+      <div class="col-xs-8">
+        <v-select id="f_qiangxiu" :value.sync="model.f_repairtype" class="input-font"
+                  :options='repairstypes' placeholder='请选择报修类型'
+                  class="inputText4"
+                  :width="'100%'"
+                  :value-single="true"
+                  v-model="model.f_repairtype" close-on-select clear-button></v-select>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>故障类型</label>
+      </div>
+      <div class="col-xs-8">
+        <v-select id="f_guzhang" :value.sync="failure" class="input-font"
+                  :options='failuretypes' placeholder='请选择故障类型'
+                  class="inputText4"
+                  :width="'100%'"
+                  multiple
+                  v-model="failure" clear-button></v-select>
+      </div>
+
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <label>备注</label>
+      </div>
+      <div class="col-xs-8">
+        <textarea class="input-font " v-model=model.f_remarks style="width: 100%"></textarea>
+      </div>
+
+    </div>
+    <div class="row app-row text-center" style="margin-top: 20px;">
+      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="save">保存</button>
+    </div>
+    <div class="form-group col-sm-12">
+
+      <div class="panel" style="padding: 10px 10px 5px 10px;">
+        <div class="panel-body panel-self"
+             style="background-color: #F8F8F8;width: 90%;margin-left:5%;height: 220px;position: relative">
+          <div class="row" style="height: 180px;overflow: scroll;top: 1px">
+            <div class="col-sm-4">
+              <img-self :src="model.f_single_path" alt="抢修照片" :width="140" :height="170" capture="camera" type="file"
+                        @change="upload"></img-self>
+            </div>
+          </div>
+
+          <div class="row text-right div-photo" style="height: 50px">
+            <img src="../../../assets/remove.png" @click="delfile('f_single_path', model.f_single_path)"/>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic('f_single_path','抢修照片','拍照')">拍照
+            </button>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic('f_single_path','抢修照片','相册')">相册
+            </button>
+          </div>
+        </div>
+      </div>
+
+    </div>
+    <div class="form-group col-sm-12">
+
+      <div class="panel" style="padding: 10px 10px 5px 10px;">
+        <div class="panel-body panel-self"
+             style="background-color: #F8F8F8;width: 90%;margin-left:5%;height: 220px;position: relative">
+          <div class="row" style="height: 180px;overflow: scroll;top: 1px">
+            <div class="col-sm-4">
+              <img-self :src="model.f_singlea_path" alt="抢修照片" :width="140" :height="170" capture="camera" type="file"
+                        @change="upload"></img-self>
+            </div>
+          </div>
+
+          <div class="row text-right div-photo" style="height: 50px">
+            <img src="../../../assets/remove.png" @click="delfile('f_singlea_path', model.f_singlea_path)"/>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic1('f_singlea_path','抢修照片','拍照')">拍照
+            </button>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic1('f_singlea_path','抢修照片','相册')">相册
+            </button>
+          </div>
+        </div>
+      </div>
+
+    </div>
+    <div class="form-group col-sm-12">
+
+      <div class="panel" style="padding: 10px 10px 5px 10px;">
+        <div class="panel-body panel-self"
+             style="background-color: #F8F8F8;width: 90%;margin-left:5%;height: 220px;position: relative">
+          <div class="row" style="height: 180px;overflow: scroll;top: 1px">
+            <div class="col-sm-4">
+              <img-self :src="model.f_singleb_path" alt="抢修照片" :width="140" :height="170" capture="camera" type="file"
+                        @change="upload"></img-self>
+            </div>
+          </div>
+
+          <div class="row text-right div-photo" style="height: 50px">
+            <img src="../../../assets/remove.png" @click="delfile('f_singleb_path', model.f_singleb_path)"/>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic2('f_singleb_path','抢修照片','拍照')">拍照
+            </button>
+            <button type="button" name="button" class="btn btn-primary btn-photo"
+                    @click="takePic2('f_singleb_path','抢修照片','相册')">相册
+            </button>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import * as Util from '../../../components/Util'
+  import {HttpResetClass} from "vue-client";
+
+  export default {
+    title: '在线维修处理',
+    props: {
+      userinfo: {
+        type: Object,
+        default: null
+      },
+      f_userinfo_id: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        source:
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
+        userid: Vue.user.id,
+        is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
+        failure: [],
+        model: {
+          f_userinfo_id: '',
+          f_userinfo_code: '',
+          aState: null,
+          f_address: '',
+          f_area: "",
+          f_attendant: Vue.user.name,
+          f_building: "",
+          f_card_id: "",
+          f_contact_phone: "",
+          f_depid: Vue.user.depids,
+          f_filiale_id: "",
+          f_floor: "",
+          f_handlingtype: "转维修员",
+          f_enter_number: '',
+          f_meetunit: "",
+          f_operator: Vue.user.name,
+          f_operatorid: Vue.user.id,
+          f_orgid: Vue.user.orgid,
+          f_orgname: Vue.user.orgs,
+          f_outlets: "",
+          f_phone: "",
+          f_reciever: "",
+          f_remarks: "",
+          f_repair_date: Util.getNowDate(),
+          f_repairman_phone: "",
+          f_repairtype: "整改",
+          f_residential_area: "",
+          f_room: "",
+          f_service_id: "",
+          f_source: "临时派单",
+          f_street: "",
+          f_unit: "",
+          f_unit_name: "",
+          f_user_name: "",
+          f_user_type: "",
+          failure: "",
+          f_single_path: '',
+          f_singlea_path: '',
+          f_singleb_path: '',
+          serviceacitivity: [{
+            f_service_acitivity_type: "派单",
+            f_reciever: Vue.user.name
+          }]
+        },
+        repairstypes: this.$appdata.getParam('报修类型'),
+        failuretypes: this.$appdata.getParam('在线维修故障类型'),
+        user_types: [{label: "民用", value: "民用"},
+          {label: "非民用", value: "非民用"}],
+        repair_types: [{label: "民用", value: "民用"},
+          {label: "非民用", value: "非民用"}],
+        handling_types: [{label: "是", value: "转站点"},
+          {label: "否", value: "转维修员"}]
+      }
+    },
+    methods: {
+      delfile(prop, fileName) {
+        if (fileName == Vue.nopic)
+          return
+        else {
+          HostApp.delfile(fileName)
+          this.model[prop] = Vue.nopic
+        }
+      },
+      cameraCallBack(prop, fileName) {
+        HostApp.__this__.model.f_single_path = fileName + '?' + Math.random()
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      cameraCallBack1(prop, fileName) {
+        HostApp.__this__.model.f_singlea_path = fileName + '?' + Math.random()
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      cameraCallBack2(prop, fileName) {
+        HostApp.__this__.model.f_singleb_path = fileName + '?' + Math.random()
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+
+      takePic(prop, title,type) {
+        const obj = HostApp.getGpsDetailAddress()
+        HostApp.__callback__ = this.cameraCallBack
+        HostApp.__this__ = this
+        let fileName
+        if (!this.model.f_single_path || this.model.f_single_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.model.f_single_path)
+        }
+        let jingweidu = ''
+        if (this.is_has_jingweidu == 'true') {
+          jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
+        }
+        //tag
+        //tag
+        let  page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'
+        if(type === '相册'){
+          page ='com.aofeng.hybrid.android.peripheral.ActionPickActivity'
+        }
+        HostApp._open_a_page({
+          type: 'boomerang',
+          page: page,
+          param: {
+            file: fileName,
+            requestCode: 111,
+            callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu
+          }
+        })
+      },
+      takePic1(prop, title,type) {
+        HostApp.__callback__ = this.cameraCallBack1
+        HostApp.__this__ = this
+        let fileName
+        if (!this.model.f_singlea_path || this.model.f_singlea_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.model.f_singlea_path)
+        }
+        //tag
+        //tag
+        let  page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'
+        if(type === '相册'){
+          page ='com.aofeng.hybrid.android.peripheral.ActionPickActivity'
+        }
+        HostApp._open_a_page({
+          type: 'boomerang',
+          page: page,
+          param: {
+            file: fileName,
+            requestCode: 111,
+            callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+          }
+        })
+      },
+      takePic2(prop, title,type) {
+        HostApp.__callback__ = this.cameraCallBack2
+        HostApp.__this__ = this
+        let fileName
+        if (!this.model.f_singleb_path || this.model.f_singleb_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.model.f_singleb_path)
+        }
+        //tag
+        //tag
+        let  page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'
+        if(type === '相册'){
+          page ='com.aofeng.hybrid.android.peripheral.ActionPickActivity'
+        }
+        HostApp._open_a_page({
+          type: 'boomerang',
+          page: page,
+          param: {
+            file: fileName,
+            requestCode: 111,
+            callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+          }
+        })
+      },
+
+      save() {
+        if (!this.model.f_address) {
+          this.$showMessage('请填写地址信息')
+          return
+        }
+        //tag)
+        let data = {
+          model: this.model, loginUser: {
+            name: Vue.user.name,
+            ename: Vue.user.ename
+          }, user: null, callObj: null
+        }
+        if (this.model.f_handlingtype == '转维修员') {
+          data.toRepair = '一级派单'
+          this.model.f_meetunit = Vue.user.deps
+          this.model.f_orgid = Vue.user.orgid
+          this.model.f_filiale = Vue.user.org
+          this.model.f_outlets = Vue.user.deps
+          this.model.f_filiale_id = Vue.user.orgid
+        }
+        //tag
+        HostApp.__this__ = this
+        HostApp.logicWithHint({
+          'logic': 'callerSendPhone', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+          'data': data, 'backresult': 1
+        })
+      },
+      commitCallBack(jo) {
+        if (jo.state == "ok" && this.model.f_handlingtype == '转站点') {
+          this.$showMessage('抢修上报成功', ['confirm']).then((req) => {
+            if (req === 'confirm') {
+              this.$dispatch('confirm')
+            }
+          })
+        } else if (jo.state == "ok" && this.model.f_handlingtype == '转维修员') {
+          this.$showMessage('抢修上报成功,请前往待办工单页面查看', ['confirm']).then((req) => {
+            if (req === 'confirm') {
+              this.$dispatch('confirm')
+            }
+          })
+        } else {
+          this.$showMessage('服务器内部错误')
+        }
+      },
+      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]
+      },
+      changeFailure(val) {
+        let failure = []
+        for (let i = 0; i < val.length; i++) {
+          failure.push({"f_failure_type": val[i], "failurecase": []})
+        }
+        this.model.failure = JSON.stringify(failure)
+      }
+    },
+    ready() {
+      this.changeFailure(this.failure)
+      // let gen = select(this)
+      // co(gen)
+      if (this.f_userinfo_id) {
+        new HttpResetClass().load('POST', 'rs/sql/tel_getUserInfoAdress', {
+          data: {
+            condition: `ti.f_userinfo_id = '${this.f_userinfo_id}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.userinfo = res.data[0]
+        })
+      }
+    },
+    watch: {
+      'failure'(val) {
+        this.changeFailure(val)
+      },
+      'userinfo'(val) {
+        if (val) {
+          this.model.f_user_name = val.f_user_name
+          this.model.f_contact_phone = val.f_user_phone
+          this.model.f_userinfo_id = val.f_userinfo_id
+          this.model.f_userinfo_code = val.f_userinfo_code
+          this.model.f_address = val.f_address
+          this.model.f_user_type = val.f_user_type
+          this.model.f_enter_number = val.f_enter_number
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .inputText4 {
+    font-family: Arial, Helvetica, sans-serif;
+    background: none repeat scroll 0 0 #F5F7FD;
+    border: 1px solid #B8BFE9;
+    padding: 5px 7px;
+    width: 100px;
+    vertical-align: middle;
+    height: 30px;
+    font-size: 12px;
+    margin: 0;
+    list-style: none outside none;
+  }
+
+  .input-font {
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+
+  .bg {
+    background-color: blue;
+    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;
+  }
+
+  .app-text {
+    font-size: 12px;
+  }
+</style>

package/src/filiale/yangchunboneng/telephoneAndroid.js

@@ -3,7 +3,8 @@ import Vue from "vue";
 
 //pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
 let specialComp = {
-  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) }
+  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) },
+  'temporary-single': (resolve) => { require(['./android/TemporarySingle'], resolve) }
 }
 exports.specialComp = specialComp