首页 发现 帮助
注册 登录
wangchao
/
yiliangyiyun-pc-jj
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

achao 3 年之前
父节点
1078b368f0 be0f48339b
当前提交
e5399e1a72
共有 27 个文件被更改，包括 343 次插入 和 178 次删除
分列视图 显示文件统计
  1. 5 124
      public/static/tradeServicesPrint.html
  2. 163 0
      public/static/warehouseBatchPrint.html
  3. 1 3
      src/global.js
  4. 1 1
      src/layout/index/sidebar/sidebarItem.vue
  5. 1 1
      src/model/home/index.js
  6. 1 1
      src/store/modules/permission.js
  7. 6 0
      src/views/contractManagement/salesContractAdd.vue
  8. 7 0
      src/views/contractManagement/salesContractEdit.vue
  9. 7 2
      src/views/contractManagement/salesContractExamine.vue
  10. 25 9
      src/views/home/index.vue
  11. 13 4
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  12. 2 2
      src/views/taskManagement/tranManagementLook.vue
  13. 3 3
      src/views/taskManagement/tranManagementTransportAdd.vue
  14. 3 2
      src/views/taskManagement/tranManagementTransportEdit.vue
  15. 10 2
      src/views/tranManagement/tranManagementShippingArrangemen.vue
  16. 3 1
      src/views/tranManagement/tranManagementShippingLook.vue
  17. 7 1
      src/views/tranManagement/tranManagementTransporTrainDetails.vue
  18. 7 1
      src/views/tranManagement/tranManagementTransporTrainNo.vue
  19. 9 1
      src/views/tranManagement/tranManagementVehicleDispatching.vue
  20. 7 1
      src/views/tranManagement/tranManagementVehicleLook.vue
  21. 1 1
      src/views/warehouse/warehouseManagementList.vue
  22. 2 0
      src/views/warehouse/warehouseManagementNoComplete.vue
  23. 0 3
      src/views/warehouse/warehouseManagementNoWeightOut.vue
  24. 6 0
      src/views/warehouse/warehouseManagementPerfectDelivery.vue
  25. 5 0
      src/views/warehouse/warehouseManagementPerfectput.vue
  26. 48 14
      src/views/warehouse/warehouseManagementRecord.vue
  27. 0 1
      src/views/warehouse/warehouseManagementTare.vue

+ 5 - 124
public/static/tradeServicesPrint.html
查看文件 

@@ -49,13 +49,6 @@
 
         display: flex;
 
         margin: 10px 0;
 
       }
 
-
 
-      img {
 
-        width: 41px;
 
-        height: 41px;
 
-        /* margin-right: 118px; */
 
-      }
 
-
 
       .config {
 
         margin-right: 240px;
 
       }
 
@@ -73,43 +66,6 @@
 
         text-align: right;
 
         margin-bottom: 10px;
 
       }
 
-
 
-      .small-row {
 
-        display: flex;
 
-      }
 
-
 
-      .small-content {
 
-        width: 400px;
 
-        margin: 0 auto;
 
-        border: 1px solid #ccc;
 
-        padding: 20px 20px 160px 20px;
 
-        position: absolute;
 
-        top: 0;
 
-        bottom: 0;
 
-        left: 0;
 
-        right: 0;
 
-        margin: auto;
 
-        height: 650px;
 
-      }
 
-
 
-      .small-title {
 
-        text-align: center;
 
-        font-size: 18px;
 
-        display: flex;
 
-        justify-content: space-between;
 
-        align-items: center;
 
-      }
 
-
 
-      .small-row {
 
-        display: flex;
 
-        justify-content: space-between;
 
-        margin: 10px;
 
-      }
 
-
 
-      .small-img {
 
-        margin-right: 0;
 
-      }
 
-
 
       .sign {
 
         margin-right: 100px;
 
       }
 
@@ -120,57 +76,10 @@
 
         font-size: 16px;
 
         margin: 10px 0;
 
       }
 
-
 
-      .header1 {
 
-        font-size: 24px;
 
-        margin: 30px 60px 10px 60px;
 
-        display: flex;
 
-        justify-content: center;
 
-      }
 
-
 
-      .line {
 
-        height: 2px;
 
-        width: 410px;
 
-        margin: 3px auto;
 
-        background: black;
 
-      }
 
-
 
-      .line:nth-of-type(3) {
 
-        margin-bottom: 30px;
 
-      }
 
-
 
       .header-top {
 
         display: flex;
 
         justify-content: space-between;
 
       }
 
-
 
-      .sfcard {}
 
-
 
-      .sfcard-content {
 
-        display: flex;
 
-        align-items: center;
 
-        justify-content: space-evenly;
 
-      }
 
-
 
-      .sfcard-content img {
 
-        width: 45%;
 
-        height: 50vh;
 
-      }
 
-
 
