safecheck-client 3.0.35-6 → 3.0.35-61

package/src/filiale/dexin/pc.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'paper-main': (resolve) => {require(['./pc/PaperList.vue'], resolve)},
+  'defect-main-new2': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
 }
 exports.specialComp = specialComp
 

package/src/filiale/huaran/android/CheckPlanDown.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="auto">
+
+    <div class="auto">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+          <div partial>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/档案信息.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">计划名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_plan_name" class="search_input input-font"
+                       v-model="model.f_plan_name" condition="f_plan_name like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </div>
+            <!--<div class="row app-btn">-->
+            <!--<button class="btn btn-primary col-xs-6" type="button"  @click="search"><span class="glyphicon  glyphicon-search" style="margin-right: 20px;">查询</span></button>-->
+            <!--</div>-->
+            <div style="height:30px;"></div>
+          </div>
+        </criteria>
+        <list :model="model" partial='list'>
+          <div partial>
+            <div class="auto app-text" style="margin-top: 5px;">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self">
+                  <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_plan_name }}</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_plan_year }}/{{row.f_plan_month}}</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_create_operator }}/{{row.f_plan_month}}</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_send_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <div class="row text-right" >
+                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downloadHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </list>
+      </criteria-paged>
+    </div>
+    <!--<div class="row text-center" style="margin-top: 20px;">-->
+    <!--<button type="' 正在进行共享计划下载，请确认！' btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
+    <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="database()">数据库导出</button>&ndash;&gt;-->
+    <!--</div>-->
+    <!-- <div class="auto" style="padding-top: 20px;" v-if='show'>
+      <p class="text-warning" style="padding: 0 10px">正在下载抄表单...</p>
+    </div> -->
+    <!-- <hand-info v-if="show" :data="handinfo"></hand-info> -->
+    <!-- <div class="auto" v-if="!show">
+      <p class="text-warning" style="padding: 0 10px">
+        暂无可操作的抄表信息
+      </p>
+    </div> -->
+  </div>
+  <!--  <back-page :need-back='true'  @flag="$back()"></back-page>-->
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import co from 'co'
+import Vue from 'vue'
+// const downloadHand = function * (self, row) {
+//
+// }
+
+export default {
+  title: '共享计划下载',
+  data () {
+    return {
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`,f_fengongsi_name:`'${Vue.user.orgs.split('.').pop()}'`}),
+      checkPlanInfo: [],
+      localcheckPlanInfo:[]
+    }
+  },
+  ready () {
+
+    this.getlocalCheckPlan()
+  },
+  methods: {
+    reload() {
+      //tag
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    getlocalCheckPlan() {
+      let value = this.$androidUtil.path({alias: 'getLocalCheckPlan', data: {}})
+      //tag
+      this.localcheckPlanInfo = value.data
+      // this.$androidUtil.path({alias: 'getLocalCheckPlan', data:{}}).then((value)=>{
+      //   //tag
+      //   this.localcheckPlanInfo = value.data
+      // })
+    },
+    downloadHand(row) {
+      HostApp.__this__ =this
+      this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          HostApp.logicWithHint({
+            'logic': 'DownCheckPlanInfo',
+            'callback': 'javascript: HostApp.__this__.downloadHandCallback()',
+            'data': {id: row.id},
+            'backresult': 1
+          })
+        }
+      })
+    },
+    downloadHandCallback(jo) {
+      // 安卓端
+      //tag
+      if (jo.state == 'ok') {
+        let result = JSON.parse(jo.result)
+        if (result.state == 0) {
+          if (result.data.length > 0) {
+            this.getlocalCheckPlan()
+            this.$showMessage('下载成功，您可前往计划导航进行查看！')
+          } else {
+            this.$showMessage('无可下载的共享计划！')
+          }
+        } else {
+          this.$showMessage('下载失败！')
+        }
+      } else {
+        this.$showMessage('下载失败，请重试！')
+      }
+    }
+  },
+  computed: {
+    isDown () {
+      return function (row) {
+        for (let info of this.localcheckPlanInfo) {
+          if (info.id == row.id) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+}
+</script>
+<style>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  background-color:#499edf;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+</style>

package/src/filiale/huaran/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'check-plan-down': (resolve) => { require(['./android/CheckPlanDown'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/huaran/pc/PaperList.vue

@@ -282,6 +282,14 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2" >
+                <label class="font_normal_body">用户分公司</label>
+                <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_user_orgid" condition="f_user_orgid in {}"></right-tree-safe>
+              </div>
+              <div class="form-group col-sm-2" >
+                <label class="font_normal_body">安检员分公司</label>
+                <right-tree-safe  @re-res="$parent.$parent.getResm2" v-model="model.f_orgid" condition="f_orgid in {}"></right-tree-safe>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -308,6 +316,12 @@
               <th>
                 <nobr>客户名称</nobr>
               </th>
+              <th >
+                <nobr>用户分公司</nobr>
+              </th>
+              <th >
+                <nobr>安检员分公司</nobr>
+              </th>
               <th>
                 <nobr>客户表号</nobr>
               </th>
@@ -370,6 +384,8 @@
           <template partial='body'>
             <td style="text-align: center">{{ row.f_userinfo_code }}</td>
             <td style="text-align: center">{{ row.f_user_name }}</td>
+            <td style="text-align: center" >{{ row.f_orgname}}</td>
+            <td style="text-align: center" >{{ row.f_filiale_name}}</td>
             <td style="text-align: center">{{ row.f_meternumber }}</td>
             <td style="text-align: center">{{ row.f_meter_brand }}</td>
             <td style="text-align: center">{{ row.f_user_phone }}</td>
@@ -678,7 +694,12 @@ export default {
       this.getPcd(this.model.f_filialeid)
       //this.$refs.paged.$refs.criteria.search()
     },
-
+    getResm (obj) {
+      this.$refs.paged.$refs.criteria.model.f_user_orgid= this.$login.convertToIn(obj.resids)
+    },
+    getResm2(obj) {
+      this.$refs.paged.$refs.criteria.model.f_orgid= this.$login.convertToIn(obj.resids)
+    },
     change(row) {
       asyncReady(this).then(() => {
         if (row.f_safe_type == '已挂表未办卡安检') {

package/src/filiale/huaran/pc/PlanManage.vue

@@ -20,7 +20,7 @@
              v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
           <table style="width:100%;table-layout:fixed">
             <tr class="safe-planfont">
-              <td rowspan="6"><input type="checkbox" style="pointer-events:auto"
+              <td rowspan="8"><input type="checkbox" style="pointer-events:auto"
                                      v-show="row.plan_count == 0 || row.f_issued == '未下发'"
                                      onClick="event.cancelBubble = true"
                                      :checked="checkplan.check.isChecked(row.f_check_item_id)"
@@ -58,6 +58,24 @@
                   :title="row.f_safecheck_type">{{ row.f_safecheck_type }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_type">
+              <td colspan="3">共享公司 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_type">{{ row.f_share_type }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_company_name">
+              <td colspan="3">分公司名称 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_company_name">{{ row.f_share_company_name }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" v-if="row.f_schedule_type">
+              <td colspan="3">任务性质 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_schedule_type">{{ row.f_schedule_type }}
+              </td>
+            </tr>
           </table>
         </div>
       </div>
@@ -210,6 +228,13 @@
                       value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">任务性质:</label>
+            <v-select class="select select_list" :search="false" :value.sync="createPlan.f_schedule_type"
+                      v-model="createPlan.f_schedule_type" :options='schedule_types' placeholder='请选择' close-on-select
+                      value-single>
+            </v-select>
+          </div>
           <div class="form-group col-sm-4" v-show="createPlan.isShare == '否'">
             <label class="font_normal_body">部&ensp;&ensp;&ensp;&ensp;门:</label>
             <v-select class="select select_list" :search="false" :value.sync="createPlan.f_department_id"
@@ -233,13 +258,13 @@
                       value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4">
+          <div class="form-group col-sm-4" v-if="createPlan.isShare == '是' && isSeePlanShare">
             <label class="font_normal_body">共享公司:</label>
             <v-select class="select select_list" :value.sync="createPlan.f_share_type" v-model="createPlan.f_share_type"
                       :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4" v-if="createPlan.f_share_type == '是'">
+          <div class="form-group col-sm-4" v-if="createPlan.isShare == '是' && isSeePlanShare && createPlan.f_share_type == '是'">
             <label class="font_normal_body">分公司名称:</label>
             <v-select class="select select_list" :value.sync="createPlan.f_share_company_name"
                       v-model="createPlan.f_share_company_name" :search="false" :options='companyNameList'
@@ -298,6 +323,20 @@
                       v-model="upCheckPlan.f_safecheck_type" :options='ntoway' close-on-select value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4" v-if="upCheckPlan.isShare == '是' && isSeePlanShare">
+            <label class="font_normal_body">共享公司:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_type" v-model="upCheckPlan.f_share_type"
+                      :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-6" v-if="upCheckPlan.isShare == '是' && isSeePlanShare && upCheckPlan.f_share_type == '是'">
+            <label class="font_normal_body">分公司名称:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_company_name"
+                      v-model="upCheckPlan.f_share_company_name" :search="false" :options='companyNameList'
+                      placeholder='请选择'
+                      close-on-select value-single>
+            </v-select>
+          </div>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -322,7 +361,10 @@ export default {
       totalTaskList: [],
       departments: [],
       companyNameList: [],
+      // isSeePlanShare: this.$login.r ? this.$login.r.includes("安检任务共享公司") : true,
+      isSeePlanShare: true,
       opt: [{label: "按时间降序", value: "按时间降序"}, {label: "按时间升序", value: "按时间升序"}],
+      schedule_types: [{label: "民用", value: "民用"}, {label: "非民用", value: "非民用"}],
       currentorder: '按时间降序',
       isdelete: this.$login.r ? this.$login.r.includes("安检任务删除") : false,
       checkplan: new SearchList(true),
@@ -331,6 +373,8 @@ export default {
         f_plan_name: '',
         f_safecheck_type: '',
         f_plan_year: '',
+        f_share_type:'',
+        f_share_company_name:'',
         f_plan_month: '',
         f_checker_id: '',
         isShare: '',
@@ -342,6 +386,7 @@ export default {
         f_plan_name: '',
         f_total_task_id:'',
         f_plan_year: '',
+        f_schedule_type:'民用',
         f_department_id: '',
         f_plan_month: '',
         isShare: '否',
@@ -557,6 +602,8 @@ export default {
       } else {
         this.createPlan.f_checker_id = this.createPlan.checker.id
         this.createPlan.f_checker = this.createPlan.checker.name
+        this.createPlan.f_share_type = '否'
+        this.createPlan.f_share_company_name = ''
       }
       if (this.createPlan.f_total_task){
         this.createPlan.f_total_task_id = this.createPlan.f_total_task.id
@@ -576,6 +623,7 @@ export default {
         f_plan_name: '',
         f_plan_year: '',
         f_plan_month: '',
+        f_schedule_type:'民用',
         isShare: '否',
         f_issued: '否',
         f_checker_id: null,
@@ -601,6 +649,10 @@ export default {
         Vue.showMessage("请选择安检月份！")
         return false
       }
+      if (!this.createPlan.f_schedule_type) {
+        Vue.showMessage("请选择任务性质！")
+        return false
+      }
       if (this.createPlan.isShare == "否") {
         if (JSON.stringify(this.createPlan.checker) == '{}') {
           Vue.showMessage("请选择安检人员！")
@@ -691,14 +743,16 @@ export default {
       this.upCheckPlan.f_checker = row.f_checker ? row.f_checker : null
       this.upCheckPlan.isShare = row.f_checker_id ? '否' : '是'
       this.upCheckPlan.f_issued = row.f_issued
+      this.upCheckPlan.f_share_type = row.f_share_type
+      this.upCheckPlan.f_share_company_name = row.f_share_company_name
       this.upCheckPlan.checker = {id: row.f_checker_id, name: row.f_checker}
       this.showUpPlan = true
     },
     async upPlan() {
-      if (this.upCheckPlan.f_issued == '已下发') {
-        this.$showMessage("该任务已下发，无法进行修改！")
-        return
-      }
+      // if (this.upCheckPlan.f_issued == '已下发') {
+      //   this.$showMessage("该任务已下发，无法进行修改！")
+      //   return
+      // }
       if (!this.upCheckPlan.f_plan_name) {
         Vue.showMessage("请输入安检任务名称！")
         return false
@@ -719,6 +773,8 @@ export default {
       } else {
         this.upCheckPlan.f_checker_id = this.upCheckPlan.checker.id
         this.upCheckPlan.f_checker = this.upCheckPlan.checker.name
+        this.createPlan.f_share_type = '否'
+        this.createPlan.f_share_company_name = ''
       }
       this.isSend = true
       let res = await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
@@ -729,6 +785,9 @@ export default {
           f_plan_name: this.upCheckPlan.f_plan_name,
           f_plan_year: this.upCheckPlan.f_plan_year,
           f_plan_month: this.upCheckPlan.f_plan_month,
+          f_share_type: this.upCheckPlan.f_share_type,
+          f_share_company_name: this.upCheckPlan.f_share_type == '否' ? '' : this.upCheckPlan.f_share_company_name,
+          issued:"是",
           f_plan_id: this.upCheckPlan.id
         }
       }, {resolveMsg: null, rejectMsg: null})

package/src/filiale/huaran/pc/checkUserList.vue

@@ -34,6 +34,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-1 upuserinfo_sel">
+              <v-select class="select select_list"
+                        :width="'95%'"
+                        class="select select_list"
+                        :value.sync="model.checkBook"
+                        v-model="model.checkBook"
+                        :options='$parent.$parent.checkBooks'
+                        placeholder='安&ensp;检&ensp;册'
+                        :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4">
               <button class="button_new" style="margin-right: 10px" @click="$parent.$parent.showUserCondition()">
                 更多条件
@@ -273,20 +285,20 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4">
-                    <label class="font_normal_body">安&ensp;检&ensp;册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.checkBook"
-                      v-model="model.checkBook"
-                      :options='$parent.$parent.checkBooks'
-                      placeholder='请选择'
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4">-->
+<!--                    <label class="font_normal_body">安&ensp;检&ensp;册:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.checkBook"-->
+<!--                      v-model="model.checkBook"-->
+<!--                      :options='$parent.$parent.checkBooks'-->
+<!--                      placeholder='请选择'-->
+<!--                      :search="false"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4">
                     <label class="font_normal_body">通气起始:</label>
                     <datepicker
@@ -513,6 +525,8 @@ export default {
   },
   props: ["selectplan", "userlogin"],
   ready() {
+    console.log('-====')
+    console.log(this.$login.f)
     this.$refs.paged.$refs.criteria.model.f_user_state = '正常'
     // this.hasCheckBooks=this.$appdata.getSingleValue('是否使用安检册')
     // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
@@ -533,7 +547,7 @@ export default {
           orderitem: 'id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
-        this.checkBooks.push({label: '全部', value: ''})
+        // this.checkBooks.push({label: '全部', value: ''})
         res.data.forEach(ress => {
           this.checkBooks.push({
             label: ress.f_check_book_name,
@@ -590,13 +604,26 @@ export default {
           args.condition += ` and ui.f_last_check_date <='${args.model.f_end_time} 23:59:59' `
         }
       }
-
-      if (args.model.checkBook) {
-        let arr = args.model.checkBook.split('-')
-        if (arr[1] == '用户') {
-          args.condition += ` and ua.f_check_book_id='${arr[0]}'`
-        } else {
-          args.condition += ` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
+      debugger
+      if (args.model.checkBook && Array.isArray(args.model.checkBook)) {
+        let userIds = [];
+        let areaIds = [];
+        args.model.checkBook.forEach(checkBook => {
+          let arr = checkBook.split('-');
+          if (arr[1] == '用户') {
+            userIds.push(arr[0]);
+          } else {
+            areaIds.push(arr[0]);
+          }
+        });
+        if (userIds.length > 0 && areaIds.length == 0) {
+          args.condition += ` and ua.f_check_book_id in (${userIds.map(id => `'${id}'`).join(',')})`;
+        }
+        if (areaIds.length > 0 && userIds.length == 0) {
+          args.condition += ` and area.f_check_book_id in (${areaIds.map(id => `'${id}'`).join(',')}) and ua.f_check_book_id is null`;
+        }
+        if (userIds.length > 0 && areaIds.length > 0){
+          args.condition += ` and (ua.f_check_book_id in (${userIds.map(id => `'${id}'`).join(',')}) or area.f_check_book_id in (${areaIds.map(id => `'${id}'`).join(',')}))`;
         }
       }
       if (this.uploadCodeCondition) {
@@ -812,6 +839,12 @@ export default {
       })
     },
 
+  },
+  watch:{
+    'userlogin.orgid'(){
+      this.getCheckBook()
+      this.loadpage()
+    }
   }
 }
 </script>

