xiaozhan
/
crmeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:

Browse Source 
修改单据相关字段显示
main
zxf 3 months ago
parent 41416c4ca6
commit 1d6105a165
14 changed files with 120 additions and 256 deletions
Show Stats Download Patch File Download Diff File

5
admin/.env.development
Unescape View File

@ -2,9 +2,9 @@
ENV = 'development' ENV = 'development'
# base api # base api
# VUE_APP_BASE_API = 'http://127.0.0.1:18091' VUE_APP_BASE_API = 'http://127.0.0.1:18091'
# VUE_APP_BASE_API = 'http://124.71.134.146:18091' # VUE_APP_BASE_API = 'http://124.71.134.146:18091'
VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn' # VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn'
# VUE_APP_BASE_API = 'http://wangyi.test.jiutianda.cn' # VUE_APP_BASE_API = 'http://wangyi.test.jiutianda.cn'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
@ -15,3 +15,4 @@ VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn'
# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

3
admin/.env.production
Unescape View File

@ -2,5 +2,6 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = 'http://124.71.134.146:18091' # VUE_APP_BASE_API = 'http://124.71.134.146:18091'
VUE_APP_BASE_API = 'http://119.45.21.129:18091'

27
admin/src/views/ck/ckstock/index.vue
Unescape View File

@ -115,11 +115,6 @@
</el-table-column> </el-table-column>
<el-table-column label="单据编号" align="center" prop="billNumber" sortable='custom' width="100"/> <el-table-column label="单据编号" align="center" prop="billNumber" sortable='custom' width="100"/>
</el-table-column> </el-table-column>
<el-table-column label="船舶信息" align="center">
<el-table-column label="航次号" align="center" prop="voyageNo" sortable='custom' width="100"/>
<el-table-column label="船舶名称" align="center" prop="vesselName" sortable='custom' width="100"/>
</el-table-column>
<el-table-column label="货物信息" align="center"> <el-table-column label="货物信息" align="center">
<el-table-column label="库场名称" align="center" prop="stockCode" sortable='custom' width="100"> <el-table-column label="库场名称" align="center" prop="stockCode" sortable='custom' width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -127,18 +122,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓位名称" align="center" prop="stockName" sortable='custom' width="100"/> <el-table-column label="仓位名称" align="center" prop="stockName" sortable='custom' width="100"/>
<el-table-column label="货主名称" align="center" prop="custName" sortable='custom' width="100"/> <el-table-column label="供应商名称" align="center" prop="custName" sortable='custom' width="100"/>
<el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/> <el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/>
<el-table-column label="货物自然序号" align="center" prop="cargoNumber" sortable='custom' width="130"/> <el-table-column label="货物编号" align="center" prop="hsCode" sortable='custom' width="100"/>
<el-table-column label="商品料号" align="center" prop="itemNumber" sortable='custom' width="100"/>
<el-table-column label="电子账册项号" align="center" prop="bookNumber" sortable='custom' width="130"/>
<el-table-column label="HS编号" align="center" prop="hsCode" sortable='custom' width="100"/>
<el-table-column label="报关单号" align="center" prop="customsNo" sortable='custom' width="100"/>
<el-table-column label="核注清单号" align="center" prop="listNumber" sortable='custom' width="130"/>
<el-table-column label="货物价值" align="center" prop="cargoValue" sortable='custom' width="100"/> <el-table-column label="货物价值" align="center" prop="cargoValue" sortable='custom' width="100"/>
<el-table-column label="提运单号" align="center" prop="billNo" sortable='custom' width="100"/>
<el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom' <el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom'
min-width="200"/> min-width="200"/>
<el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' width="100"> <el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' width="100">
@ -147,16 +134,6 @@
:value="scope.row.originCountry != null ? scope.row.originCountry : ''"></dict-tag> :value="scope.row.originCountry != null ? scope.row.originCountry : ''"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="业务性质" align="center" prop="opType" sortable='custom' width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_business_nature" :value="scope.row.opType"/>
</template>
</el-table-column>
<el-table-column label="贸易性质" align="center" prop="tradType" sortable='custom' width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_trade_nature" :value="scope.row.tradType"/>
</template>
</el-table-column>
<el-table-column label="货物件数" align="center" prop="cargoNum" sortable='custom' width="130"/> <el-table-column label="货物件数" align="center" prop="cargoNum" sortable='custom' width="130"/>
<el-table-column label="货物重量" align="center" prop="cargoWt" sortable='custom' width="130"/> <el-table-column label="货物重量" align="center" prop="cargoWt" sortable='custom' width="130"/>
<el-table-column label="货物体积" align="center" prop="cargoVol" sortable='custom' width="130"/> <el-table-column label="货物体积" align="center" prop="cargoVol" sortable='custom' width="130"/>

