apply-clients 3.5.5-84 → 3.5.5-86

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://125.46.75.142:6010'
-var applyinstall = 'http://125.46.75.142:6010'
+var ldap = 'http://61.163.123.47:31785'
+var applyinstall = 'http://61.163.123.47:31785'
 
 var proxyTable = {
   '/api': {
@@ -54,7 +54,7 @@ var proxyTable = {
     changeOrigin: true
   },
   '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall,
+    target: ldap ? ldap:applyinstall,
     changeOrigin: true
   },
   '/rs/logic/getLogin': {
@@ -128,10 +128,10 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8300, function (err) {
+module.exports = app.listen(31785, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8300')
+  console.log('Listening at http://localhost:31785')
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.5-84",
+  "version": "3.5.5-86",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Install/ContractCharge.vue

@@ -1,210 +1,210 @@
-<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>合同金额</th>
-          <th>付款节点</th>
-          <th>付款比例</th>
-          <th>应收金额</th>
-          <th>
-            <button v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-新增')" type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.f_amount }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.defname }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>
-              <button v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-修改')" type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
-              <button  v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-删除')" type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
-            </font></nobr>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-    <modal
-      :show.sync="addModal"
-      backdrop="false"
-      :title="titleText"
-    >
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">{{ titleText }}</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">合同金额(元)：：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   class="form-control input_view"
-                   style="width: 60%"
-                   readonly
-                   v-model="addData.f_amount"/>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">付款节点：</label>
-          <div class="col-sm-9">
-            <v-select
-              v-model="addData.applyType"
-              placeholder='请选择需要发起的工程类型'
-              :value.sync="addData.applyType"
-              :options='payProjects'
-              :value-single="true"
-              class="select select_list"
-              :search="false"
-              close-on-select></v-select>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">付款比例(%)：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   class="form-control input_view" style="width: 60%"
-                   v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">预付款金额(元)：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   style="width: 60%"
-                   class="form-control input_view"
-                   v-model="addData.f_due_money"
-                   @change="inputChange(2)"/>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary"  @click="saveOrUpdate()">确认</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '付款预设',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 1
-    }
-  },
-  data () {
-    return {
-      model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
-      payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
-      addModal: false,
-      addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
-      titleText: ''
-    }
-  },
-  methods: {
-    toFixed (num) {
-      return parseFloat(num).toFixed(2)
-    },
-    showAdd () {
-      this.addData = {
-        f_amount: this.selectdata.f_contract_money,
-        f_process_id: this.selectdata.f_process_id,
-        f_payment_ratio: '',
-        defname: '',
-        f_due_money: ''
-      }
-      this.titleText = '新增付款预设'
-      this.addModal = true
-    },
-    inputChange (type) {
-      if (this.addData.f_amount) {
-        if (type === 1) {
-          this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
-          // this.addData.f_due_money转为数字类型
-          this.addData.f_due_money = parseFloat(this.addData.f_due_money)
-          this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
-          if (this.addData.f_due_money > this.selectdata.f_contract_money) {
-            this.addData.f_payment_ratio = 0
-            this.addData.f_due_money = 0
-            this.$showMessage('预付款金额不能大于合同金额')
-          }
-        } else {
-          this.addData.f_payment_ratio = Math.round(this.addData.f_due_money / this.addData.f_amount * 100)
-          this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
-          if (this.addData.f_payment_ratio > 100) {
-            this.addData.f_payment_ratio = 0
-            this.addData.f_due_money = 0
-            this.$showMessage('付款比率不能大于100%')
-          }
-        }
-      }
-    },
-    updateData (row) {
-      this.addData = row
-      this.addData.f_amount = this.selectdata.f_contract_money
-      this.titleText = '修改付款预设'
-      this.addModal = true
-    },
-    delData (row) {
-      console.log('delData=========')
-      this.$resetdelete('apply/rs/entity/t_contract_charge', {id: row.id}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then(() => {
-        this.search()
-      })
-      this.addModal = false
-    },
-    saveOrUpdate () {
-      // this.addData
-      console.log('saveOrUpdate=========')
-      this.addData.defname = this.addData.applyType
-      new HttpResetClass().load('POST', 'apply/rs/entity/t_contract_charge', this.addData, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then(() => {
-        this.search()
-      })
-      // 关闭弹窗
-      this.addModal = false
-    },
-    closeModal () {
-      this.addModal = false
-    },
-    search () {
-      let data = {
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      new HttpResetClass().load('POST', 'rs/sql/getContractCharge', {data: data}
-        , {resolveMsg: null, rejectMsg: null})
-        .then((res) => {
-          this.model.rows = res.data
-        })
-    }
-  },
-  ready () {
-    this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
-    this.search()
-  }
-}
-</script>
-
-<style scoped>
-
-</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>合同金额</th>
+          <th>付款节点</th>
+          <th>付款比例</th>
+          <th>应收金额</th>
+          <th>
+            <button v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-新增')" type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_amount }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.defname }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>
+              <button v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-修改')" type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
+              <button  v-if="$parent.$parent.$login.f.f_role_name.includes('付款预设-删除')" type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
+            </font></nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal
+      :show.sync="addModal"
+      backdrop="false"
+      :title="titleText"
+    >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">{{ titleText }}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">合同金额(元)：：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 60%"
+                   readonly
+                   v-model="addData.f_amount"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">付款节点：</label>
+          <div class="col-sm-9">
+            <v-select
+              v-model="addData.applyType"
+              placeholder='请选择需要发起的工程类型'
+              :value.sync="addData.applyType"
+              :options='payProjects'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              close-on-select></v-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">付款比例(%)：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   class="form-control input_view" style="width: 60%"
+                   v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">预付款金额(元)：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   style="width: 60%"
+                   class="form-control input_view"
+                   v-model="addData.f_due_money"
+                   @change="inputChange(2)"/>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary"  @click="saveOrUpdate()">确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '付款预设',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 1
+    }
+  },
+  data () {
+    return {
+      model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
+      payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
+      addModal: false,
+      addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
+      titleText: ''
+    }
+  },
+  methods: {
+    toFixed (num) {
+      return parseFloat(num).toFixed(2)
+    },
+    showAdd () {
+      this.addData = {
+        f_amount: this.selectdata.f_contract_money,
+        f_process_id: this.selectdata.f_process_id,
+        f_payment_ratio: '',
+        defname: '',
+        f_due_money: ''
+      }
+      this.titleText = '新增付款预设'
+      this.addModal = true
+    },
+    inputChange (type) {
+      if (this.addData.f_amount) {
+        if (type === 1) {
+          this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
+          // this.addData.f_due_money转为数字类型
+          this.addData.f_due_money = parseFloat(this.addData.f_due_money)
+          this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
+          if (this.addData.f_due_money > this.selectdata.f_contract_money) {
+            this.addData.f_payment_ratio = 0
+            this.addData.f_due_money = 0
+            this.$showMessage('预付款金额不能大于合同金额')
+          }
+        } else {
+          this.addData.f_payment_ratio = Math.round(this.addData.f_due_money / this.addData.f_amount * 100)
+          this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
+          if (this.addData.f_payment_ratio > 100) {
+            this.addData.f_payment_ratio = 0
+            this.addData.f_due_money = 0
+            this.$showMessage('付款比率不能大于100%')
+          }
+        }
+      }
+    },
+    updateData (row) {
+      this.addData = row
+      this.addData.f_amount = this.selectdata.f_contract_money
+      this.titleText = '修改付款预设'
+      this.addModal = true
+    },
+    delData (row) {
+      console.log('delData=========')
+      this.$resetdelete('apply/rs/entity/t_contract_charge', {id: row.id}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(() => {
+        this.search()
+      })
+      this.addModal = false
+    },
+    saveOrUpdate () {
+      // this.addData
+      console.log('saveOrUpdate=========')
+      this.addData.defname = this.addData.applyType
+      new HttpResetClass().load('POST', 'apply/rs/entity/t_contract_charge', this.addData, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(() => {
+        this.search()
+      })
+      // 关闭弹窗
+      this.addModal = false
+    },
+    closeModal () {
+      this.addModal = false
+    },
+    search () {
+      let data = {
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      new HttpResetClass().load('POST', 'rs/sql/getContractCharge', {data: data}
+        , {resolveMsg: null, rejectMsg: null})
+        .then((res) => {
+          this.model.rows = res.data
+        })
+    }
+  },
+  ready () {
+    this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
+    this.search()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>