safecheck-client 4.0.2-37 → 4.0.2-39

package/src/components/android/week/CheckResultSimple.vue

@@ -55,7 +55,7 @@
                          @change="changse"
                          @click="transelation(idxs)"
                          :multiple="row.multiple"
-                         :value-single="row.multiple"
+                         :value-single="!row.multiple"
                          :close-on-select="!row.multiple" clear-button></v-select>
               <div style="float: left;width: 30%" class="form-group" v-if="row.type == 'radio'">
                 <div  class="col-xs-6 col-sm-6 col-md-6" v-for="item in row.options">
@@ -88,7 +88,7 @@ export default {
       selectindex: null
     }
   },
-  props: ['items'],
+  props: ['itemname','items'],
   ready() {
   },
   methods: {
@@ -109,7 +109,7 @@ export default {
   computed:{
   },
   watch: {
-    'items'(){
+    'itemname'(){
       for (let item in this.items) {
         if (this.items[item].type === 'selector') {
           let page = [

package/src/components/android/week/FirstWeekCheck.vue

@@ -1,64 +1,62 @@
 <template>
   <div class="auto">
-    <criteria-paged :model="model"  :pager="false" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial>
-          <form>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">表 &nbsp;&nbsp; &nbsp;&nbsp; 号：</label>
+    <div v-if="!showcheck">
+      <criteria-paged :model="model"   v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:cri>
+          <div partial>
+            <form>
+              <div class="row app-row">
+                <div class="col-xs-4">
+                  <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                  <label class="font text-left">表 &nbsp;&nbsp; &nbsp;&nbsp; 号：</label>
+                </div>
+                <div class="col-xs-8" >
+                  <input class="search_input input-font"
+                         v-model=model.f_meternumber condition="f_meternumber = '{}'" style="width: 70%" placeholder="请输入表号" />
+                  <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+                </div>
               </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model=model.f_meternumber condition="f_meternumber = '{}'" style="width: 70%" placeholder="请输入表号" />
-                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              <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>
+                <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;"  @click="$parent.$parent.showModal">执行首检</button>
               </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>
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;"  @click="$parent.$parent.showModal">执行首检</button>
-            </div>
-          </form>
-        </div>
-      </criteria>
+            </form>
+          </div>
+        </criteria>
 
-      <list :model="model" partial='list'>
-        <div partial>
-          <div @click="$parent.$parent.$parent.inspect(row)" 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_meternumber }}</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_first_inspection_date }}</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_last_inspection_agency }}</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_user_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_meter_brand }}</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_meter_style }}</p>
+        <list :model="model" partial='list'>
+          <div partial>
+            <div @click="$parent.$parent.$parent.inspect(row)" 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_meternumber }}</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_first_inspection_date }}</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_last_inspection_agency }}</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_meter_brand }}</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_meter_style }}</p>
+                  </div>
                 </div>
               </div>
-            </div>
 
+            </div>
           </div>
-        </div>
-      </list>
-    </criteria-paged>
+        </list>
+      </criteria-paged>
+    </div>
     <div v-if="showcheck">
       <check-rsult-simple :items="weekCheck" ></check-rsult-simple>
       <div class="row text-center" style="margin-top: 20px;">
