Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新交易流程和审批条件文本

Browse Source
This commit is contained in:
锦麟 王
2026-07-14 14:57:46 +08:00
parent 623183f47f
commit 8b5a69fd10
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/Views/AccountOpeningProcess/Index.cshtml
+5 -5
View File
@@ -298,7 +298,7 @@
</div>
<div v-show="isTrade">
<div style="margin: 10px auto">交易流程</div>
<div style="margin: 10px auto">交易新增和修改流程</div>
<div>
<div class="node-wrap">
<div class="end-node">
@@ -336,7 +336,7 @@
</div>
<div class="trigger-condition-box">
<div class="trigger-condition-title">
<span>触发条件</span>
<span>审批条件</span>
<div class="trigger-actions">
<button class="trigger-action-btn" v-on:click="addTriggerCondition(item)">+ 条件</button>
<button class="trigger-action-btn" v-on:click="addTriggerParen(item,'left')">+ (</button>
@@ -428,7 +428,7 @@
</div>
<div class="trigger-condition-box">
<div class="trigger-condition-title">
<span>触发条件</span>
<span>审批条件</span>
<div class="trigger-actions">
<button class="trigger-action-btn" v-on:click="addTriggerCondition(childSecond)">+ 条件</button>
<button class="trigger-action-btn" v-on:click="addTriggerParen(childSecond,'left')">+ (</button>
@@ -529,7 +529,7 @@
</div>
<div class="trigger-condition-box">
<div class="trigger-condition-title">
<span>触发条件</span>
<span>审批条件</span>
<div class="trigger-actions">
<button class="trigger-action-btn" v-on:click="addTriggerCondition(item)">+ 条件</button>
<button class="trigger-action-btn" v-on:click="addTriggerParen(item,'left')">+ (</button>
@@ -621,7 +621,7 @@
</div>
<div class="trigger-condition-box">
<div class="trigger-condition-title">
<span>触发条件</span>
<span>审批条件</span>
<div class="trigger-actions">
<button class="trigger-action-btn" v-on:click="addTriggerCondition(childSecond)">+ 条件</button>
<button class="trigger-action-btn" v-on:click="addTriggerParen(childSecond,'left')">+ (</button>
YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js
+13 -5
View File
@@ -15,6 +15,12 @@ function initSelectize(selector, options) {
}
function setRuleDiv() {
// 先销毁已有的 selectize 实例，避免在隐藏容器(v-show)里初始化后尺寸错位
$("[name='selectRule']").each(function () {
if (this.selectize) {
this.selectize.destroy();
}
});
initSelectize("[name='selectRule']", {
options: getRules(),
valueField: 'Value',
@@ -42,7 +48,7 @@ var app = new Vue({
{ text: '--请选择--', value: '0' },
{ text: '客户开户', value: '1' },
{ text: '客户信息修改', value: '5' },
{ text: '交易', value: '2' },
{ text: '交易新增和修改', value: '2' },
{ text: '交易了结', value: '6' },
/* { text: '资信与授信', value: '3' },*/
{ text: '出金', value: '4' }
@@ -79,11 +85,11 @@ var app = new Vue({
],
conditionOps: [
{ value: 'gt', text: '>' },
{ value: 'lt', text: '<' },
//{ value: 'lt', text: '<' },
{ value: 'gte', text: '>=' },
{ value: 'lte', text: '<=' },
{ value: 'eq', text: '=' },
{ value: 'neq', text: '≠' }
//{ value: 'lte', text: '<=' },
//{ value: 'eq', text: '=' },
//{ value: 'neq', text: '≠' }
],
conditionLogics: [
{ value: 'AND', text: '满足全部条件时触发' },
@@ -1456,6 +1462,7 @@ var app = new Vue({
handler(val, oldVal) {
this.$nextTick(function () {
setRuleDiv();
this.initRuleType();
})
},
},
@@ -1464,6 +1471,7 @@ var app = new Vue({
handler(val, oldVal) {
this.$nextTick(function () {
setRuleDiv();
this.initRuleType();
})
},
}
YLErpWeb/wwwroot/Statics/libs/selectize/css/accountOpeningProcess.css
+14
View File
@@ -569,6 +569,20 @@ html {
opacity: 1;
}
/* 修复审批规则 selectize 标签初始加载时下沉、不居中问题 */
/* 关键：bundle.min.css 里设置了 .selectize-input.items.not-full.has-options { height:28px }，
固定高度导致标签在 baseline 对齐下下沉。这里把高度改回 auto，并强制标签垂直居中。 */
.selectize-control.multi .selectize-input.items.not-full.has-options,
.selectize-control.multi .selectize-input.items.not-full.has-options.has-items {
height: auto;
min-height: 20px;
}
.selectize-control.multi .selectize-input > div[data-value],
.selectize-control.multi .selectize-input > div.item {
vertical-align: middle !important;
}
/* 需求③：多分支连线。多个 .col-box 时，中间列（非首非尾）的右覆盖线宽度置 0，避免连线断裂 */
.col-box:not(:first-child):not(:last-child) .top-right-cover-line {
width: 0;