safecheck-client 3.0.34-84 → 3.0.34-87

package/src/filiale/bayan/android/AddPlanItem.vue

@@ -174,6 +174,14 @@
                   <p class="panel-title col-xs-4 text-left font">最后安检状态</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.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">{{ row.f_table_state }}</p>
+                </div>
+                <div class="row" v-if="row.f_table_state = '停用'">
+                  <p class="panel-title col-xs-4 text-left font">原因</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_table_state }}</p>
+                </div>
               </div>
             </div>
 

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -77,6 +77,20 @@
         </ol>
       </div>
     </div>
+    <div class="form-group col-sm-12 col-xs-12 col-md-12 info"  :class="style__">
+      <div class="text-center">
+        <label class="font">客户意见反馈：</label>
+      </div>
+      <div class="col-md-12 col-sm-12 col-xs-12">
+        <ol class="showIi">
+          <li>检查说明：</li>
+          <li>1.已对客户燃气设施进行了安全检查</li>
+          <li>2.已对客户进行了安全用气知识宣传，并发放宣传资料</li>
+          <li>3.已对客户资料进行了登记</li>
+          <li>4.已向隐患用户告知说明隐患整改项目,并充分向用户告知了存在的隐患内容及注意事项，用户已获悉其中的内容</li>
+        </ol>
+      </div>
+    </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
       <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
 
@@ -338,7 +352,7 @@
     </div>
   </modal>
 
-    <!--停用框-->
+  <!--停用框-->
   <modal :show.sync="showTYModel" v-ref:modal>
     <div slot="modal-header" class="modal-header">
       <h4 class="modal-title">
