diff --git a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue index d5546a8afa..ff2cf3743f 100644 --- a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue +++ b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue @@ -30,49 +30,49 @@ export default { btnList: [ { type: 'primary', - size: 'small', + size: 'medium', icon: 'plus', btnKey: 'toAdd', btnLabel: '新增' }, { type: 'primary', - size: 'small', + size: 'medium', icon: 'edit', btnKey: 'toEdit', btnLabel: '编辑' }, { type: 'primary', - size: 'small', + size: 'medium', icon: 'submit', btnKey: 'doSubmit', btnLabel: '提交' }, { type: 'danger', - size: 'small', + size: 'medium', icon: 'del', btnKey: 'doDel', btnLabel: '删除' }, { type: 'success', - size: 'small', + size: 'medium', icon: 'Import', btnKey: 'doImport', btnLabel: '导入' }, { type: 'success', - size: 'small', + size: 'medium', icon: 'export', btnKey: 'build', btnLabel: '导出' }, { type: 'info', - size: 'small', + size: 'medium', icon: 'cross', btnKey: 'doClose', btnLabel: '关闭' diff --git a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue index f58c63cb3a..38177d7946 100644 --- a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue +++ b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue @@ -68,11 +68,11 @@ border-color: $border-color; } } - .el-button{ - padding: 8px 20px; - // background-color: $color-primary; - // color: $text-color-inverse; - } + // .el-button{ + // padding: 8px 20px; + // // background-color: $color-primary; + // // color: $text-color-inverse; + // } .el-select{ width: 150px; } diff --git a/anrui-base/anrui-base-ui/src/styles/anrui-button.scss b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss new file mode 100644 index 0000000000..eed676cfe6 --- /dev/null +++ b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss @@ -0,0 +1,14 @@ +.el-button--medium { + padding: 10px 14px; + font-size: 16px; + } + + .el-button--small { + padding: 7px 12px; + font-size: 14px; + } + + .el-button--mini { + padding: 5px 10px; + font-size: 12px; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss index 00a5696f1f..a87c52ba54 100644 --- a/anrui-base/anrui-base-ui/src/styles/index.scss +++ b/anrui-base/anrui-base-ui/src/styles/index.scss @@ -7,6 +7,7 @@ @import './e-table.scss'; @import './element-table.scss'; @import './element-tabs.scss'; +@import './anrui-button.scss'; body { height: 100%; -moz-osx-font-smoothing: grayscale; diff --git a/anrui-base/anrui-base-ui/src/styles/upload.vue b/anrui-base/anrui-base-ui/src/styles/upload.vue deleted file mode 100644 index d4418a8200..0000000000 --- a/anrui-base/anrui-base-ui/src/styles/upload.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - 点击上传 - 单个文件大小不允许超过100M,支持上传文件类型:{{ accept }} - - - - - - - diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue index dec7480764..dd883568b6 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue @@ -177,28 +177,28 @@ export default { btnList: [ { type: 'primary', - size: 'small', + size: 'medium', icon: 'plus', btnKey: 'toAdd', btnLabel: '新增' }, { type: 'danger', - size: 'small', + size: 'medium', icon: 'del', btnKey: 'doDel', btnLabel: '删除' }, { type: 'success', - size: 'small', + size: 'medium', icon: 'export', btnKey: 'build', btnLabel: '导出' }, { type: 'info', - size: 'small', + size: 'medium', icon: 'cross', btnKey: 'doClose', btnLabel: '关闭' diff --git a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue index 923cc622bc..e04c6a3bc8 100644 --- a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue +++ b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue @@ -1,23 +1,20 @@ - + {{ searchxianshitit }} - + - + - - - + @@ -44,32 +41,32 @@ - + {{ scope.row.name }} - {{ scope.row.invoBank }} + {{ scope.row.mobile }} - + {{ scope.row.bankName }} - + {{ scope.row.bankAccount }} - + {{ scope.row.company }} - + {{ scope.row.remarks }} @@ -90,14 +87,13 @@ @@ -262,4 +223,7 @@ export default { line-height: 40px !important; font-weight: 600; } +.filter-item{ + width: 93%; +} diff --git a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue index ebae302ecb..65d8dbba73 100644 --- a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue @@ -1,13 +1,13 @@ - 中介人详情 + 中介人员详情 返回 - + 姓名 @@ -22,7 +22,7 @@ - {{temp.phone}} + {{temp.mobile}} @@ -32,7 +32,7 @@ - {{temp.phone}} + {{temp.bankName}} @@ -40,7 +40,7 @@ - {{temp.phone}} + {{temp.bankAccount}} @@ -50,7 +50,7 @@ - {{temp.phone}} + {{temp.company}} @@ -70,28 +70,16 @@ + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue new file mode 100644 index 0000000000..26f5d72bf2 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue new file mode 100644 index 0000000000..471ba0a37e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue new file mode 100644 index 0000000000..992f6d14b6 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue @@ -0,0 +1,397 @@ + + + + + + + 分公司间调账申请详情 + + + 同 意 + 驳 回 + 终 止 + + + + + + + + 分公司间调账申请 + + + + + + {{temp.accadjTypeValue}} + + + + + {{temp.callOutOrgName}} + + + + + {{temp.callInOrgName}} + + + + + + + + 申请车辆列表 + + + + + + + + {{ scope.row.vehicleAlias }} + + + + + {{ scope.row.configName }} + + + + + {{ scope.row.vinNo }} + + + + + {{ scope.row.inventoryLocationName }} + + + + + {{ scope.row.witPinMoney }} + + + + + {{ scope.row.invoiceTypeValue }} + + + + + {{ scope.row.freight }} + + + + + {{ scope.row.freightUndertakerName }} + + + + + {{ scope.row.remarks }} + + + + + + + + + + + + + + 当前环节 + + {{ current.taskName }}->{{ nextNode.name }} + + + + + 意见 + + + + + + 确 定 + 取 消 + + + + + + + + +