Browse Source

2023-6-13

master
guoxing 2 years ago
parent
commit
d7434fe8f0
  1. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  2. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
  3. 4
      yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js
  4. 2
      yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js
  5. 4
      yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json
  6. 32
      yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue
  7. 2
      yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue

2
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"

4
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 = "数据";

4
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", // 登录超时或失效的情况下,跳转到的登录页面

2
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),
// 油罐类型 数据字典

4
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" : {

32
yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue

@ -4,7 +4,9 @@
<view class="item">
<text class="item_text">合同编号</text>
<input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable />
<uni-data-select style="flex-grow: 1;" v-model="formobj.contractNumber" :localdata="contractNumber"
@change="contractNumberChange"></uni-data-select>
<!-- <input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> -->
</view>
<view class="item">
<text class="item_text" style="margin-left: -9px;">供货商名称</text>
@ -46,7 +48,7 @@
</view>
<view class="item">
<text class="item_text">收料价值</text>
<input v-model="formobj.value" placeholder=""type="number" @input="input2" class="item_input"
<input v-model="formobj.value" placeholder="" type="number" @input="input2" class="item_input"
clearable />
</view>
<view class="item">
@ -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);

2
yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue

@ -36,7 +36,7 @@
//
formData: {
userName: 'admin',
password: '123456'
password: 'admin'
},
rules: {
// name

Loading…
Cancel
Save