apply-clients 7.1.36 → 7.1.39

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

@@ -0,0 +1,126 @@
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      /*width: 30px;*/
+      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/supplementalAgreement.vue

@@ -1,193 +1,187 @@
 <template>
   <div class="col-sm-12" style="margin: 20px 0px;">
     <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
-      <template partial='head'>
-        <tr>
-          <th class="textNoLineBreak">序号</th>
-          <th class="textNoLineBreak">合同类型</th>
-          <th class="textNoLineBreak">合同金额</th>
-          <th class="textNoLineBreak">签订日期</th>
-          <th class="textNoLineBreak">提交人</th>
-          <th class="textNoLineBreak">备注</th>
-          <th class="textNoLineBreak">状态</th>
-          <th class="textNoLineBreak">作废人员</th>
-          <th class="textNoLineBreak">作废时间</th>
-          <th class="textNoLineBreak">作废原因</th>
-          <th class="textNoLineBreak">
-            <button
-              type="button"
-              class="btn btn-info head-but"
-              :disabled="$parent.$parent.mark === 1"
-              @click="$parent.$parent.showSupplement = !$parent.$parent.showSupplement"
-            >补充协议</button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr>{{$index+1}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_contract_type}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_contract_money}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_contract_time}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_operator}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_remarks}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_contract_status}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_void_staff}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_void_date}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_void_remarks}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>
+        <template partial='head'>
+          <tr>
+            <th class="textNoLineBreak">序号</th>
+            <th class="textNoLineBreak">合同金额</th>
+            <th class="textNoLineBreak">合同类型</th>
+            <th class="textNoLineBreak">签订日期</th>
+            <th class="textNoLineBreak">提交人</th>
+            <th class="textNoLineBreak">备注</th>
+            <th class="textNoLineBreak">状态</th>
+            <th class="textNoLineBreak">作废人员</th>
+            <th class="textNoLineBreak">作废时间</th>
+            <th class="textNoLineBreak">作废原因</th>
+            <th class="textNoLineBreak">
               <button
                 type="button"
-                name="button"
-                class="btn btn-link"
-                :disabled="$parent.$parent.mark === 1 || row.f_contract_status === '作废'"
-                @click="$parent.$parent.showInvalidModal(row)"
-              >作废</button>
-            </nobr>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
+                class="btn btn-info head-but"
+                :disabled="$parent.$parent.mark === 1"
+                @click="$parent.$parent.showSupplement = !$parent.$parent.showSupplement"
+              >补充协议</button>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contract_money}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contract_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contract_time}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_remarks}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contract_status}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_void_staff}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_void_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_void_remarks}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  :disabled="$parent.$parent.mark === 1 || row.f_contract_status === '作废'"
+                  @click="$parent.$parent.showInvalidModal(row)"
+                >作废</button>
+              </nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
 
-    <validator name="v">
-      <modal v-if="showSupplement" :show.sync="showSupplement" v-ref:modal :large="true" :backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-          <h4 class="modal-title">协议明细</h4>
-        </header>
-        <article slot="modal-body" class="modal-body clearfix">
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">合同编号：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     readonly
-                     :value="selectdata.f_contract_number"
-                     v-model="contract.f_contract_number" />
-            </div>
+    <modal v-if="showSupplement" :show.sync="showSupplement" v-ref:modal :large="true" :backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">协议明细</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">合同编号：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   readonly
+                   :value="selectdata.f_contract_number"
+                   v-model="contract.f_contract_number" />
           </div>
-          <div class="form-group col-sm-12" :class="[$v.f_contract_type.required ? 'has-error' : '']">
-            <label class="col-sm-2 control-label">合同类型：</label>
-            <div class="col-sm-10">
-              <input type="text" v-show="false"
-                     class="form-control input_view"
-                     v-validate:f_contract_type = "['required']"
-                     v-model="contract.f_contract_type" />
-              <input-select
-                class="select select_list"
-                :value.sync="contract.f_contract_type"
-                v-model="contract.f_contract_type"
-                :options="contractType"
-                :valueSingle="true"></input-select>
-            </div>
+        </div>
+        <div class="form-group col-sm-12" :class="contract.f_contract_money ? '':'has-error'">
+          <label class="col-sm-2 control-label">合同金额：</label>
+          <div class="col-sm-10">
+            <input type="number"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   :value="contract.f_contract_money"
+                   v-model="contract.f_contract_money" />
           </div>
