telephone-clients 3.0.105-5 → 3.0.106

package/build.gradle

@@ -0,0 +1,15 @@
+buildscript {
+  repositories {
+    mavenCentral()
+    jcenter()
+  }
+}
+
+version = '3.0.48'
+
+apply plugin: 'java'
+
+task release(type:Exec) {
+  workingDir '.'
+  commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "telephone-clients",
-  "version": "3.0.105-5",
-  "description": "呼叫模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "android": "node build/dev-android.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": "http://gitee.com/aote/telephone",
-  "keywords": [
-    "telephone-clients"
-  ],
-  "author": "申志明",
-  "license": "ISC",
-  "dependencies": {
-    "@keeex/qrcodejs-kx": "^1.0.2",
-    "date-fns": "^2.29.3",
-    "dayjs": "^1.11.6",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "^0.0.2",
-    "src": "^1.1.2",
-    "swiper": "^6.1.2",
-    "vue": "^1.0.17",
-    "vue-awesome-swiper": "^4.1.1"
-  },
-  "devDependencies": {
-    "address-client": "3.0.23",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "chromedriver": "^2.21.2",
-    "compression-webpack-plugin": "^1.1.2",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less-loader": "^2.2.3",
-    "lolex": "^1.5.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "ol": "^4.6.4",
-    "phantomjs-prebuilt": "^2.1.3",
-    "proj4": "^2.2.1",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.61",
-    "system-phone": "1.2.100",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.116",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-dev-server": "^2.9.7",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  }
-}
+{
+  "name": "telephone-clients",
+  "version": "3.0.106",
+  "description": "呼叫模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "android": "node build/dev-android.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": "http://gitee.com/aote/telephone",
+  "keywords": [
+    "telephone-clients"
+  ],
+  "author": "申志明",
+  "license": "ISC",
+  "dependencies": {
+    "@keeex/qrcodejs-kx": "^1.0.2",
+    "date-fns": "^2.29.3",
+    "dayjs": "^1.11.6",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "^0.0.2",
+    "src": "^1.1.2",
+    "swiper": "^6.1.2",
+    "vue": "^1.0.17",
+    "vue-awesome-swiper": "^4.1.1"
+  },
+  "devDependencies": {
+    "address-client": "3.0.23",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "chromedriver": "^2.21.2",
+    "compression-webpack-plugin": "^1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.30.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less-loader": "^2.2.3",
+    "lolex": "^1.5.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "ol": "^4.6.4",
+    "phantomjs-prebuilt": "^2.1.3",
+    "proj4": "^2.2.1",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.61",
+    "system-phone": "1.2.100",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.116",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-dev-server": "^2.9.7",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  }
+}

package/src/components/android/ImgArea.vue

@@ -2,6 +2,7 @@
   <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 ">
@@ -22,7 +23,8 @@
     model: {
       type: Array
     },
