huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

改bug

Browse Source
dev
e 3 years ago
parent 60868d98a9
commit c63fd9557d
5 changed files with 18 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/utils/api.js
  2. 10
      src/views/data/Framework.vue
  3. 17
      src/views/order/AddOrder.vue
  4. 3
      src/views/order/selectClient.vue
  5. 2
      src/views/setting/Person.vue

2
src/utils/api.js
Unescape View File

@ -116,7 +116,7 @@ export default {
deleteCategory:`${host}/data/data/table/deleteCategory`,
deleteTable:`${host}/data/data/table/deleteTable`,
previewData:`${host}/data/data/preview`,
staticPreview:`${host}/data/data/staticPreview`,
// 产品管理
deleteProduct:`${host}/data/data/product/delete`,
findById:`${host}/data/data/product/findById`,

10
src/views/data/Framework.vue
Unescape View File

@ -55,9 +55,9 @@
<el-dialog title="导入" :visible.sync="importVisible" width="80%" center @close="closeImport" class="dialog" :close-on-click-modal="false">
<el-container style="padding: 20px 0 20px 20px;background-color: #f0f0f0;">
<el-aside width="300px">
<el-tree style="margin: 10px;" ref="typeTree" :data="importTypeList" node-key="id" accordion :default-expanded-keys="defaultTypeActive" :current-node-key="curId" show-checkbox :props="defaultProps" highlight-current @node-click="importTypeClick"></el-tree>
</el-aside>
<div style="overflow:auto;height: 558px;width:330px;padding:15px;background:#fff">
<el-tree ref="typeTree" :data="importTypeList" node-key="id" accordion :default-expanded-keys="defaultTypeActive" :current-node-key="curId" show-checkbox :props="defaultProps" highlight-current @node-click="importTypeClick"></el-tree>
</div>
<el-main style="padding-top: 0;padding-bottom: 0;">
<el-card shadow="hover">
<el-table :data="fieldData" stripe header-align="center">
@ -238,6 +238,7 @@ export default {
for(let i in n){
if(typeof n[i] == 'string' && n[i].endsWith('+0000')) n[i] = this.formatDate('yyyy-MM-dd hh:mm:ss',new Date(n[i]))
}
})
this.previewData = data
this.previewVisible = true
@ -329,7 +330,7 @@ export default {
}).catch(res => {})
},
getFields(){
this.$get(`${this.api.previewData}?tableName=${this.tableName}&tableId=${this.curId}`).then(res => {
this.$get(`${this.api.staticPreview}?tableName=${this.tableName}`).then(res => {
let comment = res.comment
let fieldHead = []
comment.map(n => {
@ -344,6 +345,7 @@ export default {
}
})
this.fieldData = data
console.log(data,'data');
}).catch(res => {})
this.importVisible = true
},

17
src/views/order/AddOrder.vue
Unescape View File

@ -207,7 +207,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="市场价" align="center" width="165">
<el-table-column label="市场价" align="center" width="185">
<template slot-scope="scope">
<div class="small">
<el-input disabled v-model="scope.row.marketValue" placeholder="请输入"type="text"></el-input>
@ -215,7 +215,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="成交价" align="center" width="165">
<el-table-column label="成交价" align="center" width="185">
<template slot-scope="scope">
<div class="small">
<el-input :disabled="disabled||editDisabled" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" @change="[dealComputers($event,scope.row),discount($event,scope.row),userAmount($event,scope.row)]" v-model="scope.row.finalPrice" placeholder="请输入"type="text"></el-input>
@ -230,7 +230,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="账号数" align="center">
<el-table-column label="账号数" align="center" width="150">
<template slot-scope="scope">
<div class="small">
<el-input :disabled="disabled||editDisabled" @change="dealComputers($event,scope.row)" v-model="scope.row.accountNum" placeholder="请输入"type="text"></el-input>
@ -238,7 +238,7 @@
</template>
</el-table-column>
<!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 -->
<el-table-column label="总金额(元)" align="center">
<el-table-column label="总金额(元)" align="center" width="180">
<template slot-scope="scope">
<div class="small">
<el-input :disabled="disabled||editDisabled" @change="[allAmount($event,scope.row),allAmountChange($event,scope.row)]" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" v-model="scope.row.totalAmount" placeholder="请输入"type="text"></el-input>
@ -250,7 +250,7 @@
<el-button :disabled="disabled" @click="configure(scope.row)">配置</el-button>
</template>
</el-table-column> -->
<el-table-column label="操作" align="center" width="330px">
<el-table-column label="操作" align="center" width="230px">
<template slot-scope="scope">
<div class="flex-c-c">
<el-button v-if="!editDisabled&&!disabled" style="margin-right:10px;" @click="delDataForm(scope.$index)">删除</el-button>
@ -923,7 +923,7 @@ export default {
if(val){
let all = val*10000
if(row.accountNum){// 若有账号
row.marketValue = all/row.accountNum
row.finalPrice = all/row.accountNum
}
if(row.finalPrice){
row.accountNum = all/row.finalPrice
@ -978,7 +978,7 @@ export default {
let date2 = Date.parse(nowYear);
let ms = Math.abs(date1 - date2)
let days = Math.floor(ms / (24 * 3600 * 1000));
let days = Math.floor(ms / (24 * 3600 * 1000)) + 1;
console.log(Date.parse(endYear),nowYear,date1,date2,days,'剩余期限');
row.remainingPeriod = days
},
@ -1207,7 +1207,8 @@ export default {
}
/deep/ .small .el-input__inner{
width: 70px;
width: 100%;
margin-right: 5px;
}
/deep/ .discountRate .el-input__inner{
width: 85px;

3
src/views/order/selectClient.vue
Unescape View File

@ -206,14 +206,13 @@ export default {
show:true,
id:this.checkedID,
name:this.checkedName,
}
await this.$get(this.api.queryCustomerDetails,{customerId:this.checkedID}).then(res=>{
console.log(res,'当前的res');
let data = res.result.customer
param.email = data.email
param.phone = data.phone
param.name = data.name
param.name = data.customerName
})
this.$emit('back',param)

2
src/views/setting/Person.vue
Unescape View File

@ -830,7 +830,7 @@ export default {
// n.userId = this.form.userId
// })
// if(isEmpty) return this.$message.warning('请选择职业')
if(this.accountReapeat) return this.$message.warning('该账号已存在')
// if(this.accountReapeat) return this.$message.warning('该账号已存在')
if(this.form.idNumber && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/.test(this.form.idNumber)) return this.$message.warning('请输入正确的证件号码')
let form = this.form
let personalFileList = []

Write Preview
Loading…
Cancel
Save