+
+
-
{{ item }}
+ /
+
+
+
+
+
@@ -83,10 +83,11 @@
-
+ /
+
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index e96d3817..e7a1a409 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -77,10 +77,11 @@
-
+ /
+
@@ -150,10 +151,11 @@
-
+ /
+
@@ -459,7 +461,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
- if(item.unitPrice==0 || item.purchaseNum==0){
+ if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
@@ -522,7 +524,7 @@ export default {
this.noMaterial = false;
if(this.materialList.length>0){
this.materialList.forEach(item=>{
- if(item.unitPrice==0 || item.purchaseNum==0){
+ if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){
this.noMaterial = true
}else{
let obj = Object.assign({}, item)
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/index.vue b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
index d18b19bb..6391c290 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/index.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
@@ -95,7 +95,11 @@
是
-
+
+ {{ scope.row.productionPlanId||'/' }}
+
+
+
+ {{ scope.row.productionPlanId||'/' }}
+
+
+
+ {{ scope.row.contractCode||'/' }}
+
+
-
{{ item }}
+ /
+
+
+
-
-
+ /
+
-
-
+ /
+
diff --git a/src/views/foodManage/returnManage/materialReturn/edit.vue b/src/views/foodManage/returnManage/materialReturn/edit.vue
index 8658ddcc..7a61fe67 100644
--- a/src/views/foodManage/returnManage/materialReturn/edit.vue
+++ b/src/views/foodManage/returnManage/materialReturn/edit.vue
@@ -66,10 +66,11 @@
-
+ /
+
diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue
index 6c168877..8dd7b77a 100644
--- a/src/views/foodManage/stockManage/depotManage/index.vue
+++ b/src/views/foodManage/stockManage/depotManage/index.vue
@@ -61,20 +61,35 @@
-
- 原料
- 商品
+ 原料
+ 商品
+ /
+
+ {{ scope.row.address||'/' }}
+
+
+
+
+ {{ scope.row.managerName||'/' }}
+
+
+
+
+
+ {{ hidePhone(scope.row.managerPhone)||'/' }}
+
+
+
+ 按份
+ 称重
+ /
+
+
-
-
+ /
+
+
+
+ 按份
+ 称重
+ /
+
+
+
-
+
+
+ 按份
+ 称重
+ /
+
+
@@ -169,10 +174,11 @@
-
+ /
+
@@ -692,7 +698,7 @@ export default {
"pageSize": this.queryParams2.pageSize,
"pageNum": this.queryParams2.pageNum,
"orderGoodsCode": this.queryParams2.orderGoodsCode,
- "orderStatus":2,
+ "orderStatus":3,
"isInspect":0,
"ifAllInto":2,
"areaId": this.baseInfo.areaId,
diff --git a/src/views/foodManage/stockManage/warehouseOut/detail.vue b/src/views/foodManage/stockManage/warehouseOut/detail.vue
index b151c705..d1e8455f 100644
--- a/src/views/foodManage/stockManage/warehouseOut/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/detail.vue
@@ -63,10 +63,11 @@
-
+ /
+
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index b187bd27..6b393d94 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -67,7 +67,12 @@
+
+
+ 按份
+ 称重
+ /
+
+ /
+
-
+ /
+
+
+
+
{{ (scope.row.singlePrice/100).toFixed(2) }}
-
+
{{ (scope.row.totalPrice/100).toFixed(2) }}
@@ -190,6 +191,15 @@ export default {
//查询
getGoodsInquiryDetailInfoApi(param).then((response) => {
this.baseInfo = this.supplierQuotationData;
+ //是否在报价时间段判断
+ let start = new Date(this.supplierQuotationData.startTime).getTime()
+ let end = new Date(this.supplierQuotationData.endTime).getTime()
+ let now = new Date().getTime()
+ if(now>start&&now
+
+ 按份
+ 称重
+ /
+
+
-
+
-
-
+ /
+
+
{{ (scope.row.unitPrice/100).toFixed(2)||"" }}
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
index 616d8186..a106dda0 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
@@ -57,9 +57,15 @@
报价
+ 查看
0){
param.startDateTime=this.formatDateTime(this.dateRange[0])
@@ -226,6 +236,16 @@ export default {
console.log("param",param)
goodsInquiryQuotePageApi(param).then(response => {
this.tableListData = response.rows;
+ this.tableListData.forEach(item=>{
+ let start = new Date(item.startTime).getTime()
+ let end = new Date(item.endTime).getTime()
+ let now = new Date().getTime()
+ if(now>start&&now
+
+ 按份
+ 称重
+ /
+
+
+
+
+ 按份
+ 称重
+ /
+
+
+
+
+ {{ scope.row.areaName||'/' }}
+
+
+
+
+ {{ scope.row.purchaseGoodsTime||'/' }}
+
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 5e31ab12..8e58904f 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -75,14 +75,26 @@
+
+ {{ scope.row.supplierScore||'/' }}
+
+
+
+ {{ hidePhone(scope.row.linkmanPhone) }}
+
+
+
+ {{ scope.row.address||'/' }}
+
+
{
if (response.rows) {
// 从接口返回的数据中提取用户选项
- this.supplierUserList = response.rows
+ this.supplierUserList = response.rows;
}
});
},
@@ -910,7 +922,7 @@ export default {
arr.push(item.categoryId)
})
this.$set(this.form,"categoryIdList",arr)
- this.$set(this.form,"supplierUserId",Number(row.supplierUserId))
+ this.$set(this.form,"supplierUserId",row.supplierUserId)
this.open = true;
this.title = "修改";
diff --git a/src/views/foodManage/supplierManage/supplierQualification/index.vue b/src/views/foodManage/supplierManage/supplierQualification/index.vue
index 31712a1d..435b3178 100644
--- a/src/views/foodManage/supplierManage/supplierQualification/index.vue
+++ b/src/views/foodManage/supplierManage/supplierQualification/index.vue
@@ -58,7 +58,11 @@
+
+ {{ hidePhone(scope.row.linkmanPhone) }}
+
+
-
+
+ {{ scope.row.lastBidDate||'/' }}
+
+
+
+
+ {{ (scope.row.lastBidAmount/100).toFixed(2) }}
+
+
-
搜索
@@ -30,7 +30,11 @@
+
+ {{ hidePhone(scope.row.phone) }}
+
+
男
@@ -258,6 +262,8 @@ export default {
getList() {
this.loading = true;
let param = {
+ "pageNum":this.queryParams.pageNum,
+ "pageSize":this.queryParams.pageSize,
"searchValue":this.queryParams.searchValue,
"type":this.queryParams.type,
}
diff --git a/src/views/ims/supplier_person/index.vue b/src/views/ims/supplier_person/index.vue
index 052b334f..1b307fc9 100644
--- a/src/views/ims/supplier_person/index.vue
+++ b/src/views/ims/supplier_person/index.vue
@@ -30,7 +30,11 @@
+
+ {{ hidePhone(scope.row.phone) }}
+
+
男
@@ -243,6 +247,8 @@ export default {
getList() {
this.loading = true;
let param = {
+ "pageNum":this.queryParams.pageNum,
+ "pageSize":this.queryParams.pageSize,
"searchValue":this.queryParams.searchValue,
"type":this.queryParams.type,
}
diff --git a/src/views/kitchen/devicesManage/deviesRecord/index.vue b/src/views/kitchen/devicesManage/deviesRecord/index.vue
index e4841a03..9def431d 100644
--- a/src/views/kitchen/devicesManage/deviesRecord/index.vue
+++ b/src/views/kitchen/devicesManage/deviesRecord/index.vue
@@ -40,10 +40,22 @@
离线
-
+
+ {{ scope.row.startUseTime||'/' }}
+
+
+
+
+ {{ scope.row.endUseTime||'/' }}
+
+
+
+
+ {{ scope.row.useTime||'/' }}
+
+
+
{{ item }}
+ /
+
+
+
+ {{ item }}
-
+ /
+
历史视频
-
@@ -95,14 +106,14 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
var that = this;
if(domId=='2'){
var oWebVideoCtrl2 = this.$refs.videoIframe2.contentWindow.WebVideoCtrl;
- oWebVideoCtrl2.I_InitPlugin(1300,700, {
+ oWebVideoCtrl2.I_InitPlugin(1300,650, {
bWndFull: true,//�Ƿ�֧�ֵ�����˫��ȫ����Ĭ��֧�� true:֧�� false:��֧��
iWndowType: 1,
cbInitPluginComplete: function () {
@@ -134,7 +145,7 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@@ -166,7 +177,7 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@@ -221,7 +232,7 @@ methods:{
color: #000;
margin-top: 10px;
span{
- margin-left: 40px;
+ margin-left: 10px;
font-size: 20px;
font-weight: bold;
}
diff --git a/src/views/kitchen/environment/videoMonitoring/index.vue b/src/views/kitchen/environment/videoMonitoring/index.vue
index b22fbfa5..713e780f 100644
--- a/src/views/kitchen/environment/videoMonitoring/index.vue
+++ b/src/views/kitchen/environment/videoMonitoring/index.vue
@@ -3,18 +3,49 @@
-
+
经研院食堂监控历史
+
+ 
+
+
+
+ 
+ {{ node.label }}
+
+
+ {{ node.label }}
+
+
@@ -27,8 +38,8 @@
:picker-options="pickerOptions" >
-
视频监控
-
+
+ {{ scope.row.enterCabinetTime||'/' }}
+
+
+
+
+ {{ scope.row.leaveCabinetTime||'/' }}
+
+
-
@@ -32,11 +32,27 @@
+
+ {{ scope.row.openCabinetTemp||'/' }}
+
+
+
+
+ {{ scope.row.closeCabinetTemp||'/' }}
+
+
+
+ {{ scope.row.openCabinetTime||'/' }}
+
+
+
+
+ {{ scope.row.closeCabinetTime||'/' }}
+
+
-
+
+ {{ hidePhone(scope.row.mobile) }}
+
+
@@ -241,12 +244,17 @@ export default {
"pageNum":this.queryParams.pageNum,
"pageSize":this.queryParams.pageSize,
"articleTitle":this.queryParams.articleTitle,
- "deptIds":this.queryParams.deptIdList.join(",")||"",
- "startDate":this.formatDate(this.dateRange[0]),
+ "deptIds":this.queryParams.deptIdList.join(",")||"",
"areaId":this.queryParams.areaId,
"canteenId":this.queryParams.canteenId,
- "subPlaceId":this.queryParams.subPlaceId,
- "endDate":this.formatDate(this.dateRange[1])
+ "subPlaceId":this.queryParams.subPlaceId,
+ }
+ if(this.dateRange&&this.dateRange.length>0){
+ param.startDate=this.formatDate(this.dateRange[0])
+ param.endDate=this.formatDate(this.dateRange[1])
+ }else{
+ param.startDate=undefined;
+ param.endDate=undefined;
}
console.log("param",param);
getIntoRecordsListApi(param).then(response => {
diff --git a/src/views/kitchen/staffManage/morningCheck/index.vue b/src/views/kitchen/staffManage/morningCheck/index.vue
index e75bc561..17d71b2b 100644
--- a/src/views/kitchen/staffManage/morningCheck/index.vue
+++ b/src/views/kitchen/staffManage/morningCheck/index.vue
@@ -31,14 +31,18 @@
+
+ {{ hidePhone(scope.row.mobile) }}
+
+
+
{{ scope.row.temperatureValue }} ℃
diff --git a/src/views/kitchen/staffManage/staff/index.vue b/src/views/kitchen/staffManage/staff/index.vue
index c1953fe0..95779c8a 100644
--- a/src/views/kitchen/staffManage/staff/index.vue
+++ b/src/views/kitchen/staffManage/staff/index.vue
@@ -56,7 +56,11 @@
+
+ {{ hidePhone(scope.row.mobile) }}
+
+
男
diff --git a/src/views/login1.vue b/src/views/login1.vue
index 0a0cc0aa..13d2066a 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -97,7 +97,7 @@
-
-
+
+ 经研院食堂视频监控
+
+
+
+
+
+
+
+ {{ node.label }}
+
+
+ {{ node.label }}
+
+
-
@@ -73,13 +104,13 @@ methods:{
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
var that = this;
var oWebVideoCtrl1 = this.$refs.videoIframe1.contentWindow.WebVideoCtrl;
- oWebVideoCtrl1.I_InitPlugin(1300,700, {
+ oWebVideoCtrl1.I_InitPlugin(1300,645, {
bWndFull: true,//�Ƿ�֧�ֵ�����˫��ȫ����Ĭ��֧�� true:֧�� false:��֧��
iWndowType: 2,
cbInitPluginComplete: function () {
@@ -91,7 +122,7 @@ methods:{
iRtspPort: oLiveView.szPort,
iWndIndex:0,
iStreamType: oLiveView.iStreamType,
- iChannelID: 1,
+ iChannelID: 5,
bZeroChannel: oLiveView.bZeroChannel
});
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
@@ -105,14 +136,14 @@ methods:{
iRtspPort: oLiveView.szPort,
iWndIndex:2,
iStreamType: oLiveView.iStreamType,
- iChannelID: 1,
+ iChannelID: 3,
bZeroChannel: oLiveView.bZeroChannel
});
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort,
iWndIndex:3,
iStreamType: oLiveView.iStreamType,
- iChannelID: 2,
+ iChannelID: 4,
bZeroChannel: oLiveView.bZeroChannel
});
}
@@ -141,8 +172,8 @@ methods:{
szPort: "80", // protocol port
szUsername: "admin", // device username
szPassword: "JYY202509", // device password
- iStreamType: 1, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
@@ -175,7 +206,7 @@ methods:{
szUsername:"admin", // device username
szPassword:"JYY202509", // device password
iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream
- iChannelID: 1, // channel no
+ iChannelID: 2, // channel no
bZeroChannel: false // zero channel
}
var szDeviceIdentify = oLiveView.szIP;
@@ -191,6 +222,14 @@ methods:{
});
}, 1000);
},
+
+ async changeWindow(type){
+ var oWebVideoCtrl1 = this.$refs.videoIframe1.contentWindow.WebVideoCtrl;
+ setTimeout(function () {
+ oWebVideoCtrl1.I_ChangeWndNum(type);
+ }, 1000);
+ }
+ // I_ChangeWndNum(iWndType)
}
}
@@ -205,7 +244,7 @@ methods:{
color: #000;
margin-top: 10px;
span{
- margin-left: 40px;
+ margin-left: 10px;
font-size: 20px;
font-weight: bold;
}
diff --git a/src/views/kitchen/foodSafety/sampleManage/index.vue b/src/views/kitchen/foodSafety/sampleManage/index.vue
index f5844e31..f60b3e90 100644
--- a/src/views/kitchen/foodSafety/sampleManage/index.vue
+++ b/src/views/kitchen/foodSafety/sampleManage/index.vue
@@ -89,8 +89,16 @@
无
- 
+ 
+ 
+ 
+
+
+
+ {{ hidePhone(scope.row.phonenumber) }}
+
+
+
+ {{ hidePhone(scope.row.phonenumber) }}
+
+
-
+
+
+
- {{ hidePhone(scope.row.phonenumber) }}
+ {{ hidePhone(scope.row.userName) }}
+ {{ scope.row.userName }}