148
admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
Unescape View File

@ -23,9 +23,16 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">HS编号</template> <template slot="label">货物编号</template>
<div class="nomal-text">{{ scope.row.goodsCode }}</div> <div class="nomal-text">{{ scope.row.goodsCode }}</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item>
<template slot="label">规格类型品质</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoSpec }}</div>
<el-form-item v-else prop="cargoSpec" class="margin-none">
<el-input v-model="scope.row.cargoSpec" placeholder="请输入规格类型品质" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">仓库名称<rq></rq></template> <template slot="label">仓库名称<rq></rq></template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.stockName }}</div> <div v-if="tableReadonly" class="nomal-text">{{ scope.row.stockName }}</div>
@ -62,77 +69,34 @@
<dict-tag :options="dict.type.bm_measuring_unit" :value="scope.row.unit"></dict-tag> <dict-tag :options="dict.type.bm_measuring_unit" :value="scope.row.unit"></dict-tag>
</div> </div>
<el-form-item v-else prop="unit" class="margin-none"> <el-form-item v-else prop="unit" class="margin-none">
<MyFormItemInput type="select" :options="dict.type.bm_measuring_unit" required prop="firstUnit" v-model="scope.row.unit"></MyFormItemInput> <MyFormItemInput type="select" :options="dict.type.bm_measuring_unit" required prop="unit" v-model="scope.row.unit"></MyFormItemInput>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">第一计量单位</template>
<div v-if="tableReadonly" class="nomal-text">
<dict-tag :options="dict.type.bm_measuring_unit" :value="scope.row.firstUnit"></dict-tag>
</div>
<el-form-item v-else prop="firstUnit" class="margin-none">
<MyFormItemInput type="select" :options="dict.type.bm_measuring_unit" required prop="firstUnit" v-model="scope.row.firstUnit"></MyFormItemInput>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">货物自然序号</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoNumber }}</div>
<el-form-item v-else prop="cargoNumber" class="margin-none">
<el-input v-model="scope.row.cargoNumber" placeholder="请输入货物自然序号" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">商品料号</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.itemNumber }}</div>
<el-form-item v-else prop="itemNumber" class="margin-none">
<el-input v-model="scope.row.itemNumber" placeholder="请输入商品料号" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">电子账册项号</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.bookNumber }}</div>
<el-form-item v-else prop="bookNumber" class="margin-none">
<el-input v-model="scope.row.bookNumber" placeholder="请输入电子账册项号" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">报关单号</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.customsNo }}</div>
<el-form-item v-else prop="customsNo" class="margin-none">
<el-input v-model="scope.row.customsNo" placeholder="请输入报关单号" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">核注清单号</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.listNumber }}</div>
<el-form-item v-else prop="listNumber" class="margin-none">
<el-input v-model="scope.row.listNumber" placeholder="请输入核注清单号" />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">货物件数</template> <template slot="label">货物数量</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoNum }}</div> <div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoNum }}</div>
<el-form-item v-else prop="cargoNum" class="margin-none"> <el-form-item v-else prop="cargoNum" class="margin-none">
<el-input-number v-model="scope.row.cargoNum" placeholder="请输入货物件数" style="width: 100%" :precision="2" <el-input-number v-model="scope.row.cargoNum" placeholder="请输入货物数量" style="width: 100%" :precision="2"
:min="0" controls-position="right" /> :min="0" controls-position="right" />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <!-- <el-descriptions-item>-->
<template slot="label">货物重量</template> <!-- <template slot="label">货物重量</template>-->
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoWt }}</div> <!-- <div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoWt }}</div>-->
<el-form-item v-else prop="cargoWt" class="margin-none"> <!-- <el-form-item v-else prop="cargoWt" class="margin-none">-->
<el-input-number controls-position="right" v-model="scope.row.cargoWt" :precision="2" :min="0" <!-- <el-input-number controls-position="right" v-model="scope.row.cargoWt" :precision="2" :min="0"-->
placeholder="请输入货物重量" style="width: 100%" /> <!-- placeholder="请输入货物重量" style="width: 100%" />-->
</el-form-item> <!-- </el-form-item>-->
</el-descriptions-item> <!-- </el-descriptions-item>-->
<el-descriptions-item> <!-- <el-descriptions-item>-->
<template slot="label">货物体积(m³)</template> <!-- <template slot="label">货物体积(m³)</template>-->
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoVol }}</div> <!-- <div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoVol }}</div>-->
<el-form-item v-else prop="cargoVol" class="margin-none"> <!-- <el-form-item v-else prop="cargoVol" class="margin-none">-->
<el-input-number controls-position="right" v-model="scope.row.cargoVol" :precision="2" :min="0" <!-- <el-input-number controls-position="right" v-model="scope.row.cargoVol" :precision="2" :min="0"-->
placeholder="请输入货物体积" style="width: 100%" /> <!-- placeholder="请输入货物体积" style="width: 100%" />-->
</el-form-item> <!-- </el-form-item>-->
</el-descriptions-item> <!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label">货物单价</template> <template slot="label">货物单价</template>
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.unitPrice }}</div> <div v-if="tableReadonly" class="nomal-text">{{ scope.row.unitPrice }}</div>
@ -170,34 +134,28 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item>
<template slot="label">规格类型品质</template> <!-- <el-descriptions-item>-->
<div v-if="tableReadonly" class="nomal-text">{{ scope.row.cargoSpec }}</div> <!-- <template slot="label">原产国<rq/></template>-->
<el-form-item v-else prop="cargoSpec" class="margin-none"> <!-- <div v-if="tableReadonly" class="nomal-text">-->
<el-input v-model="scope.row.cargoSpec" placeholder="请输入规格类型品质" /> <!-- <dict-tag :options="dict.type.sys_origin_country" :value="scope.row.originCountry"></dict-tag>-->
</el-form-item> <!-- </div>-->
</el-descriptions-item> <!-- <el-form-item v-else prop="originCountry" class="margin-none">-->
<el-descriptions-item> <!-- <el-select filterable v-model="scope.row.originCountry" placeholder="请输入原产国" clearable style="width: 100%">-->
<template slot="label">原产国<rq/></template> <!-- <el-option v-for="dict in dict.type.sys_origin_country" :key="dict.value" :label="dict.label"-->
<div v-if="tableReadonly" class="nomal-text"> <!-- :value="dict.value" />-->
<dict-tag :options="dict.type.sys_origin_country" :value="scope.row.originCountry"></dict-tag> <!-- </el-select>-->
</div> <!-- </el-form-item>-->
<el-form-item v-else prop="originCountry" class="margin-none"> <!-- </el-descriptions-item>-->
<el-select filterable v-model="scope.row.originCountry" placeholder="请输入原产国" clearable style="width: 100%"> <!-- <el-descriptions-item>-->
<el-option v-for="dict in dict.type.sys_origin_country" :key="dict.value" :label="dict.label" <!-- <template slot="label">文件上传</template>-->
:value="dict.value" /> <!-- <el-form-item prop="fileUploadFiles" class="margin-none">-->
</el-select> <!-- <FileUploadVO-->
</el-form-item> <!-- :value="scope.row.fileUploadFiles"-->
</el-descriptions-item> <!-- @input="updateFile($event, scope.row)"-->
<el-descriptions-item> <!-- ></FileUploadVO>-->
<template slot="label">文件上传</template> <!-- </el-form-item>-->
<el-form-item prop="fileUploadFiles" class="margin-none"> <!-- </el-descriptions-item>-->
<FileUploadVO
:value="scope.row.fileUploadFiles"
@input="updateFile($event, scope.row)"
></FileUploadVO>
</el-form-item>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-form> </el-form>
</template> </template>
@ -220,8 +178,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="货主" prop="custId"> <el-form-item label="供应商" prop="custId">
<el-select v-model="form.custId" filterable placeholder="请输入货主名称" style="width: 100%" clearable <el-select v-model="form.custId" filterable placeholder="请输入供应商名称" style="width: 100%" clearable
@change="setCustDetail"> @change="setCustDetail">
<el-option v-for="item in custList" :key="item.id" :label="item.custName" :value="item.id"> <el-option v-for="item in custList" :key="item.id" :label="item.custName" :value="item.id">
</el-option> </el-option>
@ -437,7 +395,7 @@ export default {
{ required: true, message: "库场不能为空", trigger: "change" } { required: true, message: "库场不能为空", trigger: "change" }
], ],
custId: [ custId: [
{ required: true, message: "货主不能为空", trigger: "change" } { required: true, message: "供应商不能为空", trigger: "change" }
], ],
currType: [ currType: [
{ required: true, message: "币种不能为空", trigger: "blur" }, { required: true, message: "币种不能为空", trigger: "blur" },

31
admin/src/views/ck/ckwarehouse/index.vue
Unescape View File

@ -59,7 +59,7 @@
<el-table-column label="仓库名称" align="center" prop="stockName" sortable='custom' min-width="80" fixed="left" /> <el-table-column label="仓库名称" align="center" prop="stockName" sortable='custom' min-width="80" fixed="left" />
<el-table-column label="货架名称" align="center" prop="shelfName" sortable='custom' min-width="80" fixed="left" /> <el-table-column label="货架名称" align="center" prop="shelfName" sortable='custom' min-width="80" fixed="left" />
<el-table-column label="货位名称" align="center" prop="locationName" sortable='custom' min-width="80" fixed="left" /> <el-table-column label="货位名称" align="center" prop="locationName" sortable='custom' min-width="80" fixed="left" />
<el-table-column label="货主名称" align="center" prop="custName" sortable='custom' min-width="150" /> <el-table-column label="供应商" align="center" prop="custName" sortable='custom' min-width="150" />
<el-table-column label="数据来源" align="center" prop="sourceType" sortable='custom' min-width="100"> <el-table-column label="数据来源" align="center" prop="sourceType" sortable='custom' min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -71,15 +71,9 @@
<el-tag>{{ scope.row.billStatus == '1' ? '已确认' : '未确认' }}</el-tag> <el-tag>{{ scope.row.billStatus == '1' ? '已确认' : '未确认' }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货物自然序号" align="center" prop="cargoNumber" sortable='custom' min-width="140" /> <el-table-column label="货物编号" align="center" prop="hsCode" sortable='custom' min-width="100" />
<el-table-column label="商品料号" align="center" prop="itemNumber" sortable='custom' min-width="100" />
<el-table-column label="电子账册项号" align="center" prop="bookNumber" sortable='custom' min-width="130" />
<el-table-column label="HS编号" align="center" prop="hsCode" sortable='custom' min-width="100" />
<el-table-column label="报关单号" align="center" prop="customsNo" sortable='custom' min-width="100" />
<el-table-column label="核注清单号" align="center" prop="listNumber" sortable='custom' min-width="130" />
<el-table-column label="提运单号" align="center" prop="billNo" sortable='custom' min-width="100" />
<el-table-column label="货物价值" align="center" prop="cargoValue" sortable='custom' min-width="100" /> <el-table-column label="货物价值" align="center" prop="cargoValue" sortable='custom' min-width="100" />
<el-table-column label="货物重量" align="center" prop="cargoWt" sortable='custom' min-width="100" /> <el-table-column label="货物数量" align="center" prop="cargoWt" sortable='custom' min-width="100" />
<el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom' min-width="200" /> <el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom' min-width="200" />
<el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' min-width="100"> <el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -156,12 +150,6 @@ export default {
// optionsLabel: 'vesselName', // optionsLabel: 'vesselName',
// }, // },
{
label: '核注清单号',
prop: 'listNumber',
type: 'text',
labelWidth: '90px'
},
{ {
label: '单据日期', label: '单据日期',
prop: 'date', prop: 'date',
@ -189,8 +177,8 @@ export default {
}, },
{ {
label: '报关单号', label: '货物编号',
prop: 'customsNo', prop: 'hsCode',
type: 'text', type: 'text',
}, },
], ],
@ -266,8 +254,7 @@ export default {
cargoName: null, cargoName: null,
stockCode: null, stockCode: null,
stockName: null, stockName: null,
customsNo: null, hsCode: null,
listNumber: null,
beginDate: null, beginDate: null,
endDate: null, endDate: null,
queryTime: null, queryTime: null,
@ -398,8 +385,7 @@ export default {
this.queryParams.stockCode = this.billQuery.stockCode; this.queryParams.stockCode = this.billQuery.stockCode;
this.queryParams.cargoName = this.billQuery.cargoName; this.queryParams.cargoName = this.billQuery.cargoName;
this.queryParams.billNumber = this.billQuery.billNumber; this.queryParams.billNumber = this.billQuery.billNumber;
this.queryParams.customsNo = this.billQuery.customsNo; this.queryParams.hsCode = this.billQuery.hsCode;
this.queryParams.listNumber = this.billQuery.listNumber;
this.refreshList(); this.refreshList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
@ -410,8 +396,7 @@ export default {
cargoName: null, cargoName: null,
stockCode: null, stockCode: null,
stockName: null, stockName: null,
customsNo: null, hsCode: null,
listNumber: null,
dateBegin: null, dateBegin: null,
dateEnd: null, dateEnd: null,
} }

56
admin/src/views/ck/instock/index.vue
Unescape View File

@ -133,17 +133,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓位名称" align="center" prop="stockName" sortable='custom' width="100" v-if="false"/> <el-table-column label="仓位名称" align="center" prop="stockName" sortable='custom' width="100" v-if="false"/>
<el-table-column label="货主名称" align="center" prop="custName" sortable='custom' width="100"/> <el-table-column label="供应商" align="center" prop="custName" sortable='custom' width="100"/>
<el-table-column label="商品编码" align="center" prop="hsCode" sortable='custom' width="100"/> <el-table-column label="货物编号" align="center" prop="hsCode" sortable='custom' width="100"/>
<el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/> <el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/>
<el-table-column label="入库库件数" align="center" prop="cargoNum" sortable='custom' width="130"/> <el-table-column label="入库库件数" align="center" prop="cargoNum" sortable='custom' width="130"/>
<el-table-column label="入库重量" align="center" prop="cargoWt" sortable='custom' width="130"/> <el-table-column label="入库重量" align="center" prop="cargoWt" sortable='custom' width="130"/>
<el-table-column label="入库体积" align="center" prop="cargoVol" sortable='custom' width="130"/> <el-table-column label="入库体积" align="center" prop="cargoVol" sortable='custom' width="130"/>
<el-table-column label="入库货物价值" align="center" prop="cargoValue" sortable='custom' width="130"/> <el-table-column label="入库货物价值" align="center" prop="cargoValue" sortable='custom' width="130"/>
<el-table-column label="货物自然序号" align="center" prop="cargoNumber" sortable='custom'width="130" />
<el-table-column label="商品料号" align="center" prop="itemNumber" sortable='custom' width="100" />
<el-table-column label="电子账册项号" align="center" prop="bookNumber" sortable='custom' width="130"/>
<el-table-column label="HS编号" align="center" prop="hsCode" sortable='custom'width="100" />
<el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/> <el-table-column label="货物名称" align="center" prop="cargoName" sortable='custom' width="100"/>
<el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom' min-width="200"/> <el-table-column label="规格类型品质" show-overflow-tooltip align="center" prop="cargoSpec" sortable='custom' min-width="200"/>
<el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' width="100"> <el-table-column label="原产国" align="center" prop="originCountry" sortable='custom' width="100">
@ -152,14 +148,7 @@
:value="scope.row.originCountry != null ? scope.row.originCountry : ''"></dict-tag> :value="scope.row.originCountry != null ? scope.row.originCountry : ''"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报关单号" align="center" prop="customsNo" sortable='custom' width="100"/>
<el-table-column label="核注清单号" align="center" prop="listNumber" sortable='custom' width="130"/>
<el-table-column label="提运单号" align="center" prop="billNo" sortable='custom' width="100"/>
<el-table-column label="贸易性质" align="center" prop="tradType" sortable='custom' width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_trade_nature" :value="scope.row.tradType"/>
</template>
</el-table-column>
<!-- <el-table-column label="船舶信息" align="center">--> <!-- <el-table-column label="船舶信息" align="center">-->
<!-- <el-table-column label="航次号" align="center" prop="voyageNo" sortable='custom' width="100"/>--> <!-- <el-table-column label="航次号" align="center" prop="voyageNo" sortable='custom' width="100"/>-->
<!-- <el-table-column label="船舶名称" align="center" prop="vesselName" sortable='custom' width="100"/>--> <!-- <el-table-column label="船舶名称" align="center" prop="vesselName" sortable='custom' width="100"/>-->
@ -221,17 +210,6 @@ export default {
optionsProp: 'stockCode', optionsProp: 'stockCode',
optionsLabel: 'stockName', optionsLabel: 'stockName',
}, },
{
label: '项号',
prop: 'bookNumber',
type: 'text',
},
{
label: '核注清单号',
prop: 'listNumber',
type: 'text',
labelWidth: '90px'
},
{ {
label: '有效期至', label: '有效期至',
prop: 'excTime', prop: 'excTime',
@ -243,13 +221,8 @@ export default {
prop: 'billNumber', prop: 'billNumber',
type: 'text', type: 'text',
}, },
// {
// label: '船舶名称',
// prop: 'vesselName',
// type: 'text',
// },
{ {
label: '商品编码', label: '货物编号',
prop: 'hsCode', prop: 'hsCode',
type: 'text', type: 'text',
}, },
@ -258,11 +231,6 @@ export default {
prop: 'cargoName', prop: 'cargoName',
type: 'text', type: 'text',
}, },
// {
// label: '航次',
// prop: 'voyageNo',
// type: 'text',
// },
{ {
label: '货架名称', label: '货架名称',
prop: 'shelfName', prop: 'shelfName',
@ -271,11 +239,6 @@ export default {
optionsProp: 'shelfName', optionsProp: 'shelfName',
optionsLabel: 'shelfName', optionsLabel: 'shelfName',
}, },
{
label: '报关单号',
prop: 'customsNo',
type: 'text',
},
{ {
label: '单据日期', label: '单据日期',
prop: 'queryTime', prop: 'queryTime',
@ -283,16 +246,11 @@ export default {
options: datePickerOpts() options: datePickerOpts()
}, },
{ {
label: '货主名称', label: '供应商',
prop: 'custName', prop: 'custName',
type: 'text', type: 'text',
}, },
{
label: '贸易性质',
prop: 'tradType',
type: 'select',
getOptions: () => this.dict.type.sys_trade_nature,
},
], ],
activeName: ['1', '2', '3'], activeName: ['1', '2', '3'],
pickerOptions: { pickerOptions: {
@ -437,7 +395,7 @@ export default {
{ required: true, message: "库场名称不能为空", trigger: "blur" } { required: true, message: "库场名称不能为空", trigger: "blur" }
], ],
custName: [ custName: [
{ required: true, message: "货主名称不能为空", trigger: "blur" } { required: true, message: "供应商不能为空", trigger: "blur" }
], ],
} }
}; };

