Головна сторінка Огляд Довідка
Реєстрація Увійти
wangchao
/
yiliangyiyun-pc-jj
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

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

gjy 3 роки тому
батько
e39f576889 362c2545f5
коміт
962caa2e03
7 змінених файлів з 278 додано та 108 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 254 88
      public/static/print.html
  2. 3 3
      public/static/weightCheck.html
  3. 1 1
      src/views/houseSelfCollect/component/weightCheckPrint.vue
  4. 4 2
      src/views/houseSelfCollect/weighingManagement.vue
  5. 14 12
      src/views/houseSelfCollect/weightCheck.vue
  6. 1 1
      src/views/tranManagement/tranManagementReceivingloading.vue
  7. 1 1
      src/views/tranManagement/tranManagementTransporFeedback.vue

+ 254 - 88
public/static/print.html
Переглянути файл 

@@ -1,98 +1,240 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
-  <head>
 
-    <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
-    <title></title>
 
-    <style>
 
-    .content{
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+  <title></title>
 
+  <style>
 
+    .content {
 
       text-align: center;
 
       text-align: center;
 
       display: flex;
 
       display: flex;
 
       align-items: center;
 
       align-items: center;
 
       justify-content: center;
 
       justify-content: center;
 
       flex-direction: column;
 
       flex-direction: column;
 
     }
 
     }
 
-    .title{
 
+
 
+    .title {
 
       width: 600px;
 
       width: 600px;
 
       position: relative;
 
       position: relative;
 
-      border-top: 1px solid #EBEEF5;
 
-       border-left: 1px solid #EBEEF5;
 
-        border-right: 1px solid #EBEEF5;
 
-        /* padding: 20px; */
 
-        box-sizing: border-box;
 
+      /* border-top: 1px solid #EBEEF5;
 
+      border-left: 1px solid #EBEEF5;
 
+      border-right: 1px solid #EBEEF5; */
 
+      /* padding: 20px; */
 
+      box-sizing: border-box;
 
     }
 
     }
 
-    .name{
 
+
 
+    .name {
 
       font-size: 14px;
 
       font-size: 14px;
 
       font-weight: 500;
 
       font-weight: 500;
 
       color: #323233;
 
       color: #323233;
 
     }
 
     }
 
-    .price{
 
+
 
+    .price {
 
       position: absolute;
 
       position: absolute;
 
-         right: 10px;
 
-         bottom: 0;
 
-         margin: auto;
 
-         font-size: 14px;
 
+      right: 10px;
 
+      bottom: 0;
 
+      margin: auto;
 
+      font-size: 14px;
 
 
 
     }
 
     }
 
-    .tableBox tr{
 
+    .tableBox {
 
+      width: 80px;
 
+    }
 
+    .tableBox tr {
 
       font-size: 12px;
 
       font-size: 12px;
 
-      padding:0!important;
 
+      padding: 0 !important;
 
+      display: flow-root;
 
+      border-left:1px solid #ccc;
 
+      border-right:1px solid #ccc;
 
+      border-bottom:1px solid #ccc;
 
+      display: flex;
 
+      justify-content: space-between;
 
     }
 
     }
 
-    .tableBox td{
 
+
 
+    .tableBox td {
 
       font-size: 12px;
 
       font-size: 12px;
 
-      padding:0!important;
 
+      padding: 0 !important;
 
+    }
 
+
 
+    .tableBox .cell {
 
+      text-align: center;
 
+      padding: 0!important;
 
+      margin:0 2px!important;
 
+    }
 
+    .table-row{
 
+      display: flex;
 
+      border-top: 1px solid #ccc;
 
     }
 
     }
 
-    .tableBox .cell{
 
-      text-align:center;
 
+    .el-table--scrollable-x .el-table__body-wrapper{
 
+      overflow: hidden!important;
 
     }
 
     }
 
-    </style>
 
-  </head>
 
-  <body>
 
-    <div id="app">
 
-      <div class="content" v-for="(item,index) in 4">
 
