apply-clients 3.3.32 → 3.3.36

package/src/components/product/OldApply/Monitor/MonitorApply.vue

@@ -27,9 +27,14 @@
                        condition="f_user_name like '%{}%'">
               </div>
               <div class="form-group col-sm-3 button-range">
-                <button class="button_search button_spacing" @click="$parent.$parent.create()" v-el:cx>创建档案</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="getOldApply"
+                              template-name='旧报装信息导出'
+                              :choose-col="true"></export-excel>
                 <div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
@@ -143,6 +148,8 @@
               <th style="white-space: nowrap;">流程状态</th>
               <th style="white-space: nowrap;">收费项目</th>
               <th style="white-space: nowrap;">合同金额</th>
+              <th style="white-space: nowrap;">表号</th>
+              <th style="white-space: nowrap;">防盗卡号</th>
               <th style="white-space: nowrap;">报建日期</th>
               <th style="white-space: nowrap;">客户编号</th>
             </tr>
@@ -179,6 +186,12 @@
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_contract_money}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_meternumber}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_card_number}}</font></nobr>
+              </td>
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_apply_date}}</font></nobr>
               </td>
@@ -226,7 +239,44 @@ export default {
         {label: '商业', value: '商业'},
         {label: '工业', value: '工业'}
       ],
-      stopReasons: [{label: '全部', value: ''}, ...this.$appdata.getParam('终止原因')]
+      stopReasons: [{label: '全部', value: ''}, ...this.$appdata.getParam('终止原因')],
+      getfield: {
+        'f_userinfo_code': '用户编号',
+        'f_apply_num': '工程编号',
+        'f_apply_type': '报建类型',
+        'f_sub_state': '流程状态',
+        'f_user_name': '单位名称',
+        'f_contact': '联系人',
+        'f_phone': '电话',
+        'f_idnumber': '身份证号',
+        'f_gas_nature': '用气性质',
+        'f_apply_date': '报建接收时间',
+        'f_apply_check_date': '报建审核日期',
+        'f_contract_money': '合同价格',
+        'f_payment_term': '收费项目',
+        'f_unit_name': '集收单位',
+        'f_address': '地址',
+        'f_apply_remarks': '报建备注',
+        'f_construction_unit': '施工项目部',
+        'f_construction_worker': '施工负责人',
+        'f_completion_time': '施工完成时间',
+        'f_meternumber': '表号',
+        'f_card_number': '防盗卡号',
+        'f_construction_check_time': '施工审核时间',
+        'f_plan_date': '计划通气时间',
+        'f_gas_price_name': '计划气价名称',
+        'f_remark_stask': '计划通气备注',
+        'f_ventilate_date': '通气日期',
+        'f_gas_remarks': '通气备注',
+        'f_acceptor': '验收人',
+        'f_acceptor_date': '验收日期',
+        'f_acceptance_is_qualified': '验收结果',
+        'f_price_name': '气价名称',
+        'f_stop_reason': '终止原因',
+        'f_stop_user': '终止人员',
+        'f_stop_date': '终止时间',
+        'f_stop_remarks': '终止备注'
+      }
     }
   },
   ready () {
@@ -254,6 +304,13 @@ export default {
       }
       this.curorgid = val
     }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition + ` and f_orgid = '${this.curorgid[0]}'`
+      }
+    }
   }
 }
 </script>

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

@@ -19,12 +19,12 @@
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_apply_num = '{}'">
               </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-              </div>
               <div class="form-group col-sm-3 button-range">
+                <a type="button" class="button_new button_spacing" v-if="$parent.$parent.projectStart"
+                   href="/apply/download/excel/散户报装模板.xlsx" download>模板下载</a>
+                <button class="button_new button_spacing" style="width: max-content"
+                        v-if="$parent.$parent.projectStart"
+                        @click="$parent.$parent.showFile = !$parent.$parent.showFile">批量散户导入</button>
                 <button class="button_new button_spacing" style="width: max-content"
                         v-if="$parent.$parent.projectStart"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
@@ -39,6 +39,11 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
                 <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -214,6 +219,19 @@
         </div>
       </div>
     </modal>
+
+    <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+        <h4 class="modal-title">选择文件</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <file-upload class="my-file-uploader" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -237,7 +255,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
         applyNatures: [{label: '全部', value: ''}], // 报建性质
-        criteriaShow: false
+        criteriaShow: false,
+        showFile: false
       }
     },
     ready () {
@@ -245,6 +264,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
       this.search()
     },
     methods: {
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
       // 点击操作
       click (val) {
         this.$dispatch('apply', val)
@@ -377,6 +402,17 @@ import {HttpResetClass, PagedList} from 'vue-client'
           }
         }
       }
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath,
+          user: this.$login.f
+        }
+        let res = await this.$resetpost(`rs/logic/importApply`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
+
+        this.closeFile()
+      }
     }
   }
 </script>

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