-      .sfcard-title {
 
-        font-size: 28px;
 
-        text-align: center;
 
-        margin: 10px 0;
 
-      }
 
-
 
-      .avatar {
 
-        margin-bottom: 120px;
 
-      }
 
-
 
-      .avatar:nth-of-type(2) {
 
-        margin-bottom: 140px;
 
-      }
 
-
 
       .center {
 
        height: calc(100vh - 8px);
 
       }
 
@@ -178,7 +87,7 @@
 
   </head>
 
   <body>
 
     <div id="app">
 
-      <div v-for="(item,index) in printData" :key="index">
 
+      <div v-for="(item,index) in printData" >
 
         <div class="center">
 
             <div class="title">磅码单</div>
 
             <div class="title">{{item.code}}</div>
 
@@ -222,10 +131,8 @@
 
       <div v-for="(item,index) in printData1" :key="index">
 
       <div class="center">
 
         <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
 
-        <!-- {{customerInfo}} -->
 
         <div class="header">
 
            <div>单位名称：{{ item.compName}}</div>
 
-           <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
 
         </div>
 
         <div class="header-top">
 
           <div>单位：公斤、元</div>
 
@@ -233,7 +140,6 @@
 
         </div>
 
         <div class="header-top">
 
           <div>开票日期：{{item.createDate}}</div>
 
-          <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
 
           <div class="number">{{item.paymentNo}}</div>
 
         </div>
 
         <table class="table">
 
@@ -274,7 +180,6 @@
 
             <td class="col col-bgc">扣重</td>
 
             <td class="col col-bgc">扣杂</td>
 
             <td class="col col-bgc">净重</td>
 
-            <!-- <td class="col col-bgc">纯重</td> -->
 
           </tr>
 
           <tr class="row">
 
             <td class="col">{{ item.goodsName}}</td>
 
@@ -284,10 +189,10 @@
 
             <td class="col">{{ item.qualityInspectionManagement.impurity}}</td>
 
             <td class="col">{{ item.grossWeight}}</td>
 
             <td class="col">{{ item.tare}}</td>
 
-            <td class="col" v-if="item.type == '干粮'">{{printData.weighingManagement.buckleMiscellaneous}}</td>
 
+            <td class="col" v-if="item.type == '干粮'">{{item.weighingManagement.buckleMiscellaneous}}</td>
 
             <td class="col" v-if="item.type == '潮粮'">0</td>
 
             <td class="col" v-if="item.type == '干粮'">0</td>
 
-            <td class="col" v-if="item.type == '潮粮'">{{printData.netWeight}}</td>
 
+            <td class="col" v-if="item.type == '潮粮'">{{item.netWeight}}</td>
 
             <td class="col">{{item.pureWeight}}</td>
 
           </tr>
 
           <tr class="row">
 
@@ -304,8 +209,8 @@
 
             <td class="col col-bgc">卸车扣款</td>
 
           </tr>
 
           <tr class="row">
 
-            <td class="col " v-if="printData.type == '潮粮'">{{item.tidalGrainPrice}}</td>
 
-            <td class="col " v-if="printData.type == '干粮'">{{item.qualityInspectionManagement.dryGrainPrice}}</td>
 
+            <td class="col " v-if="item.type == '潮粮'">{{item.tidalGrainPrice}}</td>
 
+            <td class="col " v-if="item.type == '干粮'">{{item.qualityInspectionManagement.dryGrainPrice}}</td>
 
             <td class="col ">{{ item.unitDeduction}}</td>
 
             <td class="col ">{{ item.grainMoney}}</td>
 
             <td class="col ">{{ item.weighingSubsidy}}</td>
 
@@ -319,7 +224,6 @@
 
           <tr class="row">
 
             <td class="col col-bgc">质量扣款</td>
 
             <td class="col col-bgc">其他扣款</td>
 
-            <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td> -->
 
             <td class="col col-bgc">合计应付</td>
 
             <td class="col col-bgc">购粮性质</td>
 
             <td class="col col-bgc">车牌号</td>
 
@@ -328,15 +232,12 @@
 
           <tr class="row">
 
             <td class="col ">{{ item.qualityDeduction}}</td>
 
             <td class="col ">{{ item.otherDeduction}}</td>
 
-            <!-- <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td> -->
 
             <td class="col ">{{ item.calculationPayable}}</td>
 
             <td class="col ">{{ item.qualityInspectionManagement.natureOfGrainPurchase}}</td>
 
             <td class="col ">{{ item.carNo}}</td>
 
             <td class="col " colspan="5">{{ item.remarks}}</td>
 
           </tr>
 
           <tr class="row">
 
-            <!-- <td class="col col-bgc">实付金额</td>
 
-            <td class="col " colspan="2">{{printData.actualPayment}}</td> -->
 
             <td class="col col-bgc" colspan="3">人民币（大写）</td>
 
             <td class="col " colspan="7">{{item.capitalize}}</td>
 
     