@@ -101,30 +99,31 @@ export default {
       http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getWeekCheckTypeByType`, {f_safecheck_type: '首检' }).then(res=>{
         if (res.data && res.data.length > 0 ){
           this.weekConfig = res.data[0]
-          const  json = JSON.parse(res.data[0].f_json)
-          this.weekCheck = []
-          if (json && json.length > 0){
-            for (let i = 0; i < json.length; i++){
-              if (json[i].itemname === '首检'){
-                json[i].items.forEach(row => {
-                  this.weekCheck.push({
-                    f_item_name: row.itemname,
-                    f_item_value: row.f_item_value || '',
-                    options:row.options,
-                    type: row.type,
-                    isshow:true,
-                    f_path: '',
-                    multiple: row.multiple?row.multiple:false,
-                    readonly:false
-                  })
-                })
-              }
-            }
-          }
         }
-
       })
     },
+    getdetails(){
+      const  json = JSON.parse(this.weekConfig.f_json)
+      this.weekCheck = []
+      if (json && json.length > 0){
+        for (let i = 0; i < json.length; i++){
+          if (json[i].itemname === '首检'){
+            json[i].items.forEach(row => {
+              this.weekCheck.push({
+                f_item_name: row.itemname,
+                f_item_value: row.f_item_value || '',
+                options:row.options,
+                type: row.type,
+                isshow:true,
+                f_path: '',
+                multiple: row.multiple?row.multiple:false,
+                readonly:false
+              })
+            })
+          }
+        }
+      }
+    },
     scan(){
       HostApp.__this__=this,
       HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
@@ -134,7 +133,7 @@ export default {
       this.$refs.paged.$refs.cri.model.f_meternumber=datapa
     },
     inspect (row) {
-      this.getweekconfig()
+      this.getdetails()
       this.useritem = row
       this.weekCheck.forEach(item=>{
         if (item.f_item_name === '表号' && !Util.isEmpty(row.f_meternumber)){
@@ -153,11 +152,11 @@ export default {
       this.showcheck = true
     },
     showModal(){
-      this.getweekconfig()
+      this.getdetails()
       this.showcheck = true
     },
     colse(){
-      this.getweekconfig()
+      this.getdetails()
       this.showcheck = false
     },
     uploadCheckPaper(){
@@ -169,16 +168,15 @@ export default {
       })
       const http = new HttpResetClass()
       const weekCheckpaper = {
-        f_userinfo_id: this.useritem.f_userinfo_id,
-        f_user_name: this.useritem.f_user_name,
-        f_user_phone: this.useritem.f_user_phone,
         f_meter_brand: this.useritem.f_meter_brand,
         f_meter_style: this.useritem.f_meter_style,
         f_meternumber: this.useritem.f_meternumber,
-        f_address: this.useritem.f_address,
-        f_checker_id: Vue.user.id,
-        f_checker_name: Vue.user.name,
+        f_device_address: this.useritem.f_device_address,
+        f_address: this.useritem.f_device_address,
+        f_operatorid: Vue.user.id,
+        f_operator: Vue.user.name,
         f_complete: '已完成',
+        f_last_inspection_result: '正常',
         f_entry_status: '正常',
         f_safe_type: '首检',
         f_state: '已检',
@@ -186,14 +184,22 @@ export default {
         f_safecheck_type_id: this.weekConfig.f_security_check_type_id,
         f_safe_type_version: this.weekConfig.version,
         f_upload_date: Util.toStandardTimeString(),
-        f_filiale_id: Vue.user.orgid,
-        f_filiale: Vue.user.orgs,
+        f_filialeid: Vue.user.orgid,
+        f_orgid: Vue.user.orgid,
+        f_orgname: Vue.user.orgs,
       }
       http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveWeekPaper`, weekCheckpaper, {resolveMsg: '首检成功!', rejectMsg: '首检失败,请联系管理员检查!'}).then(res=>{
         if (res.data){
           this.colse()
         }
       })
+    },
+    selfsearch(args){
+      if (Util.isEmpty(args.model.f_meternumber)){
+        this.$showMessage("请输入表号查询！")
+        return
+      }
+      this.model.search(args.condition, args.model)
     }
   }
 }

package/src/components/android/week/StepHeaderBar.vue

@@ -16,9 +16,9 @@
         </div>
       </div>
     </div>
-    <check-rsult-simple v-if="showSimple" :items="weekCheck" ></check-rsult-simple>
+    <check-rsult-simple  :itemname="itemname"  :items="weekCheck" ></check-rsult-simple>
     <div class="row text-center" style="margin-top: 20px;">
-      <button v-if="showbutton" type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="uploadCheckPaper">提交</button>
+      <button v-if="showbutton" type="button" class="col-sm-3 btn btn-primary" @click="uploadCheckPaper">提交</button>
     </div>
   </div>
 </template>
