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

收费项目相关修改

Browse Source
演示数据2.0
anthonywj 9 months ago
parent 6861612025
commit 22c9ba4dd1
4 changed files with 82 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
src/utils/request.js
Unescape Escape View File

@ -20,7 +20,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
timeout: 100000
})
// request拦截器

51
src/views/basic/destiny/skProject.vue
Unescape Escape View File

@ -13,19 +13,26 @@
<el-input v-model="filterQuery.name" placeholder="请输入项目名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" offset="1">
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-download" @click="onDownload">更新下载</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
</el-button-group>
<el-col :span="6">
<el-form-item label="对照状态:">
<el-select v-model="filterQuery.contrastStatus" style="width: 90%" placeholder="请选择对照状态">
<el-option label="全部" value=""></el-option>
<el-option label="未对照" value="1"></el-option>
<el-option label="已对照" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider></el-divider>
<div class="top-right-btn" style="margin-top: -5px">
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-download" @click="onDownload">更新下载</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
@ -33,6 +40,15 @@
<el-table-column label="项目名称" prop="name" width="160"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
<el-table-column label="价格" prop="price" width="160"></el-table-column>
<el-table-column label="状态" prop="contrastStatus" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.contrastStatus)">{{
statusMap[scope.row.contrastStatus]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180"></el-table-column>
<!-- <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>-->
<el-table-column label="更新时间" prop="createTime" width="160"></el-table-column>
@ -160,7 +176,8 @@ export default {
code: "",
type: 2,
page: 1,
limit: 20
limit: 20,
contrastStatus: null,
},
editType: "",
formVisible: false,
@ -192,6 +209,10 @@ export default {
page: 1,
limit: 10,
},
statusMap: {
1: "未对照",
2: "已对照"
},
};
},
methods: {
@ -229,7 +250,13 @@ export default {
this.$message.error("数据加载失败")
})
},
statusFilterType(status) {
const statusMap = {
1: 'warning',
2: 'success'
}
return statusMap[status]
},
getList() {
this.loading = true;
getBasicDestinyfilter(this.filterQuery).then(response => {
@ -298,7 +325,7 @@ export default {
this.filterDestinyDelect()
},
filterDestinyDelect() {
if (this.delectQuery.id == null ) return;
if (this.delectQuery.id == null) return;
filterDestinyDelect(this.delectQuery)
.then((response) => {
this.loading = false;

69
src/views/basic/destiny/warlockBag.vue
Unescape Escape View File

@ -24,7 +24,14 @@
</el-col>
</el-row>
</el-form>
<el-divider style="margin: 15px"></el-divider>
<div class="top-right-btn">
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
@ -35,21 +42,27 @@
<el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="备注" prop="remark" width="260"></el-table-column>-->
<!-- <el-table-column label="备注" prop="remark" width="260"></el-table-column>-->
<el-table-column label="规格" prop="ggxh" width="260"></el-table-column>
<el-table-column label="价格" prop="price" width="260">
<template slot-scope="scope">
{{ scope.row.price == "null" ? "0.00":scope.row.price }}
{{ scope.row.price == "null" ? "0.00" : scope.row.price }}
</template>
</el-table-column>
<!-- <el-table-column label="单位" prop="unit" width="260"></el-table-column>-->
<!-- <el-table-column label="单位" prop="unit" width="260"></el-table-column>-->
<el-table-column label="创建人" prop="createByName" width="260"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
<el-table-column label="操作" width="220" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)" :disabled="scope.row.status != 1">编辑</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="scope.row.status != 1" >删除</el-button>
<el-button type="text" size="small" @click.native.stop="onSubmitSkSkProject(scope.row)" v-if="scope.row.status == 1">提交</el-button>
<el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)"
:disabled="scope.row.status != 1">编辑
</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
:disabled="scope.row.status != 1">删除
</el-button>
<el-button type="text" size="small" @click.native.stop="onSubmitSkSkProject(scope.row)"
v-if="scope.row.status == 1">提交
</el-button>
</template>
</el-table-column>
</el-table>
@ -68,7 +81,7 @@
<el-col :span="24">
<el-button type="primary" style="float: right;margin-bottom: 12px;margin-right: 20px" size="small"
icon="search" @click="selectProduct"
v-if="this.delectQuery.id != null ">新增产品
v-if="this.delectQuery.id != null ">新增产品
</el-button>
</el-col>
</el-row>
@ -92,7 +105,7 @@
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="操作" width="220" >
<el-table-column label="操作" width="220">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
@click.native.stop="rowChange(scope.row)">编辑
@ -129,21 +142,21 @@
></destinyModelEdit>
</el-dialog>
<!-- <el-dialog-->
<!-- title="选入产品"-->
<!-- :visible.sync="selectFormVisible"-->
<!-- :close-on-click-modal="false"-->
<!-- :close-on-press-escape="false"-->
<!-- width="80%"-->
<!-- :before-close="closeDialog"-->
<!-- v-if="selectFormVisible"-->
<!-- >-->
<!-- <destinyModelSelectProduct-->
<!-- :editQuery="editQuery"-->
<!-- :codeArray="codeArray"-->
<!-- :closeDialog="closeDialog"-->
<!-- ></destinyModelSelectProduct>-->
<!-- </el-dialog>-->
<!-- <el-dialog-->
<!-- title="选入产品"-->
<!-- :visible.sync="selectFormVisible"-->
<!-- :close-on-click-modal="false"-->
<!-- :close-on-press-escape="false"-->
<!-- width="80%"-->
<!-- :before-close="closeDialog"-->
<!-- v-if="selectFormVisible"-->
<!-- >-->
<!-- <destinyModelSelectProduct-->
<!-- :editQuery="editQuery"-->
<!-- :codeArray="codeArray"-->
<!-- :closeDialog="closeDialog"-->
<!-- ></destinyModelSelectProduct>-->
<!-- </el-dialog>-->
<el-dialog
title="选入产品"
@ -170,7 +183,7 @@ import {
addModeldestiny,
delectModeldestiny,
filterDestinyDelect,
getBasicDestinyfilter, delectModeldestinyProduct, downloadBasicProject, uploadModeldestinyProduct,submitSkSkProject
getBasicDestinyfilter, delectModeldestinyProduct, downloadBasicProject, uploadModeldestinyProduct, submitSkSkProject
} from "@/api/basic/basicDestinyRel";
import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
@ -277,7 +290,7 @@ export default {
this.selectedIndex = null
}
}).catch(() => {
});
});
}
},
rowChange(val) {
@ -338,7 +351,7 @@ export default {
this.formVisible = true;
this.editQuery = row;
},
onSubmitSkSkProject(row){
onSubmitSkSkProject(row) {
submitSkSkProject(row).then(res => {
if (res.code == 20000) {
this.getList();
@ -418,7 +431,7 @@ export default {
}
,
components: {
destinyModelEdit, destinyModelSelectProduct,destinySelectProduct
destinyModelEdit, destinyModelSelectProduct, destinySelectProduct
}
,
created() {

2
src/views/inout/PanelCreateOrderBizDetail.vue
Unescape Escape View File

@ -102,7 +102,7 @@
<el-table-column width="160" label="注册/备案号" prop="certCode" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产企业" prop="manufacturer" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<el-table-column label="操作" width="200" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" v-if="scope.row.index == selectedIndex" @click.stop="true"
@click.native="saveChange(scope.row)">保存

Write Preview
Loading…
Cancel
Save