apply-clients 3.3.216 → 3.4.1

package/src/components/android/ProgressReport/ProgressReportDetail.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="panel-body">
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_project_number }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>CEA&emsp;号：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_cea_number }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>类&emsp;&emsp;型：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_type }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>操&ensp;作&ensp;人：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_pr_operator }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>操作时间：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_pr_operation_date }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>详细说明：</b></p>
+      <p class="col-xs-9 text-left input-font" style="word-wrap: break-word">{{ selectdata.f_explanation }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto" v-if="selectdata.f_blobid && selectdata.f_type">
+      <app-take-pic :blobid="selectdata.f_blobid" :type="selectdata.f_type" :defname="selectdata.defname" :isdelete="false" :istakepic="false"></app-take-pic>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '进度详情',
+  props: ['selectdata'],
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  },
+  events: {
+  }
+}
+</script>
+<style scoped>
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+</style>

package/src/components/android/ProgressReport/ProgressReportList.vue

@@ -0,0 +1,209 @@
+<template>
+  <div style="width: 100%">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial style="padding: 10px">
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">项目名称：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="f_entry_name like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">CEA号：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_cea_number condition="f_cea_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="col-xs-4">
+              <label  class="font text-left">工程编号：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_project_number condition="f_project_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="col-xs-4">
+              <label  class="font text-left">类&emsp;&emsp;型：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input-select
+                v-model="model.f_type"
+                condition="pr.f_type like '%{}%'"
+                :value.sync="model.f_type"
+                :options='$parent.$parent.typeList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto">
+            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
+            <button class="btn btn-info"  @click="$parent.$parent.clear()">清空</button>
+            <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
+          </div>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial class="auto app-text panel" style="margin: 10px">
+          <div class="panel-body panel-self">
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>工程编号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_number }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>CEA&emsp;号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_cea_number }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>类&emsp;&emsp;型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_type }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>操&ensp;作&ensp;人：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_pr_operator }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>操作时间：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_pr_operation_date }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>详细说明：</b></p>
+              <span class="col-xs-9 text-left input-font">
+                <p class="exceed">{{ row.f_explanation }}</p>
+              </span>
+            </div>
+            <div class="col-xs-12 text-right">
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看详情</button>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import { PagedList, HttpResetClass } from 'vue-client'
+import {isEmpty} from '../../Util'
+export default {
+  title: '进度列表',
+  data () {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getProgressReportList`, 20, {
+      // model: new PagedList('rs/sql/getProgressReportList', 20, {
+        data: {
+          id: Vue.user.id,
+          orgid: Vue.user.orgid
+          // id: '266',
+          // orgid: '212'
+        }
+      }),
+      criteriaShow: false,
+      typeList: [
+        {'label': '全部', 'value': ''},
+        {'label': '文明施工', 'value': '文明施工'},
+        {'label': '管沟开挖', 'value': '管沟开挖'},
+        {'label': '管道焊接', 'value': '管道焊接'},
+        {'label': '打压记录', 'value': '打压记录'},
+        {'label': '防腐记录', 'value': '防腐记录'},
+        {'label': '隐蔽回填', 'value': '隐蔽回填'},
+        {'label': '高空作业', 'value': '高空作业'},
+        {'label': '签证记录', 'value': '签证记录'}
+      ]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    click (row) {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: `${row.f_type}详情`,
+        safe: true
+      })
+      this.$goto('progress-report-detail', {selectdata: row}, 'self', _this.search)
+    }
+  },
+  events: {
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.exceed {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.app-row {
+  height: auto;
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_bottom.png")
+}
+</style>

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -1,142 +1,84 @@
 <template>
-  <div class="p-10">
+  <div style="width: 100%">
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial class="auto">
-          <div class="row form-group app-input">
-            <label class="">客户名称：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">联&ensp;系&ensp;人：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_contact condition="u.f_contact like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">报建编号：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_apply_num condition="u.f_apply_num like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">合同编号：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_contract_number condition="u.f_contract_number like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">报建类型：</label>
-            <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                v-model="model.f_apply_type"
-                placeholder='报建类型'
-                condition="u.f_apply_type like '%{}%'"
-                :value.sync="model.f_apply_type"
-                :options='$parent.$parent.applytype'
-                class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+        <div partial style="padding: 10px">
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">项目名称：</label>
             </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">办理环节：</label>
             <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                v-model="model.defname"
-                placeholder='办理环节'
-                condition="act.defname = '{}'"
-                :value.sync="model.defname"
-                :options='$parent.$parent.defnames'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
             </div>
           </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">联系电话：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_phone condition="u.f_phone like '%{}%'" />
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">CEA号：</label>
             </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">用户地址：</label>
             <div class="col-xs-8" >
-              <input class="" v-model=model.f_address condition="u.f_address like '%{}%'" />
+              <input  class="search_input input-font" v-model=model.f_cea_number condition="u.f_cea_number like '%{}%'" />
             </div>
           </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">开始时间：</label>
-            <div class="col-xs-8" >
-              <datepicker id="startDate" placeholder="开始日期"
-                          style="width: 100%!important;"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="u.f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
-              </datepicker>
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="col-xs-4">
+              <label  class="font text-left">工程编号：</label>
             </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">结束时间：</label>
             <div class="col-xs-8" >
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 100%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
-              </datepicker>
+              <input  class="search_input input-font" v-model=model.f_project_number condition="u.f_project_number like '%{}%'" />
             </div>
           </div>
-          <div class="row form-group text-right" style="">
+          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto">
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
-            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
+            <button class="btn btn-info"  @click="$parent.$parent.clear()">清空</button>
             <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
           </div>
         </div>
       </criteria>
       <list :model="model" partial='list'>
-        <div partial class="auto app-text panel">
+        <div partial class="auto app-text panel" style="margin: 10px">
           <div class="panel-body panel-self">
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_user_name }}</p>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>工程编号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_number }}</p>
             </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_phone }}</p>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>CEA&emsp;号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_cea_number }}</p>
             </div>
             <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_num }}</p>
+              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
             </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_type }}</p>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>项目类型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_apply_type }}</p>
             </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.defname }}</p>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>工程类型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_type }}</p>
             </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>项目区域：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_area }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>联&ensp;系&ensp;人：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_contact }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>联系电话：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_phone }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>办理环节：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.defname }}</p>
             </div>
             <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
+              <p class="col-xs-3 text-left font"><b>项目地址：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
             </div>
-
             <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看进度</button>
             </div>
           </div>
         </div>
@@ -147,24 +89,19 @@
 <script>
   import Vue from 'vue'
   import { PagedList, HttpResetClass } from 'vue-client'
-  import {isEmpty} from '../../Util'
   export default {
     title: '报建流程',
     data () {
       return {
         model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`, 20, {
-        // model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: Vue.user.id,
             orgid: Vue.user.orgid
-            // id: '1626081',
-            // orgid: '1123'
+            // id: '266',
+            // orgid: '212'
           }
         }),
