Commit 1c7cc9a7 by nanrui

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 6e117b4f 562a9b1d
...@@ -87,8 +87,7 @@ ...@@ -87,8 +87,7 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :isPty="false" :promptData="promptData" <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
@select-ety="selectMsg">
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData" <c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData"
@select-ety="selectMsg"> @select-ety="selectMsg">
......
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="less comm" prop="bodgrp.cbs.opn1.cur" style="padding-top:15px" disabled> <el-form-item label="less comm" prop="bodgrp.cbs.opn1.cur" style="padding-top:15px" disabled>
<c-select v-model="model.bodgrp.cbs.opn1.cur" style="width: %" placeholder="请选择Document Amount" disabled <c-select v-model="model.bodgrp.cbs.opn1.cur" style="width:100%" placeholder="请选择Document Amount" disabled
:code="codes.cur"> :code="codes.cur">
</c-select> </c-select>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000266 --> <!--PD000266 -->
<el-tab-pane label="Party" name="ptyp"> <el-tab-pane label="Parties" name="ptyp">
<c-content> <c-content>
<m-ptyp :model="model" :codes="codes" /> <m-ptyp :model="model" :codes="codes" />
</c-content> </c-content>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000266 --> <!--PD000266 -->
<el-tab-pane label="Party" name="ptyp"> <el-tab-pane label="Parties" name="ptyp">
<m-ptyp :model="model" :codes="codes" /> <m-ptyp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment