mt-fe-group/qms
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’
2023-07-11 17:01:39 +08:00
parent cb49f5e6b8
commit 7728882b29
30 changed files with 606 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/modules/basic/components/customerSearch.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
* @LastEditTime: 2023-06-29 16:59:18
* @LastEditTime: 2023-07-11 09:50:29
* @Description:
-->
<template>
@@ -50,14 +50,16 @@ export default {
customerTypeId: null,
customerTypeStatus: null
},
options: [{
options: [
{
value: 0,
label: '不可用'
},
{
value: 1,
label: '可用'
}],
}
],
};
},
computed: {

54
src/views/modules/basic/qmsControlMode.vue
View File

@@ -2,9 +2,6 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="1" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
@@ -24,7 +21,7 @@
<control-add ref="addOrUpdate" @refreshDataList="successSubmit"></control-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<control-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></control-search>
<el-row slot="footer" type="flex" justify="end">
@@ -39,16 +36,16 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
<script>
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
// import basicSearch from "@/mixins/basic-search";
import showProductList from "./components/showProductList.vue";
import controlSearch from "./components/controlSearch.vue";
// import controlSearch from "./components/controlSearch.vue";
import controlAdd from "./components/control-add.vue";
import available from "./components/available.vue";
import planBtn from "./components/planBtn.vue";
@@ -99,7 +96,7 @@ const tableBtn = [
},
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
@@ -115,21 +112,21 @@ export default {
addOrEditTitle: '',
addOrUpdateVisible:false,
productOrUpdateVisible: false,
headValue:{},
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable:true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: 'success',
plain:true
},
{
type: "button",
@@ -149,7 +146,6 @@ export default {
type: "button",
btnName: "取消选中",
name: "cancel",
color: "primary",
// plain: true,
},
],
@@ -157,7 +153,7 @@ export default {
},
components: {
showProductList,
controlSearch,
// controlSearch,
controlAdd
},
methods: {
@@ -177,13 +173,13 @@ export default {
// this.searchOrEditTitle = "";
// this.searchOrUpdateVisible = false;
// },
conditionSearch() {
this.searchOrEditTitle = "搜索";
this.searchOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.searchOrUpdate.init();
});
},
// conditionSearch() {
// this.searchOrEditTitle = "搜索";
// this.searchOrUpdateVisible = true;
// this.$nextTick(() => {
// this.$refs.searchOrUpdate.init();
// });
// },
// handleConfirm() {
// this.$refs.addOrUpdate.dataFormSubmitHandle();
// },
@@ -235,11 +231,11 @@ export default {
// });
// },
buttonClick(val) {
console.log(val);
this.headValue = val
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.key = null;
this.listQuery.key = this.headValue.name ? headValue.name :null
console.log(i18n );
this.listQuery.page = 1;
this.getDataList();

138
src/views/modules/basic/qmsCustomer.vue
View File

@@ -2,9 +2,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="4" class="item">
<!-- <el-badge :value="4" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</el-badge> -->
</SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
:limit="listQuery.limit" :table-data="tableData">
@@ -19,7 +19,7 @@
<customer-add ref="addOrUpdate" @refreshDataList="successSubmit"></customer-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<customer-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></customer-search>
<el-row slot="footer" type="flex" justify="end">
@@ -34,36 +34,36 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
<script>
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
import customerAdd from "./components/customer-add";
import customerSearch from "./components/customerSearch.vue";
import available from "./components/available.vue";
// import radio from "./components/radio.vue";
// import i18n from "@/i18n";
import basicPage from "@/mixins/basic-page"
// import basicSearch from "@/mixins/basic-search"
import customerAdd from "./components/customer-add"
import customerSearch from "./components/customerSearch.vue"
import available from "./components/available.vue"
// import radio from "./components/radio.vue"
import i18n from "@/i18n"
// import i18n from "@/i18n";
const tableProps = [
{
prop: "customerCode",
label: '编码'
label: i18n.t('basic.code')
},
{
prop: "customerName",
label: "客户"
label: i18n.t('basic.name')
},
{
prop: "customerTypeName",
label: "客户类型"
label: i18n.t('basic.customerTypeName')
},
{
prop: "customerTypeStatus",
label: "状态",
label: i18n.t('basic.status'),
subcomponent: available,
}
];
@@ -78,36 +78,79 @@ const tableBtn = [
}
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
getDataListURL: "/basic/qmsCustomer/page",
deleteURL: "/basic/qmsCustomer",
exportURL: '/basic/qmsCustomer/export'
exportURL: '/basic/qmsCustomer/export',
getCustomerPageListURL: "/basic/qmsCustomerType/page"
},
tableProps,
tableBtn,
productData: {},
listQuery: {
limit: 10,
page: 1,
name: null,
code: null,
status: null,
customerTypeId:null
},
searchOrEditTitle: "",
searchOrUpdateVisible: false,
productOrEditTitle: "",
productOrUpdateVisible: false,
headValue:{},
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: 'select',
label: i18n.t('basic.customerTypeName'),
placeholder: i18n.t('basic.customerTypeName'),
param: 'customerTypeId',
selectOptions:[],
clearable: true,
filterable: true
},
{
type: 'select',
label: i18n.t('basic.status'),
placeholder: i18n.t('basic.status'),
param: 'status',
selectOptions: [
{
id: '0',
name: '不可用'
},
{
id: '1',
name: '可用'
}
],
clearable: true,
filterable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: 'success',
plain: true
// plain: true,
},
{
@@ -121,7 +164,8 @@ export default {
type: "button",
btnName: "导出",
name: "export",
color: "primary",
color: 'primary',
plain: true
// plain: true,
}
],
@@ -129,7 +173,10 @@ export default {
},
components: {
customerAdd,
customerSearch,
// customerSearch,
},
mounted () {
this.getDict();
},
methods: {
//search-bar点击
@@ -156,16 +203,31 @@ export default {
// console.log(key);
// console.log(key);
// this.listQuery.key = key;
this.listQuery.code = dataForm.code
this.listQuery.name = dataForm.name
this.listQuery.customerTypeId = dataForm.customerTypeId
this.listQuery.customerTypeStatus = dataForm.customerTypeStatus
this.listQuery.page = 1;
this.getDataList();
this.searchOrUpdateVisible = false;
// console.log(11111);
// this.conditionSearchSubmit();
},
getDict() {
this.$http
.get(this.urlOptions.getCustomerPageListURL, {
params: {
limit: 999,
page: 1
}
})
.then(({ data: res }) => {
if (res.code === 0) {
this.formConfig[2].selectOptions = res.data.list.map((item) => {
return {
name: item.customerTypeName,
id:item.id
}
})
}
})
},
handleClick(val) {
console.log(val);
if (val.type === "delete") {
@@ -231,16 +293,16 @@ export default {
}).catch(() => { })
},
buttonClick(val) {
console.log(val);
this.headValue = val
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
// this.listQuery.key = "";
this.listQuery.page = 1;
this.listQuery.code = null
this.listQuery.name = null
this.listQuery.customerTypeId = null
this.listQuery.customerTypeStatus = null
this.listQuery.code = this.headValue.code ? this.headValue.code : undefined
this.listQuery.name = this.headValue.name ? this.headValue.name : undefined
this.listQuery.customerTypeId = this.headValue.customerTypeId ? this.headValue.customerTypeId : undefined
this.listQuery.status = this.headValue.status ? this.headValue.status : undefined
this.getDataList();
break;
case "export":

80
src/views/modules/basic/qmsCustomerType.vue
View File

@@ -2,9 +2,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="3" class="item">
<!-- <el-badge :value="3" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</el-badge> -->
</SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
:limit="listQuery.limit" :table-data="tableData">
@@ -19,7 +19,7 @@
<customer-type-add ref="addOrUpdate" @refreshDataList="successSubmit"></customer-type-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<customerType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></customerType-search>
<el-row slot="footer" type="flex" justify="end">
@@ -34,7 +34,7 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
@@ -43,7 +43,7 @@
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
import customerTypeAdd from "./components/customerType-add";
import customerTypeSearch from "./components/customerTypeSearch.vue";
// import customerTypeSearch from "./components/customerTypeSearch.vue";
import available from "./components/available.vue";
import Cookies from 'js-cookie'
import qs from 'qs'
@@ -76,7 +76,7 @@ const tableBtn = [
}
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
@@ -94,15 +94,46 @@ export default {
productOrEditTitle: "",
productOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: 'select',
label: i18n.t('basic.status'),
placeholder: i18n.t('basic.status'),
param: 'status',
selectOptions: [
{
id: '0',
name: '不可用'
},
{
id: '1',
name: '可用'
}
],
clearable: true,
filterable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
btnName: "搜索",
@@ -110,26 +141,19 @@ export default {
color: "primary",
// plain: true,
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
// plain: true,
},
{
type: "button",
btnName: "导出",
name: "export",
color: "primary",
color: 'primary',
plain: true
// plain: true,
}
],
};
},
components: {
customerTypeAdd,
customerTypeSearch
customerTypeAdd
},
methods: {
//search-bar点击
@@ -233,9 +257,9 @@ export default {
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.name = null
this.listQuery.code = null
this.listQuery.status = null
this.listQuery.name =val.name ?val.name : null
this.listQuery.code = val.code ? val.code : null
this.listQuery.status = val.status ? val.status : null
// console.log(i18n);
this.listQuery.page = 1;
this.getDataList();

69
src/views/modules/basic/qmsFailureType.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-29 17:02:33
* @LastEditTime: 2023-07-11 10:07:22
* @LastEditors: zhp
* @Description:
-->
@@ -9,9 +9,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="3" class="item">
<!-- <el-badge :value="3" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</el-badge> -->
</SearchBar>
<base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
@@ -25,7 +25,7 @@
<failure-type-add ref="addOrUpdate" @refreshDataList="successSubmit"></failure-type-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<failureType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></failureType-search>
<el-row slot="footer" type="flex" justify="end">
@@ -40,7 +40,7 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
@@ -49,9 +49,9 @@
import basicPage from "@/mixins/basic-page";
import failureTypeAdd from "./components/failureType-add";
// import AddOrUpdate from './params-add-or-update'
import failureTypeSearch from "./components/failureTypeSearch";
// import failureTypeSearch from "./components/failureTypeSearch";
import available from "./components/available.vue";
import basicSearch from "@/mixins/basic-search";
// import basicSearch from "@/mixins/basic-search";
import i18n from "@/i18n";
const tableProps = [
{
@@ -79,9 +79,8 @@ const tableBtn = [
},
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
components: {
failureTypeSearch,
failureTypeAdd
},
data() {
@@ -95,26 +94,52 @@ export default {
searchOrEditTitle: '',
searchOrUpdateVisible:false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: 'select',
label: i18n.t('basic.status'),
placeholder: i18n.t('basic.status'),
param: 'status',
selectOptions: [
{
id: '0',
name: '不可用'
},
{
id: '1',
name: '可用'
}
],
clearable: true,
filterable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
btnName: "搜索",
name: "search",
color: "primary",
// plain: true,
}
],
};
@@ -190,9 +215,9 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.code = null
this.listQuery.name = null
this.listQuery.failureTypeStatus = null
this.listQuery.code =val.code ? val.code : null
this.listQuery.name = val.name ? val.name : null
this.listQuery.status = val.status ? val.status : null
this.getDataList();
break;
case "add":

46
src/views/modules/basic/qmsProduct.vue
View File

@@ -2,9 +2,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="2" class="item">
<!-- <el-badge :value="2" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</el-badge> -->
</SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
@@ -19,7 +19,7 @@
<product-add ref="addOrUpdate" @refreshDataList="successSubmit"></product-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<product-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></product-search>
<el-row slot="footer" type="flex" justify="end">
@@ -34,15 +34,15 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
<script>
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
import productSearch from "./components/productSearch.vue";
// import basicSearch from "@/mixins/basic-search";
// import productSearch from "./components/productSearch.vue";
import productAdd from "./components/product-add.vue";
import available from "./components/available.vue";
import radio from "./components/radio.vue";
@@ -86,7 +86,7 @@ const tableBtn = [
}
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
@@ -103,20 +103,27 @@ export default {
addOrUpdateVisible: false,
productOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
@@ -129,7 +136,6 @@ export default {
};
},
components: {
productSearch,
productAdd
},
methods: {
@@ -214,8 +220,8 @@ export default {
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.productName = null
this.listQuery.productCode = null
this.listQuery.productName =val.name ?val.name: null
this.listQuery.productCode = val.code ? val.code : null
// console.log(i18n);
this.listQuery.page = 1;
this.getDataList();

78
src/views/modules/basic/qmsProductType.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-21 14:30:17
* @LastEditTime: 2023-07-10 15:38:11
* @LastEditTime: 2023-07-11 10:24:01
* @LastEditors: zhp
* @Description:
-->
@@ -9,9 +9,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="3" class="item">
<!-- <el-badge :value="3" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</el-badge> -->
</SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
:limit="listQuery.limit" :table-data="tableData">
@@ -26,7 +26,7 @@
<product-type-add ref="addOrUpdate" @refreshDataList="successSubmit"></product-type-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<productType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></productType-search>
<el-row slot="footer" type="flex" justify="end">
@@ -41,16 +41,16 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-card>
</template>
<script>
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
// import basicSearch from "@/mixins/basic-search";
import productTypeAdd from "./components/productType-add";
import productTypeSearch from "./components/productTypeSearch.vue";
// import productTypeSearch from "./components/productTypeSearch.vue";
import available from "./components/available.vue";
import Cookies from 'js-cookie'
import qs from 'qs'
@@ -83,7 +83,7 @@ const tableBtn = [
}
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
@@ -101,15 +101,46 @@ export default {
productOrEditTitle: "",
productOrUpdateVisible: false,
formConfig: [
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// type: 'select',
// label: i18n.t('basic.status'),
// placeholder: i18n.t('basic.status'),
// param: 'status',
// selectOptions: [
// {
// id: '0',
// name: '不可用'
// },
// {
// id: 1,
// name: '可用'
// }
// ],
// clearable: true,
// filterable: true
// },
{
type: "button",
btnName: "新增",
name: "add",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
btnName: "搜索",
@@ -117,26 +148,19 @@ export default {
color: "primary",
// plain: true,
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
// plain: true,
},
{
type: "button",
btnName: "导出",
name: "export",
color: "primary",
plain: true
// plain: true,
}
],
};
},
components: {
productTypeAdd,
productTypeSearch
productTypeAdd
},
methods: {
//search-bar点击
@@ -254,9 +278,9 @@ export default {
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.name = null
this.listQuery.code = null
this.listQuery.status = null
this.listQuery.name = val.name ?val.name : null
this.listQuery.code = val.code ? val.code : null
// this.listQuery.status = val.status ? val.status : null
// console.log(i18n);
this.listQuery.page = 1
// console.log(basicPage)

58
src/views/modules/basic/qmsTeam.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-21 14:30:17
* @LastEditTime: 2023-07-10 15:39:29
* @LastEditTime: 2023-07-11 10:16:26
* @LastEditors: zhp
* @Description:
-->
@@ -11,9 +11,6 @@
<el-col :span="14">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="2" class="item">
<el-button type="primary" size="small" @click="conditionSearch">{{ $t("conditionSearch")}}}</el-button>
</el-badge>
</SearchBar>
<base-table highlight-current-row id="palletTable" :table-props="tableProps" :page="listQuery.page"
@current-change="handleCurrentChange" ref="palletTable1" :limit="listQuery.limit" :table-data="tableData">
@@ -28,7 +25,7 @@
<team-add ref="addOrUpdate" @refreshDataList="successSubmit"></team-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
<!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
@cancel="handleSearchCancel" @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<team-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></team-search>
<el-row slot="footer" type="flex" justify="end">
@@ -44,7 +41,7 @@
</el-button>
</el-col>
</el-row>
</base-dialog>
</base-dialog> -->
</div>
</el-col>
<el-col :span="10">
@@ -67,10 +64,10 @@
<script>
import basicPage from "@/mixins/basic-page";
import basicSearch from "@/mixins/basic-search";
// import basicSearch from "@/mixins/basic-search";
import teamAdd from "./components/team-add";
import teamMemberAdd from './components/teamMember-add'
import teamSearch from "./components/teamSearch.vue";
// import teamSearch from "./components/teamSearch.vue";
import Cookies from 'js-cookie'
import qs from 'qs'
// import radio from "./components/radio.vue";
@@ -114,7 +111,7 @@ const tableBtn = [
}
];
export default {
mixins: [basicPage, basicSearch],
mixins: [basicPage],
data() {
return {
urlOptions: {
@@ -138,26 +135,32 @@ export default {
productOrEditTitle: "",
productOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: "button",
btnName: i18n.t('search'),
name: "search",
color: "primary",
btnName: "新增",
name: "add",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
btnName: i18n.t('add'),
name: "add",
btnName: "搜索",
name: "search",
color: "primary",
// plain: true,
},
@@ -166,6 +169,7 @@ export default {
btnName: i18n.t('export'),
name: 'export',
color: "primary",
plain: true
// plain: true,
},
{
@@ -198,8 +202,7 @@ export default {
},
components: {
teamAdd,
teamMemberAdd,
teamSearch
teamMemberAdd
},
// mounted() {
// this.getDepData()
@@ -359,9 +362,8 @@ export default {
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.name = null
this.listQuery.code = null
this.listQuery.status = null
this.listQuery.name = val.name ?val.name : null
this.listQuery.code = val.code ? val.code : null
// console.log(i18n);
this.listQuery.page = 1;
this.getDataList();