apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

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

@@ -19,6 +19,7 @@
             <th>
               <button
                 type="button"
+                v-if="$parent.$parent.$parent.selectdata.f_apply_type !== '非民用报建'"
                 class="btn btn-info head-but"
                 @click="$parent.$parent.$parent.openModal()"
                 :disabled="$parent.$parent.$parent.mark === 1 ||
@@ -37,10 +38,17 @@
               <template v-if="$parent.$parent.$parent.selectdata.f_apply_type === '民用报建'">
                 <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.$parent.mark !== 1"
                         @click="$parent.$parent.$parent.importBefore()">导入</button>
-                <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.$parent.mark !== 1 && $parent.$parent.$parent.selectdata.f_apply_nature === '小区'"
+                <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.$parent.mark !== 1 && $parent.$parent.$parent.selectdata.f_apply_nature === '小区' && $parent.$parent.$parent.selectdata.defname !== '工程施工'"
                    href="/apply/download/excel/小区导入.xlsx" download>模板下载</a>
-                <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.$parent.mark !== 1 && $parent.$parent.$parent.selectdata.f_apply_nature === '散户'"
+                <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.$parent.mark !== 1 && $parent.$parent.$parent.selectdata.f_apply_nature === '散户' && $parent.$parent.$parent.selectdata.defname !== '工程施工'"
                    href="/apply/download/excel/散户导入模板.xlsx" download>模板下载</a>
+                <export-excel :data="$parent.$parent.$parent.getCondition"
+                              :field="$parent.$parent.$parent.getfield"
+                              v-if="$parent.$parent.$parent.mark !== 1 && $parent.$parent.$parent.selectdata.f_apply_nature === '小区' && $parent.$parent.$parent.selectdata.defname === '工程施工'"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="getApplyUserinfoExcel"
+                              template-name='待添加表号信息导出'
+                              :choose-col="true"></export-excel>
               </template>
             </th>
           </tr>
@@ -146,7 +154,7 @@
               <input class="form-control input_view" style=""
                      v-validate:f_user_name = "['required']"
                      v-model="userinfo.f_user_name"
-                     :value.sync="showUserinfo.f_user_name"
+                     :value.sync="showUserInformation.f_user_name"
                      :readonly="mark === 1 || userinfo.f_user_state === '正常'"
                      placeholder="客户名称"/>
             </div>
@@ -156,7 +164,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style=""
                      v-model="userinfo.f_user_phone"
-                     :value.sync="showUserinfo.f_user_phone"
+                     :value.sync="showUserInformation.f_user_phone"
                      :readonly="mark === 1 || userinfo.f_user_state === '正常'"
                      placeholder="客户电话"/>
             </div>
@@ -166,7 +174,7 @@
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
-                :value.sync="showUserinfo.f_credentials"
+                :value.sync="showUserInformation.f_credentials"
                 v-model="userinfo.f_credentials"
                 :options="credentialsList"
                 :disable="mark === 1 || userinfo.f_user_state === '正常'"
@@ -179,7 +187,7 @@
               <input class="form-control input_view" style=""
                      placeholder="证件号码"
                      v-model="userinfo.f_idnumber"
-                     :value="showUserinfo.f_idnumber"
+                     :value="showUserInformation.f_idnumber"
                      :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
             </div>
           </div>
@@ -321,13 +329,13 @@
                      :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
             </div>
           </div>
-          <div class="form-group col-sm-6">
+          <div class="form-group col-sm-6" v-show="false">
             <label class="col-sm-4 control-label">初始底数：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style=""
                      type="number"
                      v-model="userfile.f_initial_base"
-                     :value="userfile.f_initial_base"
+                     :value="userfile.f_meter_base"
                      placeholder="初始底数"
                      :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
             </div>
@@ -477,6 +485,31 @@
       </footer>
     </modal>
   </validator>
+  <validator name="x">
+    <modal v-if="showDeleteModel" :show.sync="showDeleteModel" v-ref:modal :large="true" :backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
+        <h4 class="modal-title">销户原因</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="left col-sm-12 col-xs-12" :class="[$x.f_cancel_cause.required ? 'has-error' : '']">
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">销户原因：</label>
+            <div class="col-sm-10">
+              <input class="form-control input_view" style=""
+                     v-validate:f_cancel_cause = "['required']"
+                     v-model="userinfo.f_cancel_cause"
+                     :value.sync="userinfo.f_cancel_cause"
+                     placeholder="销户原因"/>
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="deleteUser" :disabled="!$x.valid">确认</button>
+      </footer>
+    </modal>
+  </validator>
 </template>
 <script>
 import Vue from 'vue'
