apply-clients 3.4.2 → 3.4.4

package/src/components/product/Process/ExplorationUser.vue

@@ -1,138 +1,189 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
-        <exploration-select v-ref:query :show-data="showData"></exploration-select>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.defname'>
-            <service-control v-ref:service :selectdata="selectdata"></service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="true"
-                          :issearch="true"
-                          :defname="selectdata.defname">
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '报建流程',
-  data () {
-    return {
-      showQuery: true,       // 控制查询页
-      showData: true,     // 控制列表数据
-      showtotal: false, // 详情显示
-      selectdata: {},
-      xmlname: ''        // 配置文件名
-    }
-  },
-  ready () {
-  },
-  methods: {
-    // 获取页面配置json文件
-    async loadName () {
-
-      let data = {
-        workname: this.selectdata.processname
-      }
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        'rs/logic/ApplyGetConfigs',
-        {data: data},
-        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-      )
-
-      Vue.prototype.$workflow_vue = res.data
-    }
-  },
-  events: {
-    'onMessage' (data) {
-      console.log('接收消息')
-      console.log(data)
-      if (data.type === 'apply-task') {
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      }
-    },
-    // 刷新控制层
-    async 'breakControl' (servicedata) {
-
-      if (servicedata.id) {
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            userid: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }
-        let res = await this.$resetpost(
-          'rs/sql/checkuser',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
-        )
-
-        this.selectdata = res.data[0]
-      } else {
-        this.selectdata = servicedata
-      }
-
-      this.showtotal = false
-      this.$nextTick(() => {
-        this.showtotal = true
-      })
-
-    },
-    // 初始化
-    async 'apply' (val) {
-      this.showtotal = false
-      this.selectdata = val
-
-      // 次方法必须同步执行，否则后续会出问题
-      // 获取页面json配置文件
-      await this.loadName()
-
-      // 显示详细
-      this.showtotal = true
-      // 关闭列表数据
-      this.showData = false
-      // 关闭分页
-      this.$refs.query.$refs.cp.pager = false
-    },
-    'search' () {
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData = true
-      // 显示分页
-      this.$refs.query.$refs.cp.pager = true
-      // 调用查询
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    'loadPage' () {
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData = true
-      // 显示分页
-      this.$refs.query.$refs.cp.pager = true
-      // 调用查询
-      this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-    }
-  },
-  watch: {
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
+        <exploration-select v-ref:query :show-data="showData"></exploration-select>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.defname'>
+            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="true"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+
+      <validator name="v">
+        <modal v-if="showLater" :show.sync="showLater" v-ref:modal :large="true" :backdrop="false" title="稍后处理">
+          <header slot="modal-header" class="modal-header">
+            <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+            <h4 class="modal-title">稍后处理</h4>
+          </header>
+
+          <article slot="modal-body" class="modal-body clearfix">
+            <div class="form-group col-sm-12">
+              <label class="col-sm-2 control-label">稍后处理备注：</label>
+              <div class="col-sm-10">
+                <input type="textarea"
+                       class="form-control input_view"
+                       style="width: 100%"
+                       v-model="laterapply.f_later_remarks" />
+              </div>
+            </div>
+          </article>
+
+          <footer slot="modal-footer" class="modal-footer">
+            <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="later()">稍后处理</button>
+          </footer>
+        </modal>
+      </validator>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        showQuery: true,       // 控制查询页
+        showData: true,     // 控制列表数据
+        showtotal: false, // 详情显示
+        selectdata: {},
+        xmlname: '',        // 配置文件名
+        showLater: false,
+        laterapply: {}
+      }
+    },
+    ready () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+
+        let data = {
+          workname: this.selectdata.processname
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      },
+      async later () {
+        let http = new HttpResetClass()
+        let data = {
+          laterapply: this.laterapply,
+          selectdata: this.selectdata,
+          user: this.$login.f
+        }
+        let res = await http.load('POST', 'rs/logic/laterprocessing', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '稍后处理记录保存失败！！！'
+        })
+        this.closeModal()
+      },
+      closeModal () {
+        this.selectdata = null
+        this.showLater = false
+        this.laterapply = {}
+
+        this.$refs.query.loadPage()
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.query.$refs.cp.$refs.cri.search()
+        }
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              id: this.$login.f.id,
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/checkuser',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+
+          this.selectdata = res.data[0]
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      async openLater (row) {
+        this.selectdata = row
+        this.showLater = true
+      },
+      // 初始化
+      async 'apply' (val) {
+        this.showtotal = false
+        this.selectdata = val
+
+        // 次方法必须同步执行，否则后续会出问题
+        // 获取页面json配置文件
+        await this.loadName()
+
+        // 显示详细
+        this.showtotal = true
+        // 关闭列表数据
+        this.showData = false
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+    watch: {
+    }
+  }
+</script>

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -15,6 +15,7 @@
             <th>客户名称</th>
             <th>客户电话</th>
             <th>地址信息</th>
