更新

public/static/payprint1.html

@@ -682,7 +682,8 @@
                         <td v-if="!printData.extra1" class="col" colspan="4">
                             {{ printData.identityAuthenticationInfo.customerNumberCard}}
                         </td>
-                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'" class="col" colspan="4">
+                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'||printData.contractManagement.seller == '依安县亿廷农业发展有限责任公司'"
+                            class="col" colspan="4">
                             郭传亮
                         </td>
                         <td v-else class="col" colspan="4">
@@ -697,7 +698,8 @@
                         <td v-if="!printData.extra1" class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
                         </td>
-                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'" class="col" colspan="4">
+                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'||printData.contractManagement.seller == '依安县亿廷农业发展有限责任公司'"
+                            class="col" colspan="4">
                             15174590000
                         </td>
                         <td v-else class="col" colspan="4">

public/static/warehousePrint.html

@@ -191,8 +191,8 @@
                 <span>{{warehouseName}}</span>
                 <span v-if='printData[0].qualityInspector'>质检员:</span>
                 <span v-if='printData[0].qualityInspector'>{{printData[0].qualityInspector}}</span>
-                <span>检斤员：</span>
-                <span>{{printData[0].secretaryWeigher}}</span>
+                <span> 检斤员：</span>
+                <span>{{printData[0].qualityInspector}}</span>
                 <p>
                     <span>日期：</span>
                     <span>{{startDate}}</span>
@@ -225,7 +225,7 @@
                 </tr>
                 <tr class="row" v-for="(item,index) in printData">
                     <td class="col">{{item.busNo.substring(8)}}</td>
-                    <td class="col">{{item.inOutDate}}</td>
+                    <td class="col">{{item.inOutDate.substring(5)}}</td>
                     <td class="col">{{item.carNo}}</td>
                     <td class="col">{{item.binNumber}}</td>
                     <td class="col">{{item.waterContent}}</td>

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1016,24 +1016,24 @@ export default {
         } else if (this.tpyeNo == 2) {
           this.information = '皮重'
         }
-        getToken()
-          .toPromise()
-          .then(response => {
-            accessToken = response
-            player = new EZUIKit.EZUIKitPlayer({
-              id: 'video-container', // 视频容器ID
-              accessToken: accessToken,
-              url: 'ezopen://open.ys7.com/' + this.monitorUrl2 + '.hd.live',
-              template: 'standard',
-              width: 550,
-              height: 350,
-              handleCapturePicture: res => {
-                console.log('rereer', res)
-              }
-            })
-            window.player = player
-            window.accessToken = accessToken
-          })
+        //     getToken()
+        //       .toPromise()
+        //       .then(response => {
+        //         accessToken = response
+        //         player = new EZUIKit.EZUIKitPlayer({
+        //           id: 'video-container', // 视频容器ID
+        //           accessToken: accessToken,
+        //           url: 'ezopen://open.ys7.com/' + this.monitorUrl2 + '.hd.live',
+        //           template: 'standard',
+        //           width: 550,
+        //           height: 350,
+        //           handleCapturePicture: res => {
+        //             console.log('rereer', res)
+        //           }
+        //         })
+        //         window.player = player
+        //         window.accessToken = accessToken
+        //       })
         this.getList()
       })
   },
@@ -1282,20 +1282,20 @@ export default {
             this.disabled = false
           }
           let _this = this
-          if (_this.monitorUrl2) {
-            player = new EZUIKit.EZUIKitPlayer({
-              id: 'video-container', // 视频容器ID
-              accessToken: accessToken,
-              url: 'ezopen://open.ys7.com/' + _this.monitorUrl2 + '.hd.live',
-              // simple - 极简版; pcLive-pc直播；pcRec-pc回放；mobileLive-移动端直播；mobileRec-移动端回放;security - 安防版;voice-语音版;
-              template: 'standard',
-              width: 550,
-              height: 350
-            })
-            window.player = player
-          } else {
-            player.stop()
-          }
+          //   if (_this.monitorUrl2) {
+          //     player = new EZUIKit.EZUIKitPlayer({
+          //       id: 'video-container', // 视频容器ID
+          //       accessToken: accessToken,
+          //       url: 'ezopen://open.ys7.com/' + _this.monitorUrl2 + '.hd.live',
+          //       // simple - 极简版; pcLive-pc直播；pcRec-pc回放；mobileLive-移动端直播；mobileRec-移动端回放;security - 安防版;voice-语音版;
+          //       template: 'standard',
+          //       width: 550,
+          //       height: 350
+          //     })
+          //     window.player = player
+          //   } else {
+          //     player.stop()
+          //   }
         }
       }
       this.getList()

src/views/outboundManagement/weighingManagementNew.vue

@@ -2298,20 +2298,20 @@ export default {
           }
           this.monitorUrl2 = this.warehouseList1[i].monitorUrl2
           let _this = this