@@ -527,7 +560,14 @@ export default {
       Sign: false,
       fileurl: null,
       devicesinfo: [],
-      showUserinfo: {}
+      showUserInformation: {},
+      showDeleteModel: false,
+      getfield: {
+        'f_userinfo_id': '  客户编号  ',
+        'f_address': '     地址     ',
+        'f_meternumber': '   表号  ',
+        'f_aroundmeter': '  表向 '
+      }
     }
   },
   ready () {
@@ -537,12 +577,21 @@ export default {
   },
   methods: {
     async deleteUserinfo (row) {
+      this.userinfo = row
+      let res = await this.$showMessage('此操作不可撤回，您确定要删除这条记录吗？')
+      if (res === 'cancel') {
+        return
+      }
+      this.showDeleteModel = !this.showDeleteModel
+    },
+    async deleteUser () {
       let res = await this.$showMessage('此操作不可撤回，您确定要删除这条记录吗？')
       if (res === 'cancel') {
         return
       }
       let data = {
-        userinfo: row,
+        login: this.$login.f,
+        userinfo: this.userinfo,
         selectdata: this.selectdata
       }
       res = await this.$resetpost('rs/logic/applyDeleteUserinfo', {data:data}, {
@@ -554,7 +603,14 @@ export default {
     },
     // 保存档案
     async saveUserFile () {
-      this.meternumberValidate()
+      if (this.selectdata.defname === '工程施工'){
+        await this.meternumberValidate()
+        if (this.userfile.f_meter_base - 0 === 0 || this.userfile.f_meter_base - 0 > 1.5){
+          console.log("当前表底数",this.userfile.f_meter_base)
+          this.$showAlert('表读数必须大于0小于或等于1.5！', 'warning', 3000)
+          throw '表读数必须大于0小于或等于1.5！'
+        }
+      }
       let data = {
         user: this.$login.f,
         userinfo: this.userinfo,
@@ -706,21 +762,6 @@ export default {
         console.log('------------------修正---------------------',row)
         this.userinfo = row
 
-        if (this.userinfo.f_residential_area_id) {
-          let data = {
-            tablename: 't_area_address',
-            condition: `id = '${this.userinfo.f_residential_area_id}'`
-          }
-          let http = new HttpResetClass()
-          let res = await http.load(
-            'POST',
-            `rs/sql/applySingleTable`,
-            {data: data},
-            {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
-          )
-
-          this.area = res.data[0]
-        }
 
         let data = {
           tablename: 't_userfiles',
@@ -782,10 +823,10 @@ export default {
       this.userinfo.f_location_address = this.selectdata.f_order_address
       if(!row){
         // 档案回填用户信息
-        this.showUserinfo.f_user_name = this.selectdata.f_user_name
-        this.showUserinfo.f_user_phone = this.selectdata.f_phone
-        this.showUserinfo.f_credentials = this.selectdata.f_credentials
-        this.showUserinfo.f_idnumber = this.selectdata.f_idnumber
+        this.showUserInformation.f_user_name = this.selectdata.f_user_name
+        this.showUserInformation.f_user_phone = this.selectdata.f_phone
+        this.showUserInformation.f_credentials = this.selectdata.f_credentials
+        this.showUserInformation.f_idnumber = this.selectdata.f_idnumber
       }
       this.showModal = true
     },
@@ -862,7 +903,7 @@ export default {
     },
     searchCondition (args) {
       if (this.selectdata.f_apply_type === '分户挂表') {
-        args.condition = args.condition + `and ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+        args.condition = args.condition + `and ui.f_userinfo_id = 'ui.f_process_id = '61207''`
       } else {
         args.condition = args.condition + `and ui.f_process_id = '${this.selectdata.f_process_id}'`
       }
@@ -882,6 +923,7 @@ export default {
       this.userfile = {}
       this.gasModelList = {}
       this.Sign = {}
+      this.showDeleteModel = false
       this.search()
     },
     //关闭导入弹框
@@ -900,7 +942,9 @@ 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)
+      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)
     }
@@ -911,7 +955,7 @@ export default {
         (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')
     },
     newShowDeleteUserInfo () {
-      return this.selectdata.f_apply_type === '设备拆除' && this.selectdata.defname === '销户'
+      return this.selectdata.f_apply_type === '设备拆除' && this.selectdata.defname === '核对气量'
     },
     showAddress () {
       return (this.selectdata.f_apply_type === '民用报建' || this.selectdata.f_apply_type === '设备拆除') && (this.selectdata.defname !== '工程施工')
@@ -959,6 +1003,15 @@ export default {
     // 安装位置
     positions() {
       return this.$appdata.getParam('安装位置')
+    },
+    getCondition () {
+      return {
+        condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
+        data: {
+          userid: this.$login.f.id,
+          f_filiale: this.$login.f.f_fengongsi
+        }
+      }
     }
   },
   watch: {

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

@@ -112,6 +112,10 @@
             <td>备&emsp;&emsp;注：</td>
             <td colspan="5">{{ selectdata.f_due_money_remarks }}</td>
           </tr>
+          <tr>
+            <td>注：</td>
+            <td colspan="5">转账用户需航宇路中国银行取确认收款单后来公司换取发票。</td>
+          </tr>
         </table>
       </div>
     </article>
@@ -145,7 +149,7 @@ Date.prototype.Format = function (fmt) {
   return fmt
 }
 export default {
-  title: '打印收费票据',
+  title: '打印解款单',
   props: ['selectdata'],
   data () {
     return {