apply-clients 7.1.35 → 7.1.36

package/src/components/product/Process/Processes/Print/printCharge.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>

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

@@ -1,6 +1,13 @@
 <template>
+  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
+
   <div class="col-sm-12" style="margin: 20px 0px;">
-      <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+        </div>
+      </criteria>
+      <data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
         <template partial='head'>
           <tr>
             <th class="textNoLineBreak">序号</th>
@@ -9,7 +16,7 @@
             <th class="textNoLineBreak">街道</th>
             <th class="textNoLineBreak">小区</th>
             <th class="textNoLineBreak">详细地址</th>
-            <th class="textNoLineBreak">用户状态</th>
+            <th class="textNoLineBreak">地址状态</th>
             <th class="textNoLineBreak">客户编号</th>
             <th class="textNoLineBreak">用户姓名</th>
             <th class="textNoLineBreak">电话</th>
@@ -18,9 +25,10 @@
             <th class="textNoLineBreak">时间</th>
             <th class="textNoLineBreak">
               <button type="button" class="btn btn-info head-but"
-                      @click="$parent.$parent.showFileModal()">导入</button>
+                      :disabled="$parent.$parent.$parent.mark === 1"
+                      @click="$parent.$parent.$parent.showFileModal()">导入</button>
               <a type="button" class="btn btn-info head-but"
-                      href="/applyinstall/Excel/v3报装地址批量导入.xlsx" download>模板下载</a>
+                      href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
             </th>
           </tr>
         </template>
@@ -30,7 +38,7 @@
               <nobr>{{$index+1}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_area}}</nobr>
+              <nobr>{{row.f_pcd}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_slice_area}}</nobr>
@@ -45,7 +53,7 @@
               <nobr>{{row.f_address}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_user_state}}</nobr>
+              <nobr>{{row.f_address_state}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_userinfo_code}}</nobr>
@@ -63,27 +71,17 @@
               <nobr>{{row.f_idnumber}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_createfile_date}}</nobr>
+              <nobr>{{row.f_create_date}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.updateState(row.f_userinfo_id,0)"
-                >操作</button>
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.updateState(row.f_userinfo_id,1)"
-                >撤销</button>
+
               </nobr>
             </td>
           </tr>
         </template>
       </data-grid>
+    </criteria-paged>
   </div>
   <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
     <header slot="modal-header" class="modal-header">
@@ -97,7 +95,6 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
-
 </template>
 <script>
 import {PagedList} from 'vue-client'
@@ -111,110 +108,44 @@ export default {
     },
     mark: {
       type: Number,
-      default: 0        // 0：正常  1：禁用 2：追加用户
+      default: 0        // 0：正常  1：禁用
     }
   },
   data () {
     return {
       showFile: false,
-      model: {
-        data: null
-      }
+      model: new PagedList('rs/sql/getAddressAanUserinfo', 20, {
+        data: {
+          f_filialeid: this.$login.f.orgid,
+          f_process_id: this.selectdata.f_process_id
+        }
+      }),
+      showWork: false
     }
   },
   ready () {
     this.search()
   },
   methods: {
-    async queryUserPrice() {
-      let http = new HttpResetClass()
-      let data = {
-        condition: "f_process_id = '" + this.selectdata.f_process_id + "'",
-        tablename: "t_one_price"
-      }
-      let res = await http.load('POST', 'rs/sql/apply_singleTable', {data:data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
-      this.model.data = res.data
-    },
     showFileModal() {
-      for (let i = 0; i < this.selectdata.fields.length; i++) {
-        let item = this.selectdata.fields[i]
-        if (item.label === '街道' && !item.value) {
-          this.$showAlert('街道地址不能为空！！！', 'warning', 3000)
-          return
-        }
-        // if (item.label === '小区' && !item.value) {
-        //   this.$showAlert('小区不能为空！！！', 'warning', 3000)
-        //   return
-        // }
-      }
       this.showFile = !this.showFile
     },
     async search () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: " 1=1",
-        f_filialeid: this.$login.f.f_orgids,
-        f_process_id: this.selectdata.f_process_id
-      }
-      let res = await http.load('POST', 'rs/sql/getAddressAanUserinfo', {data:data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
-      this.model.data = res.data
-      for (let i = 0; i < this.selectdata.fields.length; i++) {
-        if (this.selectdata.fields[i].label === '户数') {
-          this.selectdata.fields[i].value = res.data.length
-        }
-      }
+      this.$refs.cp.$refs.cri.search()
     },
     // 关闭文件上传对话框
     closeFile() {
+      this.showWork = false
       this.showFile = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
       this.search()
-    },
-    updateState(f_userinfo_id,num) {
-      let http = new HttpResetClass()
-      let data = {
-        f_userinfo_id: f_userinfo_id,
-        num: num
-      }
-      if (num == 0) {
-        this.$showMessage('确定要修改用户状态为不符合吗！！！', ['confirm']).then(async (res) => {
-          if (res === 'confirm') {
-            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
-              resolveMsg: null,
-              rejectMsg: null
-            })
-
-            this.$showMessage("修改成功！")
-            this.search()
-
-          }
-        })
-      }else {
-        this.$showMessage('确定要撤销用户状态为正常吗！！！', ['confirm']).then(async (res) => {
-          if (res === 'confirm') {
-            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
-              resolveMsg: null,
-              rejectMsg: null
-            })
-
-            this.$showMessage("修改成功！")
-            this.search()
-
-          }
-        })
-      }
-
-
     }
   },
   events: {
+    'beforeFileUpload' (file) {
+      this.showWork = true
+    },
     async 'onFileUpload'(file, result) {
       let data = {
         selectdata: this.selectdata,
@@ -222,27 +153,42 @@ export default {
         user: this.$login.f,
         mark: this.mark
       }
-      let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
 
-      if(res.data){
-        let mm = '';
-        for(var i=0;i<res.data.msg.length;i++){
-          mm+=`${res.data.msg[i].msg}` + "   "
-        }
-        let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
-        this.$showMessage(msg)
-      }else {
-        this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
+      try {
+        let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '导入失败！！！',
+          silent: true
+        }, 0)
+      } catch (e) {
+        // this.closeFile()
+      } finally {
+        this.closeFile()
       }
-      if (this.mark !== 0) {
-        this.$dispatch('breakControl', this.selectdata)
-      }
-      this.closeFile()
+
     }
   },
   computed: {
   },
   watch: {
+    'model.count': {
+      handler: function () {
+        if (this.model.count != this.selectdata.f_apply_count) {
+          console.log(this.model.count)
+          console.log(this.selectdata.f_apply_count)
+          console.log(this.model.count !== this.selectdata.f_apply_count)
+          this.selectdata.f_apply_count = this.model.count
+
+          this.$resetpost(
+            'rs/entity/t_apply',
+            this.selectdata,
+            {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
+          ).then(res => {
+            this.$dispatch('breakControl', this.selectdata)
+          })
+        }
+      }
+    }
   }
 }
 </script>