@@ -376,11 +277,6 @@
 
     new Vue({
 
       el: '#app',
 
       data: {
 
-        isShowPrintType1: false,
 
-        isShowPrintType2: false,
 
-        isShowPrintType3: false,
 
-        isShowPrintType4: false,
 
-        showType: [],
 
         printData: [
 
             {
 
                 identityAuthenticationInfo:{},
 
@@ -390,19 +286,7 @@
 
             }
 
         ],
 
         printData1: [],
 
-        customerList: {},
 
-        customerList1: [],
 
-        name: '',
 
-        bigContent: false,
 
-        smallContent: false,
 
         date: '',
 
-        imageUrl1: '',
 
-        imageUrl2: '',
 
-        imageUrl3: '',
 
-        imageUrl4: '',
 
-        identity: [],
 
-        bank: [],
 
-        selectPrint: false,
 
       },
 
       computed: {},
 
       methods: {
 
@@ -436,9 +320,6 @@
 
       },
 
       mounted() {
 
         this.date = new Date().toLocaleString()
 
-        // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
 
-        // console.log("cdsjkvdjkljklkcj",JSON.parse(_data))
 
-        // inOutRecord_print
 
         this.printData = JSON.parse(sessionStorage.getItem('inOutRecord_printBD'))
 
         this.printData1 = JSON.parse(sessionStorage.getItem('inOutRecord_printJSD'))
 
         console.log("磅单",this.printData)

+ 163 - 0
public/static/warehouseBatchPrint.html
查看文件 

@@ -0,0 +1,163 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta charset="utf-8">
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <title></title>
 
+    <style>
 
+      table,
 
+      table tr th,
 
+      table tr td {
 
+        border: 2px solid #333333;
 
+        padding: 5px 0;
 
+        height: 55px;
 
+      }
 
+
 
+      #app {
 
+         /* height: 98vh;  */
 
+        position: relative; 
+      }
 
+
 
+      .content {
 
+        width: 1000px;
 
+        padding: 70px 20px 20px 20px;
 
+        font-size: 22px;
 
+        height: calc(100vh - 7.5vh) ;
 
+        top: 0;
 
+        bottom: 0;
 
+        left: 0;
 
+        right: 0;
 
+      }
 
+
 
+      table {
 
+        width: 100%;
 
+        text-align: center;
 
+        border-collapse: collapse;
 
+        border: 3px solid #333333;
 
+      }
 
+
 
+      .col-bgc {
 
+        background: #f6f7fb;
 
+      }
 
+
 
+      .bottom-row1 {
 
+        display: flex;
 
+        /* justify-content: space-between; */
 
+        margin-top: 5px 0;
 
+      }
 
+
 
+      .bottom-row2 {
 
+        display: flex;
 
+      }
 
+      .config {
 
+        margin-top: 10px;
 
+        margin-right: 240px;
 
+      }
 
+      .autograph{
 
+        margin-top: 10px;
 
+     }
 
+
 
+      .title {
 
+        text-align: center;
 
+        font-size: 36px;
 
+        font-weight: 500;
 
+        margin-bottom: 20px;
 
+      }
 
+    </style>
 
+  </head>
 
+  <body>
 
+    <div id="app">
 
+      <div class="content"  v-for="(item,index) in tableData">
 
+        <div v-if="item.inOutFlag == '2'" class="title">{{item.companyName}}</div>
 
+        <div v-else  class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}</div>
 
+        <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
 
+        <div v-else class="title">出库检斤单</div>
 
+        <table class="table">
 
+          <tr class="row">
 
+            <td class="col col-bgc">送货单位</td>
 
+            <td class="col" colspan="4">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.warehouseName}}</td>
 
+            <td class="col col-bgc">车牌号</td>
 
+            <td class="col" colspan="1">{{item.carNo}}</td>
 
+            <td class="col col-bgc">货名</td>
 