-    sutitle:'维修照片'
+    sutitle:'维修照片',
+    isxiangce:'否'
   },
   data () {
     return {
@@ -66,6 +68,28 @@
       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 ''

package/src/components/pc/SiteBack.vue

@@ -1,93 +1,93 @@
-<template>
-  <div class="form-inline auto ">
-    <div class="row">
-      <label style="margin-left: 20px;">工单编号：</label><span>{{ row.f_service_id }}</span>
-    </div>
-    <div class="row">
-      <label style="margin-left: 20px;">退回原因:</label>
-      <textarea style="width: 30%" name="name" rows="2" class="ver-textarea" class="form-control" v-model='model.serviceacitivity[0].f_site_back_reason'></textarea>
-    </div>
-    <div class="row">
-      <button style="float: right;" type="button" name="button" class="button_search button_spacing"
-              @click="$emit('cancel')">取消
-      </button>
-      <button style="float: right;" type="button" name="button" class="button_search button_spacing"
-              @click="WorkBack()">退回
-      </button>
-    </div>
-  </div>
-</template>
-<script>
-import * as Util from '../Util'
-import Vue from 'vue'
-
-export default {
-  title: '站点工单打回',
-  props: {
-    row: {
-      type: Object
-    },
-    source: '',
-    //用来标记本单是否需要回更退回原因 回更后手机端置换代办业务会显示退回原因。未包含维修单的退回
-    isupdate: {
-      type: Boolean,
-      default:false
-    },
-
-  },
-  data () {
-    return {
-      model: {
-        serviceacitivity: [{
-          f_site_back_date: '',
-          f_site_back_name: '',
-          serviceid: '',
-          f_service_acitivity_type: ''
-        }
-        ]
-      }
-    }
-  },
-  watch: {
-    // 报修单发生改变，给报修单设置默认打回对象
-    row (val) {
-      this.setRow()
-    }
-  },
-  ready () {
-    this.setRow()
-  },
-  methods: {
-    WorkBack () {
-      // 将数据发送给业务逻辑
-      let data = ''
-      if (this.source == 'mobile') {
-        data = {model: this.model, loginUser: {name: Vue.user.name, ename: Vue.user.ename, id: Vue.user.id}}
-        return this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/siteBack`, data).then(() => {
-          this.$emit('success')
-        })
-      } else {
-        data = {
-          model: this.model,
-          loginUser: {name: this.$login.f.name, ename: this.$login.f.ename, id: this.$login.f.id}
-        }
-        if(this.isupdate){
-          data.isupdate=this.isupdate
-        }
-        return this.$resetpost('rs/logic/siteBack', data).then(() => {
-          this.$emit('success')
-        })
-      }
-
-    },
-    setRow () {
-      if (this.row) {
-        this.model = Object.assign({}, this.model, this.row)
-        this.$set('model.serviceacitivity', [{
-          f_service_acitivity_type: '打回'
-        }])
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="form-inline auto ">
+    <div class="row">
+      <label style="margin-left: 20px;">工单编号：</label><span>{{ row.f_service_id }}</span>
+    </div>
+    <div class="row">
+      <label style="margin-left: 20px;">退回原因:</label>
+      <textarea style="width: 30%" name="name" rows="2" class="ver-textarea" class="form-control" v-model='model.serviceacitivity[0].f_site_back_reason'></textarea>
+    </div>
+    <div class="row">
+      <button style="float: right;" type="button" name="button" class="button_search button_spacing"
+              @click="$emit('cancel')">取消
+      </button>
+      <button style="float: right;" type="button" name="button" class="button_search button_spacing"
+              @click="WorkBack()">退回
+      </button>
+    </div>
+  </div>
+</template>
+<script>
+import * as Util from '../Util'
+import Vue from 'vue'
+
+export default {
+  title: '站点工单打回',
+  props: {
+    row: {
+      type: Object
+    },
+    source: '',
+    //用来标记本单是否需要回更退回原因 回更后手机端置换代办业务会显示退回原因。未包含维修单的退回
+    isupdate: {
+      type: Boolean,
+      default:false
+    },
+
+  },
+  data () {
+    return {
+      model: {
+        serviceacitivity: [{
+          f_site_back_date: '',
+          f_site_back_name: '',
+          serviceid: '',
+          f_service_acitivity_type: ''
+        }
+        ]
+      }
+    }
+  },
+  watch: {
+    // 报修单发生改变，给报修单设置默认打回对象
+    row (val) {
+      this.setRow()
+    }
+  },
+  ready () {
+    this.setRow()
+  },
+  methods: {
+    WorkBack () {
+      // 将数据发送给业务逻辑
+      let data = ''
+      if (this.source == 'mobile') {
+        data = {model: this.model, loginUser: {name: Vue.user.name, ename: Vue.user.ename, id: Vue.user.id}}
+        return this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/siteBack`, data).then(() => {
+          this.$emit('success')
+        })
+      } else {
+        data = {
+          model: this.model,
+          loginUser: {name: this.$login.f.name, ename: this.$login.f.ename, id: this.$login.f.id}
+        }
+        if(this.isupdate){
+          data.isupdate=this.isupdate
+        }
+        return this.$resetpost('rs/logic/siteBack', data).then(() => {
+          this.$emit('success')
+        })
+      }
+
+    },
+    setRow () {
+      if (this.row) {
+        this.model = Object.assign({}, this.model, this.row)
+        this.$set('model.serviceacitivity', [{
+          f_service_acitivity_type: '打回'
+        }])
+      }
+    }
+  }
+}
+</script>

package/src/components/sendsingle/onlinequeryuser.vue

@@ -292,7 +292,7 @@ export default {
         this.$showMessage('     请输入条件...')
         return
       }else {
-        args.condition += ` and uf.f_orgid = '${this.f_orgid}' and f_table_state = '正常' `
+        args.condition += ` and uf.f_orgid = '${this.f_orgid}' `
         // 取消分公司
         // args.condition += ` and f_table_state = '正常' `
         // args.condition += ` and uf.f_orgid = '454' and f_table_state = '正常'  `

package/src/components/weinan/WorkListAll.vue

@@ -189,10 +189,8 @@
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">报修类型</label>
                 <v-select :value.sync="model.f_repairtype" v-model='model.f_repairtype'
-                          :value-single="true"
-                          :options='$parent.$parent.repairstypes' placeholder='报修类型'
-                          close-on-select
-                          condition="f_repairtype like '%{}%'"></v-select>
+                          :multiple="true"
+                          :options='$parent.$parent.repairstypes' placeholder='报修类型'></v-select>
               </div>
             </div>
           </div>
@@ -209,17 +207,9 @@
               <th><nobr>客户信息</nobr></th>
 
               <th><nobr>故障明细</nobr></th>
-              <!--              <th><nobr>工单状态</nobr></th>-->
               <th><nobr>派单人</nobr></th>
               <th><nobr>工单来源</nobr></th>
               <th><nobr>接单员</nobr></th>
-              <!--              <th><nobr>上传时间</nobr></th>-->
-              <!--              <th><nobr>到达时间</nobr></th>-->
-              <!--              <th><nobr>离开时间</nobr></th>-->
-
-              <!--<th><nobr>管理改造费用</nobr></th>-->
-              <!--<th><nobr>材料改造费用</nobr></th>-->
-              <!--<th><nobr>费用</nobr></th>-->
               <th><nobr>工单类型</nobr></th>
               <th><nobr>报修类型</nobr></th>
               <th><nobr>工单结果</nobr></th>
@@ -227,8 +217,6 @@
               <th><nobr>工单备注</nobr></th>
               <th><nobr>结案备注</nobr></th>
               <th><nobr>回访</nobr></th>
-
-              <!--              <th><nobr>抢修照片</nobr></th>-->
               <th><nobr>操作</nobr></th>
               <th v-if="$parent.$parent.$parent.systemshow"><nobr>操作</nobr></th>
             </tr>
@@ -241,35 +229,15 @@
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_contact_phone}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;{{row.f_address}}&nbsp;&nbsp;&nbsp;{{row.f_contact_name}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{$parent.$parent.$parent.troubles(row.failure)}}</nobr></td>
-
-
-            <!--<td><nobr>{{row.f_repairtype}}</nobr></td>-->
-
-
-            <!--            <td style="text-align: center;" :style="row.serviceacitivity && row.serviceacitivity[0].f_is_abnormal == '异常'?'color:red;text-align: center;':'text-align: center;'">-->
-            <!--              <nobr>{{row.processins.activities.length == 0 ? (row.f_state === '撤销' ? '撤销' : '完成') : row.processins.activities[0].defname}}</nobr>-->
-            <!--            </td>-->
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_single_man}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_source == '安检' ? '安检转发' : row.f_source == '微信' ? '微信转发' :row.f_source}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_order_man}} {{row.f_repairman_phone}}</nobr></td>
-            <!--            <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_date}}</nobr></td>-->
-            <!--            <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_date_come}}</nobr></td>-->
-            <!--            <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_date_leave}}</nobr></td>-->
-
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_workorder_type}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_repairtype}}</nobr></td>
-
-            <!--<td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_cost_manage}}</nobr></td>-->
-            <!--<td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_cost_material}}</nobr></td>-->
-            <!--<td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.serviceacitivity[0].f_money}}</nobr></td>-->
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.state}}</nobr></td>
-
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_date}}</nobr></td>
-
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_remarkss}}</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr>{{row.f_remakes}}</nobr></td>
-            <!--            <td :style="$parent.$parent.$parent.whatcolor(row)"><nobr><div v-if="row.f_single_path"><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.showpicture(row)" >抢修照片-->
-            <!--            </button-link></div></nobr></td>-->
             <td :style="$parent.$parent.$parent.whatcolor(row)" ><nobr v-if="row.f_again_revisit!='否'"><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.playWav(row)">回访</button-link></nobr><nobr v-if="row.f_again_revisit=='否'">回访完成</nobr></td>
             <td :style="$parent.$parent.$parent.whatcolor(row)" ><nobr v-if="row.f_workorder_type== '报修单'&& row.state=='未完成' "><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.finishWork(row)">结案</button-link></nobr><nobr ><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.remarkwork(row)">备注</button-link></nobr></td>
             <td style="text-align: center;" v-if="$parent.$parent.$parent.systemshow" :style="row.serviceacitivity && row.serviceacitivity[0].f_is_abnormal == '异常'?'color:red;text-align: center;':'text-align: center;'">