-          <div class="form-group col-sm-12" :class="[$v.f_contract_money.required ? 'has-error' : '']">
-            <label class="col-sm-2 control-label">合同金额：</label>
-            <div class="col-sm-10">
-              <input type="number" style="width: 100%"
-                     class="form-control input_view"
-                     v-validate:f_contract_money = "['required']"
-                     v-model="contract.f_contract_money" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">合同类型：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   :value="contract.f_contract_type"
+                   v-model="contract.f_contract_type" />
           </div>
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">备注：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     v-model="contract.f_remarks" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">备注：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   v-model="contract.f_remarks" />
           </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="saveContract()">新增协议</button>
-        </footer>
-      </modal>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="saveContract()">新增协议</button>
+      </footer>
+    </modal>
 
-      <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :large="true" :backdrop="false" title="作废协议">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-          <h4 class="modal-title">作废协议</h4>
-        </header>
-        <article slot="modal-body" class="modal-body clearfix">
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">合同编号：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     readonly
-                     v-model="contract.f_contract_number" />
-            </div>
+    <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :large="true" :backdrop="false" title="作废协议">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">作废协议</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">合同编号：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   readonly
+                   v-model="contract.f_contract_number" />
           </div>
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">合同类型：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     readonly
-                     v-model="contract.f_contract_type" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">合同金额：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   readonly
+                   v-model="contract.f_contract_money" />
           </div>
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">合同金额：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     readonly
-                     v-model="contract.f_contract_money" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">合同类型：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   readonly
+                   v-model="contract.f_contract_type" />
           </div>
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">提交人员：</label>
-            <div class="col-sm-10">
-              <input type="text"
-                     class="form-control input_view"
-                     style="width: 100%"
-                     readonly
-                     v-model="contract.f_operator" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">提交人员：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   readonly
+                   v-model="contract.f_operator" />
           </div>
-          <div class="form-group col-sm-12" :class="[$v.f_void_remarks.required ? 'has-error' : '']">
-            <label class="col-sm-2 control-label">作废原因：</label>
-            <div class="col-sm-10">
-              <input type="text" style="width: 100%"
-                     class="form-control input_view"
-                     v-validate:f_void_remarks = "['required']"
-                     v-model="contract.f_void_remarks" />
-            </div>
+        </div>
+        <div class="form-group col-sm-12" :class="contract.f_void_remarks ? '':'has-error'">
+          <label class="col-sm-2 control-label">作废原因：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   v-model="contract.f_void_remarks" />
           </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="invalidContract()">确认作废</button>
-        </footer>
-      </modal>
-    </validator>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="invalidContract()">确认作废</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -220,6 +214,11 @@ export default {
   },
   methods: {
     async invalidContract() {
+      if (isEmpty(this.contract.f_void_remarks)) {
+        this.$showAlert('请输入作废原因！！！', 'warning', 3000)
+        return
+      }
+
       let http = new HttpResetClass()
       let data = {
         selectdata: this.selectdata,
@@ -237,17 +236,19 @@ export default {
       this.showInvalid = true
     },
     async saveContract() {
-      if (isEmpty(this.selectdata.f_contract_money)) {
-        this.$showAlert('请先录入主合同金额！！！', 'warning', 3000)
+      if (isEmpty(this.contract.f_contract_money)) {
+        this.$showAlert('合同金额不能为空！！！', 'warning', 3000)
         return
       }
+
+
       let http = new HttpResetClass()
       let data = {
         contract: this.contract,
         user: this.$login.f,
         selectdata: this.selectdata
       }
-        let res = await http.load('POST', 'rs/logic/addApplyContract', {data: data}, {
+      let res = await http.load('POST', 'rs/logic/addApplyContract', {data: data}, {
         resolveMsg: null,
         rejectMsg: '添加失败'
       })
@@ -257,14 +258,15 @@ export default {
       let http = new HttpResetClass()
       let data = {
         tablename: 't_contract',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
       }
-      let res = await http.load('POST', 'rs/sql/applySingleTable', {data: data}, {
+      let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
         resolveMsg: null,
         rejectMsg: '补充协议查询失败'
       })
       this.model.data = res.data
     },
+    // 关闭对话框
     closeModal() {
       this.showSupplement = false
       this.showInvalid = false
@@ -275,9 +277,6 @@ export default {
   events: {
   },
   computed: {
-    contractType () {
-      return this.$appdata.getParam('合同类型')
-    }
   },
   watch: {
   }