+            <td class="col" colspan="1">{{item.goodsName}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">收货单位</td>
 
+            <td class="col" colspan="4">{{item.contractManagementInfo?item.contractManagementInfo.buyer:item.receiveWarehouse}}</td>
 
+            <td class="col col-bgc">类型</td>
 
+            <td class="col"colspan="1">{{item.type}}</td>
 
+            <td class="col col-bgc">检斤时间</td>
 
+            <td class="col" colspan="1">{{item.updateDate}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">毛重（吨）</td>
 
+            <td class="col" colspan="2">{{item.grossWeight}}</td>
 
+            <td class="col col-bgc">皮重（吨）</td>
 
+            <td class="col" colspan="2">{{item.tare}}</td>
 
+            <td class="col col-bgc">净重（吨）</td>
 
+            <td class="col" colspan="2">{{item.netWeight}}</td>
 
+          </tr>
 
+        </table>
 
+        <div class="bottom">
 
+          <div class="bottom-row1">
 
+            <div>检斤员：{{item.backOffice}}</div>
 
+          </div>
 
+          <div class="bottom-row2">
 
+            <div class="config">收货单位签名或盖章：</div>
 
+            <div class="autograph">客户签名：</div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </body>
 
+  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
 
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script type="text/javascript">
 
+    new Vue({
 
+      el: '#app',
 
+      data: {
 
+        tableData: {
 
+        },
 
+        name: "",
 
+      },
 
+      computed: {},
 
+      methods: {
 
+        tableRowClassName({
 
+          row,
 
+          rowIndex
 
+        }) {
 
+          if (rowIndex === 1) {
 
+            return 'warning-row';
 
+          } else if (rowIndex === 3) {
 
+            return 'success-row';
 
+          }
 
+          return '';
 
+        },
 
+        getQueryVariable(variable) {
 
+          var query = window.location.search.substring(1);
 
+          var vars = query.split("&");
 
+          for (var i = 0; i < vars.length; i++) {
 
+            var pair = vars[i].split("=");
 
+            if (pair[0] == variable) {
 
+              return pair[1];
 
+            }
 
+          }
 
+          return (false);
 
+        },
 
+        printSmall() {},
 
+        printBig() {},
 
+      },
 
+      mounted() {
 
+        this.tableData = JSON.parse(localStorage.getItem("warehouseBatchPrint"))
 
+        console.log("打印数据", this.tableData)
 
+        document.title = "粮食检斤单"
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        };
 
+      },
 
+      watch: {}
 
+    })
 
+  </script>
 
+
 
+</html>

+ 1 - 3
src/global.js
查看文件 

@@ -12,10 +12,9 @@ export default {
 
   whetherWebSocket: function() {
 
     var that =this
 
     debugger
 
-    if (store.getters.adminId!='') {
 
       if ('WebSocket' in window) {
 
         if (process.env.NODE_ENV === 'production') {
 
-          that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + store.getters.adminId)
 
+          that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
 
         }
 
         else {
 
           that.websocket = new WebSocket('ws://localhost:3000/')
 
@@ -24,7 +23,6 @@ export default {
 
       } else {
 
         alert('当前浏览器不支持websocket')
 
       }
 
-    }
 
   },
 
   initWebSocket: function() {
 
     // 连接错误

+ 1 - 1
src/layout/index/sidebar/sidebarItem.vue
查看文件 

@@ -111,7 +111,7 @@ export default {
 
       return generateTitle(item[this.labelKey], (item.meta || {}).title, this)
 
     },
 
     vaildAvtive(item) {
 
-      console.log(item)
 
+      // console.log(item)
 
       const groupFlag = (item['group'] || []).some((ele) =>
 
         this.$route.path.includes(ele)
 
       )

+ 1 - 1
src/model/home/index.js
查看文件 

@@ -27,4 +27,4 @@ export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCat
 
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
 
 export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
 
-export const getAdminId = appRx.get(API_GET_ADMINID, errorCatcher, errorHandle, filter)
 
+export const getAdminId = appRx.post(API_GET_ADMINID, errorCatcher, errorHandle, filter)

+ 1 - 1
src/store/modules/permission.js
查看文件 

@@ -67,7 +67,7 @@ const mutations = {
 
     // console.log(routerList)
 
     state.menu = leftMenu(routerList, {})
 
     state.routes = routerList
 
-    console.log(routerList)
 
+    // console.log(routerList)
 
   },
 
   SET_MENU: (state, menu) => {
 
     state.menu = menu

+ 6 - 0
src/views/contractManagement/salesContractAdd.vue
查看文件 

@@ -224,6 +224,11 @@
 
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
 
               value-format="yyyy-MM-dd" />
 
           </ws-form-item>
 
+          <!--结算重量方式-->
 
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly">
 
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
 
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按收货重量结算</el-radio>
 
+        </ws-form-item>
 
           <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
 
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
 
               size="small" />
 
@@ -457,6 +462,7 @@
 
           addressUrl: '',
 
           sourceGoods: '',
 
           placeDelivery: '',
 
+          settlementWeightMethod: '1',
 
         },
 
         pickerBeginDateBefore: {
 
           disabledDate: (time) => {

+ 7 - 0
src/views/contractManagement/salesContractEdit.vue
查看文件 

@@ -230,6 +230,13 @@
 
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
 
               value-format="yyyy-MM-dd" />
 
           </ws-form-item>
 
+          <!--结算重量方式-->
 
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
 
+            <div class="unchanged">
 
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
 
+            </div>
 
+            <span class="unchangeable">*</span>
 
+          </ws-form-item>
 
           <!-- 最终实际交易量（吨） -->
 
           <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
 
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"

+ 7 - 2
src/views/contractManagement/salesContractExamine.vue
查看文件 

@@ -200,7 +200,12 @@
 
               {{ deptBudgetList.signingDate }}
 
             </div>
 
           </ws-form-item>
 
-
 
+          <!--结算重量方式-->
 
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
 
+            <div class="unchanged">
 
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
 
+            </div>
 
+          </ws-form-item>
 
           <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
 
             <div class="unchanged">
 
               {{ deptBudgetList.finalTradingVolume }}
 
@@ -208,7 +213,7 @@
 
           </ws-form-item>
 
         </ws-info-table>
 
 
-        <!--面试信息-->
 
+        <!--货物信息-->
 
         <div class="remark">
 
           <h3>货物信息</h3>
 
         </div>

+ 25 - 9
src/views/home/index.vue
查看文件 

@@ -328,23 +328,18 @@
 
       },
 
 
     },
 
-    activated(){debugger
 
-           getAdminId().toPromise().then(response => {debugger
 
-                this.loading = false
 
-                // WebSocket
 
-                this.$store.dispatch('setAdminId', response.data.data)
 
-                if ('WebSocket' in window) {
 
+    activated(){
 
+           if ('WebSocket' in window) {
 
                   if (process.env.NODE_ENV === 'production') {
 
-                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + response.data.data)
 
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
 
                   }
 
                   else {
 
-                    this.websocket = new WebSocket('ws://localhost:8080/websocket/' + response.data.data)
 
+                    this.websocket = new WebSocket('ws://localhost:8080/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
 
                   }
 
                   this.initWebSocket()
 
                 } else {
 
                   alert('当前浏览器不支持websocket')
 
                 }
 
-              })
 
     },
 
     async created() {
 
       //获取快捷路口列表
 
@@ -361,6 +356,22 @@
 
       }
 
     },
 
     async mounted() {
 
+      // getAdminId().toPromise().then(response => {
 
+                this.loading = false
 
+                // WebSocket
 
+                // this.$store.dispatch('setAdminId', response.data.data)
 
+                if ('WebSocket' in window) {
 
+                  if (process.env.NODE_ENV === 'production') {
 
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/84f62127b7384dcdbaeaddfe460329fc' )
 
+                  }
 
+                  else {
 
+                    this.websocket = new WebSocket('ws://192.168.1.115:8090/websocket/1' )
 
+                  }
 
+                  this.initWebSocket()
 
+                } else {
 
+                  alert('当前浏览器不支持websocket')
 
+                }
 
+              // })
 
       let that = this
 
       this.getChartsData()
 
       // this.timer = setInterval(function(){
 
@@ -436,6 +447,7 @@
 
         })
 
       },
 
          initWebSocket () {
 
+           console.log(this.webSocket,this.WebSocket)
 
       // 连接错误
 
       this.websocket.onerror = this.setErrorMessage
 
       // 连接成功
 
@@ -451,12 +463,15 @@
 
       window.onbeforeunload = this.onbeforeunload
 
     },
 
     setErrorMessage () {
 
+      console.log(11111111)
 
       console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
 
     },
 
     setOnopenMessage () {
 
+      console.log(222222222)
 
       console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
 
     },
 
     setOnmessageMessage (event) {
 
+      console.log(3333)
 
       // 根据服务器推送的消息做自己的业务处理
 
       console.log('服务端返回：' + event.data)
 
       var msg = event.data.split('$')
 
@@ -475,6 +490,7 @@
 
       that.$router.push({ path: currentPage })
 
     },
 
     setOncloseMessage () {
 
+      debugger
 
       console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
 
     },
 
       //跳转

+ 13 - 4
src/views/statisticalReport/stockPurchaseReceiptReportList.vue
查看文件 

@@ -982,6 +982,7 @@ export default {
 
           }
 
         }
 
       this.contractNo = e
 
+      this.currentPage=1
 
       this.getList()
 
     },
 
 
@@ -1020,10 +1021,18 @@ export default {
 
           sums[index] = '--'
 
         }
 
       })
 