41
admin/src/views/pub/notice/pubnotice-add-and-update.vue
Unescape View File

@ -7,18 +7,11 @@
<!-- 新增和修改表单 --> <!-- 新增和修改表单 -->
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="80px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="业务" prop="bizId">
<el-input v-model="dataForm.bizId" placeholder="业务" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知类型" prop="noticeType"> <el-form-item label="通知类型" prop="noticeType">
<el-input v-model="dataForm.noticeType" placeholder="通知类型" style="width: 100%"></el-input> <el-input v-model="dataForm.noticeType" placeholder="通知类型" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知种类" prop="type"> <el-form-item label="通知种类" prop="type">
<el-select v-model="dataForm.type" placeholder="请选择通知种类" style="width: 100%"> <el-select v-model="dataForm.type" placeholder="请选择通知种类" style="width: 100%">
@ -27,37 +20,37 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知来源" prop="noticeSource"> <el-form-item label="通知来源" prop="noticeSource">
<el-input v-model="dataForm.noticeSource" placeholder="通知来源" style="width: 100%"></el-input> <el-input v-model="dataForm.noticeSource" placeholder="通知来源" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="拟稿单位" prop="draftDept"> <el-form-item label="拟稿单位" prop="draftDept">
<el-input v-model="dataForm.draftDept" placeholder="拟稿单位" style="width: 100%"></el-input> <el-input v-model="dataForm.draftDept" placeholder="拟稿单位" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知范围" prop="noticeScope"> <el-form-item label="通知范围" prop="noticeScope">
<el-input v-model="dataForm.noticeScope" placeholder="通知范围" style="width: 100%"></el-input> <el-input v-model="dataForm.noticeScope" placeholder="通知范围" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知标题" prop="noticeTitle"> <el-form-item label="通知标题" prop="noticeTitle">
<el-input v-model="dataForm.noticeTitle" placeholder="通知标题" style="width: 100%"></el-input> <el-input v-model="dataForm.noticeTitle" placeholder="通知标题" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通知时间" prop="noticeTime"> <el-form-item label="通知时间" prop="noticeTime">
<el-input v-model="dataForm.noticeTime" placeholder="通知时间" style="width: 100%"></el-input> <el-date-picker type="date" v-model="dataForm.noticeTime" placeholder="选择日期" style="width: 100%"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="短信状态" prop="smsStatus"> <el-form-item label="短信状态" prop="smsStatus">
<el-select v-model="dataForm.smsStatus" placeholder="请选择短信状态" style="width: 100%"> <el-select v-model="dataForm.smsStatus" placeholder="请选择短信状态" style="width: 100%">
@ -66,14 +59,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-select v-model="dataForm.status" placeholder="请选择状态" style="width: 100%">
<el-option v-for="dict in dict.type.notice_status" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -88,13 +73,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="备注" type="textarea" :rows="2" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="通知内容" prop="noticeContent"> <el-form-item label="通知内容" prop="noticeContent">
@ -128,7 +106,6 @@ export default {
deptTreeOptions: [], // 部门树数据 deptTreeOptions: [], // 部门树数据
dataForm: { dataForm: {
noticeId: "", noticeId: "",
bizId: '',
noticeType: '', noticeType: '',
type: '', type: '',
noticeSource: '', noticeSource: '',
@ -139,7 +116,6 @@ export default {
noticeTime: '', noticeTime: '',
smsStatus: "0", smsStatus: "0",
status: "0", status: "0",
remark: '',
deptId: "", deptId: "",
updatestamp: '', updatestamp: '',
syncstamp: '', syncstamp: '',
@ -154,9 +130,6 @@ export default {
smsStatus: [ smsStatus: [
{required: true, message: '短信状态 为必填项', trigger: 'blur'} {required: true, message: '短信状态 为必填项', trigger: 'blur'}
], ],
status: [
{required: true, message: '状态 为必填项', trigger: 'blur'}
],
deptId: [ deptId: [
{required: true, message: '请选择部门', trigger: ['blur', 'change']} {required: true, message: '请选择部门', trigger: ['blur', 'change']}
], ],

28
app/package-lock.json generated
Unescape View File

@ -1,34 +1,8 @@
{ {
"name": "app", "name": "app",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 2, "lockfileVersion": 1,
"requires": true, "requires": true,
"packages": {
"": {
"name": "app",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"json-bigint": "^1.0.0"
}
},
"node_modules/bignumber.js": {
"version": "9.3.1",
"resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.3.1.tgz",
"integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
"engines": {
"node": "*"
}
},
"node_modules/json-bigint": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
"integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
"dependencies": {
"bignumber.js": "^9.0.0"
}
}
},
"dependencies": { "dependencies": {
"bignumber.js": { "bignumber.js": {
"version": "9.3.1", "version": "9.3.1",

22
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/MyMetaObjectHandler.java
Unescape View File

@ -0,0 +1,22 @@
package com.zbkj.admin.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import java.util.Date;
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
this.setFieldValByName("createTime", new Date(), metaObject);
this.setFieldValByName("updateTime", new Date(), metaObject);
}
@Override
public void updateFill(MetaObject metaObject) {
this.setFieldValByName("updateTime", new Date(), metaObject);
}
}

3
crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmHouse.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -102,6 +103,7 @@ public class PmHouse implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
/** /**
* 修改人 * 修改人
@ -112,6 +114,7 @@ public class PmHouse implements Serializable {
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**
* 租户ID * 租户ID

3
crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmMaintenanceOrder.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -114,6 +115,7 @@ public class PmMaintenanceOrder implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
/** /**
* 修改人 * 修改人
@ -124,6 +126,7 @@ public class PmMaintenanceOrder implements Serializable {
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**
* 租户ID * 租户ID

3
crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.zbkj.modules.autogencode.entity.PmTenant; import com.zbkj.modules.autogencode.entity.PmTenant;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -122,6 +123,7 @@ public class PmOwner implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
/** /**
* 修改人 * 修改人
@ -132,6 +134,7 @@ public class PmOwner implements Serializable {
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**
* 租户ID * 租户ID

3
crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.zbkj.modules.autogencode.entity.PmTenantHouse; import com.zbkj.modules.autogencode.entity.PmTenantHouse;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -78,6 +79,7 @@ public class PmTenant implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
/** /**
* 修改人 * 修改人
@ -88,6 +90,7 @@ public class PmTenant implements Serializable {
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**
* 租户ID * 租户ID

3
crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -125,6 +126,7 @@ public class PmTenantHouse implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
private Date createTime; private Date createTime;
/** /**
* 修改人 * 修改人
@ -135,6 +137,7 @@ public class PmTenantHouse implements Serializable {
* 修改时间 * 修改时间
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**
* 租户ID * 租户ID

Write Preview
Loading…
Cancel
Save