safecheck-client 4.0.2-39 → 4.0.2-41

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

@@ -11,22 +11,25 @@
               <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 slot="modal-body" class="modal-body">
+                  <div class="auto" :class="style__">
+                    <div class="panel" style="padding: 10px 10px 5px 10px;">
+                      <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                        <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
+                          <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px" v-for="(index,img) in row.images">
+                            <img-self :src="img.f_path" alt="安检补充照片" :width="140" :height="170"></img-self>
+                            <img src="../../../assets/删除.png" @click="delfile(img.f_path,index,idxs)" style="width: 15px;margin-top: -80px" alt="">
+                          </div>
                         </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 class="row text-right div-photo">
+                          <button type="button" name="button" class="btn btn-photo" @click="takePic(row.f_item_name,idxs)">拍照</button>
                         </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>
@@ -59,13 +62,13 @@
                          :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" >
+                  <input type="radio" :name="row.f_item_name"  :value="item.value"  :disabled="row.readonly" 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">
+                  <input type="checkbox" :name="row.f_item_name" :value="item.value" :disabled="row.readonly" v-model="row.f_item_value">
                   <span>{{item.label}}</span>
                 </div>
               </div>
@@ -92,6 +95,33 @@ export default {
   ready() {
   },
   methods: {
+    delfile(fileName, index,idxs) {
+      this.items[idxs].images.splice(index, 1)
+      HostApp.delfile(fileName)
+    },
+    cameraCallBack(fileName,idxs) {
+      let path = fileName
+      HostApp.__this__.items[idxs].images.push({
+        f_path: path
+      })
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    takePic(title, idxs) {
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = Util.guid() + '-' + '.jpg'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__( "%s","'+ idxs + '");',
+          watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+        }
+      })
+    },
     changse(val){
       if(val == undefined){
         return

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

@@ -115,7 +115,7 @@ export default {
                 options:row.options,
                 type: row.type,
                 isshow:true,
-                f_path: '',
+                images: [],
                 multiple: row.multiple?row.multiple:false,
                 readonly:false
               })

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

@@ -122,7 +122,7 @@ export default {
                 options:row.options,
                 type: row.type,
                 isshow:true,
-                f_path: '',
+                images: row.images|| [],
                 multiple: row.multiple?row.multiple:false,
                 readonly:false
               })
@@ -138,7 +138,7 @@ export default {
                     options:row.options,
                     type: row.type,
                     isshow:true,
-                    f_path: '',
+                    images: row.images|| [],
                     multiple: row.multiple?row.multiple:false,
                     readonly:false
                   })
@@ -174,7 +174,7 @@ export default {
                 f_item_value: row.f_item_value || '',
                 type: row.type,
                 isshow:true,
-                f_path: '',
+                images: row.images|| [],
                 multiple: row.multiple?row.multiple:false,
                 readonly:true
               })
@@ -192,7 +192,7 @@ export default {
             f_item_value: row.f_item_value || '',
             type: row.type,
             isshow:true,
-            f_path: '',
+            images: row.images|| [],
             multiple: row.multiple?row.multiple:false,
             readonly:true
           })
@@ -209,7 +209,7 @@ export default {
           this.$watch('weekCheck[' + item + '].f_item_value', function (val) {
             if (val === '是') {
               this.weekCheck.forEach((item) => {
-                if (item.f_item_name === '是否停用表具' || item.f_item_name === '停用备注') {
+                if (item.f_item_name === '是否停用表具' || item.f_item_name === '停用备注' || item.f_item_name === '停用图片') {
                   item.isshow = true
                 } else {
                   item.isshow = false
@@ -218,7 +218,7 @@ export default {
             }
             if (val === '否') {
               this.weekCheck.forEach((item) => {
-                if (item.f_item_name === '停用备注') {
+                if (item.f_item_name === '停用备注' || item.f_item_name === '停用图片') {
                   item.isshow = false
                 } else {
                   item.isshow = true
@@ -229,7 +229,32 @@ export default {
         }
       }
     },
-    uploadCheckPaper () {
+    async commitCallBack(jo) {
+      if (jo.state != 'ok'){
+        this.$showMessage('上传图片失败')
+        throw '上传图片失败'
+      }
+    },
+    async uploadCheckPaperPics () {
+      let tableImages =  []
+      this.weekCheck.forEach((item) => {
+        if (item.type == 'picture'){
+           item.images.forEach(image=>{
+             image.filename = image.f_path.substring(image.f_path.lastIndexOf('/')+1)
+             tableImages.push({
+               path: image.f_path,
+             })
+           })
+        }
+      })
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'imagesUploadAndroid', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+        'data': {tableImages:tableImages}, 'backresult': 1
+      })
+    },
+    async uploadCheckPaper () {
+      await this.uploadCheckPaperPics()
       const http = new HttpResetClass()
       let  json = []
       if (this.weekCheckPaper && !Util.isEmpty(this.weekCheckPaper.f_safe_content)){

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

@@ -1,188 +1,191 @@
-<template>
-  <div class="auto">
-    <criteria-paged :model="model"   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">用户名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model=model.f_user_name condition="twpi.f_user_name like '%{}%'" style="width: 70%" placeholder="请输入用户名称" />
-              </div>
-            </div>
-            <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="tu.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 app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">基表号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model="model.f_base_meternumber" condition="tu.f_base_meternumber like '%{}%'" />
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">用户地址：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model=model.f_address condition="twpi.f_address like '%{}%'"  />
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <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 '%{}%'"  />
-              </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>
-          </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_userinfo_id }}</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_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_complete }}</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_state }}</p>
-                </div>
-              </div>
-            </div>
-
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </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/getWeekPlanitem`, 20,
-      {
-        f_user_name:'this.f_user_name'
-      })
-    model.f_user_name = `${Vue.user.name}`
-    return {
-      model: model,
-
-    }
-  },
-  ready () {
-  },
-  computed: {
-  },
-  methods:{
-    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) {
-      var pardate = {
-        _this:this,
-        tittle:'周检单填写',
-        safe:true
-      }
-      this.$dispatch('gotoson',pardate)
-      this.$goto('step-header-bar', {weekdata: row}, 'self')
-
-    },
-  }
-}
-</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;
-}
-.yybtn-color{
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
-.qxbtn-color{
-  background-color: #FFFFFF;
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
-</style>
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"   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">用户名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_user_name condition="twpi.f_user_name like '%{}%'" style="width: 70%" placeholder="请输入用户名称" />
+              </div>
+            </div>
+            <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="tu.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 app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">基表号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model="model.f_base_meternumber" condition="tu.f_base_meternumber like '%{}%'" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户地址：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_address condition="twpi.f_address like '%{}%'"  />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <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 '%{}%'"  />
+              </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>
+          </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_userinfo_id }}</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_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_complete }}</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_state }}</p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </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/getWeekPlanitem`, 20,
+      {
+        f_user_name:'this.f_user_name'
+      })
+    model.f_user_name = `${Vue.user.name}`
+    return {
+      model: model,
+
+    }
+  },
+  ready () {
+  },
+  computed: {
+  },
+  methods:{
+    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
+    },
+    reload(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    inspect (row) {
+      var pardate = {
+        _this:this,
+        tittle:'周检单填写',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('step-header-bar', {weekdata: row}, 'self',this.reload)
+
+    },
+  }
+}
+</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;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>