UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_drug' into dev_drug

Browse Source
dev_drug
yewj 3 months ago
parent ae05712b99 d863685788
commit 6844cdb0f6
11 changed files with 112 additions and 119 deletions
Show Stats Download Patch File Download Diff File

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 738 B

BIN
src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
src/assets/logo/logoDm.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

6
src/layout/components/Navbar.vue
Unescape Escape View File

@ -532,9 +532,9 @@ export default {
.user-avatar { .user-avatar {
cursor: pointer; cursor: pointer;
width: 40px; width: 18px;
height: 40px; height: 18px;
border-radius: 10px; border-radius: 3px;
} }
.el-icon-caret-bottom { .el-icon-caret-bottom {

8
src/layout/components/Sidebar/Logo.vue
Unescape Escape View File

@ -19,7 +19,7 @@
</template> </template>
<script> <script>
import logoImg from '@/assets/logo/logoDm.png' import logoImg from '@/assets/logo/logo.png'
import variables from '@/assets/styles/variables.scss' import variables from '@/assets/styles/variables.scss'
export default { export default {
@ -71,9 +71,9 @@ export default {
width: 100%; width: 100%;
& .sidebar-logo { & .sidebar-logo {
width: 100px; width: 80px;
height: 100px; height: 53px;
margin-top: 12px; margin-top: 24px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }

2
src/store/modules/user.js
Unescape Escape View File

@ -103,7 +103,7 @@ const user = {
const user = res.data; const user = res.data;
const avatar = const avatar =
user.avatar == "" || user.avatar == null user.avatar == "" || user.avatar == null
? require("@/assets/logo/logoDm.png") ? require("@/assets/logo/logo.png")
: user.avatar; : user.avatar;
if (res.data.roles && res.data.roles.length > 0) { if (res.data.roles && res.data.roles.length > 0) {
// 验证返回的roles是否是一个非空数组 // 验证返回的roles是否是一个非空数组

198
src/views/inout/InvoiceCkeck.vue
Unescape Escape View File

@ -155,99 +155,99 @@
</el-card> </el-card>
</el-form> </el-form>
<!--<el-tabs type="border-card" style="margin: 15px">--> <el-tabs type="border-card" style="margin: 15px">
<!-- &lt;!&ndash;单据业务详情&ndash;&gt;--> <!--单据业务详情-->
<!-- <el-tab-pane>--> <el-tab-pane>
<!-- <span slot="label">单据 {{ input.billNo }}-单据详情</span>--> <span slot="label">单据 {{ input.billNo }}-单据详情</span>
<!-- <el-table--> <el-table
<!-- v-loading="bizDetailLoading"--> v-loading="bizDetailLoading"
<!-- :data="codeDetailList"--> :data="codeDetailList"
<!-- style="width: 100%"--> style="width: 100%"
<!-- border--> border
<!-- @current-change="BizDetailInv"--> @current-change="BizDetailInv"
<!-- @selection-change="handleSelectionUdiChange"--> @selection-change="handleSelectionUdiChange"
<!-- row-key="id"--> row-key="id"
<!-- highlight-current-row--> highlight-current-row
<!-- >--> >
<!-- <el-table-column type="selection" width="55"></el-table-column>--> <el-table-column type="selection" width="55"></el-table-column>
<!-- <el-table-column label="序号" type="index"></el-table-column>--> <el-table-column label="序号" type="index"></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="发票编码"--> label="发票编码"
<!-- prop="invoiceCodes"--> prop="invoiceCodes"
<!-- show-overflow-tooltip--> show-overflow-tooltip
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="物资名称"--> label="物资名称"
<!-- prop="coName"--> prop="coName"
<!-- width="150"--> width="150"
<!-- show-overflow-tooltip--> show-overflow-tooltip
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="规格型号"--> label="规格型号"
<!-- width="150"--> width="150"
<!-- prop="spec"--> prop="spec"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="批次号"--> label="批次号"
<!-- width="100"--> width="100"
<!-- prop="batchNo"--> prop="batchNo"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="数量"--> label="数量"
<!-- prop="count"--> prop="count"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="扫码数量"--> label="扫码数量"
<!-- prop="reCount"--> prop="reCount"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="价格"--> label="价格"
<!-- prop="price"--> prop="price"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="金额"--> label="金额"
<!-- prop="amount"--> prop="amount"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="生产日期"--> label="生产日期"
<!-- prop="productDate"--> prop="productDate"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="失效日期"--> label="失效日期"
<!-- prop="expireDate"--> prop="expireDate"
<!-- width="100"--> width="100"
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column width="100" label="计量单位" prop="measname">--> <el-table-column width="100" label="计量单位" prop="measname">
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="生产企业"--> label="生产企业"
<!-- prop="manufacturer"--> prop="manufacturer"
<!-- width="160"--> width="160"
<!-- show-overflow-tooltip--> show-overflow-tooltip
<!-- ></el-table-column>--> ></el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="注册/备案号"--> label="注册/备案号"
<!-- width="160"--> width="160"
<!-- prop="certCode"--> prop="certCode"
<!-- show-overflow-tooltip--> show-overflow-tooltip
<!-- ></el-table-column>--> ></el-table-column>
<!-- </el-table>--> </el-table>
<!-- <pagination--> <pagination
<!-- v-show="codeTotal > 0"--> v-show="codeTotal > 0"
<!-- :total="codeTotal"--> :total="codeTotal"
<!-- :page.sync="codeQuery.page"--> :page.sync="codeQuery.page"
<!-- :limit.sync="codeQuery.limit"--> :limit.sync="codeQuery.limit"
<!-- @pagination="getCodeDetailLists"--> @pagination="getCodeDetailLists"
<!-- />--> />
<!-- </el-tab-pane>--> </el-tab-pane>
<!--</el-tabs>--> </el-tabs>
<el-image-viewer <el-image-viewer
v-if="imgViewerVisible" v-if="imgViewerVisible"
style="z-index: 9999" style="z-index: 9999"
@ -306,7 +306,7 @@ export default {
data() { data() {
return { return {
idList: [], idList: [],
// invoiceRow: [], invoiceRow: [],
statusCode: null, statusCode: null,
choiceFile: "选取文件", choiceFile: "选取文件",
fileList: [], fileList: [],
@ -482,10 +482,10 @@ export default {
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer}, components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
methods: { methods: {
onSubmit() { onSubmit() {
// if (this.invoiceRow == null|| this.invoiceRow.length === 0) { if (this.invoiceRow == null|| this.invoiceRow.length === 0) {
// this.$message.error("请选择要登记的物资! "); this.$message.error("请选择要登记的物资! ");
// return false; return false;
// } }
if (this.$isBlank(this.inputQuery.invoiceEncode)) { if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error("发票编码不能为空！"); this.$message.error("发票编码不能为空！");
return; return;
@ -532,8 +532,6 @@ export default {
} else { } else {
this.postInvoice(); this.postInvoice();
} }
}, },
postInvoice() { postInvoice() {

7
src/views/inout/InvoiceRegByOrder.vue
Unescape Escape View File

@ -794,13 +794,11 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="checkInvoice" v-if="checkInvoice"
@close="closecheckInvoice"
> >
<checkInvoice <checkInvoice
:closeDialog="closecheckInvoice" :closeDialog="closecheckInvoice"
:input="inputInv" :input="inputInv"
:getOrderDetails="getOrderDetails" :getOrderDetails="getOrderDetails"
:invoiceRow="detailList"
></checkInvoice> ></checkInvoice>
</el-dialog> </el-dialog>
@ -1063,7 +1061,6 @@ export default {
acceptQuery: null, acceptQuery: null,
acceptOrderVisible: false, acceptOrderVisible: false,
subRow: null, subRow: null,
detailList:[],
}; };
}, },
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice}, components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@ -1093,13 +1090,11 @@ export default {
this.getList(); this.getList();
}, },
InvoiceRegister1(_this,row) { InvoiceRegister1(_this,row) {
_this.savebillno = _this.currentRow.billNo _this.savebillno = row.billNo
_this.inputInv = row; _this.inputInv = row;
_this.detailList.push(row)
_this.checkInvoice = true; _this.checkInvoice = true;
}, },
closecheckInvoice() { closecheckInvoice() {
this.detailList = []
this.checkInvoice = false; this.checkInvoice = false;
this.getList(); this.getList();
this.currentRow.billNo = this.savebillno; this.currentRow.billNo = this.savebillno;

4
src/views/myLogin.vue
Unescape Escape View File

@ -21,7 +21,7 @@
> >
<el-card class="box-card"> <el-card class="box-card">
<div style="text-align: center; margin-top: 10px; margin-bottom: 15px"> <div style="text-align: center; margin-top: 10px; margin-bottom: 15px">
<img alt="element-logo" src="@/assets/logo/logoDm.png"/> <img alt="element-logo" src="@/assets/logo/logo.png" width="120" height="60"/>
</div> </div>
<h3 class="title">用户登录</h3> <h3 class="title">用户登录</h3>
<el-form-item prop="username" class="item" style="margin-top: -20px"> <el-form-item prop="username" class="item" style="margin-top: -20px">
@ -135,7 +135,7 @@
target="_blank" target="_blank"
style="margin-left: 20px; font-size: 12px" style="margin-left: 20px; font-size: 12px"
> >
开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112 开发单位：厦门维衍科技有限公司 技术支持：17705920868
</a> </a>
</div> </div>
</div> </div>

4
src/views/register.vue
Unescape Escape View File

@ -15,7 +15,7 @@
<img <img
alt="element-logo" alt="element-logo"
style="width: 10%" style="width: 10%"
src="../assets/logo/logoDm.png" src="../assets/logo/logo.png"
/> />
</div> </div>
<h3 class="title">医院供应商自助平台用户注册</h3> <h3 class="title">医院供应商自助平台用户注册</h3>
@ -444,7 +444,7 @@
</el-card> </el-card>
<div style="color: #2d3a4b; text-align: center"> <div style="color: #2d3a4b; text-align: center">
<a href="http://www.xmglxp.com" style="color: #000000; font-size: 12px" <a href="http://www.xmglxp.com" style="color: #000000; font-size: 12px"
>厦门高立新鹏软件科技有限公司 &nbsp;13459286066</a > 开发单位：厦门维衍科技有限公司 &nbsp;17705920868</a
> >
</div> </div>
<div style="color: #2d3a4b; text-align: center"> <div style="color: #2d3a4b; text-align: center">

2
src/views/tool/build/index.vue
Unescape Escape View File

@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
import { makeUpJs } from '@/utils/generator/js' import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css' import { makeUpCss } from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefault' import drawingDefault from '@/utils/generator/drawingDefault'
import logo from '@/assets/logo/logoDm.png' import logo from '@/assets/logo/logo.png'
import CodeTypeDialog from './CodeTypeDialog' import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem' import DraggableItem from './DraggableItem'

Write Preview
Loading…
Cancel
Save