diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
index 92737652..b2378694 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
@@ -9,5 +9,5 @@ VUE_APP_BASE_API = '/api'
# VUE_APP_URL = "http://192.168.1.105:7101"
- VUE_APP_URL = "http://192.168.1.193:7101"
+ VUE_APP_URL = "http://192.168.1.107:7101"
##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
index 0d2bead2..d9eb25d4 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
@@ -242,7 +242,7 @@
// if (this.index == "0") {
this.loadLogList()
// } else if (this.index == "1") {
- this.loadIn112List()
+ // this.loadIn112List()
// }
},
@@ -273,7 +273,7 @@
},
init() {
this.loadLogList()
- this.loadIn112List()
+ // this.loadIn112List()
},
purchase(row) {
this.dialogTitle = "数据";
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js
index df2625db..061b34c4 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js
@@ -6,9 +6,9 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
*/
module.exports = {
- // baseUrl: 'http://192.168.1.193:7101',
+ baseUrl: 'http://192.168.1.107:7101',
// baseUrl: 'http://wu5dx5.natappfree.cc/',
- baseUrl: 'http://cyf.yyundong.com/api/',
+ // baseUrl: 'http://cyf.yyundong.com/api/',
tokenName: "satoken", // 请求头中token的名字，与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js
index 5bcb54a9..29d8b4c2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js
@@ -6,6 +6,8 @@ export default {
getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
getThresholdAnalysis: (params = {}) => request.get("/system/risk/getThresholdAnalysis", params),
+ // 合同编号类型 数据字典
+ procurementList: (params = {}) => request.post("/cyf/app/procurement/list", params),
// 原油类型 数据字典
crudeinfoList: (params = {}) => request.post("/cyf/app/crudeinfo/list", params),
// 油罐类型 数据字典
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json
index b85b85f5..612c5bc8 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "醇油坊监管",
"appid" : "__UNI__EDBF66C",
"description" : "醇油坊进销存管理平台监管工具",
- "versionName" : "1.0.0",
- "versionCode" : 100,
+ "versionName" : "1.0.0.1",
+ "versionCode" : 1001,
"transformPx" : false,
"app-plus" : {
"optimization" : {
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue
index fcba9478..b38c0332 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue
@@ -4,7 +4,9 @@
合同编号：
-
+
+
供货商名称：
@@ -46,7 +48,7 @@
收料价值：
-
@@ -88,6 +90,8 @@
data() {
return {
uploadAction: config.baseUrl + "/file/upload",
+ contractNumbers: [],
+ contractNumber: [],
supplierLists: [],
supplierList: [],
crudeLists: [],
@@ -97,6 +101,7 @@
imgList: [],
formobj: {
sid: "",
+ contractNumberSid: "",
contractNumber: "",
contractSigningDate: "",
warehousingDate: "",
@@ -231,6 +236,13 @@
this.formobj.warehousingDate = e
},
+ contractNumberChange(e){
+ console.log('e>>>>>', e);
+ const choose = this.contractNumbers.filter((item) => item.sid === e)
+ console.log(">>>>>>>>>getType", choose[0])
+ this.formobj.procSid =e
+ this.formobj.contractNumber = choose[0].supplierName
+ },
supplierChange(e) {
console.log('e>>>>>', e);
const choose = this.supplierLists.filter((item) => item.sid === e)
@@ -279,6 +291,22 @@
// this.queryParams.type = e
},
initData() {
+ // 获取采购订单 数据字典
+ this.$api.procurementList({}).then(res => {
+ console.log("contractNumber>>>", res);
+ // this.resinfo = res
+ this.contractNumbers = res
+ this.contractNumber = []
+ for (var i = 0; i < this.contractNumbers.length; i++) {
+ let item = {
+ "value": this.contractNumbers[i].sid,
+ "text": this.contractNumbers[i].orderNumber
+ }
+ this.contractNumber.push(item)
+ }
+
+ })
+
// 获取供货商 数据字典
this.$api.supplierList({}).then(res => {
console.log("supplierList>>>", res);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue
index 78888707..0b37b564 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue
@@ -36,7 +36,7 @@
// 表单数据
formData: {
userName: 'admin',
- password: '123456'
+ password: 'admin'
},
rules: {
// 对name字段进行必填验证