-          if (_this.monitorUrl2) {
-            player = new EZUIKit.EZUIKitPlayer({
-              id: 'video-container', // 视频容器ID
-              accessToken: accessToken,
-              url: 'ezopen://open.ys7.com/' + _this.monitorUrl2 + '.hd.live',
-              // simple - 极简版; pcLive-pc直播；pcRec-pc回放；mobileLive-移动端直播；mobileRec-移动端回放;security - 安防版;voice-语音版;
-              template: 'standard',
-              width: 550,
-              height: 350
-            })
-            window.player = player
-          } else {
-            player.stop()
-          }
+          //   if (_this.monitorUrl2) {
+          //     player = new EZUIKit.EZUIKitPlayer({
+          //       id: 'video-container', // 视频容器ID
+          //       accessToken: accessToken,
+          //       url: 'ezopen://open.ys7.com/' + _this.monitorUrl2 + '.hd.live',
+          //       // simple - 极简版; pcLive-pc直播；pcRec-pc回放；mobileLive-移动端直播；mobileRec-移动端回放;security - 安防版;voice-语音版;
+          //       template: 'standard',
+          //       width: 550,
+          //       height: 350
+          //     })
+          //     window.player = player
+          //   } else {
+          //     player.stop()
+          //   }
           this.positionInfos = this.warehouseList1[i].positionInfos
           this.warehouseCount = this.warehouseList1[i].outCount
           this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
@@ -2840,24 +2840,24 @@ export default {
             }
           }
           this.warehouseList1 = response
-          getToken()
-            .toPromise()
-            .then(response => {
-              accessToken = response
-              player = new EZUIKit.EZUIKitPlayer({
-                id: 'video-container', // 视频容器ID
-                accessToken: accessToken,
-                url: 'ezopen://open.ys7.com/' + this.monitorUrl2 + '.hd.live',
-                template: 'standard',
-                width: 550,
-                height: 350,
-                handleCapturePicture: res => {
-                  console.log('rereer', res)
-                }
-              })
-              window.player = player
-              window.accessToken = accessToken
-            })
+          //   getToken()
+          //     .toPromise()
+          //     .then(response => {
+          //       accessToken = response
+          //       player = new EZUIKit.EZUIKitPlayer({
+          //         id: 'video-container', // 视频容器ID
+          //         accessToken: accessToken,
+          //         url: 'ezopen://open.ys7.com/' + this.monitorUrl2 + '.hd.live',
+          //         template: 'standard',
+          //         width: 550,
+          //         height: 350,
+          //         handleCapturePicture: res => {
+          //           console.log('rereer', res)
+          //         }
+          //       })
+          //       window.player = player
+          //       window.accessToken = accessToken
+          //     })
           this.deptBudgetList.warehouseName = this.warehouseName
           this.getList()
         })

src/views/warehousenew/warehouseManagementList.vue

@@ -536,6 +536,21 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="任务编号" span="1" prop="warehouseName">
+              <el-select
+                v-model="parameter.inOutTaskNo"
+                placeholder="请选择任务编号"
+                filterable
+                clearable
+              >
+                <el-option
+                  v-for="item in inOutTaskNoList"
+                  :key="item.inOutTaskNo"
+                  :label="item.inOutTaskNo + '(' + item.taskFlag + ')'"
+                  :value="item.inOutTaskNo"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="仓位编号" span="1" prop="warehouseName">
               <el-select
                 v-model="parameter.binNumber"
@@ -551,7 +566,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
               v-if="headerText != '导出记录'"
               label="货名"
               span="1"
@@ -570,7 +585,7 @@
                   :value="item.constValue"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="增量比例（%）" v-if="headerText == '打印记录'">
               <el-input placeholder="请输入增量比例" v-model="parameter.proportion" clearable class="proportion_css">
               </el-input>
@@ -655,7 +670,8 @@ import {
   getwarehousNameNew,
   getbintype,
   postExportjynin,
-  postExportjynout
+  postExportjynout,
+  getReceiptTaskNo
 } from '@/model/warehouse/index'
 import mapDrag from '@/components/mapdrag/warehouseMap'
 import { downloadFile } from '@/utils/batchDown'
@@ -721,6 +737,7 @@ export default {
       ],
       warehouseXiaLaCopy: [],
       warehouseAllXiaLa: [],
+      inOutTaskNoList: [],
       responsible: '',
       maptitle: '库点监控',
       btnCss1: 'btn1',
@@ -808,6 +825,15 @@ export default {
               console.log(response)
               this.typeList = response
             })
+          getReceiptTaskNo({
+            warehouseName: this.warehouseAllXiaLa[i].warehouseName,
+            flag: 5
+          })
+            .toPromise()
+            .then(response => {
+              console.log(response)
+              this.inOutTaskNoList = response
+            })
         }
       }
     },
@@ -979,7 +1005,8 @@ export default {
           printFlag: '1',
           currentPage: 1,
           pageSize: 999,
-          statusFlag: 3
+          statusFlag: 3,
+          inOutTaskNo: this.parameter.inOutTaskNo
         })
           .toPromise()
           .then(response => {