package/src/filiale/huaran/pc.js

@@ -16,6 +16,7 @@ let specialComp = {
   'check-book-list': (resolve) => { require(['./pc/CheckBookList.vue'], resolve) },
   'check-book-all': (resolve) => { require(['./pc/CheckBookAll.vue'], resolve) },
   'check-book': (resolve) => { require(['./pc/CheckBook.vue'], resolve) },
+  'check-book-entry': (resolve) => { require(['./pc/CheckBookEntry.vue'], resolve) },
   'check-plan-list': (resolve) => { require(['./pc/checkPlanList'], resolve) },
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
 

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

@@ -272,7 +272,8 @@
         </div>
         <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_bqf_state == '关阀'">
           <label class="righttxt">关阀原因:</label>
-          <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].bqf_states_reason"
+          <v-select class="rightipt"
+                    :value.sync="userinfo.meterinfo[0].bqf_states_reason"
                     v-model="userinfo.meterinfo[0].bqf_states_reason"
                     placeholder='请选择'
                     :width='wid'
@@ -281,6 +282,18 @@
                     close-on-select value-single></v-select>
           <input type="text" style="float: left;margin-left: 31%;" v-if="userinfo.meterinfo[0].bqf_states_reason == '其他'" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_bqf_states_reason"/>
         </div>
