修改
This commit is contained in:
1 parent
f726bb11fb
commit
3878d4e10d
6 files changed
+30
-16
No files matched your search
@@ -0,0 +1,18 @@
|
||||
# port 端口号
|
||||
VITE_PORT = 8888
|
||||
|
||||
#浏览器自动打开
|
||||
VITE_OPEN = true
|
||||
|
||||
# 本地环境
|
||||
ENV = 'dev'
|
||||
|
||||
# ADMIN 服务地址
|
||||
VITE_ADMIN_PROXY_PATH = http://47.96.250.9:8089
|
||||
|
||||
# 图片访问基础地址
|
||||
VITE_IMAGE_BASE_PATH = http://47.96.250.9:8089/api
|
||||
|
||||
|
||||
# 代码生成服务地址
|
||||
VITE_GEN_PROXY_PATH = http://47.96.250.9:5003
|
||||
@@ -9,6 +9,7 @@
|
||||
"dev:local": "vite --force --mode dev-local",
|
||||
"build": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build",
|
||||
"build:prod": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build --mode prod",
|
||||
"build:dev": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build --mode dev",
|
||||
"build:docker": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build --outDir ./docker/dist/",
|
||||
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
|
||||
"prettier": "prettier --write ."
|
||||
|
||||
@@ -42,11 +42,11 @@
|
||||
<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- <dict-tag :options="check_status" :value="scope.row.checkStatus" />-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="check_status" :value="scope.row.checkStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip /> -->
|
||||
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
|
||||
@@ -22,11 +22,6 @@
|
||||
<el-form-item label="经办人" prop="handlerUserId">
|
||||
<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="审批状态" prop="checkStatus">
|
||||
<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
|
||||
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="货商" prop="supplierId">
|
||||
<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" />
|
||||
</el-form-item>
|
||||
|
||||
@@ -76,11 +76,11 @@
|
||||
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />-->
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
|
||||
Reference in new issue
Block a user