telephone-clients 3.0.98 → 3.0.100

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "telephone-clients",
-  "version": "3.0.98",
-  "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.55",
-    "system-phone": "1.2.100",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.77",
-    "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.100",
+  "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.55",
+    "system-phone": "1.2.100",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.77",
+    "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/AddMyTask.vue

@@ -103,13 +103,13 @@
               </div>
               <div class="col-xs-8" >
                 <v-select
-                  :value.sync="model.f_repairtype"
-                  v-model="model.f_repairtype"
-                  :options='$parent.$parent.repairTypeOptions'
-                  placeholder='请选择'
-                  close-on-select
-                  :value-single="true"
-                  condition="f_repairtype like '%{}%'"
+                    :value.sync="model.f_repairtype"
+                    v-model="model.f_repairtype"
+                    :options='$parent.$parent.repairTypeOptions'
+                    placeholder='请选择'
+                    close-on-select
+                    :value-single="true"
+                    condition="f_repairtype like '%{}%'"
                 ></v-select>
               </div>
             </div>
@@ -162,6 +162,13 @@
                   <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_address }} &nbsp;&nbsp; {{row.f_contact_name}} </p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>联系电话:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_contact_phone || '无' }}
+                    <img src="../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_contact_phone)'>
+                  </p>
+                </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font" style="float: left"><b>派单员:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{row.f_attendant}} </p>
@@ -170,6 +177,10 @@
                   <p class="panel-title col-xs-5 text-left font" style="float: left"><b>故障明细:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{$parent.$parent.$parent.getfailure(row.failure)}} </p>
                 </div>
+                <div class="col-xs-12" v-show="row.f_remarks">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>工单备注:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_remarks }}</p>
+                </div>
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">接单</button>
                 </div>
@@ -200,11 +211,16 @@ export default {
         // userid: Vue.user.ename
       },
       repairTypeOptions: [{label: '全部', value: ''}],