+        <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_bqf_state == '开阀'">
+          <label class="righttxt">开阀原因:</label>
+          <v-select class="rightipt"
+                    :value.sync="userinfo.meterinfo[0].bqf_states_reason"
+                    v-model="userinfo.meterinfo[0].bqf_states_reason"
+                    placeholder='请选择'
+                    :width='wid'
+                    readonly
+                    :options="kf_states_reasons"
+                    close-on-select value-single></v-select>
+          <input type="text" style="float: left;margin-left: 31%;" v-if="userinfo.meterinfo[0].bqf_states_reason == '其他'" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_bqf_states_reason"/>
+        </div>
         <!--        <div class="row auto" style="margin: 5px 0">
                   <div style="display: flex;justify-content: center;">
                     <button v-if="userinfo.meterinfo[0].f_meter_classify=='机表'" class="col-sm-3 btn btn-primary" @click="upUserState()">机表关阀停用</button>
@@ -418,6 +431,7 @@ export default {
       cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
       bqf_states: [{label: '开阀', value: '开阀'}, {label: '关阀', value: '关阀'}],
       bqf_states_reasons: Vue.$appdata.getParam('关阀原因'),
+      kf_states_reasons: Vue.$appdata.getParam('开阀原因'),
       pcds: [],
       streets: [],
       update: false,
@@ -655,6 +669,9 @@ export default {
           if(this.userinfo.meterinfo[0].f_bqf_state === '关阀'){
             this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
           }
+          if(this.userinfo.meterinfo[0].f_bqf_state === '开阀'){
+            this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
+          }
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
@@ -727,6 +744,9 @@ export default {
           if(this.userinfo.meterinfo[0].f_bqf_state === '关阀'){
             this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
           }
+          if(this.userinfo.meterinfo[0].f_bqf_state === '开阀'){
+            this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
+          }
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model

package/src/filiale/qianneng/android/SwitchValve.vue

@@ -303,6 +303,7 @@ export default {
       // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
       let condition =  ` 1=1 `
       condition += this.condition
+      condition += ` and f_filialeid = '${this.filialeid}'`
       condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
       condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""
       condition += this.f_enter_number ? ` and f_enter_number = '${this.f_enter_number}'` : ""