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

资质证书生产企业关联问题，扫码序列号问题

Browse Source
dev2.0.1
anthonywj 2 years ago
parent f9b4ff3189
commit 4cb6e2ca56
5 changed files with 195 additions and 139 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -5,10 +5,6 @@ VUE_APP_TITLE = 供应商自助管理系统
ENV = 'production' ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
#林纪裕
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
# 吴总测试服务器 # 吴总测试服务器

10
src/views/inout/DialogEditCode.vue
Unescape Escape View File

@ -161,6 +161,10 @@ export default {
if (response.data.zxxsbzbhsydysl > 1) { if (response.data.zxxsbzbhsydysl > 1) {
this.isUseDyCheck = true; this.isUseDyCheck = true;
} }
let allowNoSerial = response.data.allowNoSerial??true;
if (isBlank(this.editData.serialNo) && !allowNoSerial) {
this.isSerialNo = true
}
} else { } else {
} }
this.loading = false; this.loading = false;
@ -183,9 +187,9 @@ export default {
if(isBlank(this.editData.batchNo)){ if(isBlank(this.editData.batchNo)){
this.isBatchNo=true this.isBatchNo=true
} }
if(isBlank(this.editData.serialNo)){ // if(isBlank(this.editData.serialNo)){
this.isSerialNo=true // this.isSerialNo=true
} // }
} }
} }
</script> </script>

171
src/views/purchase/cert/supCertificationAdd.vue
Unescape Escape View File