@@ -447,8 +415,8 @@
         thead: '',
         tfoot: '',
         zhihuans:[{label: '全部', value: ''},{label: '正常', value: '正常'},{label: '异常', value: '异常'}],
-        headData: ["工单类型","报修类型","工单编号","用户姓名","用户地址","用户电话","报修电话","报修时间","报修原因","维修人",'工单备注','结案备注'],
-        bodyData: ["f_workorder_type", "f_repairtype", "f_service_id","f_user_name","f_address","f_phone","f_contact_phone", "f_created_date", "f_remarks", "f_order_man",'f_remarkss','f_remakes'],
+        headData: ["工单类型","报修类型","工单编号","用户姓名","用户地址","用户电话","报修电话","报修时间","报修原因","维修人",'工单备注','结案备注','报修类型','工单来源'],
+        bodyData: ["f_workorder_type", "f_repairtype", "f_service_id","f_user_name","f_address","f_phone","f_contact_phone", "f_created_date", "f_remarks", "f_order_man",'f_remarkss','f_remakes','f_repairtype','f_source'],
         searchData: {
           condition: '1=1'
         },
@@ -463,6 +431,8 @@
           'f_single_man': '派单人',
           'f_order_man': '接单人',
           'f_workorder_type': '工单类型',
+          'f_repairtype': '报修类型',
+          'f_source': '工单来源',
           'state': '工单状态',
           'f_date':'工单完成时间',
           'f_remarkss':'工单备注',
