safecheck-client 4.0.2-3 → 4.0.2-31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.2-3",
+  "version": "4.0.2-31",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -108,7 +108,7 @@
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.26.5",
+    "vue-client": "1.25.41",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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

@@ -0,0 +1,222 @@
+<template>
+  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
+    <div class="panel panel-default auto repair-info-content">
+      <div class="panel-body" style="padding: 0">
+        <!-- 周检项内容 -->
+        <div  class="auto repair-info-content compatible" style="padding: 0">
+          <div class="row auto" style="padding: 0">
+            <div class="col-xs-12 col-sm-12 col-md-12 mg8"  v-show="row.isshow" v-for="(idxs,row) in items"  style="padding: 4px; border:1px solid #D4D4D4;border-bottom: 0" >
+              <label v-if="row.type != 'radio' && row.type != 'text' && row.type != 'picture' && row.type != 'checkbox'" v-show="row.isshow" class="fivelabel">{{row.f_item_name}}</label>
+              <label v-if="row.type == 'radio'" v-show="row.isshow" class="radiolabel">{{row.f_item_name}}</label>
+              <label v-if="row.type == 'text'" v-show="row.isshow" class="textlabel1">{{row.f_item_name}}</label>
+              <label v-if="row.type == 'picture' || row.type == 'checkbox'" v-show="row.isshow" class="textlabel">{{row.f_item_name}}</label>
+              <div style="clear: both" v-if="row.type == 'picture'" class="form-group col-sm-12" >
+                <div class="auto" >
+                  <div class="panel">
+                    <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
+                      <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+                        <div class="col-sm-4" v-show="row.f_path">
+                          <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                        </div>
+                        <div class="col-sm-4" v-show="!row.f_path" @click="takePic(idxs, row.f_item_name)">
+                          <img src="../../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
+                        </div>
+                        <img v-show="row.f_path" src="../../../assets/remove.png" :class="style__"   @click="delfile(idxs, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'string'" v-show="row.isshow">
+                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value" :readonly="role == 'androidview' || row.readonly">
+              </div>
+              <div style="float: left;width:60%" class="form-group col-sm-12" v-if="row.type == 'date'" v-show="row.isshow">
+                <datepicker id="f_making_date" :placeholder= row.f_item_name
+                            :value.sync="row.f_item_value"
+                            v-if="row.type == 'date'"
+                            v-show="row.isshow"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            readonly
+                >
+                </datepicker>
+              </div>
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'number'" v-show="row.isshow">
+                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value"  onkeyup="value=value.replace(/[^\d\.-]/g,'')" :readonly="row.readonly">
+              </div>
+              <v-select  style="float: left"  :value.sync="row.selected"
+                         v-model="row.selected"
+                         v-if="row.type == 'selector'"
+                         :search="false"
+                         v-show="row.isshow"
+                         placeholder='请选择'
+                         :options="row.options"
+                         :disabled="row.readonly"
+                         @change="changse"
+                         @click="transelation(idxs)"
+                         :multiple="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">
+                  <input type="radio" :name="row.f_item_name"  :value="item.value"  v-model="row.f_item_value" >
+                  <span>{{item.label}}</span>
+                </div>
+              </div>
+              <div v-if="row.type == 'checkbox'" class="col-xs-12 col-sm-12 col-md-12" style="white-space: nowrap" >
+                <div style="float: left" v-for="item in row.options">
+                  <input type="checkbox" :name="row.f_item_name" :value="item.value"  v-model="row.f_item_value">
+                  <span>{{item.label}}</span>
+                </div>
+              </div>
+
+             </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '周检列表信息',
+  data() {
+    return {
+      selectindex: null
+    }
+  },
+  props: ['items'],
+  ready() {
+  },
+  methods: {
+    changse(val){
+      if(val == undefined){
+        return
+      }
+      if(this.selectindex != null) {
+        if(this.items[this.selectindex].type == 'selector'){
+          this.items[this.selectindex].f_item_value = val
+        }
+      }
+    },
+    transelation(val){
+      this.selectindex = val
+    },
+  },
+  computed:{
+  },
+  watch: {
+    'items'(){
+      for (let item in this.items) {
+        if (this.items[item].type === 'selector') {
+          let page = [
+            {
+              label: "请选择",
+              value: ''
+            }
+          ]
+
+          for (let i in this.items[item].options) {
+            if(typeof this.items[item].options[i]=='function'){
+              continue
+            }
+            if (Util.isEmpty(this.items[item].f_item_value) && this.items[item].options[i].isdefault){
+              this.$set(`items[${item}].f_item_value`, this.items[item].options[i].data)
+              this.items[item].f_item_value = this.items[item].options[i].data
+            }
+            page.push({
+              label: this.items[item].options[i].data,
+              value: this.items[item].options[i].data
+            })
+          }
+          this.$set(`items[${item}].selected`, this.items[item].f_item_value)
+          this.items[item].options =  page
+          this.$set(`items[${item}].options`, page)
+        } else if (this.items[item].type === 'radio' || this.items[item].type === 'checkbox') {
+          let page = []
+          for (let i in this.items[item].options) {
+            if(typeof this.items[item].options[i]=='function'){
+              continue
+            }
+            page.push({
+              label: this.items[item].options[i].data,
+              value: this.items[item].options[i].data
+            })
+            if (Util.isEmpty(this.items[item].f_item_value) && this.items[item].options[i].isdefault){
+              this.$set(`items[${item}].f_item_value`, this.items[item].options[i].data)
+              this.items[item].f_item_value = this.items[item].options[i].data
+            }
+          }
+          this.items[item].options =  page
+          this.$set(`items[${item}].options`, page)
+        }
+      }
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+.class-erro {
+  color: #a94442;
+}
+.fivelabel{
+  border: none;
+  float: left;
+  width: 35%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+.radiolabel{
+  border: none;
+  float: left;
+  width: 65%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.textlabel {
+  border: none;
+  width: 100%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+.textlabel1 {
+  border: none;
+  width: 100%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+.spanrodio{
+  margin-right: 10px;
+}
+.div-photo{
+  width: auto;
+  height: auto;
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+.panel-self{
+  border-radius: 5px;
+  border:1px solid #c5e1f7;
+}
+.btn-photo{
+  border: 0;
+  border-radius: 7px;
+  background-color: #7dc1f4;
+  font: 15px PingFang-SC-Bold;
+  height: 20%;
+}
+</style>
+

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

@@ -0,0 +1,236 @@
+<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>
+              <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="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>
+
+      <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>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <div v-if="showcheck">
+      <check-rsult-simple :items="weekCheck" ></check-rsult-simple>
+      <div class="row text-center" style="margin-top: 20px;">
+        <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="colse">取消</button>
+        <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="uploadCheckPaper">提交</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '首检',
+  data () {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getFirstWeekTable`, 20,
+      {
+        f_orgids:'this.f_orgids'
+      })
+    model.f_orgids = Vue.user.orgid
+    return {
+      model: model,
+      weekCheck:[],
+      useritem:{},
+      weekConfig:{},
+      showcheck:false
+    }
+  },
+  ready () {
+    this.getweekconfig()
+  },
+  computed: {
+  },
+  methods:{
+    getweekconfig(){
+      const http = new HttpResetClass()
+      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
+                  })
+                })
+              }
+            }
+          }
+        }
+
+      })
+    },
+    scan(){
+      HostApp.__this__=this,
+      HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      this.$refs.paged.$refs.cri.model.f_meternumber=datapa
+    },
+    inspect (row) {
+      this.getweekconfig()
+      this.useritem = row
+      this.weekCheck.forEach(item=>{
+        if (item.f_item_name === '表号' && !Util.isEmpty(row.f_meternumber)){
+          item.f_item_value = row.f_meternumber
+          item.readonly = true
+        }
+        if (item.f_item_name === '气表品牌' && !Util.isEmpty(row.f_meter_brand)){
+          item.f_item_value = row.f_meter_brand
+          item.readonly = true
+        }
+        if (item.f_item_name === '气表型号' && !Util.isEmpty(row.f_meter_style)){
+          item.f_item_value = row.f_meter_style
+          item.readonly = true
+        }
+      })
+      this.showcheck = true
+    },
+    showModal(){
+      this.getweekconfig()
+      this.showcheck = true
+    },
+    colse(){
+      this.getweekconfig()
+      this.showcheck = false
+    },
+    uploadCheckPaper(){
+      const  json = JSON.parse(this.weekConfig.f_json)
+      json.forEach(res=>{
+        if (res.itemname === '首检'){
+          res.items = this.weekCheck
+        }
+      })
+      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_complete: '已完成',
+        f_entry_status: '正常',
+        f_safe_type: '首检',
+        f_state: '已检',
+        f_safe_content: json,
+        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,
+      }
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveWeekPaper`, weekCheckpaper, {resolveMsg: '首检成功!', rejectMsg: '首检失败,请联系管理员检查!'}).then(res=>{
+        if (res.data){
+          this.colse()
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.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;
+}
+</style>