@ -47,8 +47,10 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList">
<el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item
v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -57,7 +59,9 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item
v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
style="width: 90%" style="width: 90%"
@ -69,7 +73,8 @@
@clear="clearQueryProduct" @clear="clearQueryProduct"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]" <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)" @change="executeFuc($event,'5',item.checkRules)"
@ -82,10 +87,13 @@
:value="dict.value" :value="dict.value"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -102,10 +110,13 @@
:value="item.code" :value="item.code"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -117,7 +128,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -134,16 +146,20 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button icon="el-icon-view" type="primary" @click="hideSearch" <el-button icon="el-icon-view" type="primary" @click="hideSearch"
>显示/隐藏搜索栏</el-button >显示/隐藏搜索栏
</el-button
> >
<el-button type="primary" icon="el-icon-refresh" @click="onReset" <el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button >重置
</el-button
> >
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询</el-button >查询
</el-button
> >
<el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()" <el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()"
>添加</el-button >添加
</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -247,7 +263,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -260,8 +278,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -296,7 +317,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -370,8 +393,10 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList2" > <template v-for="(item, index) in queryList2">
<el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item
v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="registrationQuery[item.columnName]" v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -380,7 +405,9 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item
v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
style="width: 90%" style="width: 90%"
@ -392,7 +419,8 @@
@clear="clearQueryProduct" @clear="clearQueryProduct"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="registrationQuery[item.columnName]" <el-select v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)" @change="executeFuc($event,'5',item.checkRules)"
@ -405,10 +433,13 @@
:value="dict.value" :value="dict.value"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="registrationQuery[item.columnName]" v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -425,10 +456,13 @@
:value="item.code" :value="item.code"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -440,7 +474,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="registrationQuery[item.columnName]" v-model="registrationQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -457,19 +492,23 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button icon="el-icon-view" type="primary" @click="hideSearch2" <el-button icon="el-icon-view" type="primary" @click="hideSearch2"
>显示/隐藏搜索栏</el-button >显示/隐藏搜索栏
</el-button
> >
<el-button type="primary" icon="el-icon-refresh" @click="onReset2" <el-button type="primary" icon="el-icon-refresh" @click="onReset2"
>重置</el-button >重置
</el-button
> >
<el-button type="primary" icon="el-icon-search" @click="onSubmit2" <el-button type="primary" icon="el-icon-search" @click="onSubmit2"
>查询</el-button >查询
</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="registrationDialog()" @click="registrationDialog()"
>添加</el-button >添加
</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -571,7 +610,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -584,8 +625,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -620,7 +664,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -667,7 +713,7 @@ import {
} from "../../../api/purchase/suppliersRegistrationBasic"; } from "../../../api/purchase/suppliersRegistrationBasic";
import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog"; import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
import { import {
getHead,executeFuc getHead, executeFuc
} from "@/utils/customConfig"; } from "@/utils/customConfig";
export default { export default {
@ -734,14 +780,13 @@ export default {
}, },
registrationList: [], registrationList: [],
certTotal: 0, certTotal: 0,
tableHeader:[], tableHeader: [],
queryList:[], queryList: [],
fromList:[], fromList: [],
tableHeader2:[], tableHeader2: [],
queryList2:[], queryList2: [],
fromList2:[], fromList2: [],
options: { options: {},
},
registrationLoading: false, registrationLoading: false,
registrationId: "", registrationId: "",
@ -832,8 +877,8 @@ export default {
hideSearch2() { hideSearch2() {
this.showSearch2 = !this.showSearch2; this.showSearch2 = !this.showSearch2;
}, },
addInfoDialog(_this,row) { addInfoDialog(_this, row) {
if(_this == null){ if (_this == null) {
_this = this _this = this
} }
if (_this.$isNotBlank(row)) { if (_this.$isNotBlank(row)) {
@ -872,15 +917,16 @@ export default {
console.log(this.check); console.log(this.check);
}, },
rejectInfo(_this,row) { rejectInfo(_this, row) {
_this.$confirm(row.auditComment, "驳回说明", { _this.$confirm(row.auditComment, "驳回说明", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
showCancelButton: false, showCancelButton: false,
}).then(() => {}); }).then(() => {
});
}, },
deleteDialog(_this,row) { deleteDialog(_this, row) {
_this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", { _this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -894,10 +940,11 @@ export default {
_this.getList(); _this.getList();
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
supManufacturerClick(_this,row) { supManufacturerClick(_this, row) {
_this.registrationQuery.customerId = row.customerId; _this.registrationQuery.customerId = row.customerId;
_this.registrationQuery.manufacturerIdFk = row.manufacturerId; _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
_this.getRegistrationList(); _this.getRegistrationList();
@ -930,8 +977,8 @@ export default {
this.registrationQuery.page = 1; this.registrationQuery.page = 1;
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(_this,row) { registrationDialog(_this, row) {
if(_this == null){ if (_this == null) {
_this = this _this = this
} }
if (_this.currentManufacturer == null) { if (_this.currentManufacturer == null) {
@ -958,7 +1005,7 @@ export default {
} }
_this.registrationVisible = true; _this.registrationVisible = true;
}, },
deleteRegistration(_this,row) { deleteRegistration(_this, row) {
_this.$confirm("是否删除?", "提示", { _this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -988,7 +1035,8 @@ export default {
_this.certLoading = false; _this.certLoading = false;
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
closeProductDialog() { closeProductDialog() {
this.registrationVisible = false; this.registrationVisible = false;
@ -1017,11 +1065,11 @@ export default {
this.registrationQuery.page = val.page; this.registrationQuery.page = val.page;
this.getRegistrationList(); this.getRegistrationList();
}, },
executeFuc(row,type,clickFuc,value){ executeFuc(row, type, clickFuc, value) {
return executeFuc(this,row,type,clickFuc,value); return executeFuc(this, row, type, clickFuc, value);
}, },
executeEval(row,expression,defaultRet){ executeEval(row, expression, defaultRet) {
if(expression){ if (expression) {
return eval(expression); return eval(expression);
} }
return defaultRet; return defaultRet;
@ -1031,11 +1079,12 @@ export default {
suppliersEnterpriseBasicAdd, suppliersEnterpriseBasicAdd,
suppliersRegistrationBasic, suppliersRegistrationBasic,
}, },
mounted() {}, mounted() {
},
created() { created() {
this.fileUrl = this.fileUrl =
this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name="; this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
getHead("supCertificationAdd-1","1").then((re) => { getHead("supCertificationAdd-1", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;
@ -1043,7 +1092,7 @@ export default {
this.fromList = re.data.fromList; this.fromList = re.data.fromList;
this.getList(); this.getList();
}); });
getHead("supCertificationAdd-2","1").then((re) => { getHead("supCertificationAdd-2", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj2 = re.data; this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList; this.tableHeader2 = re.data.tableList;

6
src/views/purchase/company/companyProducts.vue
Unescape Escape View File

@ -210,6 +210,10 @@ export default {
type: Function, type: Function,
required: true, required: true,
}, },
manufactory: {
type: Object,
required: true,
},
}, },
data() { data() {
return { return {
@ -298,6 +302,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
if (this.manufactory != null)
this.filterQuery.manufactory = this.manufactory
getCertUdis(this.filterQuery) getCertUdis(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

1
src/views/purchase/product/supProductEditDialog.vue
Unescape Escape View File

@ -352,6 +352,7 @@
<companyProducts <companyProducts
:selectType="selectType" :selectType="selectType"
:closeSelDialog="closeSelDialog" :closeSelDialog="closeSelDialog"
:manufactory="inputQuery.companyName"
></companyProducts> ></companyProducts>
</el-dialog> </el-dialog>

Write Preview
Loading…
Cancel
Save