+            <th v-if="$parent.$parent.$parent.selectdata.f_apply_type === '团购报建'">备注</th>
             <th>表具数量</th>
             <th>
               <template v-if="$parent.$parent.$parent.selectdata.f_apply_type === '团购报建'">
@@ -50,6 +51,9 @@
             <td style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
+            <th v-if="$parent.$parent.$parent.selectdata.f_apply_type === '团购报建'">
+              <nobr>{{row.f_userinfo_comments}}</nobr>
+            </th>
             <td style="text-align: center;">
               <nobr>{{row.f_userfiles_num === null ? 0 : row.f_userfiles_num}}</nobr>
             </td>
@@ -137,6 +141,8 @@
           <div class="col-sm-8">
             <input class="form-control input_view" style=""
                    placeholder="表号"
+                   type="number"
+                   οnkeyup="this.value=this.value.replace(/\s+/g,'')"
                    v-model="item.f_meternumber"
                    :value="item.f_meternumber"
                    @change="meternumberValidate(i)"
@@ -298,7 +304,15 @@ export default {
         'f_meter_base': '表读数',
         'f_initial_base': '初始底数',
         'f_aroundmeter': '表向',
-        'f_position': '安装位置'
+        'f_user_phone': '电话',
+        'f_userinfo_comments': '备注',
+        'f_position': '安装位置',
+        'f_userinfo_code': '用户编号',
+        'f_material_name': '材料名称',
+        'f_material_style': '材料型号',
+        'f_material_price': '材料价格',
+        'f_material_unit': '材料单位',
+        'f_material_number': '材料数量'
       },
       showWork: false
     }
