safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/filiale/wuan/android/SafecheckUserInfo.vue

@@ -13,6 +13,10 @@
           <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">{{ userinfo.f_user_name }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <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">{{ userinfo.f_contract_id}}</p>
+        </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <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">{{ userinfo.f_check_type }}
@@ -23,11 +27,11 @@
           <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}" v-model="userinfo.f_user_phone"/>
 
         </div>
-<!--        <div class="col-xs-12" style="padding: 2px 0" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')">-->
-<!--          <p class="panel-title text-left font" style="width: 23%;float: left"><b>机表表号:</b></p>-->
-<!--          <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_meter_no }}" v-model="userinfo.f_meter_no"/>-->
+        <!--        <div class="col-xs-12" style="padding: 2px 0" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')">-->
+        <!--          <p class="panel-title text-left font" style="width: 23%;float: left"><b>机表表号:</b></p>-->
+        <!--          <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_meter_no }}" v-model="userinfo.f_meter_no"/>-->
 
-<!--        </div>-->
+        <!--        </div>-->
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font"  style="width: 21%;float: left"><b>用户小区:</b></p>
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_residential_area }}</p>
@@ -42,7 +46,23 @@
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <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">{{ userinfo.f_remark }}</p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_remark?userinfo.f_remark:'无' }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <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">{{ f_operat_type?f_operat_type:'无' }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <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">{{ f_commentsdata?f_commentsdata:'无' }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <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">{{ f_operate_date?f_operate_date:'无' }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>操&ensp;作&ensp;人:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ f_operator?f_operator:'无' }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0" v-if="userinfo.f_phone">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>来电电话:</b></p>
@@ -54,7 +74,7 @@
         </div>
         <div class="col-xs-12">
           <button  type="button"  style="width: 45%;float: left" class="btn btn-primary" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')"  @click="updatebiaohao(userinfo.f_meter_no,userinfo.f_userinfoid)">表号修改</button>
-<!--          <button  type="button"  style="width: 45%;float: right" class="btn btn-primary" v-if="updateuserphone"  @click="showbiaoxinghao()">表型号修改</button>-->
+          <!--          <button  type="button"  style="width: 45%;float: right" class="btn btn-primary" v-if="updateuserphone"  @click="showbiaoxinghao()">表型号修改</button>-->
         </div>
       </div>
       <div class="panel-body">
@@ -137,6 +157,10 @@
                 <p class="panel-title col-xs-4 text-left font">上次安检时间</p>
                 <p class="panel-title col-xs-8 text-left input-font">{{ last_check_date }}</p>
               </div>
+              <div class="row" v-if="f_last_check_state != null && f_last_check_state != ''">
+                <p class="panel-title col-xs-4 text-left font">上次入户状态</p>
+                <p class="panel-title col-xs-8 text-left input-font">{{ f_last_check_state }}</p>
+              </div>
               <div class="row">
                 <p class="panel-title col-xs-4 text-left font">上次安检状态</p>
                 <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != ''">安检完成</p>
@@ -156,33 +180,33 @@
         </div>
       </div>
     </div>
-   <div v-if="showbModal">
-     <modal :show.sync="showbModal" v-ref:modal backdrop="false">
-       <div slot="modal-header" class="modal-header">
-         <h4 class="modal-title">
-           选择表型号
-         </h4>
-       </div>
-       <div slot="modal-body" class="modal-body">
-         <div class="col-xs-12">
-
-             <v-select :value.sync="biaoxinghao" v-model='biaoxinghao'
-                       :value-single="true"
-                       class="select_list select"
-                       :options='gmlist' placeholder='请选择表型号'
-                       close-on-select width="100%"></v-select>
-         </div>
-         <div class="col-xs-12" style="height: 10px">
-
-         </div>
-
-       </div>
-       <div slot="modal-footer" class="modal-footer">
-         <button  class="btn btn-default" @click="biaoxinghaook()">确认</button>
-         <button  class="btn btn-default" @click="biaoxinghaocancel()">取消</button>
-       </div>
-     </modal>
-   </div>
+    <div v-if="showbModal">
+      <modal :show.sync="showbModal" v-ref:modal backdrop="false">
+        <div slot="modal-header" class="modal-header">
+          <h4 class="modal-title">
+            选择表型号
+          </h4>
+        </div>
+        <div slot="modal-body" class="modal-body">
+          <div class="col-xs-12">
+
+            <v-select :value.sync="biaoxinghao" v-model='biaoxinghao'
+                      :value-single="true"
+                      class="select_list select"
+                      :options='gmlist' placeholder='请选择表型号'
+                      close-on-select width="100%"></v-select>
+          </div>
+          <div class="col-xs-12" style="height: 10px">
+
+          </div>
+
+        </div>
+        <div slot="modal-footer" class="modal-footer">
+          <button  class="btn btn-default" @click="biaoxinghaook()">确认</button>
+          <button  class="btn btn-default" @click="biaoxinghaocancel()">取消</button>
+        </div>
+      </modal>
+    </div>
   </div>
 </template>
 
@@ -194,25 +218,25 @@ import RadioGroup from "vue-client/src/vue-strap/src/radioGroup";
 import Radio from "vue-client/src/vue-strap/src/radioBtn";
 
 export default {
-  name: "SafecheckUserInfo",
+  title: "SafecheckUserInfo",
   props: ['userinfo'],
   data() {
     return this.$parent.$parent.data
   },
   created(){
     this.$set('showbModal',false)
-    console.log(this.showbModal)
+    //tag
     this.$set('biaoxinghao','')
   },
   ready() {
-    console.log("77777777777777777")
-    console.log(JSON.stringify(this.userinfo.planmeterss))
-    // console.log(JSON.stringify(this.userinfo.planmeterss.f_meter_no))
-    // this.$set('userinfo.f_meter_no',this.userinfo.planmeterss.f_meter_no)
-    // console.log(JSON.stringify(this.userinfo.f_meter_no))
     this.$set('beforephone',this.userinfo.f_user_phone)
+    this.$set('f_last_check_state',this.$parent.$parent.item.f_plan_meters[0].f_last_check_state)
+    this.$set('f_commentsdata',this.$parent.$parent.item.f_plan_meters[0].f_commentsdata) //拉黑原因
+    this.$set('f_operat_type',this.$parent.$parent.item.f_plan_meters[0].f_operat_type)//拉黑类型
+    this.$set('f_operate_date',this.$parent.$parent.item.f_plan_meters[0].f_operate_date) //操作时间
+    this.$set('f_operator',this.$parent.$parent.item.f_plan_meters[0].f_operator)//操作拉黑人
     this.$set('gmlist',[])
-    console.log(this.beforephone)
+    //tag
     if(Vue.config.safecheck != undefined){
       if(Vue.config.safecheck.SafecheckUserinfo != undefined){
         if(Vue.config.safecheck.SafecheckUserinfo.updateuserphone != undefined) {
@@ -220,9 +244,6 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      console.log(JSON.stringify(i) + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
   },
   methods: {
@@ -248,8 +269,8 @@ export default {
         this.$showMessage("请选择表型号")
         return
       }
-      console.log("开始更新")
-      console.log(this.biaoxinghao)
+      //tag
+      //tag
       this.$showMessage("是否确定进行修改?",['confirm', 'cancel']).then((butt)=>{
         if(butt=="confirm"){
           let http = new HttpResetClass()
@@ -259,7 +280,7 @@ export default {
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if(res.data.code == 200){
               this.$showMessage('修改成功！')
-              console.log("开始关闭")
+              //tag
               this.showbModal=false
             }else{
               this.$showMessage('修改失败！,网络异常')
@@ -271,29 +292,29 @@ export default {
 
     },
     biaoxinghaocancel(){
-      console.log("开始关闭")
+      //tag
       this.showbModal=false
     },
     showbiaoxinghao(){
       this.gmlist=[]
-      console.log(JSON.stringify(this.userinfo.planmeterss))
-      console.log("9999999999999999999999999999999")
+      //tag)
+      //tag
       let http1 = new HttpResetClass()
       http1.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
           items: 'gm.id,gm.f_meter_style',
           tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
           condition: `f_meter_brand  = '${this.userinfo.planmeterss.f_aliasname}'`,
-         // condition: `f_meter_brand  = 'this.userinfo.planmeterss'`,
+          // condition: `f_meter_brand  = 'this.userinfo.planmeterss'`,
           orderitem: 'gm.id'
         }}, {resolveMsg: null, rejectMsg: null}).then((ress) => {
-         ress.data.forEach(res=>{
-           this.gmlist.push({
-             label:res.f_meter_style,
-             value:res.id
-           })
-         })
-        console.log(JSON.stringify(this.gmlist))
-        console.log("8888888888888888888888")
+        ress.data.forEach(res=>{
+          this.gmlist.push({
+            label:res.f_meter_style,
+            value:res.id
+          })
+        })
+        //tag)
+        //tag
         this.showbModal=true
       })
 
@@ -336,14 +357,14 @@ export default {
     },
     cameraCallBack(prop, fileName) {
       HostApp.__this__.$set(prop, fileName + '?' + Math.random())
-      console.log('photo file name:' + HostApp.__this__.f_nongasuser_path)
+      //tag
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
     takePic(prop, title) {
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
-      console.log('this[prop]:' + this[prop])
+      //tag
       let fileName
       if (!this[prop] || this[prop].includes("nopic.png")) {
         fileName = Util.guid() + '-' + prop + '.jpg'
@@ -389,12 +410,14 @@ export default {
     start() {
       this.$parent.$parent.isStrat = true
       this.$set('action', !this.action)
-      this.$set('f_onsite_time', Util.toStandardTimeString())
+      if (!this.f_onsite_time){
+        this.$set('f_onsite_time', Util.toStandardTimeString())
+      }
     },
     safecheckStateReady() {
-      console.log('进入paperState====>', this.$parent.$parent.showBack)
-      console.log('parent.item====>', this.$parent.$parent.item)
-      console.log('model====>', this.$parent.$parent.model)
+      //tag
+      //tag
+      //tag
       if (!this.$parent.$parent.showBack) {
         this.$parent.$parent.showBack = true
       }
@@ -414,14 +437,16 @@ export default {
         this.start()
       }
       if (this.$parent.$parent.data.f_onsite_time) {
-        console.log('已经开始安检')
+        //tag
         this.$parent.$parent.startClick = true
       }
       this.action = true
-      console.log('this.f_onsite_time', this.f_onsite_time)
+      //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        if (!this.$parent.$parent.data.f_onsite_time){
+          this.$parent.$parent.data.f_onsite_time = this.f_onsite_time
+        }
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')
@@ -429,7 +454,7 @@ export default {
       } else if (this.$parent.$parent.role == 'view') {
         this.$set('style__', 'divmask')
         this.$set('style_view_', 'divmask')
-        console.log('set style for ....')
+        //tag
       } else {
         this.$set('style__', '')
         this.$set('style_view_', '')

package/src/filiale/wuan/android.js

@@ -4,11 +4,12 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserinfo'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
   'current-create-shebei': (resolve) => { require(['./android/CurrentCreateSheBei'], resolve) },
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
-  'area-plan': (resolve) => { require(['./android/AreaPlan'], resolve) }
+  'area-plan': (resolve) => { require(['./android/AreaPlan'], resolve) },
+  'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/wuan/pc/DefectListWeixiu.vue

@@ -193,7 +193,7 @@ import Vue from "vue";
 
 const upSolveDefect = function* (self) {
   let uploadData = self.solveModal.uploadData
-  console.log('uploadData => ' + JSON.stringify(uploadData))
+  //tag)
   self.$resetpost('/rs/logic/pcRepairDefect', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code == 200) {
@@ -252,7 +252,7 @@ const sendRepair = function* (self) {
   let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
   // 取隐患未处理的
   rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
-  console.log('row => ' + JSON.stringify(rows))
+  //tag)
   // 开始拼接
   rows.forEach(row => {
     let existIndex = -1
@@ -286,10 +286,10 @@ const sendRepair = function* (self) {
     }
   })
   uploadData.model.f_repairitems = repairitems
-  console.log('uploadData ---> ' + JSON.stringify(uploadData))
+  //tag)
   // 调工单接口
   let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
-  console.log('result ===> ' + JSON.stringify(result))
+  //tag)
   if (result.data.f_service_id) {
     let updateRes = yield self.$resetpost('/rs/logic/updateDefectState', {f_paper_id:self.check.id,f_service_id:result.data.f_service_id,itemsId: self.$login.convertToIn(rows.map(row => row.id))})
     if (updateRes.data.code == 200) {
@@ -401,8 +401,8 @@ export default {
           condition: `tcp.id  = '${this.model.f_paper_id}'`,
           orderitem: 'tri.id'
         }}).then(res=>{
-            console.log("88888888888888888888888888888888")
-            console.log(res)
+            //tag
+            //tag
         if (res.data.length>0){
           this.repairimgs=res.data
         }
@@ -441,8 +441,8 @@ export default {
       this.showToRepairModal = !this.showToRepairModal
     },
     getSiteRes(obj) {
-      console.log('siteRes ---> ')
-      console.log(obj)
+      //tag
+      //tag
       if(obj.resids[0]){
         this.toRepairModal.preData.f_meetunit = obj.res.join('.')
         this.toRepairModal.preData.f_reciever = obj.resids.join('.')

package/src/filiale/wuan/pc/DefectPaperWeiXiu.vue

@@ -53,7 +53,7 @@
                 <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                 :field="$parent.$parent.getfield"
                                 progress="safeGetExportProgress"
-                                sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
                 </div>
               </div>
             </div>
@@ -152,10 +152,10 @@
                      @click="$parent.$parent.hidden()"></div>
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
+                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content: $parent.$parent.model.f_defect_content}"
                                   :field="$parent.$parent.getfield"
                                   progress="safeGetExportProgress"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                  sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
                 </div>
               </div>
             </div>
@@ -318,7 +318,7 @@
       source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: self.$login.f.id
     }, {resolveMsg: null, rejectMsg: null})
-    console.log('获取安检员', getGasman)
+    //tag
     self.checkersid.push({label: '全部', value: ''})
     getGasman.data.forEach((checker) => {
       self.checkersid.push({label: checker.name, value: checker.name})
@@ -327,7 +327,7 @@
   export default {
     title: '隐患查询',
     data() {
-      let model = new PagedList('rs/sql/GetCheckPaperByDefect', 20, {
+      let model = new PagedList('rs/sql/GetCheckPaperByDefectNew', 20, {
         f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
       })
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -394,8 +394,8 @@
       },
 
       Mreadibook(val){
-        console.log("999999999")
-        console.log(val)
+        //tag
+        //tag
         this.sliceArea=[]
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -419,8 +419,8 @@
         }
       },
       getAllMeterBook(val){
-        console.log("999999999")
-        console.log(val)
+        //tag
+        //tag
         this.cbcs=[]
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -457,6 +457,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       search(args) {
+        console.log(321)
         if (this.f_check_plan.f_plan_name) {
           args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
         }
@@ -492,7 +493,7 @@
         return this.$refs.paged.$refs.grid.selected
       },
       getfield(){
-        console.log("---------------------------------------------导出方法")
+        //tag
         let data = {}
         this.bodyData.forEach((value, index)=>{
           data[this.bodyData[index]] = this.headData[index]