@@ -592,55 +606,55 @@ export default {
   methods: {
     //对用户停用
     async backlistTY() {
-        if (!this.tyCause) {
-          this.$showMessage("请填写停用原因！")
-          return
-        }
-        let http = new HttpResetClass()
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "f_userfiles_id,version",
-            tablename: "t_userfiles",
-            condition: "f_table_state in ('正常','停用','封堵') and f_userinfo_id= '" + this.paper.f_userinfoid + "'",
-            orderitem: "f_userfiles_id"
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        if (res2.data.length==0){
-          this.$showMessage('已成功停用')
-          this.showTYModel = false
-          return
-        }
-        let data = {
-          f_userfiles_id: {
-            f_userfiles_id: res2.data[0].f_userfiles_id,
-            f_table_state: '停用',
-            version: res2.data[0].version
-          },
-          f_userfile_id: res2.data[0].f_userfiles_id,
-          f_user_id: this.paper.f_userinfo_code,
-          f_userinfo_id: "'"+this.paper.f_userinfoid+"'",
-          f_user_name: this.paper.f_user_name,
-          f_othereason: this.tyCause,
-          f_operat_type: '停用',
-          f_describe: `${Vue.user.name}对客户${this.paper.f_user_name}进行停用操作`,
-          f_state: '有效',
-          f_user_phone: this.paper.f_user_phone,
-          f_operator: Vue.user.name,
-          f_operatorid: Vue.user.id,
-          f_orgid: Vue.user.orgid,
-          f_orgname: Vue.user.orgs,
-          f_depid: Vue.user.depids,
-          f_depname: Vue.user.deps,
-          f_zoneid: Vue.user.zoneid,
-          f_zones: Vue.user.zones
+      if (!this.tyCause) {
+        this.$showMessage("请填写停用原因！")
+        return
+      }
+      let http = new HttpResetClass()
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "f_userfiles_id,version",
+          tablename: "t_userfiles",
+          condition: "f_table_state in ('正常','停用','封堵') and f_userinfo_id= '" + this.paper.f_userinfoid + "'",
+          orderitem: "f_userfiles_id"
         }
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
-          data, {resolveMsg: null, rejectMsg: null}).then((row) => {
-          this.$showMessage('已成功停用')
-          this.paper.f_table_state = '停用'
-          this.$parent.$parent.data.f_table_state = '停用'
-          this.showTYModel = false
-        })
+      }, {resolveMsg: null, rejectMsg: null})
+      if (res2.data.length==0){
+        this.$showMessage('已成功停用')
+        this.showTYModel = false
+        return
+      }
+      let data = {
+        f_userfiles_id: {
+          f_userfiles_id: res2.data[0].f_userfiles_id,
+          f_table_state: '停用',
+          version: res2.data[0].version
+        },
+        f_userfile_id: res2.data[0].f_userfiles_id,
+        f_user_id: this.paper.f_userinfo_code,
+        f_userinfo_id: "'"+this.paper.f_userinfoid+"'",
+        f_user_name: this.paper.f_user_name,
+        f_othereason: this.tyCause,
+        f_operat_type: '停用',
+        f_describe: `${Vue.user.name}对客户${this.paper.f_user_name}进行停用操作`,
+        f_state: '有效',
+        f_user_phone: this.paper.f_user_phone,
+        f_operator: Vue.user.name,
+        f_operatorid: Vue.user.id,
+        f_orgid: Vue.user.orgid,
+        f_orgname: Vue.user.orgs,
+        f_depid: Vue.user.depids,
+        f_depname: Vue.user.deps,
+        f_zoneid: Vue.user.zoneid,
+        f_zones: Vue.user.zones
+      }
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
+        data, {resolveMsg: null, rejectMsg: null}).then((row) => {
+        this.$showMessage('已成功停用')
+        this.paper.f_table_state = '停用'
+        this.$parent.$parent.data.f_table_state = '停用'
+        this.showTYModel = false
+      })
     },
     //停用取消按钮
     tyCancel() {

package/src/filiale/bayan/android/PhoneUpUserinfo.vue

@@ -285,21 +285,21 @@
                       :options="deviceBrandOption[row.f_devices_type]"
                       close-on-select value-single></v-select> -->
           </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备型号:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">生产日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_service_life" />
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">设备型号:</label>-->
+<!--            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">生产日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_service_life" />-->
+<!--          </div>-->
           <!--          <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">到期日期:</label>
             &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_expire_date"  />&ndash;&gt;
@@ -311,31 +311,31 @@
                         :show-reset-button="reset" readonly="readonly">
             </datepicker>
           </div>-->
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"
-                                                                      v-model="row.f_input_person" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安装日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin:  5px 0">
-            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_devices_num" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">管道类型:</label>
-            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"
-                  v-model="row.f_pipe_type"
-                  placeholder='请选择管道类型'
-                  :width='wid'
-                  readonly
-                  :options="pipetypes"
-                  close-on-select value-single></v-select>
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"-->
+<!--                                                                      v-model="row.f_input_person" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安装日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin:  5px 0">-->
+<!--            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_devices_num" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">管道类型:</label>-->
+<!--            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"-->
+<!--                  v-model="row.f_pipe_type"-->
+<!--                  placeholder='请选择管道类型'-->
+<!--                  :width='wid'-->
+<!--                  readonly-->
+<!--                  :options="pipetypes"-->
+<!--                  close-on-select value-single></v-select>-->
+<!--          </div>-->
           <!--<div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备状态:</label><input type="text" class="form-control rightipt" readonly  v-model="row.f_userinfodevices_state"  />
           </div>-->

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -1331,6 +1331,9 @@
             } else {
               this.rowCodata = codata
             }
+            if (this.rowCodata.f_deputy_director){
+              HostApp.setPreference('f_deputy_director',this.rowCodata.f_deputy_director)
+            }
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1947,6 +1950,7 @@
         this.data.isupdateplanitem = this.$appdata.getSingleValue('在线安检回更有计划') ? this.$appdata.getSingleValue('在线安检回更有计划') : 'false'
         // 预约安检单工单编号
         this.data.f_SafeToRepair_id = this.item.f_service_id
+        this.data.f_deputy_director = HostApp.getPreference('f_deputy_director').data || ''
         this.data.ename = Vue.user.ename
         this.data.f_outlets = Vue.user.f_parentname
         this.data.f_meetunit = Vue.user.orgpathnames
@@ -2065,15 +2069,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2127,15 +2122,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2395,15 +2381,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",