safecheck-client 4.0.2-2 → 4.0.2-21

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

@@ -0,0 +1,323 @@
+<template>
+  <div class="auto">
+    <div class="step-header">
+      <div class="step-track">
+        <div v-for="(idx, s) in steps" :key="idx" class="step-item">
+          <div style="display: flex;align-items: center;">
+            <!-- 分隔线（仅在非第一个步骤时显示） -->
+            <div v-if="idx !== 0" class="step-divider" :class="{ active: idx <= current }"></div>
+            <!-- 圆形数字 -->
+            <div class="step-number" :class="{ active: idx  <= current }" @click="weekCheckChange(s,idx)">
+              {{ idx + 1 }}
+            </div>
+          </div>
+          <!-- 步骤标题 -->
+          <div class="step-title">{{ s }}</div>
+        </div>
+      </div>
+    </div>
+    <check-rsult-simple v-if="showSimple" :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>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '周检待办详情',
+  props: {
+    weekdata:{
+      type: Object,
+      default () {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      weekConfig:{},
+      weekCheck: [],
+      steps: [],
+      current: null,
+      showbutton:false,
+      showSimple:false,
+      weekCheckPaper:{}
+    }
+  },
+  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=>{
+        console.log('res', res.data)
+        this.weekCheckPaper = res.data
+        if (this.weekdata.f_complete == '已完成'){
+          const  json = JSON.parse(this.weekCheckPaper.f_safe_content)
+          json.forEach((row) => {
+            this.steps = []
+            this.steps.push(row.itemname)
+          })
+          this.weekCheckChange(json[json.length-1].itemname,json.length-1)
+        }
+      })
+
+    }
+  },
+  computed: {
+  },
+  methods:{
+    // 获取周检配置
+    getweekconfig(row){
+      const http = new HttpResetClass()
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getWeekCheckTypeById`, {id: row }).then(res=>{
+        if (res.data && res.data.length > 0 ){
+          this.weekConfig = res.data[0]
+          const  json = JSON.parse(this.weekConfig.f_json)
+          if (json && json.length > 0){
+            this.steps = []
+            json.forEach((row,index) => {
+              if (Util.isEmpty(this.weekdata.f_complete)){
+                this.current = 0
+              }else if (row.itemname === this.weekdata.f_complete){
+                this.current = index
+              }
+              this.steps.push(row.itemname)
+            })
+            if (Util.isEmpty(this.weekdata.f_complete)){
+              this.weekCheckChange('',this.current)
+            }else {
+              if (this.weekdata.f_complete != '已完成'){
+                this.weekCheckChange(this.weekdata.f_complete,this.current)
+              }
+            }
+          }
+        }
+      })
+    },
+    // 获取当前环节周检配置
+    weekCheckChange(row,id){
+      this.showSimple = false
+      if (this.current < id) {
+        this.$showMessage('请先完成当前环节!')
+      } else if (this.current == id){
+        this.showbutton = true
+        const  json = JSON.parse(this.weekConfig.f_json)
+        this.weekCheck = []
+        if (json && json.length > 0){
+          if (Util.isEmpty(row)){
+            json[0].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
+              })
+            })
+          }
+          else {
+            for (let i = 0; i < json.length; i++){
+              if (json[i].itemname === row){
+                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
+                  })
+                })
+              }
+            }
+          }
+        }
+        this.weekCheck.forEach(item=>{
+          if (item.f_item_name === '表号' && !Util.isEmpty(this.weekdata.f_meternumber)){
+            item.f_item_value = this.weekdata.f_meternumber
+            item.readonly = true
+          }
+          if (item.f_item_name === '气表品牌' && !Util.isEmpty(this.weekdata.f_meter_brand)){
+            item.f_item_value = this.weekdata.f_meter_brand
+            item.readonly = true
+          }
+          if (item.f_item_name === '气表型号' && !Util.isEmpty(this.weekdata.f_meter_style)){
+            item.f_item_value = this.weekdata.f_meter_style
+            item.readonly = true
+          }
+        })
+      }else {
+        this.showbutton = false
+        const  json = JSON.parse(this.weekCheckPaper.f_safe_content)
+        this.weekCheck = []
+        json[0].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
+          })
+        })
+        console.log('this.weekCheck',this.weekCheck)
+      }
+      this.showSimple = true
+    },
+    uploadCheckPaper () {
+      const http = new HttpResetClass()
+      let  json = []
+      if (this.weekCheckPaper && !Util.isEmpty(this.weekCheckPaper.f_safe_content)){
+        json = JSON.parse(this.weekCheckPaper.f_safe_content)
+      }
+      JSON.parse(this.weekConfig.f_json).forEach(res=>{
+        if (res.itemname === this.steps[this.current]){
+          res.items = this.weekCheck
+          json.push(res)
+        }
+      })
+      let data = {
+        f_userinfo_id: this.weekdata.f_userinfo_id,
+        f_user_name: this.weekdata.f_user_name,
+        f_user_phone: this.weekdata.f_user_phone,
+        f_meter_brand: this.weekdata.f_meter_brand,
+        f_meter_style: this.weekdata.f_meter_style,
+        f_meternumber: this.weekdata.f_meternumber,
+        f_address: this.weekdata.f_address,
+        f_checker_id: Vue.user.id,
+        f_checker_name: Vue.user.name,
+        f_safe_type: '周检',
+        f_safe_content: json,
+        f_safecheck_type_id: this.weekdata.safechecktype_id,
+        f_check_item_id: this.weekdata.id,
+        f_check_plan_id: this.weekdata.f_plan_id,
+        f_upload_date: Util.toStandardTimeString(),
+        f_filiale_id: Vue.user.orgid,
+        f_filiale: Vue.user.orgs,
+      }
+      if (!Util.isEmpty(this.weekdata.paper_id)){
+        data.id = this.weekdata.paper_id
+      }
+      if (this.steps[this.current] == '上传报告'){
+        data.f_complete = '已完成'
+        data.f_state = '已检'
+        data.f_entry_status = '正常'
+      }else {
+        data.f_complete = this.steps[this.current]
+        data.f_state = '未检'
+      }
+      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 (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 = '正常'
+          }
+        }
+      })
+
+
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveWeekPaper`, data).then(res=>{
+        console.log('res', res.data)
+        this.weekCheckPaper = res.data[0]
+      })
+      this.$dispatch('confirm')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.step-header {
+  background: #ffffff;
+  padding: 15px 20px;
+}
+
+.step-track {
+  display: flex;
+  justify-content: flex-start;
+  padding: 0 10px;
+  font-size: 14px;
+  color: #666;
+  overflow-x: auto; /* 启用横向滚动 */
+  /* 隐藏滚动条 */
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none; /* IE/Edge */
+}
+
+/* 隐藏WebKit浏览器的滚动条 */
+.step-track::-webkit-scrollbar {
+  display: none;
+}
+
+.step-item {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: end;
+}
+
+.step-number {
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  background: #e0e0e0;
+  color: #666;
+  line-height: 30px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 14px;
+  transition: all 0.3s ease;
+}
+
+.step-number.active {
+  background: #499EDF;
+  color: white;
+}
+
+.step-title {
+  margin-top: 8px;
+  font-size: 14px;
+  color: #666;
+  font-weight: 500;
+  width: 3em;
+  text-align: center;
+  word-break: break-all;
+  line-height: 1.4;
+}
+
+/* 分隔线 */
+.step-divider {
+  width: 80px;
+  height: 2px;
+  background: #e0e0e0;
+  margin: 0 16px;
+  transition: all 0.3s ease;
+}
+
+.step-divider.active {
+  background: #499EDF;
+}
+</style>

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

@@ -0,0 +1,151 @@
+<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">表 &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>
+            </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
+    },
+    search () {
+      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')
+
+    },
+  }
+}
+</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>

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

@@ -0,0 +1,151 @@
+<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">表 &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>
+            </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/getWeekPaper`, 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
+    },
+    search () {
+      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')
+
+    },
+  }
+}
+</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>

package/src/components/checkplan/SelectCheckPlan.vue

@@ -57,6 +57,18 @@
                 :show-rest-button="reset">
               </datepicker>
             </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
             <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
             <!--<label class="font_normal_body">安检起始</label>-->
             <!--<datepicker-->
@@ -148,6 +160,7 @@
 </template>
 <script>
 import {PagedList} from 'vue-client'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
 
 export default {
@@ -191,6 +204,7 @@ export default {
         f_start_time:'',
         f_end_time:''
       },
+      sliceArea:[],
       checker: this.$login.f,
       checkers: [],
       checkersname: [],
@@ -206,6 +220,29 @@ export default {
     }
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+
+        })
+      }
+    },
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },
@@ -256,6 +293,8 @@ export default {
     this.model.id = this.$login.f.id
     this.model.f_subcompany = this.$login.f.f_fengongsi
     this.model.f_filialeid = this.$login.f.orgid
+    this.Mreadibook(this.$login.f.orgid)
+
   },
 
   watch: {