@@ -443,7 +457,7 @@ export default {
     async notInstalled () {
       let http = new HttpResetClass()
       let data = {
-        condition: `ui.f_process_id = '${this.selectdata.f_process_id}' and uf.f_table_state = '待开通'`
+        condition: `ui.f_process_id = '${this.selectdata.f_process_id}' and uf.f_table_state != '待开通'`
       }
       let res = await http.load(
         'POST',
@@ -464,14 +478,18 @@ export default {
       }
     },
     searchCondition (args) {
-
-      if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
+      var tablestate=''
+      if(this.selectdata.f_sub_state==='完工'){
+        tablestate='正常'
+      }else{
+       tablestate='待开通'
+      }
+      if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
         args.condition = args.condition + `and ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
       } else {
         args.condition = args.condition + `and ua.f_process_id = '${this.selectdata.f_process_id}'`
       }
-
-      this.model.search(args.condition, args.model)
+      this.model.search(args.condition, args.model,tablestate)
     },
     // 查询
     async search () {
@@ -520,7 +538,7 @@ export default {
       return this.selectdata.f_apply_type === '团购报建'
     },
     getCondition () {
-      let condition = `ua.f_process_id = '${this.selectdata.f_process_id}' and nvl(uf.quantity, 0) < 1`
+      let condition = `ua.f_process_id = '${this.selectdata.f_process_id}'`
 
       return {
         condition: condition

package/src/components/product/Process/Processes/Print/printCharge.vue

@@ -43,21 +43,25 @@
     </h4>
     <table border="1" width="100%">
       <tr>
-        <td colspan="2" style="border: none">
-          开票日期：{{ new Date().Format('yyyy年MM月dd日') }}
-        </td>
-        <td colspan="2" style="border: none">
-          收据编码：{{ charge.f_charge_number }}
-        </td>
-        <td colspan="2" style="border: none">
-          状态：{{ charge.f_charge_status }}
-        </td>
+
+        <td style="width: 17%">开票日期</td>
+        <td colspan="4" style="width: 33%">{{ new Date().Format('yyyy年MM月dd日') }}</td>
+      </tr>
+      <tr>
+        <td style="width: 17%">收据编码</td>
+        <td colspan="4" style="width: 33%">{{ charge.f_charge_number }}</td>
+      </tr>
+      <tr>
+        <td style="width: 17%">状态</td>
+        <td colspan="4" style="width: 33%">{{ charge.f_charge_status }}</td>
       </tr>
       <tr>
         <td style="width: 17%">用户姓名</td>
-        <td colspan="2" style="width: 33%">{{ selectdata.f_user_name }}</td>
+        <td colspan="4" style="width: 33%">{{ selectdata.f_user_name }}</td>
+        </tr>
+      <tr>
         <td style="width: 17%">用户编号</td>
-        <td colspan="2" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
+        <td colspan="4" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
       </tr>
       <tr>
         <td>用户地址</td>
@@ -65,21 +69,41 @@
       </tr>
       <tr>
         <td>收款项目</td>
-        <td colspan="2">{{ charge.f_payment_term }}</td>
+        <td colspan="4">{{ charge.f_payment_term }}</td>
+      </tr>
+      <tr>
         <td>收款方式</td>
         <td colspan="2">{{ charge.f_payment_method }}</td>
       </tr>
       <tr>
         <td>金额</td>
-        <td colspan="2">{{ charge.f_charge_money }}</td>
+        <td colspan="4">{{ charge.f_charge_money }}</td>
+      </tr>
+      <tr>
         <td>金额大写</td>
-        <td colspan="2">{{ charge.f_amount_words }}</td>
+        <td colspan="4">{{ charge.f_amount_words }}</td>
       </tr>
       <tr>
         <td>收款人</td>
-        <td colspan="2">{{ charge.f_charge_collectors }}</td>
+        <td colspan="4">{{ charge.f_charge_collectors }}</td>
+      </tr>
+      <tr>
         <td>销售方（章）</td>
-        <td colspan="2"></td>
+        <td colspan="4" v-if="charge.f_orgname==='郸城县天然气有限公司'">
+          <img src="../../../../image/郸城收款专用章.png" style="overflow: hidden;width: 200px;height: 200px">
+        </td>
+        <td colspan="4" v-if="charge.f_orgname==='周口市天然气有限公司'">
+          <img src="../../../../image/周口收款专用章.png" style="overflow: hidden;width: 200px;height: 200px">
+        </td>
+        <td colspan="4" v-if="charge.f_orgname==='项城市天然气有限公司'">
+          <img src="../../../../image/项城收款专用章.png" style="overflow: hidden;width: 200px;height: 200px">
+        </td>
+        <td colspan="4" v-if="charge.f_orgname==='西华县天然气有限公司'">
+          <img src="../../../../image/西华收款专用章.png" style="overflow: hidden;width: 200px;height: 200px">
+        </td>
+        <td colspan="4" v-if="charge.f_orgname==='鹿邑县天然气有限公司'">
+          <img src="../../../../image/鹿邑收款专用章.png" style="overflow: hidden;width: 200px;height: 200px">
+        </td>
       </tr>
       <tr>
         <td>备&emsp;&emsp;注</td>
@@ -91,7 +115,7 @@
         </td>
       </tr>
     </table>
-    <img class="seal" border="0" :src="src" alt="">
+<!--    <img class="seal" border="0" :src="src" alt="">-->
   </div>
 
   <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'

package/src/components/product/Process/Processes/Print/printChargepc.vue

@@ -0,0 +1,142 @@
+<template>
+  <style id="printChargeStyle">
+    td{
+      height: 30px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      /*width: 100%;*/
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .orgs {
+      border-bottom: 2px solid;
+      padding: 5px;
+    }
+    .date {
+      float: left;
+      padding-left: 10px;
+    }
+    .status {
+      float: right;
+      padding-right: 10px;
+    }
+    .seal {
+      position: absolute;
+      right: 100px;
+      top: 120px;
+      width: 150px;
+      height: 150px;
+      /*opacity: 0.5;*/
+      z-index: -1;
+    }
+  </style>
+  <div id="printCharge">
+    <h4>
+      <span class="orgs">
+        {{orgs}}统一收据
+      </span>
+    </h4>
+    <table border="1" width="100%">
+      <tr>
+        <td colspan="2" style="border: none">
+          开票日期：{{ new Date().Format('yyyy年MM月dd日') }}
+        </td>
+        <td colspan="2" style="border: none">
+          收据编码：{{ charge.f_charge_number }}
+        </td>
+        <td colspan="2" style="border: none">
+          状态：{{ charge.f_charge_status }}
+        </td>
+      </tr>
+      <tr>
+        <td style="width: 17%">用户姓名</td>
+        <td colspan="2" style="width: 33%">{{ selectdata.f_user_name }}</td>
+        <td style="width: 17%">用户编号</td>
+        <td colspan="2" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
+      </tr>
+      <tr>
+        <td>用户地址</td>
+        <td colspan="5">{{ selectdata.f_address }}</td>
+      </tr>
+      <tr>
+        <td>收款项目</td>
+        <td colspan="2">{{ charge.f_payment_term }}</td>
+        <td>收款方式</td>
+        <td colspan="2">{{ charge.f_payment_method }}</td>
+      </tr>
+      <tr>
+        <td>金额</td>
+        <td colspan="2">{{ charge.f_charge_money }}</td>
+        <td>金额大写</td>
+        <td colspan="2">{{ charge.f_amount_words }}</td>
+      </tr>
+      <tr>
+        <td>收款人</td>
+        <td colspan="2">{{ charge.f_charge_collectors }}</td>
+        <td>销售方（章）</td>
+        <td colspan="2"></td>
+      </tr>
+      <tr>
+        <td>备&emsp;&emsp;注</td>
+        <td colspan="5">{{ charge.f_charge_remarks }}</td>
+      </tr>
+      <tr>
+        <td colspan="6">
+          请持此收据到{{orgs}}营业厅换取发票
+        </td>
+      </tr>
+    </table>
+    <img class="seal" border="0" :src="src" alt="">
+  </div>
+
+  <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
+                 top='20' left='30' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+  import { isEmpty } from '../../../../Util'
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  export default {
+    title: '打印收费票据',
+    props: ['selectdata', 'charge'],
+    data () {
+      return {}
+    },
+    ready () {
+    },
+    methods: {
+    },
+    computed: {
+      orgs () {
+        return this.$login.f.orgs
+      },
+      src () {
+        return require(`./img/${this.$login.f.number}.png`)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>