@@ -745,6 +715,14 @@
         if(this.order_man){
           condition.condition1 += ` and (f_order_man in (${this.order_man}) or f_outlets = '${this.depname}') `
         }
+        if(args.model.f_repairtype.length > 0){
+          let repairtype = '('
+          args.model.f_repairtype.forEach(p => {
+            repairtype += "'" + p +  "', "
+          })
+          repairtype = repairtype.substring(0,repairtype.length -2)
+          condition.condition1 += ' and f_repairtype in  ' + repairtype + ')'
+        }
         if(this.f_accept_man){
           condition.condition2 = ` sender = '${this.f_accept_man}'`
           condition.condition1 += 'and tt.actcount > 0'

package/src/components/workorder/Outlay.vue

@@ -47,10 +47,10 @@
         <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>
+            <img-area  :model="model.imgs"  :sutitle="getsutitle(row.title)" :isxiangce="isxiangce"></img-area>
           </div>
         </div>
-        <img-area  :model="model.imgs" :sutitle="'总体照片'" v-if="!imgtpe" ></img-area>
+        <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>
@@ -107,6 +107,7 @@
           default: true
         },
         imgtpe:false,
+        isxiangce:this.$appdata.getSingleValue('维修-开启相册')?this.$appdata.getSingleValue('维修-开启相册'):'否',
         imgstype:[]
       }
     },

package/src/components/workorder/PhoneStandWork.vue

@@ -177,7 +177,8 @@
         }
         let data = {
           model: this.sendselected,
-          loginUser: {name: Vue.user.name, ename: Vue.user.ename}
+          loginUser: {name: Vue.user.name, ename: Vue.user.ename},
+          f_handlingtype:'转维修员'
         }
         let HttpReset = new HttpResetClass()
         // 将数据发送给业务逻辑

package/src/components/workorder/RepairDetails.vue

@@ -507,6 +507,7 @@
           for (let k = 0; k < this.Detail.details.length; k++) {
             if (this.Detail.details[k].f_project == this.repairdetails[a].details[i].f_project) {
               this.Detail.details[k].f_content = this.Detail.details[k].f_content?this.Detail.details[k].f_content:f_item_value
+              break
             }
           }
         }