供应链接口对接

src/api/foodManage/returnManage.js

@@ -88,7 +88,7 @@ export function getReturnMaterialInfoApi(data) {
 // 新增退货单-保存
 export function addReturnMaterialApi(data) {
     return request({
-        url: '/smart-canteen/ims_refund_goods/add',
+        url: '/smart-canteen/ims_refund_goods/save',
         method: 'post',
         headers: {
             //"merchant-id":"378915229716713472",

src/views/foodManage/pickManage/materialPicking/index.vue

@@ -307,13 +307,13 @@ export default {
                 "commitStatus": this.queryParams.commitStatus,   
                 // "approveStatus": this.queryParams.approveStatus
             }
-            if(this.dateRange&&this.dateRange.length>0){
-                param.startTime=this.formatDateTime(this.dateRange[0])
-                param.endTime=this.formatDateTime(this.dateRange[1])
-            }else{
-                param.startTime=undefined;
-                param.endTime=undefined;
-            } 
+            // if(this.dateRange&&this.dateRange.length>0){
+            //     param.startTime=this.formatDate(this.dateRange[0])
+            //     param.endTime=this.formatDate(this.dateRange[1])
+            // }else{
+            //     param.startTime=undefined;
+            //     param.endTime=undefined;
+            // } 
             fetchMaterialPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.total = Number(response.total);

src/views/foodManage/returnManage/materialReturn/edit.vue

@@ -24,8 +24,8 @@
                         ></el-option>
                     </el-select> 
                 </el-form-item>
-                <el-form-item label="退货仓库" prop="warehouseId">
-                    <el-select v-model="baseInfo.warehouseId" clearable placeholder="请选择退货仓库" style="width: 100%;">
+                <el-form-item label="退货仓库" prop="refundWarehouseId">
+                    <el-select v-model="baseInfo.refundWarehouseId" clearable placeholder="请选择退货仓库" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -33,8 +33,8 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="退货人" prop="refundName">
-                    <el-input v-model="baseInfo.refundName" placeholder="请输入退货人" maxlength="20" clearable style="width: 240px"/>
+                <el-form-item label="退货人" prop="refundContact">
+                    <el-input v-model="baseInfo.refundContact" placeholder="请输入退货人" maxlength="20" clearable style="width: 240px"/>
                 </el-form-item>  
                 <el-form-item label="退货时间" prop="refundTime">
                     <el-date-picker
@@ -198,7 +198,7 @@ export default {
             refundTime: [
                 { required: true, message: "交货时间不能为空", trigger: "change" }
             ],
-            warehouseId: [
+            refundWarehouseId: [
                 { required: true, message: "送货仓库不能为空", trigger: "change" }
             ],
             supplyAddress: [
@@ -263,7 +263,7 @@ export default {
                 });  
                 drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
                     this.wareHouseOptions = response.rows||[];
-                    this.$set(this.baseInfo,'warehouseId',this.baseInfo.warehouseId) 
+                    this.$set(this.baseInfo,'refundWarehouseId',this.baseInfo.refundWarehouseId) 
                 });  
             }); 
         },
@@ -296,7 +296,7 @@ export default {
         getWareHouseData() { 
             drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
                 this.wareHouseOptions = response.rows||[];
-                this.$set(this.baseInfo,'warehouseId',null) 
+                this.$set(this.baseInfo,'refundWarehouseId',null) 
             }); 
         },
         /** 查询货品类别下拉树结构 */
@@ -327,7 +327,7 @@ export default {
         },
         //添加货品
         addMaterial(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+            if(this.baseInfo.areaId!=undefined||this.baseInfo.refundWarehouseId!=undefined){
                  this.openDialog=true
                 this.resetQuery()
                 setTimeout(()=>{
@@ -354,7 +354,7 @@ export default {
                 "pageSize": this.queryParams.pageSize,
                 "pageNum": this.queryParams.pageNum,
                 "areaId": this.baseInfo.areaId,
-                "warehouseId": this.baseInfo.warehouseId,
+                "warehouseId": this.baseInfo.refundWarehouseId,
                 "materialName": this.queryParams.materialName,
                 "materialCode": this.queryParams.materialCode,  
                 "materialTypeIds": this.queryParams.materialTypeIds,
@@ -387,8 +387,8 @@ export default {
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo); 
-                    param.refundTime = this.formatDate(this.baseInfo.refundTime) 
-                    param.refundTotalAmount=0
+                    param.refundTime = this.formatDateTime(this.baseInfo.refundTime) 
+                    // param.refundTotalAmount=0
                     param.refundTotalNum=0 
                     param.detailList = []   
                     this.noMaterial = false;
@@ -436,8 +436,8 @@ export default {
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) {
                     let param = Object.assign({},this.baseInfo); 
-                    param.refundTime = this.formatDate(this.baseInfo.refundTime) 
-                    param.refundTotalAmount=0
+                    param.refundTime = this.formatDateTime(this.baseInfo.refundTime) 
+                    // param.refundTotalAmount=0
                     param.refundTotalNum=0 
                     param.detailList = []   
                     this.noMaterial = false;

src/views/foodManage/returnManage/materialReturn/index.vue

@@ -37,8 +37,8 @@
             }" clearable @change="handleAreaChange">
             </el-cascader>
         </el-form-item>
-         <el-form-item label="退货人" prop="returnMan">
-            <el-input v-model="queryParams.returnMan" placeholder="请输入退货人" maxlength="20" clearable style="width: 240px"/>
+         <el-form-item label="退货人" prop="refundContact">
+            <el-input v-model="queryParams.refundContact" placeholder="请输入退货人" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>  
         <el-form-item label="提交状态" prop="commitStatus"> 
             <el-select v-model="queryParams.commitStatus" placeholder="请选择提交状态" style="width: 240px;">
@@ -80,26 +80,17 @@
         <el-table-column label="退货单号" align="center" prop="refundGoodsCode" :show-overflow-tooltip="true" /> 
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
-        <!-- <el-table-column label="确认状态" align="center" prop="supplierConfirmStatus" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="退货仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="退货时间" align="center" prop="refundTime" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="退货人" align="center" prop="refundContact" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="退款金额(元)" align="center" prop="refundTotalAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-                <span v-if="scope.row.supplierConfirmStatus==1">待确认</span>
-                <span v-if="scope.row.supplierConfirmStatus==2">确认通过</span>
-                <span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span> 
+               <span>{{ (scope.row.refundTotalAmount/100).toFixed(2) }}</span>
             </template>  
-        </el-table-column>
-     
-        <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
-            <template slot-scope="scope">
-               <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
-            </template>  
-        </el-table-column> -->
-        <el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/> 
-        <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="交货日期" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="150"/>
-
-        
-        <el-table-column label="w" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/> 
-        <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>  
+        </el-table-column> 
+        <el-table-column label="货品数量" align="center" prop="refundTotalNum" :show-overflow-tooltip="true" width="100"/> 
+        <!-- <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/> 
+        <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>   -->
         <!-- <el-table-column label="审批人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="审批完成时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
         <!-- <el-table-column label="负责人" align="center" prop="contractPerson" :show-overflow-tooltip="true" width="120"/> -->

src/views/foodManage/stockManage/warehouseOut/index.vue

@@ -353,7 +353,7 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) { 
             this.$modal.confirm('是否确认删除数据项？').then(function() {
-                return delWarehouseOutApi({orderGoodsIds:[row.orderGoodsId]});
+                return delWarehouseOutApi({outIds:[row.outId]});
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");

src/views/kitchen/environment/videoMonitoring/history.vue

@@ -111,13 +111,13 @@ methods:{
                         success: function (xmlDoc) {  
                             // console.log(that.formatDateTime(that.dateRange[0]))
                             // console.log(that.formatDateTime(that.dateRange[1]))
-                            oWebVideoCtrl2.I_StartPlayback(szDeviceIdentify, {
-                                szStartTime:that.formatDateTime(that.dateRange[0]),
-                                szEndTime:that.formatDateTime(that.dateRange[1]),
-                                iChannelID: that.chosenChannel2,
-                                iStreamType: oLiveView.iStreamType, 
-                                bZeroChannel: oLiveView.bZeroChannel
-                            });   
+                            // oWebVideoCtrl2.I_StartPlayback(szDeviceIdentify, {
+                            //     szStartTime:that.formatDateTime(that.dateRange[0]),
+                            //     szEndTime:that.formatDateTime(that.dateRange[1]),
+                            //     iChannelID: that.chosenChannel2,
+                            //     iStreamType: oLiveView.iStreamType, 
+                            //     bZeroChannel: oLiveView.bZeroChannel
+                            // });   
                         }
                     }); 
                 }
@@ -157,7 +157,7 @@ methods:{
             this.$modal.msgError("设备未绑定通道号");
         } 
     },
-    iframeLoaded2(Channel){   
+    iframeLoaded2(){   
         var oLiveView = {
             iProtocol: 1,            // protocol 1<EFBFBD><EFBFBD>http, 2:https
             szIP: "192.168.1.10",    // protocol ip
@@ -168,7 +168,7 @@ methods:{
             iChannelID: 1,           // channel no
             bZeroChannel: false      // zero channel
         }
-        var szDeviceIdentify = oLiveView.szIP; 
+        var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;   
         var oWebVideoCtrl2 = this.$refs.videoIframe2.contentWindow.WebVideoCtrl; 
         var that = this;
         oWebVideoCtrl2.I_Stop({iWndIndex:0}) 
@@ -186,9 +186,9 @@ methods:{
     }, 
     defaultDateRange() {
         const end = new Date(new Date().toLocaleDateString());
-        end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+        end.setTime(end.getTime() + 10 * 60 * 60 * 1000);
         const start = new Date((new Date().toLocaleDateString()));
-        start.setTime(start.getTime()+ 9 * 60 * 60 * 1000 - 1); 
+        start.setTime(start.getTime()+ 8 * 60 * 60 * 1000); 
         this.start = parseInt(start.getTime() / 1000)
         this.end = parseInt(end.getTime() / 1000)
         return [start, end]

src/views/kitchen/environment/videoMonitoring/index.vue

@@ -122,16 +122,15 @@ methods:{
                 var szInfo = "当前选择的窗口编号：" + WndIndex;
                 console.log(szInfo)
                 that.chosenWinNo = WndIndex;  
-            },
-            cbDoubleClickWnd: function (iWndIndex, bFullScreen) {
-                console.log(1111222) 
-                var szInfo = "当前放大的窗口编号：" + iWndIndex;
-                if (!bFullScreen) {            
-                    szInfo = "当前还原的窗口编号：" + iWndIndex;
-                }
-                console.log(szInfo) 
-            } 
-             //WebVideoCtrl.I_FullScreen(true);isFullScreen
+            }
+            // cbDoubleClickWnd: function (iWndIndex, bFullScreen) {
+            //     oWebVideoCtrl1.I_FullScreen(iWndIndex,true); 
+            //     var szInfo = "当前放大的窗口编号：" + iWndIndex;
+            //     if (!bFullScreen) {            
+            //         szInfo = "当前还原的窗口编号：" + iWndIndex;
+            //     }
+            //     console.log(szInfo)  
+            // }
         });  
     },
     iframeLogout(domId){
@@ -161,7 +160,7 @@ methods:{
     async handleNodeClick(data) { 
         if(data.deviceExtendInfo&&data.deviceExtendInfo!=""){
             let obj = JSON.parse(data.deviceExtendInfo)  
-            this.chosenChannel = 15 
+            this.chosenChannel = 18;
             this.iframeLoaded(this.chosenWinNo,this.chosenChannel)  
         }else{
             this.$modal.msgError("设备未绑定通道号");