apply-clients 4.1.68 → 4.1.69

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

@@ -1,5 +1,23 @@
 <template>
   <div class="col-sm-12" style="margin: 20px 0px;">
+    <div class="auto" style="overflow:auto;margin: 15px 0 0 15px;">
+      <div class="col-sm-12" style="height: 180px">
+        <div class="row col-sm-12">
+          <div class="from-group col-sm-3">
+            <label class=" control-label" >点火状态</label>
+            <v-select :value.sync="query.f_state" v-model="query.f_state"
+                      :options='firestate' placeholder='请选择'
+                      close-on-select >
+            </v-select>
+          </div>
+          <div class="form-group col-sm-5" >
+            <!--            <button  class="button_search button_spacing" @click="search()">查询</button>-->
+            <button type="button" class="btn btn-default" @click="search(0)">查询</button>
+            <button type="button" class="btn btn-default" @click="clear()">清空</button>
+          </div>
+        </div>
+      </div>
+    </div>
     <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
       <template partial='head'>
         <tr>
@@ -9,6 +27,7 @@
           <th>客户电话</th>
           <th>地址信息</th>
           <th>设备数量</th>
+          <th>点火状态</th>
           <th>
               操作
 <!--            <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"-->
@@ -45,6 +64,9 @@
           <td style="text-align: center;">
             <nobr>{{row.f_devices_num === null ? 0 : row.f_devices_num}}</nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_fire_num === null ? "未点火" : "已点火"}}</nobr>
+          </td>
           <td style="text-align: center;">
             <nobr>
               <button
@@ -53,6 +75,11 @@
                 @click="$parent.$parent.showUserFileModal(row)">
                 {{$parent.$parent.mark === 1 ? '查看' : row.f_devices_num > 0 ? '修正' : '添加'}}
               </button>
+              <button
+                type="button" name="button" class="btn btn-link"
+                @click="$parent.$parent.showFire(row)">
+                点火信息
+              </button>
             </nobr>
           </td>
         </tr>
@@ -305,6 +332,226 @@
         <button type="button" class="btn btn-primary" @click="saveUserFile" :disabled="!$v.valid">确认</button>
       </footer>
     </modal>
+    <modal :show.sync="showFilePage" width="80%" title="点火基本信息" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: auto">
+        <div class="flex-row flex-deviceinfo">
+
+          <div class="panel panel-primary col-sm-12 datapanel" v-if="selectdata.f_apply_type[0]!='工商户报建'">
+            <!--            <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>-->
+            <form class="form-horizontal select-overspread " style="flex: 1;">
+              <div style="margin-top: 2%">
+                <img style="margin-top: -2px;margin-left: 2px" src="../../../../../static/images/lefticon/矩形1183.png">
+                <a style="font-size: 16px;font-weight: 500;">民用点火信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+              </div>
+              <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;镀锌管&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_galvanize_pipe"
+                         placeholder='镀锌管' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;三&emsp;通&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_tee"
+                         placeholder='三通' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;对&emsp;丝&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_nipple"
+                         placeholder='对丝' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;弯&emsp;头&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_elbow"
+                         placeholder='弯头' >
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;管&emsp;卡&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_pipe_strap"
+                         placeholder='管卡' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;灶前阀&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_zqf"
+                         placeholder='灶前阀' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;胶&emsp;管&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_sebific_duct"
+                         placeholder='胶管' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;自闭阀&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_zbf"
+                         placeholder='自闭阀' >
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
+
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;燃气具&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_gas_appliance"
+                         placeholder='燃气具' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;热水器&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_geyser"
+                         placeholder='热水器' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;壁挂锅炉</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_bgl"
+                         placeholder='壁挂锅炉' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;型&emsp;号&emsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_bgl_style"
+                         placeholder='壁挂锅炉型号' >
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
+                <div class="col-sm-3 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;交付日期</label>
+                  <datepicker placeholder="交付日期" style="width: 57%"
+                              v-model="fireinfo.f_deliver_date"
+                              :value.sync="fireinfo.f_deliver_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;点火人员</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_lgniter"
+                         placeholder='点火人员' >
+                </div>
+                <div class="col-sm-12 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;检验结论</label>
+                  <input type="text" class="input_search" style="width:80%" v-model="fireinfo.f_fic"
+                         placeholder='设施检验结论' >
+                </div>
+                <div class="col-sm-12 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;备&emsp;&emsp;注</label>
+                  <input type="text" class="input_search" style="width:80%" v-model="fireinfo.f_comments"
+                         placeholder='备注' >
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="panel panel-primary col-sm-12 datapanel" v-if="selectdata.f_apply_type[0]=='工商户报建'">
+            <!--            <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>-->
+            <form class="form-horizontal select-overspread " style="flex: 1;">
+              <div style="margin-top: 2%">
+                <img style="margin-top: -2px;margin-left: 2px" src="../../../../../static/images/lefticon/矩形1183.png">
+                <a style="font-size: 16px;font-weight: 500;">非民用点火基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+              </div>
+              <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;探测器数量</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_detector_number"
+                         placeholder='探测器数量' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;气表品牌</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_fire_gasbrand"
+                         placeholder='气表品牌' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;控制器品牌</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_control_brand"
+                         placeholder='控制器品牌' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;控制器型号</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_control_model"
+                         placeholder='控制器型号' >
+                </div>
+              </div>
+              <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
+
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">控制器出厂日期</label>
+                  <datepicker placeholder="控制器出厂日期" style="width: 60%"
+                              v-model="fireinfo.f_control_date"
+                              :value.sync="fireinfo.f_control_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">控制器表编码</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_control_code"
+                         placeholder='控制器表编码' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">控制器表封号</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_control_number"
+                         placeholder='控制器表封号' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;燃气具类型</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_appliance_type"
+                         placeholder='燃气具类型' >
+                </div>
+              </div>
+              <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
+
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;燃气具品牌</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_appliance_brand"
+                         placeholder='燃气具品牌' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;燃气具型号</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_appliance_model"
+                         placeholder='燃气具型号' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;报警箱信息</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_alarm_info"
+                         placeholder='报警控制箱信息' >
+                </div>
+                <div class="col-sm-3 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;交付日期</label>
+                  <datepicker placeholder="交付日期" style="width: 60%"
+                              v-model="fireinfo.f_deliver_date"
+                              :value.sync="fireinfo.f_deliver_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+              </div>
+              <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;通讯方式</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_contact_method"
+                         placeholder='通讯方式' >
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;点火人员</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_lgniter"
+                         placeholder='点火人员' >
+                </div>
+                <div class="col-sm-12 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;检验结论</label>
+                  <input type="text" class="input_search" style="width:90%" v-model="fireinfo.f_fic"
+                         placeholder='设施检验结论' >
+                </div>
+                <div class="col-sm-12 form-group" >
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;备&emsp;&emsp;注</label>
+                  <input type="text" class="input_search" style="width:80%" v-model="fireinfo.f_comments"
+                         placeholder='备注' >
+                </div>
+              </div>
+            </form>
+          </div>
+        </div>
+
+      </article>
+
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='cancel()'>取消</button>
+        <button type="button" class="btn btn-success" @click='confirm()'>确定</button>
+      </footer>
+    </modal>
+<!--    <apply-file-user-fire-info v-if="showFilePage" :fireinfo="fireinfo" :showFilePage="showFilePage"></apply-file-user-fire-info>-->
   </validator>
 </template>
 <script>
