diff --git a/.env.production b/.env.production
index 1c2fb9a..2cd1310 100644
--- a/.env.production
+++ b/.env.production
@@ -5,10 +5,6 @@ VUE_APP_TITLE = 供应商自助管理系统
ENV = 'production'
# 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/'
# 吴总测试服务器
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 6b70129..fd77358 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -161,6 +161,10 @@ export default {
if (response.data.zxxsbzbhsydysl > 1) {
this.isUseDyCheck = true;
}
+ let allowNoSerial = response.data.allowNoSerial??true;
+ if (isBlank(this.editData.serialNo) && !allowNoSerial) {
+ this.isSerialNo = true
+ }
} else {
}
this.loading = false;
@@ -183,9 +187,9 @@ export default {
if(isBlank(this.editData.batchNo)){
this.isBatchNo=true
}
- if(isBlank(this.editData.serialNo)){
- this.isSerialNo=true
- }
+ // if(isBlank(this.editData.serialNo)){
+ // this.isSerialNo=true
+ // }
}
}
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index 0fc30e0..ec96ace 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -47,86 +47,98 @@
-
-
+
+
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.code }}
-
-
-
-
-
- {{ item.name }}
- {{ item.code }}
-
-
-
-
-
-
-
-
+ >
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.code
+ }}
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.code
+ }}
+
+
+
+
+
+
+
+
@@ -134,16 +146,20 @@
显示/隐藏搜索栏显示/隐藏搜索栏
+
重置重置
+
查询查询
+
添加添加
+
@@ -233,7 +249,7 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
+
@@ -246,8 +262,10 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
- {{ item.lableRuleObj[scope.row[item.columnName]] }}
+
+ {{
+ item.lableRuleObj[scope.row[item.columnName]]
+ }}
-
-
- {{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}
+
+
+ {{
+ item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+ }}
@@ -296,7 +317,9 @@
:key="item.columnName"
>
- {{ scope.row[item.columnName] }}
+ {{
+ scope.row[item.columnName]
+ }}
@@ -370,8 +393,10 @@
-
-
+
+
-
+
-
+
{{ item.name }}
- {{ item.code }}
+ {{
+ item.code
+ }}
-
+
{{ item.name }}
- {{ item.code }}
+ {{
+ item.code
+ }}
-
+
-
+
显示/隐藏搜索栏显示/隐藏搜索栏
+
重置重置
+
查询查询
+
添加添加
+
@@ -557,7 +596,7 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
+
@@ -570,8 +609,10 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
- {{ item.lableRuleObj[scope.row[item.columnName]] }}
+
+ {{
+ item.lableRuleObj[scope.row[item.columnName]]
+ }}
-
-
- {{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}
+
+
+ {{
+ item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+ }}
@@ -620,7 +664,9 @@
:key="item.columnName"
>
- {{ scope.row[item.columnName] }}
+ {{
+ scope.row[item.columnName]
+ }}
@@ -667,7 +713,7 @@ import {
} from "../../../api/purchase/suppliersRegistrationBasic";
import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
import {
- getHead,executeFuc
+ getHead, executeFuc
} from "@/utils/customConfig";
export default {
@@ -734,14 +780,13 @@ export default {
},
registrationList: [],
certTotal: 0,
- tableHeader:[],
- queryList:[],
- fromList:[],
- tableHeader2:[],
- queryList2:[],
- fromList2:[],
- options: {
- },
+ tableHeader: [],
+ queryList: [],
+ fromList: [],
+ tableHeader2: [],
+ queryList2: [],
+ fromList2: [],
+ options: {},
registrationLoading: false,
registrationId: "",
@@ -832,8 +877,8 @@ export default {
hideSearch2() {
this.showSearch2 = !this.showSearch2;
},
- addInfoDialog(_this,row) {
- if(_this == null){
+ addInfoDialog(_this, row) {
+ if (_this == null) {
_this = this
}
if (_this.$isNotBlank(row)) {
@@ -872,15 +917,16 @@ export default {
console.log(this.check);
},
- rejectInfo(_this,row) {
+ rejectInfo(_this, row) {
_this.$confirm(row.auditComment, "驳回说明", {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
- }).then(() => {});
+ }).then(() => {
+ });
},
- deleteDialog(_this,row) {
+ deleteDialog(_this, row) {
_this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -894,10 +940,11 @@ export default {
_this.getList();
});
})
- .catch(() => {});
+ .catch(() => {
+ });
},
- supManufacturerClick(_this,row) {
+ supManufacturerClick(_this, row) {
_this.registrationQuery.customerId = row.customerId;
_this.registrationQuery.manufacturerIdFk = row.manufacturerId;
_this.getRegistrationList();
@@ -930,8 +977,8 @@ export default {
this.registrationQuery.page = 1;
this.getRegistrationList();
},
- registrationDialog(_this,row) {
- if(_this == null){
+ registrationDialog(_this, row) {
+ if (_this == null) {
_this = this
}
if (_this.currentManufacturer == null) {
@@ -958,7 +1005,7 @@ export default {
}
_this.registrationVisible = true;
},
- deleteRegistration(_this,row) {
+ deleteRegistration(_this, row) {
_this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -988,7 +1035,8 @@ export default {
_this.certLoading = false;
});
})
- .catch(() => {});
+ .catch(() => {
+ });
},
closeProductDialog() {
this.registrationVisible = false;
@@ -1017,11 +1065,11 @@ export default {
this.registrationQuery.page = val.page;
this.getRegistrationList();
},
- executeFuc(row,type,clickFuc,value){
- return executeFuc(this,row,type,clickFuc,value);
+ executeFuc(row, type, clickFuc, value) {
+ return executeFuc(this, row, type, clickFuc, value);
},
- executeEval(row,expression,defaultRet){
- if(expression){
+ executeEval(row, expression, defaultRet) {
+ if (expression) {
return eval(expression);
}
return defaultRet;
@@ -1031,11 +1079,12 @@ export default {
suppliersEnterpriseBasicAdd,
suppliersRegistrationBasic,
},
- mounted() {},
+ mounted() {
+ },
created() {
this.fileUrl =
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.tableHeader = re.data.tableList;
@@ -1043,7 +1092,7 @@ export default {
this.fromList = re.data.fromList;
this.getList();
});
- getHead("supCertificationAdd-2","1").then((re) => {
+ getHead("supCertificationAdd-2", "1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index cb94190..29d029a 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -210,6 +210,10 @@ export default {
type: Function,
required: true,
},
+ manufactory: {
+ type: Object,
+ required: true,
+ },
},
data() {
return {
@@ -298,6 +302,8 @@ export default {
getList() {
this.loading = true;
this.filterQuery.customerId = store.getters.customerId;
+ if (this.manufactory != null)
+ this.filterQuery.manufactory = this.manufactory
getCertUdis(this.filterQuery)
.then((response) => {
this.loading = false;
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index df2feb5..05cb913 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -352,6 +352,7 @@