-        <div class="title">
 
-          <div class="name" v-if="index==0">水分（{{waterMin}}-{{waterMax}}）一等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==1">水分（{{waterMin}}-{{waterMax}}）二等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==2">水分（{{waterMin}}-{{waterMax}}）三等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==3">水分（{{waterMin}}-{{waterMax}}）等外单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="price">价格单位：元/公斤</div>
 
-        </div>
 
-        
-         <el-table :data="tableData" style="width: 600px" :row-class-name="tableRowClassName" class="tableBox">
 
-          <div>
 
-            
-          </div>
 
-           <el-table-column prop="waterMin" label="水分下限(%)" header-align="center">
 
-           </el-table-column>
 
-           <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column>
 
-           <el-table-column prop="price1" label="一等单价" v-if="index==0" header-align="center">
 
-           </el-table-column>
 
-           <el-table-column prop="price2" label="二等单价" v-if="index==1" header-align="center">
 
-           </el-table-column>
 
-           <el-table-column prop="price3" label="三等单价" v-if="index==2" header-align="center">
 
-           </el-table-column>
 
-           <el-table-column prop="priceOther" label="等外单价" v-if="index==3" header-align="center">
 
-           </el-table-column>
 
-         </el-table>
 
+    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
 
+    border: 0;
 
+    padding: 0;
 
+    text-overflow: initial;
 
+}
 
+.el-table__row td:nth-of-type(1){
 
+  width: 40%;
 
+  border-right: 1px solid #ccc!important;
 
+}
 
+.el-table__row td:nth-of-type(2){
 
+  width: 60%;
 
+}
 
+.el-table::before {
 
+    left: 0;
 
+    bottom: 0;
 
+    width: 100%;
 
+    height: 0px;
 
+}
 
+.content0{
 
+  margin-bottom: 30px;
 
+}
 
+.content1{
 
+  margin-bottom: 30px;
 
+}
 
+.content2{
 
+  margin-bottom: 30px;
 
+}
 
+  </style>
 
+</head>
 
+
 
+<body>
 
+  <div id="app">
 
+    <div class="content" :class="'content'+index" v-for="(item,index) in 4">
 
+      <div class="title">
 
+        <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
+        <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
+        <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
+        <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
+        <div class="price">价格单位：元/公斤</div>
 
+      </div>
 
+      <div class="table-row" >
 
+        <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          </el-table-column>
 
+          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+            </el-table-column> -->
 
+          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+          </el-table-column>
 
+        </el-table>
 
+        <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          </el-table-column>
 
+          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+           </el-table-column> -->
 
+          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+          </el-table-column>
 
+        </el-table>
 
+        <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          </el-table-column>
 
+          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+           </el-table-column> -->
 
+          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+          </el-table-column>
 
+        </el-table>
 
+        <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          </el-table-column>
 
+          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+           </el-table-column> -->
 
+          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+          </el-table-column>
 
+        </el-table>
 
+        <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
 
+          <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          </el-table-column>
 
+          <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+           </el-table-column> -->
 
+          <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+          </el-table-column>
 
+          <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+          </el-table-column>
 
+        </el-table>
 
+          <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
 
+            <el-table-column prop="waterMin" label="水分" header-align="center">
 
+            </el-table-column>
 
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+            </el-table-column>
 
+          </el-table>
 
+          <el-table :data="tableData7" :row-class-name="tableRowClassName" class="tableBox">
 
+            <el-table-column prop="waterMin" label="水分" header-align="center">
 
+            </el-table-column>
 
+            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+            </el-table-column>
 
+            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+            </el-table-column>
 
+          </el-table>
 
       </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:"",
 
-        waterMin:'',
 
-        waterMax:''
 
-      },
 
-      computed: {},
 
