apply-clients 7.1.35 → 7.1.36

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

@@ -0,0 +1,182 @@
+<template>
+  <div style="margin-bottom: 20px" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-3">选择用户</label>
+    <div class="col-sm-10" >
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
+    </div>
+  </div>
+
+  <modal v-if="showselect" :show.sync="showselect" width="80%" title="用户信息" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <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_userinfo_id"
+                       v-on:keyup.enter="search"
+                       condition="f_userinfo_id = '{}'">
+              </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="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" v-model="model.f_user_phone"
+                       v-on:keyup.enter="search" condition="f_user_phone = '{}'" placeholder='客户电话'>
+              </div>
+
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$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_address"
+                       v-on:keyup.enter="search" condition="f_address like '%{}%'" placeholder='客户地址'>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
+          <template partial='head'>
+            <tr>
+              <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>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_userinfo_id }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>
+                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
+                </font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showselect: false,
+      model: new PagedList('rs/sql/applyGetUserinfos', 20, null),
+      criteriaShow: false
+    }
+  },
+  ready () {
+  },
+  methods: {
+    select (row) {
+      this.$dispatch('selectUserinfo', row)
+
+      this.showselect = false
+    },
+    searchCondition (args) {
+      args.condition = `${args.condition} and f_filiale = '${this.$login.f.f_fengongsi}' and f_user_state = '分户挂表'`
+
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    openSelect () {
+      this.showselect = true
+      setTimeout(() => {
+        this.$refs.cp.$refs.cri.search()
+      }, 100)
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 110px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.input_view{
+  padding: 8px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7!important;
+  color: #333333!important;
+  font-size: 15px!important;
+}
+
+.input_view[readonly]{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+</style>

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

@@ -1,187 +1,193 @@
 <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">
+      <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>
               <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_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>
+                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>
 
-    <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" />
+    <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>
           </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 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>
-        <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 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>
-        <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 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>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="saveContract()">新增协议</button>
-      </footer>
-    </modal>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @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" />
+      <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>
-        </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 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>
-        <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 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>
-        <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 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>
-        <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 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>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="invalidContract()">确认作废</button>
-      </footer>
-    </modal>
+        </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>
 </template>
 <script>
@@ -214,11 +220,6 @@ 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,
@@ -236,19 +237,17 @@ export default {
       this.showInvalid = true
     },
     async saveContract() {
-      if (isEmpty(this.contract.f_contract_money)) {
-        this.$showAlert('合同金额不能为空！！！', 'warning', 3000)
+      if (isEmpty(this.selectdata.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: '添加失败'
       })
@@ -258,15 +257,14 @@ 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/singleTable', {data: data}, {
+      let res = await http.load('POST', 'rs/sql/applySingleTable', {data: data}, {
         resolveMsg: null,
         rejectMsg: '补充协议查询失败'
       })
       this.model.data = res.data
     },
-    // 关闭对话框
     closeModal() {
       this.showSupplement = false
       this.showInvalid = false
@@ -277,6 +275,9 @@ export default {
   events: {
   },
   computed: {
+    contractType () {
+      return this.$appdata.getParam('合同类型')
+    }
   },
   watch: {
   }