-      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
 
-      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
 
-			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
 
-      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
 
+      if(typeof sums[sums.length-3]=='number'){
 
+        sums[sums.length-3]=sums[sums.length-3].toFixed(2)
 
+      }
 
+      if(typeof sums[sums.length-4]=='number'){
 
+        sums[sums.length-4]=sums[sums.length-4].toFixed(2)
 
+      }
 
+      if(typeof sums[sums.length-5]=='number'){
 
+        sums[sums.length-5]=sums[sums.length-3].toFixed(2)
 
+      }
 
+      if(typeof sums[sums.length-7]=='number'){
 
+        sums[sums.length-7]=sums[sums.length-7].toFixed(2)
 
+      }
 
       return sums
 
     },
 
     getList() {

+ 2 - 2
src/views/taskManagement/tranManagementLook.vue
查看文件 

@@ -68,7 +68,7 @@
 
         class="datafor"
 
       >
 
         <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }})
 
-          <el-checkbox
 
+          <!-- <el-checkbox
 
             class="endflag"
 
             true-label="1"
 
             disabled
 
@@ -76,7 +76,7 @@
 
             v-model="item.endFlag"
 
             :label="1"
 
             >粮款结算阶段</el-checkbox
 
-          >
 
+          > -->
 
         </div>
 
           <ws-info-table class="el-table">
 
          <ws-form-item label="运输方式" span="1" prop="tranType">

