apply-clients 4.1.66 → 4.1.67

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

@@ -23,19 +23,20 @@
                      @click="$parent.$parent.unpass()">退回</button>
             <button  v-if="$parent.$parent.showcover"type="button" class="btn btn-info head-but"
                      @click="$parent.$parent.pass()">恢复</button>
-            <button  v-if="$parent.$parent.showfiling"type="button" class="btn btn-info head-but"
-                     @click="$parent.$parent.filing()">建档不合格</button>
+<!--            <button  v-if="$parent.$parent.showfiling"type="button" class="btn btn-info head-but"-->
+<!--                     @click="$parent.$parent.filing()">建档不合格</button>-->
             <button v-if="$parent.$parent.showhina" type="button" class="btn btn-info head-but"
                     :disabled="$parent.$parent.mark === 1"
                @click="$parent.$parent.showFileModal()">导入</button>
             <a v-if="$parent.$parent.showhina" type="button" class="btn btn-info head-but"
-               href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
-            <export-excel :data="$parent.$parent.getCondition"
-                          :field="$parent.$parent.getfield"
-                          sqlurl="rs/logic/applyExportfile"
-                          sql-name="getAddresAndUserinfoAndUserfiles"
-                          template-name='信息导出'
-                          :choose-col="true"></export-excel>
+               href="/apply/download/excel/中盛地址批量导入.xlsx" download>模板下载</a>
+<!--            <export-excel :data="$parent.$parent.getCondition"-->
+<!--                          :field="$parent.$parent.getfield"-->
+<!--                          sqlurl="rs/logic/applyExportfile"-->
+<!--                          sql-name="getAddressAanUserinfo"-->
+<!--                          template-name='花名册导出'-->
+<!--                          btn-name="花名册导出"-->
+<!--                          :choose-col="true"></export-excel>-->
 
           </th>
         </tr>
@@ -95,7 +96,7 @@
           <td  style="text-align: center;">
             <button v-if="$parent.$parent.showclean" class="button_new button_spacing" style="width: max-content" @click.prevent="$parent.$parent.cleanupload(row)">删除</button>
             <button v-if="$parent.$parent.showrecover" class="button_new button_spacing" style="width: max-content" @click.prevent="$parent.$parent.recoverupload(row)">恢复</button>
-             <button v-if="$parent.$parent.showfire" class="button_new button_spacing" style="width: max-content" @click.prevent="$parent.$parent.fire(row)">点火</button>
+<!--            <button v-if="$parent.$parent.showfire" class="button_new button_spacing" style="width: max-content" @click.prevent="$parent.$parent.fire(row)">点火</button>-->
           </td>
         </tr>
       </template>
@@ -660,15 +661,21 @@ export default {
       all:[],
       remark:'',
       getfield: {
-        'f_apply_num': '报建编号',
-        'f_contract_number': '合同编号',
-        'f_apply_type': '报建类型',
-        'f_charge_money': '收费金额',
-        'f_payment_method': '付款方式',
-        'f_charge_collectors': '收费人员',
-        'f_charge_date': '收费日期',
-        'f_charging_status': '状态',
-        'f_address': '地址'
+        "f_pcd": "省市区",
+        "f_street": "街道",
+        "f_slice_area": "片区/管理站",
+        "f_residential_area": "小区",
+        "f_special": "地址类型",
+        "f_building": "楼号",
+        "f_unit": "单元号",
+        "f_floor": "楼层",
+        "f_room": "门牌号",
+        "f_address": "地址",
+        "f_user_name": "用户姓名/单位名称",
+        "f_user_phone": "电话",
+        "f_credentials": "证件类型",
+        "f_idnumber": "证件号码",
+        "f_people_num": "人口数"
       }
     }
   },
@@ -726,7 +733,7 @@ export default {
         }
         let http = new HttpResetClass()
         http.load('POST', 'rs/logic/batchcheck', {data:data}, {resolveMsg: null, rejectMsg: null})
-        }
+      }
 
       console.log("13ef44", this.selectdata.f_process_id)
       let http = new HttpResetClass()
@@ -742,7 +749,7 @@ export default {
         http.load('POST', 'rs/logic/recoverson', {process:son.data[0].f_process_id}, {resolveMsg: null, rejectMsg: null})
         this.$dispatch('search')
       }
