diff --git a/manifest.json b/manifest.json
index fe138d8..7379acc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "干巷仓库APP",
- "appid" : "__UNI__A67E78B",
+ "appid" : "__UNI__A82C0EC",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -94,19 +94,19 @@
"vueVersion" : "2",
"h5" : {
"template" : "static/index.html",
- "devServer" : {
- "port" : 9090,
- "https" : false,
- "disableHostCheck" : true,
- "proxy" : {
- "/api" : {
- "target" : "http://192.168.0.31:8888",
- "pathRewrite" : {
- "^/api" : ""
- }
- }
- }
- },
+ // "devServer" : {
+ // "port" : 9090,
+ // "https" : false,
+ // "disableHostCheck" : true,
+ // "proxy" : {
+ // "/api" : {
+ // "target" : "http://192.168.0.31:8888",
+ // "pathRewrite" : {
+ // "^/api" : ""
+ // }
+ // }
+ // }
+ // },
"title" : "RuoYi-App",
"router" : {
"mode" : "hash",
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index bf92d75..50c5988 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -21,6 +21,12 @@
+
+
+
+ 选择物料号
+
+
出库清单
@@ -80,7 +86,11 @@ export default {
//工单计划
outOrderPlan: [],
// 1-仓库扫码 2-货物扫码 3-出货单扫码
- searchType: 3
+ searchType: 3,
+
+ show: false,
+ columns: [['无物料号']],
+ material_id: '无物料号' //物料号
};
},
watch: {},
@@ -120,6 +130,17 @@ export default {
this.searchType = 2;
this.outInfo = data;
this.newMaterialList = [];
+
+ let arry=[]
+ this.columns=[];
+
+ this.outInfo.materialList.forEach((item)=>{
+ arry.push(item.partnumber);
+
+ })
+ this.columns.push(arry)
+ this.material_id=this.outInfo.materialList[0].partnumber
+
} else if (type === 2) {
if (this.newMaterialList.length > 0) {
uni.showModal({
@@ -132,8 +153,10 @@ export default {
}
const checkData = {
production_packcode: data.originalCode,
- shipment_num: this.outInfo.shipmentNum
+ shipment_num: this.outInfo.shipmentNum,
+ partnumber:this.material_id
};
+ //检查是否可以出货
WarehoseApi.checkProductionOut(checkData).then((res) => {
if (res.code === 200 && res.data) {
this.newMaterialList.push(data);
@@ -203,7 +226,8 @@ export default {
if (res.confirm) {
const data = {
shipmentNum: this.outInfo.shipmentNum,
- patchCode: [this.newMaterialList[0].patchCode]
+ patchCode: [this.newMaterialList[0].patchCode],
+
};
WarehoseApi.doMaterialOut(data).then((res) => {
if (res.code !== 200) {
@@ -213,6 +237,22 @@ export default {
showCancel: false,
confirmText: '确认'
});
+
+ if(res.data.item1=100){
+ uni.showModal({
+ title: '提示',
+ content: '此物料已经出库完成，没有可以出库的了',
+ showCancel: false,
+ confirmText: '确认'
+ });
+ }else if(res.data.item2=100){
+ uni.showModal({
+ title: '提示',
+ content: '不是此物料最早批次，无法出库',
+ showCancel: false,
+ confirmText: '确认'
+ });
+ }
return;
}
uni.showModal({
@@ -262,6 +302,17 @@ export default {
}
}
});
+ },
+ //取消
+ pick_cancel() {
+ this.show = false;
+ },
+ // 确认
+ pick_confirm(e) {
+ console.log(e.value);
+ this.material_id = e.value[0];
+ console.log(this.material_id);
+ this.show = false;
}
}
};
diff --git a/pages/watchGoods/goodsdetail/goodsdetail.vue b/pages/watchGoods/goodsdetail/goodsdetail.vue
index ccfc979..fa54efa 100644
--- a/pages/watchGoods/goodsdetail/goodsdetail.vue
+++ b/pages/watchGoods/goodsdetail/goodsdetail.vue
@@ -1,26 +1,26 @@
-
+
{{ item.packageCodeClient }}
-
- 库位
- {{ item.locationCode }}
+
+ 库位：
+ {{ item.locationCode }}
-
- 零件号
- {{ item.partnumber }}
+
+ 零件号：
+ {{ item.partnumber }}
-
- 数量
- {{ item.goodsNumLogic }}
+
+ 数量：
+ {{ item.goodsNumLogic }}
-
- 入库时间
- {{ item.entryWarehouseTime }}
+
+ 入库时间：
+ {{ item.entryWarehouseTime }}
-
- 备注
- {{ item.remark }}
+
+ 备注：
+ {{ item.remark }}
@@ -65,4 +65,20 @@ export default {
font-weight: 50;
}
}
+.card {
+ background-color: #fff; /* 白色背景 */
+ border-radius: 8px; /* 圆角边框 */
+ padding: 12px; /* 内边距 */
+ margin-bottom: 16px; /* 底部间距 */
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
+}
+
+.card text {
+ font-weight: bold; /* 文本加粗 */
+ margin-bottom: 6px; /* 底部间距 */
+}
+
+.card view {
+ color: #333; /* 文本颜色 */
+}
diff --git a/utils/request.js b/utils/request.js
index 323717b..9e5c998 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -18,14 +18,20 @@ import {
let timeout = 10000
const request = config => {
// 浏览器测试用
- const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
+ // const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
// 真机测试以及部署用
- //const storageBaseUrl = 'http://' + getBaseUrl();
+ const storageBaseUrl = 'http://' + getBaseUrl();
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
config.header = config.header || {}
+
+ // 假设你使用的是PHP作为你的后端语言
+ config.header['Access-Control-Allow-Origin']= '*'; // 允许任何源访问
+ config.header['Access-Control-Allow-Methods']='GET, POST, OPTIONS'; // 允许的HTTP方法
+ config.header['Access-Control-Allow-Headers']= 'X-Requested-With'; // 允许的HTTP头
if (getToken() && !isToken) {
config.header['Authorization'] = 'Bearer ' + getToken()
+
}
// get请求映射params参数
if (config.params) {
@@ -44,9 +50,10 @@ const request = config => {
dataType: 'json'
}).then(response => {
let [error, res] = response
- // console.log('token:','Bearer ' + getToken());
+ // console.log('token:','Bearer ' + getToAccess-Control-Allow-Originken());
// console.log('request:',storageBaseUrl + config.url,response);
if (error) {
+ console.log(error)
toast('后端接口连接异常')
reject('后端接口连接异常')
return