-      methods: {
 
-  tableRowClassName({
 
+
 
+  </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: [],
 
+      tableData1: [],
 
+      tableData2: [],
 
+      tableData3: [],
 
+      tableData4: [],
 
+      tableData5: [],
 
+      tableData6: [],
 
+      tableData7: [],
 
+      name: "",
 
+      waterMin: '',
 
+      waterMax: ''
 
+    },
 
+    computed: {},
 
+    methods: {
 
+      tableRowClassName({
 
         row,
 
         row,
 
         rowIndex
 
         rowIndex
 
       }) {
 
       }) {
 
@@ -114,25 +256,49 @@
 
         }
 
         }
 
         return (false);
 
         return (false);
 
       }
 
       }
 
-      },
 
-      mounted() {
 
-        debugger
 
-        let _data = localStorage.getItem("pricePrintList")
 
-         this.name = decodeURIComponent(this.getQueryVariable("name"))
 
-        console.log(_data)
 
-        this.tableData = JSON.parse(_data)
 
-        
-        this.waterMin = this.tableData[0].waterMin
 
-        this.waterMax = this.tableData[0].waterMax
 
-        document.title = this.name+'价格对照表（按水分）'
 
-        window.print()
 
-        window.onafterprint = function(event) {
 
-          window.history.back(-1)
 
-        };
 
-      },
 
-      watch: {
 
+    },
 
+    mounted() {
 
+      let _data = localStorage.getItem("pricePrintList")
 
+      this.name = decodeURIComponent(this.getQueryVariable("name"))
 
+      console.log(_data)
 
+      this.tableData = JSON.parse(_data)
 
+      // 构造显示数据
 
+      this.waterMin = this.tableData[0].waterMin
 
+      this.waterMax = this.tableData[0].waterMax
 
+      document.title = this.name + '价格对照表（按水分）'
 
+      for (let i = 0; i < this.tableData.length; i++) {
 
+        // if(!this.tableData[i].waterMin.toString().split(".")[1]){
 
+        //   this.tableData[i].waterMin = this.tableData[i].waterMin+'.0'
 
+        // }
 
+        if (i <= 39) {
 
+          this.tableData1.push(this.tableData[i])
 
+        } else if (i <= 79 && i > 39) {
 
+          this.tableData2.push(this.tableData[i])
 
+        }
 
+        else if (i <= 119 && i > 79) {
 
+          this.tableData3.push(this.tableData[i])
 
+        }
 
+        else if (i <= 159 && i > 119) {
 
+          this.tableData4.push(this.tableData[i])
 
+        }
 
+        else if (i <= 199 && i > 159) {
 
+          this.tableData5.push(this.tableData[i])
 
+        }
 
+        else if (i <= 239 && i > 199) {
 
+          this.tableData6.push(this.tableData[i])
 
+        }
 
+        else if (i <= 279 && i > 239) {
 
+          this.tableData7.push(this.tableData[i])
 
+        }
 
       }
 
       }
 
-    })
 
-  </script>
 
+      // window.print()
 
+      window.onafterprint = function (event) {
 
+        window.history.back(-1)
 
+      };
 
+    },
 
+    watch: {
 
+    }
 
+  })
 
+</script>
 
 
 
 </html>
 
 </html>

+ 3 - 3
public/static/weightCheck.html
Переглянути файл 

@@ -164,7 +164,7 @@
 
             <td class="col col-bgc">霉变粒（%）</td>
 
             <td class="col col-bgc">霉变粒（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col col-bgc">扣杂（公斤）</td>
 
             <td class="col col-bgc">扣杂（公斤）</td>
 
-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
 
+            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
             <td class="col col-bgc">净重（公斤）</td>
 
             <td class="col col-bgc">净重（公斤）</td>
 
             <td class="col">{{tableData.netWeight}}</td>
 
             <td class="col">{{tableData.netWeight}}</td>
 
           </tr>
 
           </tr>
 
@@ -256,10 +256,10 @@
 
             <div>{{tableData.grossDate}}</div>
 
             <div>{{tableData.grossDate}}</div>
 
           </div>
 
           </div>
 
         
         
-        <div class="small-row">
 
