apply-clients 7.1.36-yuchuan-2 → 7.1.36-yuchuan-3

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

@@ -120,6 +120,20 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
+  <modal v-if="progressShow" :show.sync="progressShow" v-ref:modal :backdrop="false" title="导入进度">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close"><span>&times;</span></button>
+      <h4 class="modal-title">导入进度</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="progress" style="margin: 20px">
+        <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent}">
+          {{ percent }}
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
 
   <modal v-if="Sign" :show.sync="Sign" v-ref:modal :large="true" :backdrop="false">
     <header slot="modal-header" class="modal-header">
@@ -562,6 +576,11 @@ export default {
       devicesinfo: [],
       showUserInformation: {},
       showDeleteModel: false,
+      uuid: '',
+      percent: '0%',
+      progressShow: false,
+      // 定时器
+      timer: null,
       getfield: {
         'f_userinfo_id': '  客户编号  ',
         'f_address': '     地址     ',
@@ -903,7 +922,7 @@ export default {
     },
     searchCondition (args) {
       if (this.selectdata.f_apply_type === '分户挂表') {
-        args.condition = args.condition + `and ui.f_userinfo_id = 'ui.f_process_id = '61207''`
+        args.condition = args.condition + `and ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
       } else {
         args.condition = args.condition + `and ui.f_process_id = '${this.selectdata.f_process_id}'`
       }
@@ -933,26 +952,80 @@ export default {
       this.$refs.file.$el.querySelector('input').value = ''
       this.search()
     },
+    progressQuery() {
+      console.log('导出进度开始查询')
+      this.progressShow = true
+      // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
+      this.closeTimer()
+      // 立即执行一遍
+      this.progressTask()
+      this.timer = setInterval(this.progressTask, 3000)
+    },
+    async progressTask() {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', `rs/logic/getBatchOperaPro`,{data: {uuid: this.uuid}}, {resolveMsg: null, rejectMsg: null})
+      res = res.data
+      console.log('进度数据', res)
+      if (res.result.type === 'error') {
+        this.$showAlert(`导入excel错误: ${res.result.msg}`, 'danger', 0)
+        await http.load('POST', `rs/logic/updateApplyInstallCount`,{data: this.selectdata}, {resolveMsg: null, rejectMsg: null})
+        this.close()
+      } else {
+        this.percent = Math.floor((res.current && res.total ? res.current/res.total*100 : 0)) + '%'
+
+        console.log("导入当前进度",this.percent)
+        // 进度100%
+        if (this.percent === '100%') {
+          await http.load('POST', `rs/logic/updateApplyInstallCount`,{data: this.selectdata}, {resolveMsg: null, rejectMsg: null})
+          this.close()
+        }
+      }
+    },
+    // 关闭定时器
+    closeTimer() {
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+    },
+    guid() {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    close() {
+      this.closeTimer()
+      this.progressShow = false
+      this.percent = '0%'
+      this.$dispatch('breakControl', this.selectdata)
+    },
   },
   events: {
     async 'onFileUpload'(file, result) {
+      this.uuid = this.guid();
       let data = {
         selectdata: this.selectdata,
         filepath: result.f_downloadpath,
         user: this.$login.f,
-        mark: this.mark
+        mark: this.mark,
+        uuid: this.uuid
       }
       let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',`rs/logic/importAddressAndUserinfo`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
-
-      this.$dispatch('breakControl', this.selectdata)
+      let res = await http.load('POST',`rs/logic/importAddressAndUserinfo`, {data:data}, {
+        resolveMsg: null, rejectMsg: '导入失败！！！', silent: true
+      }, 0)
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.progressQuery()
     }
   },
   computed: {
     showDeleteUserInfo () {
       return this.selectdata.f_apply_type === '民用报建' &&
-        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')
+        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察'||this.selectdata.defname === '收费标准')
     },
     newShowDeleteUserInfo () {
       return this.selectdata.f_apply_type === '设备拆除' && this.selectdata.defname === '核对气量'

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

@@ -1,224 +1,224 @@
-<template>
-  <style id="printPaymentApprovalStyle">
-    td {
-      height: 60px;
-      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 style="margin-bottom: 20px" class="form-group select-overspread">
-    <label class="control-label-justify control-label col-sm-10">打印付款审批单</label>
-    <div class="col-sm-2">
-      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute"
-              @click="openModal()">打印预览
-      </button>
-    </div>
-  </div>
-  <modal v-if="showModal" :show.sync="showModal" title="打印预览" v-ref:modal large backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
-      <h4 class="modal-title">打印预览</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div id="printPaymentApproval">
-        <h4>
-          榆 林 榆 川 天 然 气 有 限 责 任 公 司
-        </h4>
-        <h2>
-        付 款 审 批 单
-        </h2>
-        <table style="border: 0px solid black;">
-          <tr>
-            <td style="height: 30px;">{{ new Date().Format('yyyy年MM月dd日') }}</td>
-          </tr>
-        </table>
-        <table border="1" width="100%">
-          <tr>
-            <td style="width: 17%">收款单位名称：</td>
-            <td colspan="2" style="border: none">
-              {{ selectdata.f_paper_name }}
-            </td>
-            <td style="width: 17%">付 款 方 式：</td>
-            <td colspan="2" style="border: none">
-              {{ selectdata.f_payment_method }}
-            </td>
-          </tr>
-          <tr>
-            <td style="width: 17%">开 户 银 行：</td>
-            <td colspan="2" style="width: 33%">{{ selectdata.f_bank }}</td>
-            <td style="width: 17%">账&emsp;&emsp;号：</td>
-            <td colspan="2" style="width: 33%">{{ selectdata.f_paper_account }}</td>
-          </tr>
-          <tr>
-            <td>付 款 事 由：</td>
-            <td colspan="5" style="text-align:left">
-              {{ selectdata.f_pay_remark }}
-            </td>
-          </tr>
-          <tr>
-            <td>付款金额(元、大写):</td>
-            <td colspan="2">{{ selectdata.f_amount_words }}</td>
-            <td>付款金额(元、小写):</td>
-            <td colspan="2">{{ selectdata.f_due_money }}</td>
-          </tr>
-          <tr>
-            <td style="width: 17%">备&emsp;&emsp;注：</td>
-            <td colspan="2" style="width: 33%">{{ selectdata.f_payment_remarks }}</td>
-            <td style="width: 17%">附件张数：</td>
-            <td colspan="2" style="width: 33%">{{ selectdata.f_attachment_count }}</td>
-          </tr>
-        </table>
-        <table style="border: 0px solid black;">
-          <tr>
-            <td>财务部门负责人：</td>
-            <td>&emsp;&emsp;</td>
-            <td>部门负责人：</td>
-            <td>&emsp;&emsp;</td>
-            <td>经办人：</td>
-            <td>&emsp;&emsp;</td>
-          </tr>
-          <tr>
-            <td>单位负责人：</td>
-            <td>&emsp;&emsp;</td>
-            <td>财务主管：</td>
-            <td>&emsp;&emsp;</td>
-            <td>分管领导：</td>
-            <td>&emsp;&emsp;</td>
-          </tr>
-        </table>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-primary" @click="print()">打印</button>
-    </footer>
-  </modal>
-
-  <print-element v-show="false" v-ref:print id='printPayentApproval' styleid='printPaymentApprovalStyle'
-                 top='20' left='30' width='100%' height='100%'>
-  </print-element>
-</template>
-
-<script>
-import {isEmpty} from '../../../../Util'
-import {HttpResetClass} from "vue-client";
-
-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'],
-  data () {
-    return {
-      showModal: false,
-      device: null
-    }
-  },
-  ready () {
-  },
-  methods: {
-    openModal () {
-      if (this.selectdata.f_due_money >= 0 && this.selectdata.f_due_money) {
-        this.smalltoBIG(this.selectdata.f_due_money)
-      } else {
-        this.selectdata.f_amount_words = ''
-      }
-      this.showModal = true
-    },
-    colseModal () {
-      this.showModal = false
-    },
-    print () {
-      this.showInput = false
-      setTimeout(() => {
-        this.$refs.print.PrintTable()
-      }, 10)
-    },
-    // 金额转大写
-    smalltoBIG (n) {
-      let fraction = ['角', '分']
-      let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-      let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']]
-      let head = n < 0 ? '欠' : ''
-      n = Math.abs(n)
-
-      let s = ''
-
-      for (var i = 0; i < fraction.length; i++) {
-        s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
-      }
-      s = s || '整'
-      n = Math.floor(n)
-
-      for (var i = 0; i < unit[0].length && n > 0; i++) {
-        let p = ''
-        for (var j = 0; j < unit[1].length && n > 0; j++) {
-          p = digit[n % 10] + unit[1][j] + p
-          n = Math.floor(n / 10)
-        }
-        s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
-      }
-      let result = head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
-      console.log('当前大写', result)
-      this.selectdata.f_amount_words = result
-    }
-  },
-  computed: {
-    orgs () {
-      return this.$login.f.f_fengongsi
-    },
-    src () {
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <style id="printPaymentApprovalStyle">
+    td {
+      height: 60px;
+      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 style="margin-bottom: 20px" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-10">打印付款审批单</label>
+    <div class="col-sm-2">
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute"
+              @click="openModal()">打印预览
+      </button>
+    </div>
+  </div>
+  <modal v-if="showModal" :show.sync="showModal" title="打印预览" v-ref:modal large backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
+      <h4 class="modal-title">打印预览</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div id="printPaymentApproval">
+        <h4>
+          榆 林 榆 川 天 然 气 有 限 责 任 公 司
+        </h4>
+        <h2>
+        付 款 审 批 单
+        </h2>
+        <table style="border: 0px solid black;">
+          <tr>
+            <td style="height: 30px;">{{ new Date().Format('yyyy年MM月dd日') }}</td>
+          </tr>
+        </table>
+        <table border="1" width="100%">
+          <tr>
+            <td style="width: 17%">收款单位名称：</td>
+            <td colspan="2" style="border: none">
+              {{ selectdata.f_paper_name }}
+            </td>
+            <td style="width: 17%">付 款 方 式：</td>
+            <td colspan="2" style="border: none">
+              {{ selectdata.f_payment_method }}
+            </td>
+          </tr>
+          <tr>
+            <td style="width: 17%">开 户 银 行：</td>
+            <td colspan="2" style="width: 33%">{{ selectdata.f_bank }}</td>
+            <td style="width: 17%">账&emsp;&emsp;号：</td>
+            <td colspan="2" style="width: 33%">{{ selectdata.f_paper_account }}</td>
+          </tr>
+          <tr>
+            <td>付 款 事 由：</td>
+            <td colspan="5" style="text-align:left">
+              {{ selectdata.f_pay_remark }}
+            </td>
+          </tr>
+          <tr>
+            <td>付款金额(元、大写):</td>
+            <td colspan="2">{{ selectdata.f_amount_words }}</td>
+            <td>付款金额(元、小写):</td>
+            <td colspan="2">{{ selectdata.f_due_money }}</td>
+          </tr>
+          <tr>
+            <td style="width: 17%">备&emsp;&emsp;注：</td>
+            <td colspan="2" style="width: 33%">{{ selectdata.f_payment_remarks }}</td>
+            <td style="width: 17%">附件张数：</td>
+            <td colspan="2" style="width: 33%">{{ selectdata.f_attachment_count }}</td>
+          </tr>
+        </table>
+        <table style="border: 0px solid black;">
+          <tr>
+            <td>财务部门负责人：</td>
+            <td>&emsp;&emsp;</td>
+            <td>部门负责人：</td>
+            <td>&emsp;&emsp;</td>
+            <td>经办人：</td>
+            <td>&emsp;&emsp;</td>
+          </tr>
+          <tr>
+            <td>单位负责人：</td>
+            <td>&emsp;&emsp;</td>
+            <td>财务主管：</td>
+            <td>&emsp;&emsp;</td>
+            <td>分管领导：</td>
+            <td>&emsp;&emsp;</td>
+          </tr>
+        </table>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="print()">打印</button>
+    </footer>
+  </modal>
+
+  <print-element v-show="false" v-ref:print id='printPayentApproval' styleid='printPaymentApprovalStyle'
+                 top='20' left='30' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+import {isEmpty} from '../../../../Util'
+import {HttpResetClass} from "vue-client";
+
+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'],
+  data () {
+    return {
+      showModal: false,
+      device: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    openModal () {
+      if (this.selectdata.f_due_money >= 0 && this.selectdata.f_due_money) {
+        this.smalltoBIG(this.selectdata.f_due_money)
+      } else {
+        this.selectdata.f_amount_words = ''
+      }
+      this.showModal = true
+    },
+    colseModal () {
+      this.showModal = false
+    },
+    print () {
+      this.showInput = false
+      setTimeout(() => {
+        this.$refs.print.PrintTable()
+      }, 10)
+    },
+    // 金额转大写
+    smalltoBIG (n) {
+      let fraction = ['角', '分']
+      let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
+      let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']]
+      let head = n < 0 ? '欠' : ''
+      n = Math.abs(n)
+
+      let s = ''
+
+      for (var i = 0; i < fraction.length; i++) {
+        s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
+      }
+      s = s || '整'
+      n = Math.floor(n)
+
+      for (var i = 0; i < unit[0].length && n > 0; i++) {
+        let p = ''
+        for (var j = 0; j < unit[1].length && n > 0; j++) {
+          p = digit[n % 10] + unit[1][j] + p
+          n = Math.floor(n / 10)
+        }
+        s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
+      }
+      let result = head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+      console.log('当前大写', result)
+      this.selectdata.f_amount_words = result
+    }
+  },
+  computed: {
+    orgs () {
+      return this.$login.f.f_fengongsi
+    },
+    src () {
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -72,11 +72,24 @@
               v-if="item.id && mark !== 1 && item.f_operate_state === 1"
               @click.prevent="deleteDevices(item.id)"
             >删除</button></div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              v-if="item.id && mark !== 1 && item.f_operate_state === 0"
+              @click.prevent="quChuDevices(item.id, '减少')"
+            >减少</button></div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              v-if="item.id && mark !== 1 && item.f_operate_state === 2"
+              @click.prevent="quChuDevices(item.id, '恢复')"
+            >恢复</button></div>
             <div class="col-sm-6 text-right">
               <label class="col-sm-4 control-label" v-if="item.f_operate_state === 0">旧设备</label>
             </div>
             <div class="col-sm-6 text-right">
-              <label class="col-sm-4 control-label" v-if="item.f_operate_state !== 0">新设备</label>
+              <label class="col-sm-4 control-label" v-if="item.f_operate_state === 1">新设备</label>
+            </div>
+            <div class="col-sm-6 text-right">
+              <label class="col-sm-4 control-label" v-if="item.f_operate_state === 2">标记减少设备</label>
             </div>
           </div>
           <div class="form-group col-sm-6" :class="[!item.f_devices_type ? 'has-error' : '']">
@@ -243,6 +256,18 @@ export default {
         this.$dispatch('breakControl', this.selectdata)
       })
     },
+    async quChuDevices(index, val) {
+      let data = {
+        id:index,
+        state: val,
+        selectdata: this.selectdata
+      }
+      await this.$resetpost('rs/logic/applyQuChuDevice', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '修改设备状态失败！！！'
+      })
+      this.$dispatch('breakControl', this.selectdata)
+    },
     deleteDevicesinfo (index) {
       this.devicesinfo.splice(index, 1)
     },