This commit is contained in:
parent
afa3731d4e
commit
1232bdad89
8622
logs/JIAL-ss.log
8622
logs/JIAL-ss.log
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,46 @@
|
|||
server:
|
||||
port: 3333
|
||||
spring:
|
||||
application:
|
||||
#应用的名称,可选
|
||||
name: JNDemo
|
||||
datasource:
|
||||
dynamic:
|
||||
primary: master #设置默认的数据源或者数据源组,默认值即为master
|
||||
strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
|
||||
datasource:
|
||||
master:
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
url: jdbc:sqlserver://10.1.2.11:1433;databaseName=zm_erp2;Encrypt=false;TrustServerCertificate=true;
|
||||
username: sa
|
||||
password: Itcenter110-
|
||||
druid:
|
||||
initial-size: 1
|
||||
max-active: 20
|
||||
min-idle: 1
|
||||
max-wait: 60000
|
||||
autoconfigure:
|
||||
exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration #去除Druid自动配置
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: warn
|
||||
com.JN: info
|
||||
file:
|
||||
name: logs/JIAL-ss.log
|
||||
|
||||
mybatis-plus:
|
||||
configuration:
|
||||
#在映射实体或者属性时,将数据库中表名和字段名中的下划线去掉,按照驼峰命名法映射
|
||||
map-underscore-to-camel-case: true
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
global-config:
|
||||
db-config:
|
||||
id-type: ASSIGN_ID
|
||||
|
||||
|
||||
|
|
@ -2,4 +2,4 @@ spring:
|
|||
thymeleaf:
|
||||
mode: HTML
|
||||
profiles:
|
||||
active: ss
|
||||
active: JN
|
||||
|
|
|
@ -120,28 +120,28 @@
|
|||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="净重合计" title="净重合计">
|
||||
<el-input v-model="formLabelAlign.manufAmount" placeholder="净重合计">
|
||||
<template slot="append">¥</template>
|
||||
<el-input v-model="formLabelAlign.netWeightTotal" placeholder="净重合计">
|
||||
<template slot="append">KG</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col >
|
||||
<el-col :span="6">
|
||||
<el-form-item label="重量合计" title="重量合计">
|
||||
<el-input v-model="formLabelAlign.laborCost" placeholder="重量合计">
|
||||
<template slot="append">%</template>
|
||||
<el-input v-model="formLabelAlign.weightTotal" placeholder="重量合计">
|
||||
<template slot="append">KG</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="厂价金额合计" title="厂价金额合计">
|
||||
<el-input v-model="formLabelAlign.freight" placeholder="厂价金额合计">
|
||||
<el-input v-model="formLabelAlign.totalFactoryAmount" placeholder="厂价金额合计">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="实际金额合计" title="实际金额合计">
|
||||
<el-input v-model="formLabelAlign.freight" placeholder="实际金额合计">
|
||||
<el-input v-model="formLabelAlign.totalActualAmount" placeholder="实际金额合计">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
@ -150,7 +150,7 @@
|
|||
</el-form>
|
||||
</div>
|
||||
<div class="button-box">
|
||||
<el-button type="text">选择地区</el-button>
|
||||
<el-button type="text" @click="selectedRegion">选择地区</el-button>
|
||||
<el-button type="text">添加物料</el-button>
|
||||
<el-button type="text">刷新界面</el-button>
|
||||
<el-button type="text"></el-button>
|
||||
|
@ -177,15 +177,15 @@
|
|||
width="180"
|
||||
prop="kunnr2"
|
||||
label="数量">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.kunnr2" >
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr3"
|
||||
label="电压">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.kunnr3" >
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
|
@ -216,6 +216,10 @@
|
|||
width="180"
|
||||
prop="kunnr8"
|
||||
label="盘具">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.kunnr2" >
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
|
@ -225,15 +229,23 @@
|
|||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr8"
|
||||
label="总重">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总成本">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总厂价">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总净重">
|
||||
</el-table-column>
|
||||
|
@ -248,6 +260,9 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<el-dialog title="选择地区" :visible.sync="dialogRegionVisible">
|
||||
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
|
||||
|
@ -277,14 +292,12 @@
|
|||
city: '', /*市*/
|
||||
district: '', /*区*/
|
||||
freight: '', /*运费*/
|
||||
cumulativeCost: '', /*成本累计*/
|
||||
floorPrice: '', /*底价*/
|
||||
canFloat: '', /*可下浮*/
|
||||
actualCostRatio: '', /*实际材料成本占厂价比例*/
|
||||
manufAmount: '', /*厂家金额*/
|
||||
laborCost: '', /*人工费*/
|
||||
inventoryCost: '', /*盘具*/
|
||||
canFloat: '', /*可下浮点数*/
|
||||
kilometers: '', /*公里数*/
|
||||
netWeightTotal: '', /*净重合计*/
|
||||
weightTotal: '', /*重量合计*/
|
||||
totalFactoryAmount: '', /*厂价金额合计*/
|
||||
totalActualAmount: '', /*实际金额合计*/
|
||||
},
|
||||
tableData: [
|
||||
{ kunnr1: '001', kunnr2: '002', kunnr3: '003', kunnr4: '004', kunnr5: '005', kunnr6: '006', kunnr7: '007', kunnr8: '008' },
|
||||
|
@ -319,6 +332,10 @@
|
|||
|
||||
handleDeleteClick(index){
|
||||
this.tableData.splice(index, 1)
|
||||
},
|
||||
|
||||
selectedRegion(){
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
server:
|
||||
port: 3333
|
||||
spring:
|
||||
application:
|
||||
#应用的名称,可选
|
||||
name: JNDemo
|
||||
datasource:
|
||||
dynamic:
|
||||
primary: master #设置默认的数据源或者数据源组,默认值即为master
|
||||
strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
|
||||
datasource:
|
||||
master:
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
url: jdbc:sqlserver://10.1.2.11:1433;databaseName=zm_erp2;Encrypt=false;TrustServerCertificate=true;
|
||||
username: sa
|
||||
password: Itcenter110-
|
||||
druid:
|
||||
initial-size: 1
|
||||
max-active: 20
|
||||
min-idle: 1
|
||||
max-wait: 60000
|
||||
autoconfigure:
|
||||
exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration #去除Druid自动配置
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: warn
|
||||
com.JN: info
|
||||
file:
|
||||
name: logs/JIAL-ss.log
|
||||
|
||||
mybatis-plus:
|
||||
configuration:
|
||||
#在映射实体或者属性时,将数据库中表名和字段名中的下划线去掉,按照驼峰命名法映射
|
||||
map-underscore-to-camel-case: true
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
global-config:
|
||||
db-config:
|
||||
id-type: ASSIGN_ID
|
||||
|
||||
|
||||
|
|
@ -2,4 +2,4 @@ spring:
|
|||
thymeleaf:
|
||||
mode: HTML
|
||||
profiles:
|
||||
active: ss
|
||||
active: JN
|
||||
|
|
|
@ -1,22 +1,18 @@
|
|||
.container {
|
||||
display: flex;
|
||||
|
||||
width: 100%; /* 设置页面宽度为视口宽度的100% */
|
||||
}
|
||||
|
||||
.center-container {
|
||||
text-align: center;
|
||||
margin: auto;
|
||||
width: 95%;
|
||||
padding: 10px;
|
||||
min-width: 1100px;
|
||||
}
|
||||
|
||||
.el-input {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
.el-input__inner {
|
||||
height: 30px;
|
||||
/*font-family: Roboto, serif;*/
|
||||
|
@ -41,6 +37,7 @@
|
|||
|
||||
|
||||
.el-form-item__label {
|
||||
min-width: 100px;
|
||||
text-align: justify;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="账期" title="账期">
|
||||
<el-form-item label="额外账期" title="额外账期">
|
||||
<el-input v-model="formLabelAlign.accountPeriod" placeholder="账期">
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
|
@ -103,59 +103,45 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="成本累计" title="成本累计">
|
||||
<el-input v-model="formLabelAlign.cumulativeCost" placeholder="成本累计">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col >
|
||||
<el-col :span="6">
|
||||
<el-form-item label="底价" title="底价">
|
||||
<el-input v-model="formLabelAlign.floorPrice" placeholder="底价">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="可下浮" title="可下浮">
|
||||
<el-form-item label="可下浮点数" title="可下浮点数">
|
||||
<el-input v-model="formLabelAlign.canFloat" placeholder="可下浮">
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="实际成本比例" title="实际材料成本占厂价比例">
|
||||
<el-input v-model="formLabelAlign.actualCostRatio" placeholder="实际材料成本占厂价比例">
|
||||
<template slot="append">%</template>
|
||||
<el-form-item label="运费">
|
||||
<el-input v-model="formLabelAlign.freight" placeholder="运费">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="厂家金额" title="厂家金额">
|
||||
<el-input v-model="formLabelAlign.manufAmount" placeholder="厂家金额">
|
||||
<el-form-item label="净重合计" title="净重合计">
|
||||
<el-input v-model="formLabelAlign.netWeightTotal" placeholder="净重合计">
|
||||
<template slot="append">KG</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col >
|
||||
<el-col :span="6">
|
||||
<el-form-item label="重量合计" title="重量合计">
|
||||
<el-input v-model="formLabelAlign.weightTotal" placeholder="重量合计">
|
||||
<template slot="append">KG</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="厂价金额合计" title="厂价金额合计">
|
||||
<el-input v-model="formLabelAlign.totalFactoryAmount" placeholder="厂价金额合计">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="人工费" title="人工费">
|
||||
<el-input v-model="formLabelAlign.laborCost" placeholder="人工费">
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="盘具" title="盘具">
|
||||
<el-input v-model="formLabelAlign.inventoryCost" placeholder="盘具">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" >
|
||||
<el-form-item label="运费">
|
||||
<el-input v-model="formLabelAlign.freight" placeholder="运费">
|
||||
<el-form-item label="实际金额合计" title="实际金额合计">
|
||||
<el-input v-model="formLabelAlign.totalActualAmount" placeholder="实际金额合计">
|
||||
<template slot="append">¥</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
@ -175,51 +161,93 @@
|
|||
border
|
||||
:cell-style="cellStyle"
|
||||
:header-cell-style="{ background: '#eef1f6', color: '#606266', 'text-align': 'center' }">
|
||||
<el-table-column
|
||||
fixed
|
||||
label="编号"
|
||||
type="index"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed
|
||||
width="180"
|
||||
prop="kunnr1"
|
||||
label="物料编码">
|
||||
label="品名">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr2"
|
||||
label="物料描述">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr3"
|
||||
label="销售单位">
|
||||
label="数量">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.kunnr3" >
|
||||
<el-input v-model="scope.row.kunnr2" >
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr3"
|
||||
label="电压">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr4"
|
||||
label="厂价">
|
||||
label="标准">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr5"
|
||||
label="基准成本"
|
||||
style="color: red">
|
||||
label="纤芯">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr6"
|
||||
label="现行采购成本">
|
||||
label="成本价">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr7"
|
||||
label="保留字段1">
|
||||
label="厂价">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr8"
|
||||
label="保留字段2">
|
||||
label="净量">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr8"
|
||||
label="盘具">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.kunnr2" >
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr8"
|
||||
label="盘重">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
prop="kunnr8"
|
||||
label="总重">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总成本">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总厂价">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
width="120"
|
||||
prop="kunnr8"
|
||||
label="总净重">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
|
@ -248,7 +276,6 @@
|
|||
el: '#index-app',
|
||||
data() {
|
||||
return {
|
||||
labelPosition: 'right',
|
||||
formLabelAlign: {
|
||||
processingFee: '0.60', /*蒸汽费/钢丝铠装材料及加工费*/
|
||||
prodFinancialCost: '0.40', /*生产财务成本*/
|
||||
|
@ -262,14 +289,14 @@
|
|||
city: '', /*市*/
|
||||
district: '', /*区*/
|
||||
freight: '', /*运费*/
|
||||
cumulativeCost: '', /*成本累计*/
|
||||
floorPrice: '', /*底价*/
|
||||
canFloat: '', /*可下浮*/
|
||||
actualCostRatio: '', /*实际材料成本占厂价比例*/
|
||||
manufAmount: '', /*厂家金额*/
|
||||
laborCost: '', /*人工费*/
|
||||
inventoryCost: '', /*盘具*/
|
||||
canFloat: '', /*可下浮点数*/
|
||||
kilometers: '', /*公里数*/
|
||||
netWeightTotal: '', /*净重合计*/
|
||||
weightTotal: '', /*重量合计*/
|
||||
totalFactoryAmount: '', /*厂价金额合计*/
|
||||
totalActualAmount: '', /*实际金额合计*/
|
||||
|
||||
|
||||
},
|
||||
tableData: [
|
||||
{ kunnr1: '001', kunnr2: '002', kunnr3: '003', kunnr4: '004', kunnr5: '005', kunnr6: '006', kunnr7: '007', kunnr8: '008' },
|
||||
|
|
Loading…
Reference in New Issue