apply-clients 3.5.1 → 3.5.2

package/src/filiale/yangchunboneng/pc/otherchargeManagement.vue

@@ -1,214 +1,214 @@
-<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>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr>{{$index+1}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_money}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_brand_spec}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_payment}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_operator}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_operate_date}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_state}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_confirm_person}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_confirm_date}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr v-if="row.f_confirm_person==null">
-              <button
-                type="button"
-                name="button"
-                class="btn btn-link"
-                :disabled="$parent.$parent.mark === 1"
-                @click="$parent.$parent.showConfirmModal(row,'确认收款')"
-              >确认收款</button>
-            </nobr>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-    <modal v-if="showConfirm" :show.sync="showConfirm" v-ref:modal :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="charge.f_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="charge.f_payment" />
-          </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="charge.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%"
-                   v-model="charge.f_confirm_person" />
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-2 control-label">确认时间：</label>
-          <div class="col-sm-10">
-            <datepicker id="startDate" placeholder="确认时间"
-                        style="width: 100%!important;"
-                        v-model="charge.f_confirm_date"
-                        :value.sync="charge.f_confirm_date"
-                        :default="true"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
-                        :show-reset-button="true"
-            >
-            </datepicker>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-import {getNowDate,isEmpty} from '../../../components/Util'
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '收费管理',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0
-    }
-  },
-  data () {
-    return {
-      model: {
-        rows: null
-      },
-      showConfirm: false,
-      charge:{}
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    async search () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_orgid = '${this.$login.f.orgid}' and f_state = '有效'`,
-        orderitem:'f_operate_date desc'
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/applyotherChargeQuery`, {data:data}, {
-        resolveMsg: null,
-        rejectMsg: '收费记录查询失败！！！'
-      })
-      this.model.rows = res.data
-    },
-    showConfirmModal(row,type){
-      this.charge = row
-      if (type == '确认收款'){
-        this.charge.f_confirm_person = this.$login.f.name
-        this.showConfirm= true
-      }
-    },
-    async ConfirmPayment() {
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/logic/confirmotherCharge', {data: {charge:this.charge}}, {
-        resolveMsg: null,
-        rejectMsg: '提交失败！！！'
-      })
-      if(res.data==200){
-        this.$showAlert('提交成功！！！', 'success', 3000)
-        //延时1s
-        setTimeout(() => {
-          this.showConfirm= false
-        }, 1000)
-      }
-    },
-    closeModal(){
-      this.showConfirm = false
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped>
-.textNoLineBreak {
-  white-space: nowrap;
-}
-.head-but{
-  margin-left: 5px;
-  height: 34px;
-  /*background-color: #6aa6e2;*/
-  border-radius: 4px;
-  font-family: PingFang;
-  color: #ffffff;
-}
-</style>
+<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>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_money}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_brand_spec}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_payment}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operate_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_state}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_confirm_person}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_confirm_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr v-if="row.f_confirm_person==null">
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                :disabled="$parent.$parent.mark === 1"
+                @click="$parent.$parent.showConfirmModal(row,'确认收款')"
+              >确认收款</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showConfirm" :show.sync="showConfirm" v-ref:modal :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="charge.f_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="charge.f_payment" />
+          </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="charge.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%"
+                   v-model="charge.f_confirm_person" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">确认时间：</label>
+          <div class="col-sm-10">
+            <datepicker id="startDate" placeholder="确认时间"
+                        style="width: 100%!important;"
+                        v-model="charge.f_confirm_date"
+                        :value.sync="charge.f_confirm_date"
+                        :default="true"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+            >
+            </datepicker>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {getNowDate,isEmpty} from '../../../components/Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      model: {
+        rows: null
+      },
+      showConfirm: false,
+      charge:{}
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_orgid = '${this.$login.f.orgid}' and f_state = '有效'`,
+        orderitem:'f_operate_date desc'
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/applyotherChargeQuery`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '收费记录查询失败！！！'
+      })
+      this.model.rows = res.data
+    },
+    showConfirmModal(row,type){
+      this.charge = row
+      if (type == '确认收款'){
+        this.charge.f_confirm_person = this.$login.f.name
+        this.showConfirm= true
+      }
+    },
+    async ConfirmPayment() {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/logic/confirmotherCharge', {data: {charge:this.charge}}, {
+        resolveMsg: null,
+        rejectMsg: '提交失败！！！'
+      })
+      if(res.data==200){
+        this.$showAlert('提交成功！！！', 'success', 3000)
+        //延时1s
+        setTimeout(() => {
+          this.showConfirm= false
+        }, 1000)
+      }
+    },
+    closeModal(){
+      this.showConfirm = false
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.textNoLineBreak {
+  white-space: nowrap;
+}
+.head-but{
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>

package/src/filiale/yangchunboneng/pc.js

@@ -1,17 +1,17 @@
-import Vue from 'vue'
-
-let specialComp = {
-  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect.vue'], resolve) },
-  'service-control': (resolve) => { require(['./pc/ServiceControl.vue'], resolve) },
-  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement.vue'], resolve) },
-  'file-upload': (resolve) => { require(['./pc/FileUpload.vue'], resolve) },
-  'apply-upload': (resolve) => { require(['./pc/ApplyUpload.vue'], resolve) },
-  'installinfoselect': (resolve) => { require(['./pc/InstallInfoSelect.vue'], resolve) },
-  'installation-details': (resolve) => { require(['./pc/InstallationDetails.vue'], resolve) },
-  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList.vue'], resolve) },
-  'add-material-science': (resolve) => { require(['./pc/addMaterialScience.vue'], resolve) },
-  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement.vue'], resolve) },
-  'service-view': (resolve) => { require(['./pc/ServiceView.vue'], resolve) },
-  'other-charge-management': (resolve) => { require(['./pc/otherchargeManagement.vue'], resolve) }
-}
-exports.specialComp = specialComp
+import Vue from 'vue'
+
+let specialComp = {
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect.vue'], resolve) },
+  'service-control': (resolve) => { require(['./pc/ServiceControl.vue'], resolve) },
+  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement.vue'], resolve) },
+  'file-upload': (resolve) => { require(['./pc/FileUpload.vue'], resolve) },
+  'apply-upload': (resolve) => { require(['./pc/ApplyUpload.vue'], resolve) },
+  'installinfoselect': (resolve) => { require(['./pc/InstallInfoSelect.vue'], resolve) },
+  'installation-details': (resolve) => { require(['./pc/InstallationDetails.vue'], resolve) },
+  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList.vue'], resolve) },
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience.vue'], resolve) },
+  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement.vue'], resolve) },
+  'service-view': (resolve) => { require(['./pc/ServiceView.vue'], resolve) },
+  'other-charge-management': (resolve) => { require(['./pc/otherchargeManagement.vue'], resolve) }
+}
+exports.specialComp = specialComp

package/src/main.js

@@ -1,23 +1,23 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-
-all()
-apply('qianneng')
-ldap()
-sale('qianneng')
-material()
-system(false, 'qianneng')
-
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+
+all()
+apply('hongda')
+ldap()
+sale('qianneng')
+material()
+system(false, 'qianneng')
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})