+        <!-- <div class="small-row">
 
           <div>扣杂（公斤）</div>
 
           <div>扣杂（公斤）</div>
 
           <div>{{tableData.buckleMiscellaneous}}</div>
 
           <div>{{tableData.buckleMiscellaneous}}</div>
 
-        </div>
 
+        </div> -->
 
         <div class="small-row">
 
         <div class="small-row">
 
           <div>净重（公斤）</div>
 
           <div>净重（公斤）</div>
 
           <div>{{tableData.netWeight}}</div>
 
           <div>{{tableData.netWeight}}</div>

+ 1 - 1
src/views/houseSelfCollect/component/weightCheckPrint.vue
Переглянути файл 

@@ -44,7 +44,7 @@
 
             <td class="col col-bgc">霉变粒（%）</td>
 
             <td class="col col-bgc">霉变粒（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col col-bgc">扣杂（公斤）</td>
 
             <td class="col col-bgc">扣杂（公斤）</td>
 
-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
 
+            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
             <td class="col col-bgc">净重（公斤）</td>
 
             <td class="col col-bgc">净重（公斤）</td>
 
             <td class="col">{{tableData.netWeight}}</td>
 
             <td class="col">{{tableData.netWeight}}</td>
 
           </tr>
 
           </tr>

+ 4 - 2
src/views/houseSelfCollect/weighingManagement.vue
Переглянути файл 

@@ -98,7 +98,7 @@
 
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
 
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
 
           <!-- scope.row.paymentManagement.status == '待结算' && -->
 
           <!-- scope.row.paymentManagement.status == '待结算' && -->
 
           <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
 
           <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
 
-          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
+          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
         </template>
 
         </template>
 
       </el-table-column>
 
       </el-table-column>
 
     </el-table>
 
     </el-table>
 
@@ -230,7 +230,9 @@ export default {
 
           warehouseId: this.warehouseId,
 
           warehouseId: this.warehouseId,
 
           monitorUrl1: this.monitorUrl1,
 
           monitorUrl1: this.monitorUrl1,
 
           monitorUrl2: this.monitorUrl2,
 
           monitorUrl2: this.monitorUrl2,
 
-          allowEdit:this.allowEdit
 
+          allowEdit:this.allowEdit,
 
+          cangid:this.cangid,
 
+          paramType:row.qualityInspectionManagement.paramType
 
         },
 
         },
 
       })
 
       })
 
     },
 
     },

+ 14 - 12
src/views/houseSelfCollect/weightCheck.vue
Переглянути файл 

@@ -86,10 +86,10 @@
 
               </ws-form-item>
 
               </ws-form-item>
 
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
 
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
 
               <div class="formItem">
 
               <div class="formItem">
 
-                <!-- <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重'">
 
+                <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重' && paramType == '2'">
 
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣重"
 
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣重"
 
                     maxlength="100" size="small" />
 
                     maxlength="100" size="small" />
 
-                </ws-form-item> -->
 
+                </ws-form-item>
 
 
 
                 <ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
 
                 <ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
 
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
 
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
 
@@ -98,7 +98,7 @@
 
               </div>
 
               </div>
 
             </ws-info-table>
 
             </ws-info-table>
 
             <div class="but">
 
             <div class="but">
 
-              <el-button @click="cancel" type="primary">取消</el-button>
 
+              <el-button @click="cancel" type="primary">关闭</el-button>
 
               <el-button @click="print" v-if="this.information == '毛重'" type="primary">保存</el-button>
 
               <el-button @click="print" v-if="this.information == '毛重'" type="primary">保存</el-button>
 
               <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
 
               <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
 
             </div>
 
             </div>
 
@@ -205,10 +205,14 @@
 
         param: 9600,
 
         param: 9600,
 
         monitorUrl1: '',
 
         monitorUrl1: '',
 
         monitorUrl2: '',
 
         monitorUrl2: '',
 
+        cangid:'',
 