-        criteriaShow: false,
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
-        defnames: [{label: '全部', value: ''}]
+        criteriaShow: false
       }
     },
     ready () {
@@ -188,18 +125,6 @@
           safe: true
         })
         this.$goto('app-supervisory-cart', {selectdata: row}, 'self', _this.search)
-      },
-      applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
-            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
-          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            this.defnames = [{label: '全部', value: ''}, ...res.data]
-          })
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
-        }
       }
     },
     events: {
@@ -209,6 +134,23 @@
   }
 </script>
 <style scoped>
+  .app-row {
+    height: auto;
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+  .app-text {
+    font-size: 12px;
+  }
   .panel-self{
     border-radius: 10px;
     border:1px solid #499EDF;
@@ -218,6 +160,10 @@
     font: 15px PingFang-SC-Medium;
     color: #666666;
   }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
 
   .button_shrink_top {
     width: 34px;
@@ -235,28 +181,3 @@
     background-image: url("../../../../static/newStyle/stretch_bottom.png")
   }
 </style>
-<style lang="less">
-.app-input {
-  label {
-    float: left;
-  }
-  .select {
-    button {
-      border: none;
-      outline: none;
-      text-align: left;
-      .btn-placeholder {
-        color: #ACA899
-      }
-    }
-  }
-  .datepicker {
-    .form-control:focus {
-      border: none!important;
-      outline: none!important;
-      -webkit-box-shadow: none;
-      box-shadow: none;
-    }
-  }
-}
-</style>