+ 3 - 3
src/views/taskManagement/tranManagementTransportAdd.vue
查看文件 

@@ -220,7 +220,7 @@
 
             src="../../../public/img/del.png"
 
             alt
 
           /> -->
 
-          <el-checkbox
 
+          <!-- <el-checkbox
 
             @change="(val) => {engflagchange(val, index)}"
 
             class="endflag"
 
             true-label="1"
 
@@ -229,7 +229,7 @@
 
             v-model="item.endFlag"
 
             :label="1"
 
             >粮款结算阶段</el-checkbox
 
-          >
 
+          > -->
 
         </div>
 
         <ws-info-table>
 
           <el-form-item label="运输方式" span="1" prop="waterContent">
 
@@ -726,7 +726,7 @@ export default {
 
         })
 
       xialaNo({
 
         compId: this.compId,
 
-        flag: 8,
 
+        flag: 7,
 
       })
 
         .toPromise()
 
         .then((response) => {

+ 3 - 2
src/views/taskManagement/tranManagementTransportEdit.vue
查看文件 

@@ -219,7 +219,7 @@
 
             src="../../../public/img/del.png"
 
             alt=""
 
           /> -->
 
-          <el-checkbox
 
+          <!-- <el-checkbox
 
             @change="(val) => {engflagchange(val, index)}"
 
             class="endflag"
 
             :disabled='disabled'
 
@@ -228,7 +228,7 @@
 
             v-model="item.endFlag"
 
             :label="1"
 
             >粮款结算阶段</el-checkbox
 
-          >
 
+          > -->
 
         </div>
 
         <ws-info-table>
 
           <el-form-item label="运输方式" span="1" prop="waterContent">
 
@@ -746,6 +746,7 @@ export default {
 
         })
 
       xialaNo({
 
         compId: this.compId,
 
+        flag: 7,
 
       })
 
         .toPromise()
 
         .then((response) => {

+ 10 - 2
src/views/tranManagement/tranManagementShippingArrangemen.vue
查看文件 

@@ -72,11 +72,19 @@
 
                 <el-input type="text" class="row-item" v-model="deptBudgetList.deliveryDateEnd" disabled></el-input>
 
               </el-form-item>
 
             </el-col>
 
-            <el-col :span="8">
 
-              <el-form-item label="合同编号" prop="contractNo">
 
+             <el-col :span="8">
 
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
 
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
 
+              </el-form-item>
 
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
 
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
 
               </el-form-item>
 
             </el-col>
 
+             <el-col :span="8">
 
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
 
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
 
+              </el-form-item>
 
+            </el-col>
 
           </el-row>
 
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
 
           <el-row class="myTest">

+ 3 - 1
src/views/tranManagement/tranManagementShippingLook.vue
查看文件 

@@ -56,7 +56,9 @@
 
               <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}
 
               </ws-form-item>
 
               <!--合同编号-->
 
-              <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
+              <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
+              <ws-form-item v-else label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
+              <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">{{ deptBudgetList.relatedContract }}</ws-form-item>
 
             </ws-info-table>
 
           </div>

+ 7 - 1
src/views/tranManagement/tranManagementTransporTrainDetails.vue
查看文件 

@@ -84,9 +84,15 @@
 
           {{ deptBudgetList.deliveryDateEnd }}
 
         </ws-form-item>
 
         <!--合同编号-->
 
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
 
+         <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
 
           {{ deptBudgetList.contractNo }}
 
         </ws-form-item>
 
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
 
+          {{ deptBudgetList.contractNo }}
 
+        </ws-form-item>
 
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
 
+          {{ deptBudgetList.relatedContract }}
 
+        </ws-form-item>
 
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
 
       <div class="myTest">

+ 7 - 1
src/views/tranManagement/tranManagementTransporTrainNo.vue
查看文件 

@@ -70,9 +70,15 @@
 
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
 
           {{ deptBudgetList.deliveryDateEnd }}
 
         </ws-form-item>
 
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
 
+        <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
 
           {{ deptBudgetList.contractNo }}
 
         </ws-form-item>
 
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
 
+          {{ deptBudgetList.contractNo }}
 
+        </ws-form-item>
 
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
 
+          {{ deptBudgetList.relatedContract }}
 
+        </ws-form-item>
 
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
 
       <div class="myTest">

+ 9 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue
查看文件 

@@ -70,9 +70,17 @@
 
               </el-form-item>
 
             </el-col>
 
             <el-col :span="8">
 
-              <el-form-item label="合同编号" span="1" prop="contractNo">
 
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
 
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
 
               </el-form-item>
 
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
 
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
 
+              </el-form-item>
 
+            </el-col>
 
+             <el-col :span="8">
 
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
 
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
 
+              </el-form-item>
 
             </el-col>
 
           </el-row>
 
           <div class="small-title" style="font-size: 16px">派车</div>

+ 7 - 1
src/views/tranManagement/tranManagementVehicleLook.vue
查看文件 

@@ -79,9 +79,15 @@
 
           deptBudgetList.deliveryDateEnd
 
         }}</ws-form-item>
 
         <!--合同编号-->
 
