safecheck-client 4.0.2-43 → 4.0.2-44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.2-43",
+  "version": "4.0.2-44",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

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

@@ -18,7 +18,7 @@
               </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>
+                <button v-if="$parent.$parent.model.rows.length == 0" type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;"  @click="$parent.$parent.showModal">执行首检</button>
               </div>
             </form>
           </div>
@@ -188,6 +188,17 @@ export default {
         f_orgid: Vue.user.orgid,
         f_orgname: Vue.user.orgs,
       }
+      this.weekCheck.forEach(item => {
+        if (item.f_item_name === '表号'){
+          weekCheckpaper.f_meternumber = item.f_item_value
+        }
+        if (item.f_item_name === '气表品牌'){
+          weekCheckpaper.f_meter_brand = item.f_item_value
+        }
+        if (item.f_item_name === '气表型号'){
+          weekCheckpaper.f_meter_style = item.f_item_value
+        }
+      })
       http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveWeekPaper`, weekCheckpaper, {resolveMsg: '首检成功!', rejectMsg: '首检失败,请联系管理员检查!'}).then(res=>{
         if (res.data){
           this.colse()

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

@@ -335,6 +335,7 @@ export default {
         data.f_state = '已检'
         data.f_entry_status = '正常'
       }else {
+        data.f_current_complete = this.steps[this.current + 1]
         data.f_complete = this.steps[this.current]
         data.f_state = '未检'
       }
@@ -360,6 +361,11 @@ export default {
             data.f_week_check_result = item.f_item_value
           }
         }
+        if (this.steps[this.current] == '上传报告'){
+          if (item.f_item_name === '检定时间' ){
+            data.f_complete_date = item.f_item_value
+          }
+        }
       })
 
 

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

@@ -51,8 +51,14 @@
                 <label class="font text-left">周检环节：</label>
               </div>
               <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model=model.f_complete condition="twpi.f_complete like '%{}%'"  />
+                <v-select id="f_complete"
+                          :value.sync="model.f_current_complete"
+                          class="input-font"
+                          :options='$parent.$parent.completes'
+                          placeholder='请选择周检环节'
+                          v-model="model.f_current_complete"
+                          condition="twpi.f_current_complete like '%{}%'"
+                          close-on-select clear-button></v-select>
               </div>
             </div>
             <div class="row text-center" style="margin-top: 20px;">
@@ -81,7 +87,7 @@
                 </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_complete }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_current_complete }}</p>
                 </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">周检状态</p>
@@ -112,7 +118,13 @@ export default {
     model.f_user_name = `${Vue.user.name}`
     return {
       model: model,
-
+      completes:[
+        {label:'请选择周检环节',value:''},
+        {label:'下表',value:'下表'},
+        {label:'输入检定结果',value:'输入检定结果'},
+        {label:'装表',value:'装表'},
+        {label:'上传报告',value:'上传报告'},
+      ]
     }
   },
   ready () {