-      typeData: []
+      typeData: [],
+      showMessage: true
     }
   },
   ready(){
     this.$refs.paged.$refs.cri.search()
+    if (this.$appdata.getSingleValue('取消在线接单二次确定') === '是') {
+      this.showMessage = false
+    }
+    console.log(this.showMessage)
   },
   mounted(){
 
@@ -216,7 +232,7 @@ export default {
     //  获取现有的报修类型对应的数量
     async initRepairTypeNum() {
       this.typeData = []
-      this.repairTypeOptions = []
+      this.repairTypeOptions = [{label: '全部', value: ''}]
       const http = new HttpResetClass()
       const res = await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/getOperatorServiceTypeNum`,{data: {condition: `tswo.f_filiale_id = '${Vue.user.orgid}'`}},{resolveMsg: null, rejectMsg: null})
       const plainArray = res.data.map(item => Object.assign({}, item))
@@ -261,32 +277,58 @@ export default {
       return this.model.search(data, args.model)
     },
     inspect(row){
-      this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
-        //tag)
-        if (isconfirm === 'confirm') {
-          let userdata = Object.assign({}, userdata, row)
-          userdata.f_advice = '自我接单'
-          userdata.serviceacitivity = [] //Vue.user.name
-          userdata.serviceacitivity.push({f_reciever: Vue.user.name})
-          let data = ''
-          data = {
-            model: userdata,
-            // loginUser: {name: '何文强', ename: 'hwq'}
-            loginUser: {name: Vue.user.name, ename: Vue.user.ename}
-          }
-          let HttpReset = new HttpResetClass()
-          HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
-            if (res.data.code==300){
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('没有抢到该单哦！')
-            }else {
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('接单成功！请及时处理。')
+      if (this.showMessage) {
+        this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
+          //tag)
+          if (isconfirm === 'confirm') {
+            let userdata = Object.assign({}, userdata, row)
+            userdata.f_advice = '自我接单'
+            userdata.serviceacitivity = [] //Vue.user.name
+            userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+            let data = ''
+            data = {
+              model: userdata,
+              // loginUser: {name: '何文强', ename: 'hwq'}
+              loginUser: {name: Vue.user.name, ename: Vue.user.ename}
             }
-          })
+            let HttpReset = new HttpResetClass()
+            HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+              if (res.data.code==300){
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('没有抢到该单哦！')
+              }else {
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('接单成功！请及时处理。')
+              }
+            })
+          }
+        })
+      } else {
+        let userdata = Object.assign({}, userdata, row)
+        userdata.f_advice = '自我接单'
+        userdata.serviceacitivity = [] //Vue.user.name
+        userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+        let data = ''
+        data = {
+          model: userdata,
+          // loginUser: {name: '何文强', ename: 'hwq'}
+          loginUser: {name: Vue.user.name, ename: Vue.user.ename}
         }
-      })
-    }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+          if (res.data.code==300){
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('没有抢到该单哦！')
+          }else {
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('接单成功！请及时处理。')
+          }
+        })
+      }
+    },
+    makeAPhoneCall(phoneNumber) {
+      this.$androidUtil.makeAPhoneCall(phoneNumber)
+    },
   },
   computed:{
 

package/src/components/guoxin/Console.vue

@@ -81,6 +81,8 @@
     data() {
       return {
         flgwaihu:false,
+        url7397:this.$appdata.getSingleValue('语音系统网关'),
+        url12121:this.$appdata.getSingleValue("呼叫系统网关"),
         flagip: true,
         showclick: false,
         shownotclick: true,
@@ -111,8 +113,16 @@
         this.initPhone = ''
         this.zhixian()
       })
+      if(!this.url7397 || !this.url12121){
+        let message = ''
+        message += this.url12121?"":"所属分公司 语音系统网关 未配置;"
+        message += this.url7397?"":"所属分公司 呼叫系统网关 未配置;"
+        message += "请配置后重新登录"
+        this.$showMessage(message)
+        return
+      }
       if(!this.$webSocket){
-        this.$webSocket = new StateContainer("ws://192.168.50.77:7397/websocket");
+        this.$webSocket = new StateContainer(`ws://${this.url7397}:7397/websocket`);
         this.$webSocket.oncnnsucc =  (event) => {
           //tag
           this.zhixian()
@@ -171,7 +181,7 @@
       },
       callout(){
         this.zhimang()
-        this.http.load('POST',`/bridge/callctrl?caller=${this.aChannel}&callee=${this.teleNum}&authtype=no&opt=CLICK_TO_DIAL`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
+        new HttpResetClass().load('POST',`/bridge/callctrl?caller=${this.aChannel}&callee=${this.teleNum}&authtype=no&opt=CLICK_TO_DIAL`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
           if(res.data === 200){
             this.currentState = '正在呼出'
             this.show = !this.show
@@ -195,7 +205,7 @@
         })
       },
       zhimang(){
-        this.http.load('POST',`/bridge/callctrl?extnum=${this.aChannel}&state=busy&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
+        new HttpResetClass().load('POST',`/bridge/callctrl?extnum=${this.aChannel}&state=busy&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
           if(res.data === 200){
             this.currentState = '忙'
           }else if (res.data === 400){
@@ -208,7 +218,7 @@
         })
       },
       zhixian(){
-        this.http.load('POST',`bridge/callctrl?extnum=${this.aChannel}&state=online&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
+        new HttpResetClass().load('POST',`bridge/callctrl?extnum=${this.aChannel}&state=online&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
           if(res.data === 200){
             this.currentState = '空闲'
           }else if (res.data === 400){

package/src/components/pc/TelFindUser.vue

@@ -37,12 +37,42 @@
                     condition="ta.f_address like '%{}%'"
                     :size="model.f_address ? model.f_address.length * 2 : 4"  style="height: 95%;width: 90%" ></input>
           </div>
-            <div class="form-group col-sm-4"  >
+            <div class="form-group col-sm-4"  v-if="enter_number_show">
               <label class="font_normal_body" style="width:55%">入户证号:</label>
               <input  type="text" class="input_search" v-model="model.f_enter_number" placeholder='入户证号'
                       condition="ta.f_enter_number like '%{}%'"
                      style="height: 95%;width: 90%"></input>
             </div>
+            <div class="form-group col-sm-4"  v-if="residential_area_show">
+              <label class="font_normal_body" style="width:55%">小区:</label>
+              <input  type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
+                      condition="ta.f_residential_area like '%{}%'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="building_show">
+              <label class="font_normal_body" style="width:55%">楼栋:</label>
+              <input  type="text" class="input_search" v-model="model.f_building" placeholder='楼栋'
+                      condition="ta.f_building = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="unit_show">
+              <label class="font_normal_body" style="width:55%">单元:</label>
+              <input  type="text" class="input_search" v-model="model.f_unit" placeholder='单元'
+                      condition="ta.f_unit = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="floor_show">
+              <label class="font_normal_body" style="width:55%">楼层:</label>
+              <input  type="text" class="input_search" v-model="model.f_floor" placeholder='楼层'
+                      condition="ta.f_floor = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="room_show">
+              <label class="font_normal_body" style="width:55%">房间号:</label>
+              <input  type="text" class="input_search" v-model="model.f_room" placeholder='房间号'
+                      condition="ta.f_room = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
 <!--          <div class="form-group col-sm-2"  >-->
 <!--            <v-select :value.sync="model.f_residential_area" :options='$parent.$parent.areaselected' placeholder='小区' close-on-select width="90%"-->
 <!--                      :size="model.f_residential_area?model.f_residential_area.length * 2 : 4"   class="select select_list form-group"  v-model='model.f_residential_area'   condition="ta.f_residential_area like '%{}%'" :search='true'></v-select>-->
@@ -111,7 +141,13 @@ export default {
       show: false,
       row: Object,
       tempnumber: '',
-      rows:[]
+      rows:[],
+      enter_number_show:true,
+      residential_area_show:true,
+      building_show:true,
+      unit_show:true,
+      room_show:true,
+      floor_show:true
     }
   },
   props: {
@@ -125,6 +161,40 @@ export default {
     },
   },
   methods: {
+    // 获取该组件配置文件
+    getTelFindUserConfig(){
+      let http  = new HttpResetClass()
+      http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        if(res.data.telephone){
+          if (res.data.telephone.TelFindUser){
+            let telconfig = res.data.telephone.TelFindUser.data
+            if(telconfig.criteria){
+              telconfig.criteria.forEach((item)=>{
+                if(item.name =='入户证号'){
+                  this.enter_number_show = item.ifshow
+                }
+                if(item.name =='小区'){
+                  this.residential_area_show = item.ifshow
+                }
+                if(item.name =='楼栋'){
+                  this.building_show = item.ifshow
+                }
+                if(item.name =='单元'){
+                  this.unit_show = item.ifshow
+                }
+                if(item.name =='房间号'){
+                  this.room_show = item.ifshow
+                }
+                if(item.name =='楼层'){
+                  this.floor_show = item.ifshow
+                }
+
+              })
+            }
+          }
+        }
+      })
+    },
     search (args) {
       if (this.$login.f.orgid == 165 && this.$login.f.fullnames.indexOf("汉中")!= -1){
         args.condition += ` and ti.f_user_state = '正常'`
@@ -144,8 +214,8 @@ export default {
     }
   },
   ready(){
+    this.getTelFindUserConfig()
     this.$refs.paged.$refs.criteria.search()
-    //this.model.search(`ti.f_filialeid = '${this.$login.f.orgid}'`)
 
   },
   watch: {

package/src/components/sendsingle/onlineoperation.vue

@@ -9,7 +9,7 @@
           </div>
           <label  class="input-font" style="padding-right: 0px;">售气</label>
         </div>
-        <div class="col-xs-4" style="text-align: center;margin: 15px 0;"v-show="true" @click="gotochangemeter(this.item)">
+        <div class="col-xs-4" style="text-align: center;margin: 15px 0;"v-show="parameters.changetable" @click="gotochangemeter(this.item)">
           <div>
             <img src="../../assets/换表1.png" style="width: 40px;height: 40px;margin-bottom: 5px;" alt="">
           </div>

package/src/components/workorder/FaultAll.vue

@@ -508,6 +508,16 @@ export default {
             error.ifmust = true
             return error
           }
+          if(this.msg.f_source == '安检' && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_defect_id && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_content == '已处理'&& !this.msg.serviceacitivity[0].servicerepair[i].details[j].f_first_repairimg){
+            error.msg = `${this.msg.serviceacitivity[0].servicerepair[i].f_type}中${this.msg.serviceacitivity[0].servicerepair[i].details[j].f_project}的维修照片`
+            error.ifmust = true
+            return error
+          }
+          if(this.msg.f_source == '安检' && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_defect_id && !this.msg.serviceacitivity[0].servicerepair[i].details[j].f_content){
+            error.msg = `${this.msg.serviceacitivity[0].servicerepair[i].f_type}中${this.msg.serviceacitivity[0].servicerepair[i].details[j].f_project}`
+            error.ifmust = true
+            return error
+          }
         }
       }
       return error

package/src/components/workorder/Othercharge.vue

@@ -324,7 +324,7 @@
                   depname: Vue.user.deps
                 },
                 f_invoice_type:0
-              }).then((res) => {
+              },{aoteEncrypt:'无',encryKey:'无'}).then((res) => {
                 this.$showMessage('电子票开具成功，请联系用户使用微信公众号查看发票', ['confirm']).then((res) => {
                   console.log("===res,开票失败",res)
                   this.$dispatch('confirm')

package/src/filiale/furuike/pc/MetereadInfo.vue

@@ -21,8 +21,7 @@
           <td style="text-align: center">{{row.f_hand_date}}</td>
           <td style="text-align: center">{{row.f_tablebase}}</td>
           <td style="text-align: center">{{row.f_jval}}</td>
-          <td style="text-align: center" v-if="row.f_valveState===0">开阀</td>
-          <td  style="text-align: center" v-else>关阀</td>
+          <td  style="text-align: center">{{row.f_valvestate == '0' ? '开阀' : '关阀'}}</td>
         </template>
       </data-grid>
     </criteria-paged>

package/src/filiale/hanzhong/pc/message/AllUserNew.vue

@@ -264,7 +264,7 @@
                 <th><nobr>模板id</nobr></th>
 <!--                <th><nobr>自动短信</nobr></th>-->
                 <th><nobr><b>创建人</b></nobr></th>
-<!--                <th><nobr>操作</nobr></th>-->
+                <th><nobr>操作</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -278,9 +278,9 @@
                 <button v-show="row.f_auto_send != 1" type="button" class="btn btn-success width-30" @click='$parent.$parent.$parent.$parent.autoSend(row,1)'>启动</button>
               </td>-->
               <td style="text-align: center;"><b>{{row.f_operator}}</b></td>
-<!--              <td style="text-align: center;"><nobr>
+              <td style="text-align: center;"><nobr>
                 <a @click='$parent.$parent.$parent.$parent.edit(row)'>编辑</a>&nbsp;&nbsp;&nbsp;&nbsp;<a @click='$parent.$parent.$parent.$parent.senddelete(row)'>删除</a>
-              </nobr></td>-->
+              </nobr></td>
             </template>
           </data-grid>
         </criteria-paged>

package/src/filiale/kelai/android/RepairOrderV.vue

@@ -575,7 +575,7 @@ export default {
           let repairitem = []
           for (var i = 0;i< this.repairdetails[j].details.length;i++) {
             if(this.row.f_source == '安检'){
-              repairitem.push({f_project:this.repairdetails[j].details[i].f_project,type:this.repairdetails[j].details[i].type,f_defect_id:this.repairdetails[j].details[i].f_defect_id,f_status:''})
+              repairitem.push({f_project:this.repairdetails[j].details[i].f_project,f_defect_remark:this.repairdetails[j].details[i].f_defect_remark,type:this.repairdetails[j].details[i].type,f_defect_id:this.repairdetails[j].details[i].f_defect_id,f_status:'',f_content:''})
             }else{
               repairitem.push({f_project:this.repairdetails[j].details[i].f_project,type:this.repairdetails[j].details[i].type,f_status:'',f_content:'',f_is_must:this.repairdetails[j].details[i].f_is_must ? 'true':'false'})
             }