-else {
+      else {
       let data = {
         start_activity: this.$workflow_vue.start_activity,
         model: this.selectdata,
@@ -788,12 +795,14 @@ else {
       //查父流程是否关闭
       for(let i=0;i<resparent.data.length;i++) {
         if (resparent.data[i].defname === '竣工验收' && resparent.data[i].state === '结束')
-          await http.load('POST', 'rs/logic/parentprocess', {data: resparent.data[i].processid}, {
+          // let http2 = new HttpResetClass()
+          await http.load('POST', 'rs/logic/parentprocess', {data: {processid: resparent.data[i].processid, defname: resparent.data[i].defname}}, {
             resolveMsg: null,
             rejectMsg: null
           })
         if (resparent.data[i].defname === '营业厅建档' && resparent.data[i].state === '结束')
-          await http.load('POST', 'rs/logic/parentprocess', {data: resparent.data[i].processid}, {
+          // let http3 = new HttpResetClass()
+          await http.load('POST', 'rs/logic/parentprocess', {data: {processid: resparent.data[i].processid, defname: resparent.data[i].defname}}, {
             resolveMsg: null,
             rejectMsg: null
           })
@@ -1086,12 +1095,12 @@ else {
 
     },
     getCondition () {
-      return {
-        condition: this.$refs.cp.$refs.cri.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
+      let data = {
+        condition: " 1=1",
+        f_filialeid: this.$login.f.orgid,
+        f_process_id: this.selectdata.f_process_id,
       }
+      return data
     }
   },
   watch: {

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

@@ -76,12 +76,12 @@
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
 
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.showPrintModal(row)"
-                >打印预览</button>
+<!--                <button-->
+<!--                  type="button"-->
+<!--                  name="button"-->
+<!--                  class="btn btn-link"-->
+<!--                  @click="$parent.$parent.showPrintModal(row)"-->
+<!--                >打印预览</button>-->
               </nobr>
             </td>
           </tr>
@@ -146,7 +146,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-          v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '散户报建'"
+          v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">单价（户）：</label>
           <div class="col-sm-10">
@@ -158,7 +158,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '散户报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">累计缴费金额：</label>
           <div class="col-sm-10">
@@ -170,7 +170,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '散户报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">未结金额：</label>
           <div class="col-sm-10">

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

@@ -1,130 +1,130 @@
-<template>
-  <style id="style">
-    td{
-      height: 50px;
-      width: 40px;
-      text-align: center;
-    }
-    table{
-      margin: auto;
-      width: 100%;
-      border-collapse:collapse;
-      border: 1px solid black;
-    }
-    h1,h2,h3,h4,h5,h6 {
-      text-align: center;
-    }
-    .date{
-      float: left;
-      padding-left: 30px;
-    }
-    .number{
-      float: right;
-      padding-right: 30px;
-    }
-    .rescue{
-      float: left;
-      padding: 0 30px 0 40px;
-    }
-    .service{
-      float: left;
-    }
-    .payee{
-      float: right;
-      padding-right: 30px;
-    }
-  </style>
-  <div id="print">
-    <h4>陕西中盛天然气有限公司收费单</h4>
-    <span>
-      <p class="date">{{new Date().Format('yyyy-MM-dd HH:mm:ss')}}</p>
-      <p class="number">缴费编号：{{ charge.f_charge_number }}</p>
-    </span>
-    <table border="1">
-      <tr>
-        <td>用户姓名</td>
-        <td colspan="2">{{ f_user_name }}</td>
-        <td>联系电话</td>
-        <td>{{ f_user_phone }}</td>
-      </tr>
-      <tr>
-        <td>地&emsp;&emsp;址</td>
-        <td colspan="4">{{ f_useraddress }}</td>
-      </tr>
-      <tr>
-        <td>收费项目</td>
-        <td colspan="2">安装费</td>
-        <td>收费方式</td>
-        <td>{{ charge.f_payment_method }}</td>
-      </tr>
-      <tr>
-        <td>收费金额</td>
-        <td>{{ charge.f_charge_money }}</td>
-        <td>大&emsp;&emsp;写</td>
-        <td colspan="2">{{ charge.f_amount_words }}</td>
-      </tr>
-      <tr>
-        <td>备&emsp;&emsp;注</td>
-        <td colspan="4">{{ selectdata.f_entry_name }}</td>
-      </tr>
-    </table>
-    <span>
-      <p class="rescue">
-<!--        抢险电话：5835588-->
-      </p>
-      <p class="service">
-<!--        服务电话：3718002-->
-      </p>
-      <p class="payee">收款人：{{ charge.f_charge_collectors }}</p>
-    </span>
-  </div>
-
-  <print-element v-show="false" v-ref:print id='print' styleid='style'
-                 top='40' left='60' 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 () {
-    console.log('------------------打印-------------------')
-    console.log()
-  },
-  computed: {
-    f_user_name () {
-      return isEmpty(this.charge.f_user_name) ? this.selectdata.f_contact : this.charge.f_user_name
-    },
-    f_user_phone () {
-      return isEmpty(this.charge.f_user_phone) ? this.selectdata.f_phone : this.charge.f_user_phone
-    },
-    f_useraddress () {
-      return isEmpty(this.charge.f_useraddress) ? `武安市${this.selectdata.f_street}${this.selectdata.f_residential_area}` : `武安市${this.charge.f_useraddress}`
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <style id="style">
+    td{
+      height: 50px;
+      width: 40px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .date{
+      float: left;
+      padding-left: 30px;
+    }
+    .number{
+      float: right;
+      padding-right: 30px;
+    }
+    .rescue{
+      float: left;
+      padding: 0 30px 0 40px;
+    }
+    .service{
+      float: left;
+    }
+    .payee{
+      float: right;
+      padding-right: 30px;
+    }
+  </style>
+  <div id="print">
+    <h4>陕西中盛天然气有限公司收费单</h4>
+    <span>
+      <p class="date">{{new Date().Format('yyyy-MM-dd HH:mm:ss')}}</p>
+      <p class="number">缴费编号：{{ charge.f_charge_number }}</p>
+    </span>
+    <table border="1">
+      <tr>
+        <td>用户姓名</td>
+        <td colspan="2">{{ f_user_name }}</td>
+        <td>联系电话</td>
+        <td>{{ f_user_phone }}</td>
+      </tr>
+<!--      <tr>-->
+<!--        <td>地&emsp;&emsp;址</td>-->
+<!--        <td colspan="4">{{ f_useraddress }}</td>-->
+<!--      </tr>-->
+      <tr>
+        <td>收费项目</td>
+        <td colspan="2">安装费</td>
+        <td>收费方式</td>
+        <td>{{ charge.f_payment_method }}</td>
+      </tr>
+      <tr>
+        <td>收费金额</td>
+        <td>{{ charge.f_charge_money }}</td>
+        <td>大&emsp;&emsp;写</td>
+        <td colspan="2">{{ charge.f_amount_words }}</td>
+      </tr>
+      <tr>
+        <td>备&emsp;&emsp;注</td>
+        <td colspan="4">{{ selectdata.f_entry_name }}</td>
+      </tr>
+    </table>
+    <span>
+      <p class="rescue">
+<!--        抢险电话：5835588-->
+      </p>
+      <p class="service">
+<!--        服务电话：3718002-->
+      </p>
+      <p class="payee">收款人：{{ charge.f_charge_collectors }}</p>
+    </span>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='40' left='60' 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 () {
+    console.log('------------------打印-------------------')
+    console.log()
+  },
+  computed: {
+    f_user_name () {
+      return isEmpty(this.charge.f_user_name) ? this.selectdata.f_contact : this.charge.f_user_name
+    },
+    f_user_phone () {
+      return isEmpty(this.charge.f_user_phone) ? this.selectdata.f_phone : this.charge.f_user_phone
+    },
+    f_useraddress () {
+      return isEmpty(this.charge.f_useraddress) ? `武安市${this.selectdata.f_street}${this.selectdata.f_residential_area}` : `武安市${this.charge.f_useraddress}`
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,50 +1,50 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <p class="bg-info text-center" style="padding: 8px;">{{data.type}}销户</p>
-      <div class="row" style="margin-top:10px;">
-        <div class="form-group">
-          <label class=" col-sm-2 control-label">销户原因:</label>
-          <div class="col-sm-8">
-            <textarea class="form-control" v-model="model.f_cancel_reason" rows="3" placeholder="请填写原因"></textarea>
-          </div>
-        </div>
-      </div>
-      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-        <button class="btn btn-success" @click="confirm()" >确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;认</button>
-        <button class="btn btn-default" @click="clean()" style="wid0px;margin-left:20px;">取&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  props: ['data'],
-  title: '操作撤销',
-  data () {
-    return {
-      model: {
-        f_cancel_reason: '',
-        f_user_state: this.data.f_user_state,
-        f_process_id: this.data.f_process_id
-      }
-    }
-  },
-  methods: {
-    confirm () {
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/entity/t_zsrecord', model, {resolveMsg: null, rejectMsg: '数据保存失败'})
-        .then(res => {
-          this.$info('撤销成功')
-          this.$dispatch('stoprecord')
-        })
-    },
-    clean () {
-      this.$dispatch('clean', this.model)
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;">{{data.type}}销户</p>
+      <div class="row" style="margin-top:10px;">
+        <div class="form-group">
+          <label class=" col-sm-2 control-label">销户原因:</label>
+          <div class="col-sm-8">
+            <textarea class="form-control" v-model="model.f_cancel_reason" rows="3" placeholder="请填写原因"></textarea>
+          </div>
+        </div>
+      </div>
+      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
+        <button class="btn btn-success" @click="confirm()" >确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;认</button>
+        <button class="btn btn-default" @click="clean()" style="wid0px;margin-left:20px;">取&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  props: ['data'],
+  title: '操作撤销',
+  data () {
+    return {
+      model: {
+        f_cancel_reason: '',
+        f_user_state: this.data.f_user_state,
+        f_process_id: this.data.f_process_id
+      }
+    }
+  },
+  methods: {
+    confirm () {
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/entity/t_zsrecord', model, {resolveMsg: null, rejectMsg: '数据保存失败'})
+        .then(res => {
+          this.$info('撤销成功')
+          this.$dispatch('stoprecord')
+        })
+    },
+    clean () {
+      this.$dispatch('clean', this.model)
+    }
+  }
+}
+</script>

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

@@ -292,6 +292,18 @@ export default {
           }
         }
       }
+      if (this.selectdata.defname === '施工') {
+        // for (let i = 0; i < this.show_data.fields.length; i++) {
+        //   if (this.show_data.fields[i].label == '工程状态') {
+        //     this.show_data.fields[i].value = ''
+        //   }
+        // }
+        for (const item of this.show_data.fields) {
+          if (item.label === '工程状态') {
+            return item.value = '未开工'
+          }
+        }
+      }
 
     },
     // 初始化fields值
@@ -646,25 +658,25 @@ export default {
           }
         }
       }
-      if (this.show_data.defname === '营业厅建档'){
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_userinfo',
-          condition: `f_process_id='${this.selectdata.f_process_id}'`
-
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-        if (this.show_data.fields[index].label === '是否已建档') {
-          if (res.data[0].f_user_state === '预备') {
-            this.show_data.fields[index].value = '否'
-            button.hidden = false
-          }else{
-            this.show_data.fields[index].value = '是'
-            button.hidden = true
-          }
-        }
-      }
+      // if (this.show_data.defname === '营业厅建档'){
+      //   let http = new HttpResetClass()
+      //   let data = {
+      //     tablename: 't_userinfo',
+      //     condition: `f_process_id='${this.selectdata.f_process_id}'`
+      //
+      //   }
+      //   let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+      //
+      //   if (this.show_data.fields[index].label === '是否已建档') {
+      //     if (res.data[0].f_user_state === '预备') {
+      //       this.show_data.fields[index].value = '否'
+      //       button.hidden = false
+      //     }else{
+      //       this.show_data.fields[index].value = '是'
+      //       button.hidden = true
+      //     }
+      //   }
+      // }
       if(this.show_data.defname === '现场勘察') {
         console.log("this.shdata",this.show_data)
         if (this.show_data.fields[index].label === '是否具备安装条件') {
@@ -677,26 +689,26 @@ export default {
           }
         }
       }
-      if (this.show_data.defname === '通气点火'){
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_firemessage',
-          condition: `f_process_id='${this.selectdata.f_process_id}'`
-
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
-    console.log("res")
-        console.log(res.data)
-        if (this.show_data.fields[index].label === '是否已通气') {
-          if (res.data.length==0) {
-            this.show_data.fields[index].value = '否'
-            button.hidden = false
-          }else{
-            this.show_data.fields[index].value = '是'
-            button.hidden = true
-          }
-        }
-      }
+      // if (this.show_data.defname === '通气点火'){
+      //   let http = new HttpResetClass()
+      //   let data = {
+      //     tablename: 't_firemessage',
+      //     condition: `f_process_id='${this.selectdata.f_process_id}'`
+      //
+      //   }
+      //   let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+      //   console.log("res")
+      //   console.log(res.data)
+      //   if (this.show_data.fields[index].label === '是否已通气') {
+      //     if (res.data.length==0) {
+      //       this.show_data.fields[index].value = '否'
+      //       button.hidden = false
+      //     }else{
+      //       this.show_data.fields[index].value = '是'
+      //       button.hidden = true
+      //     }
+      //   }
+      // }
       if (this.show_data.defname === '合同签订') {
         if (this.show_data.fields[index].label === '合同编号') {
           if (!isEmpty(this.show_data.fields[index].value)) {
@@ -713,6 +725,12 @@ export default {
               this.show_data.fields[index].value = null
               this.$showAlert('合同编号已存在！！！', 'warning', 3000)
             }
+            //拼写合同编号
+            if (this.selectdata.f_apply_type == '工商户报建') {
+              this.show_data.fields[index].value = "ZS-S-" + this.show_data.fields[index].value + "-" + new Date().Format('yyyy-MM-dd')
+            }else {
+              this.show_data.fields[index].value = "ZS-M-" + this.show_data.fields[index].value + "-" + new Date().Format('yyyy-MM-dd')
+            }
           }
         }
         if (this.show_data.fields[index].label === '单价（户）') {