-        <ws-form-item label="合同编号" span="1" prop="contractNo">{{
 
+        <ws-form-item label="移库编号" v-if="deptBudgetList.taskType=='移库'" span="1" prop="contractNo">{{
 
           deptBudgetList.contractNo
 
         }}</ws-form-item>
 
+        <ws-form-item label="合同编号" v-else span="1" prop="contractNo">{{
 
+          deptBudgetList.contractNo
 
+        }}</ws-form-item>
 
+        <ws-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="contractNo">{{
 
+          deptBudgetList.relatedContract
 
+        }}</ws-form-item>  
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">派车</div>
 
        <div class="myTest">

+ 1 - 1
src/views/warehouse/warehouseManagementList.vue
查看文件 

@@ -123,7 +123,7 @@
 
             </ws-button> -->
 
           </template>
 
         </el-table-column>
 
-        <el-table-column prop="address" label="操作" width="200">
 
+        <el-table-column prop="address" label="操作">
 
           <template slot-scope="scope">
 
             <div class="record" v-hasPermission="
 
            `warehouseManagement.warehouse.warehouseInfo.view`

+ 2 - 0
src/views/warehouse/warehouseManagementNoComplete.vue
查看文件 

@@ -226,6 +226,7 @@ export default {
 
             goodsNameKey: row.goodsNameKey,
 
             grade: row.grade,
 
             outType:row.outType,
 
+            addressUrl:row.addressUrl,
 
             grossWeight: row.grossWeight,
 
             inOutDate: row.inOutDate,
 
             inOutFlag: row.inOutFlag,
 
@@ -268,6 +269,7 @@ export default {
 
             goodsNameKey: row.goodsNameKey,
 
             outType:row.outType,
 
             grade: row.grade,
 
+            addressUrl:row.addressUrl,
 
             grossWeight: row.grossWeight,
 
             inOutDate: row.inOutDate,
 
             inOutFlag: row.inOutFlag,

+ 0 - 3
src/views/warehouse/warehouseManagementNoWeightOut.vue
查看文件 

@@ -1722,9 +1722,6 @@ export default {
 
   margin: 0 auto;
 
 }
 
 
-/deep/.el-form-item__label {
 
-  width: 160px;
 
-}
 
 
 //选填
 
 /deep/.el-form-item {

+ 6 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue
查看文件 

@@ -702,6 +702,12 @@ export default {
 
     this.dataList.netWeight = Number(this.$route.query.netWeight).toFixed(2)
 
     this.dataList.grade = this.$route.query.grade
 
     this.dataList.agent = this.$route.query.agent
 
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
 
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
 
+    }else{
 
+      this.dataList.addressUrl=this.$route.query.addressUrl
 
+    }
 
+    
     this.dataList.carNo = this.$route.query.carNo
 
     this.dataList.outType = this.$route.query.outType
 
     this.dataList.inOutDate = this.$route.query.inOutDate

+ 5 - 0
src/views/warehouse/warehouseManagementPerfectput.vue
查看文件 

@@ -829,6 +829,11 @@ export default {
 
     this.dataList.tare = this.$route.query.tare
 
     this.dataList.netWeight = this.$route.query.netWeight
 
     this.dataList.grade = this.$route.query.grade
 
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
 
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
 
+    }else{
 
+      this.dataList.addressUrl=this.$route.query.addressUrl
 
+    }
 
     this.dataList.agent = this.$route.query.agent
 
     this.dataList.carNo = this.$route.query.carNo
 
     this.dataList.outType = this.$route.query.outType

+ 48 - 14
src/views/warehouse/warehouseManagementRecord.vue
查看文件 

@@ -74,7 +74,9 @@
 
             alt
 
           />
 
         </ws-button>
 
-				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
 
+		<el-button type="primary" @click="batchPrint">批量打印</el-button>
 
+				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
 
+						 <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
 
 					<el-table-column type="expand">
 
 						<template #default="props">
 
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
 
@@ -110,7 +112,9 @@
 
 							</ws-form>
 
 						</template>
 
 					</el-table-column>
 
+				
 					<el-table-column type="index" label="序号">
 
+						
 						<template scope="scope">
 
 							<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
 							<span v-else>{{ scope.$index + 1 }}</span>
 
@@ -294,9 +298,11 @@
 
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 
 			@on-cancel="handleClose">
 
 			<p>查看附件</p>
 
-			<ws-upload ref="upload" table-name="maintain_work_order" oss-key="mainPlan" :comp-id="compId"
 
-				:appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
 
-				@uploadSuccess="uploadSuccess" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 
+			<el-image 
+    style="width: 100px; height: 100px"
 
+    :src="appendixIdss" 
+    :preview-src-list="srcList">
 
+  </el-image>
 
 		</WinseaContentModal>
 
 	</div>
 
 
@@ -338,21 +344,17 @@
 
 			return {
 
 				//弹出框
 
 				dialogViewSpareMoney: false,
 
-				dialogApproveFormVisible: false,
 
 				binnumberList:[],
 
 				// 船舶类型
 
 				monetaryKey: null,
 
-				// 表格显示数据
 
-				tableDate: [],
 
-				appendixIdsAdd: '',
 
 				// 是否显示
 
 				showType: true,
 
 				// 年
 
 				year: '',
 
+				srcList:[],
 
 				deptBudgetTotal: 0,
 
 				currentPage: 1,
 
 				pageSize: 10,
 
-				radiostatus: 1,
 
 				capacity: '',
 
 				searchKeyWord: '',
 
 				contractType: 2,
 
@@ -362,15 +364,14 @@
 
 				binNumber: '',
 
 				status: 1,
 
 				value2:[],
 
+				appendixIdss:'',
 
 				// 提交类型
 
 				submitType: true,
 
 				selectpackingMethod: {},
 
 				size: 10,
 
 				warehouseType: '1',
 
-				deptBudgetList1: {},
 
 				compId: localStorage.getItem('ws-pf_compId'),
 
 				deptCircularPage: {},
 
-				packtypeList: {},
 
 				pcFlag: 1,
 
 				date: {
 
 					year: dayjs().format('YYYY'),
 
@@ -387,6 +388,8 @@
 
 					},
 
 				},
 
 				accessoryTFs: false,
 
+				modification:[],
 
+				printList:[],//批量打印数据
 
 			}
 
 		},
 
 
@@ -408,6 +411,36 @@
 
 			})
 
 		},
 
 		methods: {
 
+			batchPrint(){
 
+				localStorage.removeItem("warehouseBatchPrint")
 
+				var count = 0
 
+				for(var i = 0 ; i < this.modification.length ; i++){
 
+						getPrintInfo({
 
+                        id: this.modification[i].id
 
+                      })
 
+                        .toPromise()
 
+                        .then((response) => {
 
+							count++
 
+                           this.printList.push(response)
 
+						     if(count == this.modification.length){
 
+						   localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
 
+						  window.open( '../../../../static/warehouseBatchPrint.html')
 
+					  }
 
+                     })
 
+				}
 
+			},
 
+			   handleSelectionChange(val) {
 
+			this.modification = val
 
+			console.log("sfasa",this.modification)
 
+	     	},
 
+			selectInit(row){
 
+				 //在这里一定要记得类型匹配的上。
 
+				if (row.inOutType != '收购入库' && row.inOutType != '期初') {
 
+					return true
 
+				} else  {
 
+				return false
 
+				}
 
+			},
 
 			binNumberChange(e){
 
 				if(e=='全部仓位'){
 
 					this.deptBudgetList.positionId=''
 
@@ -657,8 +690,8 @@
 
 			},
 
 			fujian(row) {
 
 				if (
 
-					row.receiveAttachmentPath === null ||
 
-					row.receiveAttachmentPath === ''
 
+					row.addressUrl === null ||
 
+					row.addressUrl === ''
 
 				) {
 
 					EventBus.$emit(
 
 						'warning',
 
@@ -667,7 +700,8 @@
 
 				} else {
 
 					this.accessoryTFs = true
 
 				}
 
-				this.appendixIdss = row.receiveAttachmentPath
 
+				this.appendixIdss = row.addressUrl
 
+				this.srcList=[row.addressUrl]
 
 			},
 
 			// 关闭 dialog时 处理文件url 初始化upload组件
 
 			handleCloe() {

+ 0 - 1
src/views/warehouse/warehouseManagementTare.vue
查看文件 

@@ -1252,7 +1252,6 @@ export default {
 
           return
 
         }
 
       }
 
-      console.log(this.deptBudgetList, '出库！！！！！')
 
       this.$confirm(`是否保存皮重检斤`, {
 
         cancelButtonText: '取消',
 
         confirmButtonText: '确定',