@@ -45,12 +45,11 @@ export default {
       steps: [],
       current: null,
       showbutton:false,
-      showSimple:false,
-      weekCheckPaper:{}
+      weekCheckPaper:{},
+      itemname:''
     }
   },
   ready () {
-    this.getweekconfig(this.weekdata.safechecktype_id)
     if (!Util.isEmpty(this.weekdata.paper_id)){
       const http = new HttpResetClass()
       http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getWeekCheckPaperById`, {id: this.weekdata.paper_id }).then(res=>{
@@ -58,14 +57,18 @@ export default {
         this.weekCheckPaper = res.data
         if (this.weekdata.f_complete == '已完成'){
           const  json = JSON.parse(this.weekCheckPaper.f_safe_content)
+          this.steps = []
           json.forEach((row) => {
-            this.steps = []
             this.steps.push(row.itemname)
           })
+          this.current = json.length
           this.weekCheckChange(json[json.length-1].itemname,json.length-1)
+        }else {
+          this.getweekconfig(this.weekdata.safechecktype_id)
         }
       })
-
+    }else {
+      this.getweekconfig(this.weekdata.safechecktype_id)
     }
   },
   computed: {
@@ -84,15 +87,15 @@ export default {
               if (Util.isEmpty(this.weekdata.f_complete)){
                 this.current = 0
               }else if (row.itemname === this.weekdata.f_complete){
-                this.current = index
+                this.current = index+1
               }
               this.steps.push(row.itemname)
             })
             if (Util.isEmpty(this.weekdata.f_complete)){
-              this.weekCheckChange('',this.current)
+              this.weekCheckChange(json[0].itemname,this.current)
             }else {
               if (this.weekdata.f_complete != '已完成'){
-                this.weekCheckChange(this.weekdata.f_complete,this.current)
+                this.weekCheckChange(this.steps[this.current],this.current)
               }
             }
           }
@@ -101,10 +104,12 @@ export default {
     },
     // 获取当前环节周检配置
     weekCheckChange(row,id){
-      this.showSimple = false
       if (this.current < id) {
+        this.weekCheck = []
+        this.showbutton = false
         this.$showMessage('请先完成当前环节!')
-      } else if (this.current == id){
+      }
+      else if (this.current == id){
         this.showbutton = true
         const  json = JSON.parse(this.weekConfig.f_json)
         this.weekCheck = []
@@ -156,7 +161,28 @@ export default {
             item.readonly = true
           }
         })
-      }else {
+      }
+      else if (this.current > id){
+        this.showbutton = false
+        this.weekCheck = []
+        const  json = JSON.parse(this.weekCheckPaper.f_safe_content)
+        json.forEach(res=>{
+          if (res.itemname === row){
+            res.items.forEach(row => {
+              this.weekCheck.push({
+                f_item_name: row.f_item_name,
+                f_item_value: row.f_item_value || '',
+                type: row.type,
+                isshow:true,
+                f_path: '',
+                multiple: row.multiple?row.multiple:false,
+                readonly:true
+              })
+            })
+          }
+        })
+      }
+      else {
         this.showbutton = false
         const  json = JSON.parse(this.weekCheckPaper.f_safe_content)
         this.weekCheck = []
@@ -173,7 +199,35 @@ export default {
         })
         console.log('this.weekCheck',this.weekCheck)
       }
-      this.showSimple = true
+      this.itemname = row
+      this.watchitem()
+    },
+    // 监听表单
+    watchitem(){
+      for (let item in this.weekCheck) {
+        if (this.weekCheck[item].f_item_name === "是否停用表具") {
+          this.$watch('weekCheck[' + item + '].f_item_value', function (val) {
+            if (val === '是') {
+              this.weekCheck.forEach((item) => {
+                if (item.f_item_name === '是否停用表具' || item.f_item_name === '停用备注') {
+                  item.isshow = true
+                } else {
+                  item.isshow = false
+                }
+              })
+            }
+            if (val === '否') {
+              this.weekCheck.forEach((item) => {
+                if (item.f_item_name === '停用备注') {
+                  item.isshow = false
+                } else {
+                  item.isshow = true
+                }
+              })
+            }
+          })
+        }
+      }
     },
     uploadCheckPaper () {
       const http = new HttpResetClass()
@@ -198,6 +252,8 @@ export default {
         f_checker_id: Vue.user.id,
         f_checker_name: Vue.user.name,
         f_safe_type: '周检',
+        f_entry_status :'正常',
+        f_table_state: this.weekdata.f_table_state,
         f_safe_content: json,
         f_safecheck_type_id: this.weekdata.safechecktype_id,
         f_check_item_id: this.weekdata.id,
@@ -219,21 +275,21 @@ export default {
       }
       this.weekCheck.forEach(item => {
         if (this.steps[this.current] == '下表'){
-          if (item.f_item_name === '是否停用表具' && item.f_item_value == '是'){
-            data.f_table_state = '停用'
-            data.f_complete = '已完成'
-            data.f_state = '已检'
-          }else {
-            data.f_table_state = '正常'
+          if (item.f_item_name === '是否停用表具'){
+            if (item.f_item_value == '是'){
+              data.f_table_state = '停用'
+              data.f_complete = '已完成'
+              data.f_state = '已检'
+            }
           }
         }
         if (this.steps[this.current] == '装表'){
-          if (item.f_item_name === '处理方式' && !Util.isEmpty(item.f_item_value)){
-            data.f_entry_status = item.f_item_value
-            data.f_complete = '已完成'
-            data.f_state = '已检'
-          }else {
-            data.f_entry_status = '正常'
+          if (item.f_item_name === '处理方式' ){
+            if (!Util.isEmpty(item.f_item_value)){
+              data.f_entry_status = item.f_item_value
+              data.f_complete = '已完成'
+              data.f_state = '已检'
+            }
           }
         }
       })