+        paramType:'1'
 
       }
 
       }
 
     },
 
     },
 
     activated() {
 
     activated() {
 
       console.log(this.common.name)
 
       console.log(this.common.name)
 
+      this.cangid = this.$route.query.cangid
 
+      this.paramType = this.$route.query.paramType
 
       this.getList()
 
       this.getList()
 
       this.tpyeNo = this.$route.query.tpyeNo
 
       this.tpyeNo = this.$route.query.tpyeNo
 
       this.weighingList.number = this.$route.query.number
 
       this.weighingList.number = this.$route.query.number
 
@@ -252,11 +256,6 @@
 
         this.pageSize = val
 
         this.pageSize = val
 
         this.getList()
 
         this.getList()
 
       },
 
       },
 
-      handleCurrentChange(val) {
 
-        this.currentPage = val
 
-        console.log(`当前页: ${val}`)
 
-        this.getList()
 
-      },
 
       getList() {
 
       getList() {
 
         // 货名
 
         // 货名
 
         getinspectLookGoods({
 
         getinspectLookGoods({
 
@@ -359,7 +358,9 @@
 
         this.index = val
 
         this.index = val
 
         if (this.information == '皮重') {
 
         if (this.information == '皮重') {
 
           this.information = '毛重'
 
           this.information = '毛重'
 
+          this.tpyeNo = 1
 
         } else {
 
         } else {
 
+          this.tpyeNo = 2
 
           this.information = '皮重'
 
           this.information = '皮重'
 
         }
 
         }
 
         this.getList()
 
         this.getList()
 
@@ -375,6 +376,7 @@
 
           weight: val.grossWeight
 
           weight: val.grossWeight
 
         }
 
         }
 
         this.weighingList = val;
 
         this.weighingList = val;
 
+        this.paramType = val.qualityInspectionManagement.paramType
 
       },
 
       },
 
       async closePort() {
 
       async closePort() {
 
         console.log('closePort');
 
         console.log('closePort');
 
@@ -477,9 +479,9 @@
 
       },
 
       },
 
       closePrint() {
 
       closePrint() {
 
         this.isShowPrint = false
 
         this.isShowPrint = false
 
-        this.$router.push({
 
-          path: 'weighingManagement'
 
-        })
 
+        // this.$router.push({
 
+        //   path: 'weighingManagement'
 
+        // })
 
       },
 
       },
 
       print() {
 
       print() {
 
         if (!this.weighingList.grossWeight) {
 
         if (!this.weighingList.grossWeight) {
 
@@ -613,7 +615,7 @@
 
                               title: '成功',
 
                               title: '成功',
 
                               message: '保存成功',
 
                               message: '保存成功',
 
                             })
 
                             })
 
-                            this.$router.go(-1)
 
+                            // this.$router.go(-1)
 
                           })
 
                           })
 
                           .catch((response) => {
 
                           .catch((response) => {
 
                             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
                             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

+ 1 - 1
src/views/tranManagement/tranManagementReceivingloading.vue
Переглянути файл 

@@ -76,7 +76,7 @@
 
             >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
 
             >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
 
             <!--合同编号-->
 
             <!--合同编号-->
 
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
-            <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
+            <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.tranType }}</ws-form-item>
 
           </ws-info-table>
 
           </ws-info-table>
 
 
 
           <div class="small-title" style="font-size: 16px;width: 50%;float: left;">卸车详情</div>
 
           <div class="small-title" style="font-size: 16px;width: 50%;float: left;">卸车详情</div>

+ 1 - 1
src/views/tranManagement/tranManagementTransporFeedback.vue
Переглянути файл 

@@ -69,7 +69,7 @@
 
         <!--合同编号-->
 
         <!--合同编号-->
 
         <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
         <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
         <!-- 运输方式 -->
 
         <!-- 运输方式 -->
 
-        <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
 
+        <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.tranType }}</ws-form-item>
 
       </ws-info-table>
 
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
 
       <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
 
       <!-- 导入 -->
 
       <!-- 导入 -->