@@ -346,7 +593,12 @@ export default {
         'f_position': '安装位置',
         'f_install_person': '安装人',
         'f_install_date': '安装日期'
-      }
+      },
+      showFilePage: false,
+      fireinfo: {},
+      firestate: [{label:"全部",value:'0'},{label:"未点火",value:'is null'},{label:"已点火",value:'is not null'}],
+      query: {},//查询数据
+      condition: "1 = 1"
     }
   },
   ready () {
@@ -397,11 +649,52 @@ export default {
 
       this.showUserFile = true
     },
+    // 打开点火信息
+    async showFire(row) {
+      if (this.$login.f.f_role_name.includes("报装点火权限")) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `f_userinfo_id = '${row.f_userinfo_id}'`
+        }
+        let res = await http.load('POST', 'rs/logic/getUserinfoAndUserfilesDevices', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+
+        this.userinfo = res.data
+        console.log("获取到的表具信息：" + JSON.stringify(res.data))
+        if (res.data.fireinfo.length <= 0) {
+          this.userinfo.fireinfo = [
+            {
+
+            }
+          ]
+          this.fireinfo = {}
+        }else {
+          this.fireinfo = this.userinfo.fireinfo[0]
+        }
+        this.showFilePage = true
+      }else {
+        this.$showMessage("您没有操作权限！")
+      }
+    },
+    conditionData() {
+      if (this.query.f_state == '0') {
+        this.condition = "1 = 1"
+      }else if (this.query.f_state == 'is null' || this.query.f_state == 'is not null') {
+        this.condition = "fi.f_fire_num " + this.query.f_state
+      }else {
+        this.condition = "1 = 1"
+      }
+    },
     // 查询
-    async search () {
+    async search (num) {
+      if (num == 0) {
+        this.conditionData()
+      }
       let http = new HttpResetClass()
       let data = {
-        condition: " 1=1",
+        condition: this.condition,
         f_process_id: this.selectdata.f_process_id
       }
       let res = await http.load('POST', 'rs/sql/getAddresAndUserinfoAndUserfilesAmountDevices', {data:data}, {
@@ -440,7 +733,34 @@ export default {
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
       this.search()
-    }
+    },
+    async confirm () {
+      console.log('传入数据:')
+      // 添加组织信息
+      this.fireinfo.f_user_id = this.userinfo.userfiles[0].f_user_id
+      this.fireinfo.f_userfiles_id = this.userinfo.userfiles[0].f_userfiles_id
+      this.fireinfo.f_operatorid = this.$login.f.id
+      this.fireinfo.f_operator = this.$login.f.name
+      this.fireinfo.f_state = "有效"
+
+      let http = new HttpResetClass()
+      let data = {
+        fireinfo: this.fireinfo
+      }
+      let res = await http.load('POST', 'rs/logic/addInstallationDetailsFire', {data:data}, {
+        resolveMsg: "添加成功",
+        rejectMsg: "添加失败"
+      }).then((res) => {
+        this.cancel()
+      })
+    },
+    cancel () {
+      this.showFilePage = false
+    },
+    async clear() {
+      this.query = {}
+      this.condition = "1 = 1"
+    },
   },
   events: {
     async 'onFileUpload'(file, result) {

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/Service/ServiceControl.vue

@@ -727,9 +727,11 @@ export default {
             }
             //拼写合同编号
             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')
+              this.show_data.fields[index].value = "ZS-S-" + this.show_data.fields[index].value
+              // 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')
+              this.show_data.fields[index].value = "ZS-M-" + this.show_data.fields[index].value
+              // this.show_data.fields[index].value = "ZS-M-" + this.show_data.fields[index].value + "-" + new Date().Format('yyyy-MM-dd')
             }
           }
         }