telephone-clients 3.0.72-13 → 3.0.72-14

package/package.json

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

package/src/filiale/zhongyi/android/FaultAll.vue

@@ -12,87 +12,17 @@
       <div class="panel-body ">
         <div class="row auto compatible">
           <div class="row auto">
-            <!--<div class="panel panel-default auto repair-info-content">-->
-            <!--<div class="row auto compatible">-->
-            <!--&lt;!&ndash;<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left " v-show="zhihuan">置换通气</label>&ndash;&gt;-->
-            <!--&lt;!&ndash;<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left " v-show="hunei">户内维修</label>&ndash;&gt;-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="hunei.f_if_change == '是'">-->
-            <!--<label class="control-label ">换表</label>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="hunei.f_if_change == '是'">-->
-            <!--<p class="control-label">换表原因:{{hunei.f_reason_change}},{{hunei.f_result_change}}</p>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left " v-show="hunei.details.length">户内维修-->
-            <!--故障详情</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-for="detail in hunei.details">-->
-            <!--<label class="control-label">-->
-            <!--<nobr>{{detail.f_project}}</nobr>-->
-            <!--</label>-->
-            <!--<span class="pd-top">{{detail.f_content}}，{{detail.f_contentmessage}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left " v-show="gaiGuan">改管</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="gaiGuan.f_result">-->
-            <!--<span>处理结果：{{gaiGuan.f_result}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="gaiGuan.f_remarks">-->
-            <!--<span>备注：{{gaiGuan.f_remarks}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left "-->
-            <!--v-show="liGuanWeiXou">立管维修</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="liGuanWeiXou.f_type">-->
-            <!--<span>事故类型：{{liGuanWeiXou.f_li_type}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="liGuanWeiXou.f_remarks">-->
-            <!--<span>备注：{{liGuanWeiXou.f_remarks}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left "-->
-            <!--v-show="sanhuanzhuang">散户安装</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="sanhuanzhuang.f_li_result">-->
-            <!--<span>立管情况：{{sanhuanzhuang.f_li_result}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="sanhuanzhuang.f_remarks">-->
-            <!--<span>备注：{{sanhuanzhuang.f_remarks}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left "-->
-            <!--v-show="sheBeiRepairAll">设备维修</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group"-->
-            <!--v-for="sheBeiRepair in sheBeiRepairAll.details">-->
-            <!--<label class="control-label">-->
-            <!--<nobr>{{sheBeiRepair.f_project}}</nobr>-->
-            <!--</label><span class="pd-top">{{sheBeiRepair.f_content}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left " v-show="troubleDeal">事故原因</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="troubleDeal.f_if_fire">-->
-            <!--<label class="control-label">着火:</label><span class="pd-top">{{troubleDeal.f_fire_cause}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="troubleDeal.f_if_leakage">-->
-            <!--<label class="control-label">泄露:</label><span class="pd-top">{{troubleDeal.f_leakage_cause}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="troubleDeal.f_if_blast">-->
-            <!--<label class="control-label">爆炸:</label><span class="pd-top">{{troubleDeal.f_blast_cause}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="troubleDeal.f_if_water">-->
-            <!--<label class="control-label">进水:</label><span class="pd-top">{{troubleDeal.f_water_cause}}</span>-->
-            <!--</div>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-6 form-input-group" v-show="troubleDeal.f_if_stopup">-->
-            <!--<label class="control-label">堵塞:</label><span class="pd-top">{{troubleDeal.f_stopup_cause}}</span>-->
-            <!--</div>-->
-            <!--<label class="col-xs-12 col-sm-12 col-md-12 form-input-group lb-left "-->
-            <!--v-show="zaoJuRepairAll">灶具维修</label>-->
-            <!--<div class="col-xs-12 col-sm-6 col-md-4 form-input-group" v-for="zaoJuRepair in zaoJuRepairAll.details">-->
-            <!--<label class="control-label">-->
-            <!--<nobr>{{zaoJuRepair.f_project}}</nobr>-->
-            <!--</label><span class="pd-top">{{zaoJuRepair.f_content}}</span>-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--<img-area :model="model.imgs" :url="imgurl" :system="system"></img-area>-->
             <div class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;" v-if="!show">
               <div class="col-xs-3 col-sm-3 col-md-3">
                 <button type="button" name="button" class="col-sm-3 btn btn-primary" @click='confirm("已完成")'>
                   工单完成
                 </button>
               </div>
+              <div class="col-xs-3 col-sm-3 col-md-3" v-if="isNeedMaterial">
+                <button type="button" name="button" class="col-sm-3 btn btn-primary" @click='showmateria'>
+                  材料收费
+                </button>
+              </div>
               <div class="col-xs-3 col-sm-3 col-md-3" v-show="wwcbutten">
                 <button type="button" name="button" class="col-sm-3 btn btn-primary" @click='noRepair'>
                   工单未完
@@ -199,13 +129,23 @@
       </div>
     </div>
   </div>
+  <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+    <header slot="modal-header" class="modal-header text-center">
+      <button type="button" class="close" @click="close2"><span>&times;</span></button>
+      <h4 class="modal-title">添加材料</h4>
+    </header>
+    <article slot="modal-body">
+      <appinstallation-material v-if="showmaterial" :selectdata = "selectdata"></appinstallation-material>
+    </article>
+    <footer slot="modal-footer"></footer>
+  </modal>
 </template>
 <script>
   import Vue from 'vue'
   import * as Util from '../../../components/Util'
   import {HttpResetClass} from 'vue-client'
   import FailureEdit from '../../../components/pc/FailureEdit'
-
+  import AppInstallationMaterial from '../../../components/workorder/AppInstallationMaterial'
   export default {
     title: '故障汇总',
     props: {
@@ -222,6 +162,9 @@
         type: Boolean,
         default: false
       },
+      row: {
+        type: Object
+      },
       system: '',
       parentPage:''
     },
@@ -240,7 +183,10 @@
         showhead: true,
         repairers : this.$appdata.getParam('站点管理员'),
         config:{},
-        othercharge_id: ''
+        othercharge_id: '',
+        showmaterial:false,
+        selectdata:{},
+        isNeedMaterial: this.$appdata.getSingleValue('材料收费') == '是',
       }
     },
     methods: {
@@ -472,16 +418,6 @@
             }
           }
         }
-        if(param == '已完成'){
-          if(this.msg.serviceacitivity[0].imgs.length==0 || !this.msg.serviceacitivity[0].imgs[0].android_file || !this.msg.serviceacitivity[0].imgs[0].path){
-            this.$showMessage('燃气设施全景未拍照,请拍照后重新尝试上传')
-            return
-          }
-          if(!this.msg.serviceacitivity[0].f_signname || !this.msg.serviceacitivity[0].f_sign_path){
-            this.$showMessage('用户未签名,请签名后重新尝试上传')
-            return
-          }
-        }
         if(param != '结案'&& (this.msg.f_workorder_type == '置换通气单'||this.msg.f_workorder_type == '安装单')) {
           //  检测验证是否必填
           var isfinish = this.checkismust()
@@ -504,6 +440,12 @@
             this.msg.f_is_abnormal = '异常'
             this.msg.serviceacitivity[0].f_is_abnormal = '异常'
           }
+          // 检测置换照片是否已拍
+          // var imgflag = this.checkzhihuanimg()
+          // if(!(imgflag.check)){
+          //   this.$showMessage(`${imgflag.title}未拍照！`, ['confirm'])
+          //   return
+          // }
         }
         else if(this.msg.f_workorder_type == '报修单' && param != '结案'){
           let isfinish = this.checkismust()
@@ -791,6 +733,18 @@
       close1() {
         this.showhead = true
         this.showCannotrepair = false
+      },
+      showmateria(){
+        this.selectdata = {
+          f_process_id :this.msg.f_processid,
+          model:this.msg
+        }
+        console.log("传递数据",this.msg)
+        this.showmaterial = true
+      },
+      close2(){
+        this.showmaterial = false
+        this.selectdata ={}
       }
     },
     async ready () {
@@ -888,8 +842,8 @@
     }
     ,
     components: {
-      'failure-edit':
-      FailureEdit
+      'failure-edit': FailureEdit,
+      'appinstallation-material': AppInstallationMaterial
     }
   }
 </script>

package/src/filiale/zhongyi/telephoneAndroid.js

@@ -1,13 +1,13 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
-let specialComp = {
-  // 手机处理维修
-  // 'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
+let specialComp = {
+  // 手机处理维修
+  'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+