@@ -2,7 +2,6 @@
   <style id="style">
     td{
       height: 30px;
-      width: 100px;
       text-align: center;
     }
     table{
@@ -35,68 +34,96 @@
       /*opacity: 0.5;*/
       z-index: -1;
     }
+    .sign {
+      vertical-align: top;
+      padding: 10px;
+    }
+    .material {
+      text-align: left;
+      vertical-align: top;
+      padding: 10px;
+    }
   </style>
 
   <div style="margin-bottom: 20px" class="form-group select-overspread">
     <label class="control-label-justify control-label col-sm-2">打印施工通知单</label>
     <div class="col-sm-10" >
-      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute">打印</button>
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openModal()">打印</button>
     </div>
   </div>
 
-  <div id="print" v-show="true">
-    <h4>
-      <span class="orgs">
-        施工安装通知单
-      </span>
-    </h4>
-    <table border="1">
-      <tr>
-        <td>用户姓名</td>
-        <td>{{ selectdata.f_user_name }}</td>
-        <td>报装编号</td>
-        <td>{{ selectdata.f_apply_num }}</td>
-        <td>电&emsp;&emsp;&emsp;&emsp;话</td>
-        <td>{{ selectdata.f_phone }}</td>
-      </tr>
-      <tr>
-        <td>用户地址</td>
-        <td colspan="3">{{ selectdata.f_address }}</td>
-        <td>施工安装时间</td>
-        <td>{{ selectdata.f_construction_date }}</td>
-      </tr>
-      <tr>
-        <td>安装项目</td>
-        <td>{{ selectdata.f_install_project }}</td>
-        <td>通知时间</td>
-        <td>{{ selectdata.f_construction_unit }}</td>
-        <td>施工安装单位</td>
-        <td>{{ selectdata.f_construction_unit }}</td>
-      </tr>
-      <tr style="height: 500px;">
-        <td colspan="6">
+  <modal v-if="showModal" :show.sync="showModal" width="80%" 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="print">
+        <h3><span style="letter-spacing: 15px">施工安装通知单</span></h3>
+        <table border="1">
+          <tr>
+            <td>用户姓名</td>
+            <td>{{ selectdata.f_user_name }}</td>
+            <td>报装编号</td>
+            <td>{{ selectdata.f_apply_num }}</td>
+            <td>电&emsp;&emsp;&emsp;&emsp;话</td>
+            <td>{{ selectdata.f_phone }}</td>
+          </tr>
+          <tr>
+            <td>用户地址</td>
+            <td colspan="3">{{ selectdata.f_address }}</td>
+            <td>施工安装时间</td>
+            <td>{{ selectdata.f_construction_date }}</td>
+          </tr>
+          <tr>
+            <td>安装项目</td>
+            <td>{{ selectdata.f_install_project }}</td>
+            <td>通知时间</td>
+            <td>{{ selectdata.sendtime }}</td>
+            <td>施工安装单位</td>
+            <td>{{ selectdata.f_construction_unit }}</td>
+          </tr>
+          <tr>
+            <td>表号</td>
+            <td colspan="2">{{ userfile.f_meternumber }}</td>
+            <td>表封号</td>
+            <td colspan="2">{{ userfile.f_metertitles }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" class="material">
+              <p>施工安装情况</p>
+              <p v-for="item in selectdata.onetomany[0].rows" style="width: auto;display: inline-block;margin-right: 15px">
+                <span style="margin-right: 10px">{{$index + 1}}、{{item.f_material_name}}{{item.f_material_style}}</span>{{item.f_material_number}}{{item.f_material_unit}}
+              </p>
+            </td>
+          </tr>
+          <tr style="height: 80px">
+            <td colspan="2" class="sign">施工安装单位（签字）</td>
+            <td colspan="2" class="sign">工程验收（签字）</td>
+            <td colspan="2" class="sign">用户（签字）</td>
+          </tr>
+          <tr>
+            <td>备&emsp;&emsp;注</td>
+            <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
+          </tr>
+        </table>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="print()">打印</button>
+    </footer>
+  </modal>
+
 
-        </td>
-      </tr>
-      <tr style="height: 100px">
-        <td colspan="2">施工安装单位（签字）</td>
-        <td colspan="2">工程验收（签字）</td>
-        <td colspan="2">用户（签字）</td>
-      </tr>
-      <tr>
-        <td>备&emsp;&emsp;注</td>
-        <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
-      </tr>
-    </table>
-  </div>
   <print-element v-show="false" v-ref:print id='print' styleid='style'
-                 top='40' left='60' width='100%' height='100%'>
+                 top='10' left='3' width='90%' 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, //月份
@@ -124,11 +151,41 @@ export default {
     }
   },
   data () {
-    return {}
+    return {
+      showModal: false,
+      userfile: null
+    }
   },
   ready () {
   },
   methods: {
+    colseModal () {
+      this.showModal = false
+      this.userfile = null
+    },
+    print () {
+      this.$refs.print.PrintTable()
+    },
+    openModal () {
+      this.getUserFiles()
+
+      this.showModal = true
+    },
+    async getUserFiles () {
+      let data = {
+        tablename: 't_userfiles',
+        condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '表具信息查询失败！！！'}
+      )
+
+      this.userfile = res.data[0]
+    },
   },
   computed: {
     orgs () {

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

@@ -1,13 +1,12 @@
 <template>
-  <style id="style">
+  <style id="printChargeStyle">
     td{
       height: 30px;
-      width: 100px;
       text-align: center;
     }
     table{
       margin: auto;
-      width: 100%;
+      /*width: 100%;*/
       border-collapse:collapse;
       border: 1px solid black;
     }
@@ -36,18 +35,22 @@
       z-index: -1;
     }
   </style>
-  <div id="print">
+  <div id="printCharge">
     <h4>
       <span class="orgs">
         {{orgs}}统一收据
       </span>
     </h4>
-    <table border="1">
+    <table border="1" width="100%">
       <tr>
-        <td colspan="6">
-          <span class="date">开票日期：{{ new Date().Format('yyyy年MM月dd日') }}</span>
-          <span>收据编码：{{ charge.f_charge_number }}</span>
-          <span class="status">状态：{{ charge.f_charge_status }}</span>
+        <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>
@@ -91,8 +94,8 @@
     <img class="seal" border="0" :src="src" alt="">
   </div>
 
-  <print-element v-show="false" v-ref:print id='print' styleid='style'
-                 top='40' left='60' width='100%' height='100%'>
+  <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
+                 top='20' left='30' width='100%' height='100%'>
   </print-element>
 </template>
 

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

@@ -12,10 +12,9 @@
       <h4 class="modal-title">打印预览</h4>
     </header>
     <article slot="modal-body" class="modal-body clearfix">
-      <style id="style">
+      <style id="printRefundStyle">
         td{
           height: 30px;
-          width: 100px;
           text-align: center;
         }
         table{
@@ -40,7 +39,7 @@
           padding-right: 10px;
         }
       </style>
-      <div id="print">
+      <div id="printRefund">
         <h4>
           <span class="orgs">
             {{selectdata.f_refund_item}}退款收到条
@@ -48,10 +47,14 @@
         </h4>
         <table border="1">
           <tr>
-            <td colspan="6">
-              <span class="date">开票日期：{{ new Date().Format('yyyy年MM月dd日') }}</span>
-              <span>工程编号：{{ selectdata.f_parent_apply_num }}</span>
-              <span class="status">经办人：{{ username }}</span>
+            <td colspan="2" style="border: none">
+              开票日期：{{ new Date().Format('yyyy年MM月dd日') }}
+            </td>
+            <td colspan="2" style="border: none">
+              工程编号：{{ selectdata.f_parent_apply_num }}
+            </td>
+            <td colspan="2" style="border: none">
+              经办人：{{ username }}
             </td>
           </tr>
           <tr>
@@ -79,9 +82,9 @@
           <tr>
             <td>备&emsp;&emsp;注</td>
             <td colspan="5" style="text-align: left">
-              <p>1、退款收到人姓名必须为天然气开户姓名。</p>
-              <p>2、退款收到人办理退款时，必须携带身份证或身份证复印件进行办理，并填写退款收到条方可退款。</p>
-              <p>3、若退款收到人因特殊原因无法到达现场时需代办人办理退款时，必须现场联系退款用户，核实各项信息确认为代办后，代办人提供退款用户身份证复印件及本人身份证复印件方可办理退款。</p>
+              <p style="margin: 0 0 5px">1、退款收到人姓名必须为天然气开户姓名。</p>
+              <p style="margin: 0 0 5px">2、退款收到人办理退款时，必须携带身份证或身份证复印件进行办理，并填写退款收到条方可退款。</p>
+              <p style="margin: 0 0 5px">3、若退款收到人因特殊原因无法到达现场时需代办人办理退款时，必须现场联系退款用户，核实各项信息确认为代办后，代办人提供退款用户身份证复印件及本人身份证复印件方可办理退款。</p>
             </td>
           </tr>
         </table>
@@ -92,8 +95,8 @@
     </footer>
   </modal>
 
-  <print-element v-show="false" v-ref:print id='print' styleid='style'
-                 top='40' left='60' width='100%' height='100%'>
+  <print-element v-show="false" v-ref:print id='printRefund' styleid='printRefundStyle'
+                 top='5' left='30' width='100%' height='100%'>
   </print-element>
 </template>
 

package/src/components/product/Process/Service/ServiceControl.vue

@@ -645,7 +645,7 @@ export default {
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `rs/sql/getApplyMaterial`,
+        `rs/sql/getStockMaterial`,
         {data: data},
         {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
       )
@@ -1193,7 +1193,7 @@ export default {
         f_process_id : this.show_data.f_process_id,
         f_operator_id: this.$login.f.id,
         f_operator: this.$login.f.name,
-        f_operation_date: new Date(),
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: this.$login.f.orgid,
         f_orgname: this.$login.f.orgs
       }