apply-clients 3.3.36 → 3.3.40

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

@@ -1,142 +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">{{ selectdata.f_entry_name }}</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>
+<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">{{ selectdata.f_entry_name }}</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/Print/printRefund.vue

@@ -6,7 +6,7 @@
     </div>
   </div>
 
-  <modal :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
+  <modal :show.sync="showPrint" v-ref:modal :backdrop="false" title="打印预览">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="showPrint = !showPrint"><span>&times;</span></button>
       <h4 class="modal-title">打印预览</h4>

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

@@ -1,4 +1,6 @@
 <template>
+  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
+
   <div class="col-sm-12" style="margin: 20px 0px;">
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
@@ -117,7 +119,8 @@ export default {
           f_filialeid: this.$login.f.orgid,
           f_process_id: this.selectdata.f_process_id
         }
-      })
+      }),
+      showWork: false
     }
   },
   ready () {
@@ -132,6 +135,7 @@ export default {
     },
     // 关闭文件上传对话框
     closeFile() {
+      this.showWork = false
       this.showFile = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
@@ -139,6 +143,9 @@ export default {
     }
   },
   events: {
+    'beforeFileUpload' (file) {
+      this.showWork = true
+    },
     async 'onFileUpload'(file, result) {
       let data = {
         selectdata: this.selectdata,
@@ -146,8 +153,17 @@ 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)
-      this.closeFile()
+
+      try {
+        let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '导入失败！！！',
+          silent: true
+        }, 0)
+      } catch (e) {
+        this.closeFile()
+      }
+
     }
   },
   computed: {

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

@@ -288,7 +288,7 @@
       </modal>
     </validator>
 
-    <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :large="true" :backdrop="false" title="作废收费">
+    <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :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>