wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

java8
常熟吴彦祖 4 months ago
parent
26636d6a89 b5ec40c9dd
commit
8157995ac7
3 changed files with 185 additions and 2 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. 79
      src/views/modules/ecss/codelnotify.vue
  2. 54
      src/views/modules/ecss/codelnotifyConfirm.vue
  3. 54
      src/views/modules/ecss/createDeclaration.vue

79
src/views/modules/ecss/codelnotify.vue
View File

@ -351,6 +351,11 @@
<el-input v-model="updateDetailModel.ttlAmount" type="number" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'VAT'" >
<el-input v-model="updateDetailModel.vat" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'价税合计'" >
<el-input v-model="updateDetailModel.sumPrice" type="number" ></el-input>
@ -366,7 +371,17 @@
<el-input v-model="updateDetailModel.upc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item :label="'Roll'" >
<el-input v-model="updateDetailModel.roll" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'Carton'" >
<el-input v-model="updateDetailModel.carton" ></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item :label="'Remark'" >
<el-input v-model="updateDetailModel.remark" ></el-input>
</el-form-item>
@ -812,7 +827,10 @@
upc:'',
remark:'',
pn:'',
addFlag:''
addFlag:'',
carton:'',
vat:'',
roll:'',
},
activeName:'detail',
columnList1: [
@ -1430,6 +1448,24 @@
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "vat",
headerAlign: "center",
align: "right",
columnLabel: "VAT",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801001,
@ -1520,6 +1556,42 @@
fixed: '',
columnWidth: 300
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "roll",
headerAlign: "center",
align: "right",
columnLabel: "Roll",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "carton",
headerAlign: "center",
align: "right",
columnLabel: "Carton",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
],
ossColumns:[
@ -2064,6 +2136,9 @@
this.updateDetailModel.upc=''
this.updateDetailModel.remark=''
this.updateDetailModel.pn=''
this.updateDetailModel.roll=''
this.updateDetailModel.carton=''
this.updateDetailModel.vat=''
this.updateDetailModel.addFlag=0
this.updateDetailModelFlag=true
},

54
src/views/modules/ecss/codelnotifyConfirm.vue
View File

@ -1340,6 +1340,24 @@
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "vat",
headerAlign: "center",
align: "right",
columnLabel: "VAT",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801002,
@ -1412,6 +1430,42 @@
fixed: '',
columnWidth: 300
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "roll",
headerAlign: "center",
align: "right",
columnLabel: "Roll",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "carton",
headerAlign: "center",
align: "right",
columnLabel: "Carton",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
],
columnList3:[
{

54
src/views/modules/ecss/createDeclaration.vue
View File

@ -1113,6 +1113,24 @@
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "vat",
headerAlign: "center",
align: "right",
columnLabel: "VAT",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801001,
@ -1203,6 +1221,42 @@
fixed: '',
columnWidth: 300
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "roll",
headerAlign: "center",
align: "right",
columnLabel: "Roll",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801001,
serialNumber: '801001Table2Remark',
tableId: "801001Table2",
tableName: "关务系统发货通知单明细",
columnProp: "carton",
headerAlign: "center",
align: "right",
columnLabel: "Carton",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
],
currentRow:{},

Write Preview
Loading…
Cancel
Save