صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
gdc
/
yiliangyiyun-pc
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

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

gjy 3 سال پیش
والد
bb648f24d6 6d04fae66c
کامیت
16056bcc6f
20فایلهای تغییر یافته به همراه142 افزوده شده و 86 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 3 3
      public/static/collectionContractRecordPrint.html
  2. 2 2
      public/static/inspection.html
  3. 3 3
      public/static/inspectionnew.html
  4. 2 3
      public/static/outInspectionPrint.html
  5. 29 14
      public/static/outWeightPrint.html
  6. 2 2
      public/static/payprint.html
  7. 2 3
      public/static/print.html
  8. 2 2
      public/static/tradeServicesPrint.html
  9. 2 2
      public/static/warehouseBatchPrint.html
  10. 2 2
      public/static/warehousePrint.html
  11. 12 6
      public/static/weightCheck.html
  12. 2 2
      public/static/weightCheckInOut.html
  13. 2 2
      public/static/weightCheckOut.html
  14. 3 3
      public/static/weightChecknew.html
  15. 9 3
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  16. 3 2
      src/views/houseSelfCollect/newWeighingManagement.vue
  17. 25 13
      src/views/outboundManagement/component/weightCheckPrint.vue
  18. 21 15
      src/views/outboundManagement/weighingManagementNew.vue
  19. 5 2
      src/views/warehousenew/warehouseManagement.vue
  20. 11 2
      src/views/warehousenew/warehouseManagementList.vue

+ 3 - 3
public/static/collectionContractRecordPrint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8" />
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table tr td {
 
@@ -233,8 +233,8 @@
 
       </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 src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/inspection.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
 
     <style>
 
@@ -337,7 +337,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 3 - 3
public/static/inspectionnew.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
 
     <style>
 
@@ -336,8 +336,8 @@
 
       </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 src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 3
public/static/outInspectionPrint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
 
     <style>
 
@@ -314,9 +314,8 @@
 
       </div>
 
     </div>
 
   </body>
 
-  <!-- <script src="https://cdn.jsdelivr.net/npm/vue@2"></script> -->
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 29 - 14
public/static/outWeightPrint.html
مشاهده فایل 

@@ -1,9 +1,8 @@
 
 <!DOCTYPE html>
 
 <html>
 
-
 
 <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
         .number {
 
@@ -65,12 +64,14 @@
 
 
         .config {
 
             margin-top: 20px;
 
-            margin-right: 120px;
 
+      width: 30%;
 
+      min-width: 200px;
 
         }
 
 
         .autograph {
 
             margin-top: 20px;
 
-            margin-right: 120px;
 
+        width: 30%;
 
+        min-width: 200px;
 
         }
 
 
         .bottom-row3 {
 
@@ -158,23 +159,27 @@
 
                     <td class="col col-bgc">容量（克/升）</td>
 
                     <td class="col">{{tableData.qualityInspectionManagement ?
 
                         tableData.qualityInspectionManagement.bulkDensity:""}}</td>
 
-                    <td class="col col-bgc">不完善粒（%）</td>
 
-                    <td class="col">{{tableData.qualityInspectionManagement ?
 
-                        tableData.qualityInspectionManagement.imperfectGrain:""}}</td>
 
+                    <!-- <td class="col col-bgc">不完善粒（%）</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?tableData.qualityInspectionManagement.imperfectGrain:""}}</td> -->
 
+                    <td class="col col-bgc">水分（%）</td>
 
+                    <td class="col">{{ tableData.qualityInspectionManagement ? tableData.qualityInspectionManagement.waterContent:""}}</td>
 
                 </tr>
 
                 <tr class="row">
 
                     <td class="col col-bgc">等级</td>
 
                     <td class="col">{{tableData.qualityInspectionManagement ?
 
                         tableData.qualityInspectionManagement.grade:""}}</td>
 
-                    <td class="col col-bgc">水分（%）</td>
 
-                    <td class="col">{{ tableData.qualityInspectionManagement ?
 
-                        tableData.qualityInspectionManagement.waterContent:""}}</td>
 
+                 
                     <td class="col col-bgc">热损伤（%）</td>
 
                     <td class="col">{{tableData.qualityInspectionManagement ?
 
                         tableData.qualityInspectionManagement.jiaorenli:""}}</td>
 
-                    <td class="col" colspan="2"></td>
 
+                    <td class="col col-bgc">杂质（%）</td>
 
+                    <td class="col">{{ tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.impurity:""}}</td>
 
+                    <td class="col col-bgc">扣杂</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.buckleMiscellaneous:""}}</td>
 
                 </tr>
 
-                <tr class="row">
 
+                <!-- <tr class="row">
 
                     <td class="col col-bgc">杂质（%）</td>
 
                     <td class="col">{{ tableData.qualityInspectionManagement ?
 
                         tableData.qualityInspectionManagement.impurity:""}}</td>
 
@@ -185,7 +190,7 @@
 
                     <td class="col">{{tableData.qualityInspectionManagement ?
 
                         tableData.qualityInspectionManagement.buckleMiscellaneous:""}}</td>
 
                     <td class="col" colspan="2"></td>
 
-                </tr>
 
+                </tr> -->
 
                 <tr class="row">
 
                     <td class="col col-bgc">毛重（公斤）</td>
 
                     <td class="col">{{tableData.grossWeight}}</td>
 
@@ -196,6 +201,16 @@
 
                     <td class="col col-bgc">净重（公斤）</td>
 
                     <td class="col">{{tableData.netWeight}}</td>
 
                 </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">箱号-1</td>
 
+                    <td class="col">{{tableData.boxNo}}</td>
 
+                    <td class="col col-bgc">箱号-2</td>
 
+                    <td class="col">{{tableData.boxNoOther}}</td>
 
+                     <td class="col col-bgc">封号-1</td>
 
+                    <td class="col">{{tableData.titleNo}}</td>
 
+                    <td class="col col-bgc">封号-2</td>
 
+                    <td class="col">{{tableData.titleNoOther}}</td>
 
+                  </tr>
 
                 <tr class="row">
 
                     <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
                     <td class="col" colspan="2">{{tableData.grossDate}}</td>
 
@@ -295,7 +310,7 @@
 
     </div>
 
 </body>
 
 <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-<script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
 
 <script type="text/javascript">
 
     new Vue({
 
         el: '#app',

+ 2 - 2
public/static/payprint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8" />
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table tr td {
 
@@ -1074,7 +1074,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 3
public/static/print.html
مشاهده فایل 

@@ -1,9 +1,8 @@
 
 <!DOCTYPE html>
 
 <html>
 
-
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       .content {
 
@@ -265,7 +264,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/tradeServicesPrint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8" />
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -276,7 +276,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/warehouseBatchPrint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       body{
 
@@ -234,7 +234,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/warehousePrint.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8" />
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -239,7 +239,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 12 - 6
public/static/weightCheck.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -25,7 +25,8 @@
 
         width: 1000px;
 
         padding: 30px 20px 20px 20px;
 
         font-size: 18px;
 
-        height: 570px;
 
+        height: 630px;
 
+        /* height: 570px; */
 
          position: relative;
 
       }
 
 
@@ -233,7 +234,9 @@
 
                 <!-- <div class="left">
 
                 <img :src="item.codeUrl" alt="">
 
               </div> -->
 
-                <div class="config">收货单位签名或盖章：</div>
 
+                
+              <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
 
+              <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
 
                 <div class="autograph">客户签名：</div>
 
                 <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
 
               </div>
 
@@ -335,7 +338,8 @@
 
                 <!-- <div class="left">
 
                 <img :src="item.codeUrl" alt="">
 
               </div> -->
 
-                <div class="config">收货单位签名或盖章：</div>
 
+                <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
 
+                <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
 
                 <div class="autograph">客户签名：</div>
 
                 <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
 
               </div>
 
@@ -440,7 +444,9 @@
 
               <!-- <div class="left">
 
                 <img :src="tableData.codeUrl" alt="">
 
               </div> -->
 
-              <div class="config">收货单位签名或盖章：</div>
 
+              
+              <div class="config" v-if="_item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
 
+              <div class="config" v-if="_item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
 
               <div class="autograph">客户签名：</div>
 
               <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名：</div>
 
             </div>
 
@@ -534,7 +540,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/weightCheckInOut.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -184,7 +184,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 2 - 2
public/static/weightCheckOut.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -185,7 +185,7 @@
 
     </div>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 3 - 3
public/static/weightChecknew.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
   <head>
 
     <meta charset="utf-8">
 
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
 
     <title></title>
 
     <style>
 
       table,
 
@@ -409,8 +409,8 @@
 
       </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 src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
 
   <script type="text/javascript">
 
     new Vue({
 
       el: '#app',

+ 9 - 3
src/views/houseSelfCollect/acquisitionManagementAdd.vue
مشاهده فایل 

@@ -15,8 +15,7 @@
 
           <div class="grid-content">
 
             <el-form-item label="货名">
 
               <el-select v-model="selectVal" placeholder="请选择" @change="goodsChange" :disabled="!isEdit" filterable clearable ref="elSelect">
 
-                <el-option v-for="item in goodnameList" :key="item.constValue" :label="item.constValue"
 
-                  :value="item.constValue">
 
+                <el-option v-for="item in goodnameList" :key="item.id" :label="item.constValue" :value="item.constValue">
 
                 </el-option>
 
               </el-select>
 
             </el-form-item>
 
@@ -285,10 +284,12 @@
 
           if (_goodsNameList.length == 0) {
 
             this.goodnameList = response
 
             this.selectVal = response[0].constValue
 
+            this.baseInfoForm.goodsNameKey = response[0].constKey
 
           } else {
 
             this.goodnameList = _list
 
             if (_list.length != 0) {
 
               this.selectVal = _list[0].constValue
 
+              this.baseInfoForm.goodsNameKey = _list[0].constKey
 
             }
 
           }
 
         })
 
@@ -422,7 +423,12 @@
 
         })
 
       },
 
       goodsChange(e) {
 
-        
+        for(let num = 0 ; num < this.goodnameList.length ; num++){
 
+          if(e == this.goodnameList[num].constValue){
 
+             this.baseInfoForm.goodsNameKey = this.goodnameList[num].constKey
 
+             break  
+          }
 
+        }
 
       },
 
       changeBaseWater(val) {
 
         for (let i = 0; i < this.priceList.length; i++) {

+ 3 - 2
src/views/houseSelfCollect/newWeighingManagement.vue
مشاهده فایل 

@@ -1426,7 +1426,8 @@
 
             var warehousing = {}
 
             //贸易入库保存需要再走入库接口
 
             if (this.inWarehouseType == 1) {
 
-              warehousing = this.weighingList
 
+              warehousing = JSON.parse(JSON.stringify(this.weighingList))
 
+              // warehousing = this.weighingList
 
               warehousing.secretaryWeigher = localStorage.getItem('ws-pf_staffName')
 
               warehousing.compId = localStorage.getItem('ws-pf_compId')
 
               warehousing.inOutFlag = 2
 
@@ -1509,7 +1510,7 @@
 
                                 warehousing.deductionWeight /= 1000
 
                                 warehousing.statusFlag = 1
 
                                 warehousing.inOutFlag =
 
-                                  warehousing.id = warehousing.warehouseInOutId
 
+                                warehousing.id = warehousing.warehouseInOutId
 
                                 warehousing.warehouseInOutDetail.id = warehousing.inOutDetailId
 
                                 addstorageputList(warehousing).toPromise().then((response) => {
 
                                   if (response == 'OK') {

+ 25 - 13
src/views/outboundManagement/component/weightCheckPrint.vue
مشاهده فایل 

@@ -26,27 +26,27 @@
 
             <td class="col">{{tableData.type}}</td>
 
             <td class="col col-bgc">容量（克/升）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
 
-            <td class="col col-bgc">不完善粒（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
 
+            <!-- <td class="col col-bgc">不完善粒（%）</td>
 
+            <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td> -->
 
+             <td class="col col-bgc">水分（%）</td>
 
+            <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
           </tr>
 
           <tr class="row">
 
             <td class="col col-bgc">等级</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
 
-            <td class="col col-bgc">水分（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
             <td class="col col-bgc">热损伤（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
-            <td class="col" colspan="2"></td>
 
-          </tr>
 
-          <tr class="row">
 
             <td class="col col-bgc">杂质（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
 
-            <td class="col col-bgc">霉变粒（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col col-bgc">扣杂</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
-             <td class="col" colspan="2"></td>
 
           </tr>
 
+          <!-- <tr class="row">
 
+            
+            <td class="col col-bgc">霉变粒（%）</td>
 
+            <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
+             <td class="col" colspan="2"></td>
 
+          </tr> -->
 
           <tr class="row">
 
             <td class="col col-bgc">毛重（公斤）</td>
 
             <td class="col">{{tableData.grossWeight}}</td>
 
@@ -57,6 +57,16 @@
 
             <td class="col col-bgc">净重（公斤）</td>
 
             <td class="col">{{tableData.netWeight}}</td>
 
           </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">箱号-1</td>
 
+            <td class="col">{{tableData.boxNo}}</td>
 
+            <td class="col col-bgc">箱号-2</td>
 
+            <td class="col">{{tableData.boxNoOther}}</td>
 
+             <td class="col col-bgc">封号-1</td>
 
+            <td class="col">{{tableData.titleNo}}</td>
 
+            <td class="col col-bgc">封号-2</td>
 
+            <td class="col">{{tableData.titleNoOther}}</td>
 
+          </tr>
 
           <tr class="row">
 
             <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
             <td class="col" colspan="2">{{tableData.grossDate}}</td>
 
@@ -155,12 +165,14 @@ export default{
 
     }
 
 
     .config {
 
-        margin-top: 20px;
 
-      margin-right: 120px;
 
+      margin-top: 20px;
 
+      width: 30%;
 
+      min-width: 200px;
 
     }
 
     .autograph{
 
         margin-top: 20px;
 
-        margin-right: 240px;
 
+        width: 30%;
 
+        min-width: 200px;
 
     }
 
   }

+ 21 - 15
src/views/outboundManagement/weighingManagementNew.vue
مشاهده فایل 

@@ -140,7 +140,7 @@
 
                       weighingList.outType == '汽运' ||
 
                       weighingList.outType == '集装箱船'
 
                     ">
 
-                        <ws-input v-if="!carstatus || carjudge" :disabled="tpyeNo == 2" v-model="weighingList.carNo"
 
+                        <ws-input v-if="!carstatus || carjudge"  v-model="weighingList.carNo"
 
                           placeholder="请输入车牌号" maxlength="7" size="small" />
 
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
 
                           class="typeselect" @change="carChange">
 
@@ -153,36 +153,36 @@
 
                       weighingList.outType == '汽运' ||
 
                       weighingList.outType == '集装箱船'
 
                     ">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNo" placeholder="请输入箱号"
 
+                        <ws-input  v-model="weighingList.boxNo" placeholder="请输入箱号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
 
                       weighingList.outType == '汽运' ||
 
                       weighingList.outType == '集装箱船'
 
                     ">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNoOther" placeholder="请输入箱号"
 
+                        <ws-input  v-model="weighingList.boxNoOther" placeholder="请输入箱号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
 
                       weighingList.outType == '汽运' ||
 
                       weighingList.outType == '集装箱船'
 
                     ">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNo" placeholder="请输入封号"
 
+                        <ws-input  v-model="weighingList.titleNo" placeholder="请输入封号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
 
                       weighingList.outType == '汽运' ||
 
                       weighingList.outType == '集装箱船'
 
                     ">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNoOther" placeholder="请输入封号"
 
+                        <ws-input  v-model="weighingList.titleNoOther" placeholder="请输入封号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumber" placeholder="请输入车厢号"
 
+                        <ws-input  v-model="weighingList.wingNumber" placeholder="请输入车厢号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
 
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
 
+                        <ws-input  v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
 
                           maxlength="20" size="small" />
 
                       </ws-form-item>
 
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
 
@@ -800,13 +800,13 @@
 
         this.$refs.weightChild.openPort()
 
       },
 
 
-      listclick(row) {debugger
 
+      listclick(row) {
 
         this.id = row.id
 
         getweighing({
 
             id: row.id,
 
           })
 
           .toPromise()
 
-          .then((response) => {debugger
 
+          .then((response) => {
 
             this.weighingList = response
 
             // this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
 
             // this.weighingList.tare = this.weighingList.tare * 1000
 
@@ -913,6 +913,12 @@
 
         }
 
       },
 
       print() {
 
+        // if(this.tpyeNo==2){
 
+        //   if(this.weighingList.qualityInspectionManagement.status != '已质检'){
 
+        //     this.$message.error("该条信息未质检！")
 
+        //     return
 
+        //   }
 
+        // }
 
         this.weighingList.carNumber = this.weighingList.carNo
 
         if (this.types == 1 || this.types == 2) {
 
           if (!this.weighingList.contractNo) {
 
@@ -1599,9 +1605,13 @@
 
       },
 
       contractNoChange(e) {
 
         this.warehouseCount = this.warehouseCount1
 
-        console.log(this.warehouseCount)
 
         for (let i = 0; i < this.taskNolist.length; i++) {
 
           if (this.taskNolist[i].inOutTaskNo == e) {
 
+            //  this.weighingList.number = this.taskNolist[i].inOutTaskNo
 
+              this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
 
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
 
+             this.weighingList.goodsName = this.taskNolist[i].goodsName
 
+             this.weighingList.tips = this.taskNolist[i].businessDescribe
 
             var data = this.taskNolist[i]
 
             if (this.taskNolist[i].contractNo) {
 
               // console.log(this.taskNolist[i])
 
@@ -1625,11 +1635,7 @@
 
             this.weighingList.inOutType = this.outContractNo[i].inOutType
 
             if (this.outContractNo[i].inOutType == '销售出库') {
 
               this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
 
-              this.weighingList.number =
 
-                'XSCK' +
 
-                this.getTime() +
 
-                this.warehouseNo +
 
-                this.warehouseCount.substring(this.warehouseCount.length - 4)
 
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
 
               this.weighingList.buyer = this.outContractNo[i].buyer
 
               this.weighingList.seller = localStorage.getItem('ws-pf_compName')
 
               if (!this.outContractNo[i].unitContractPrice) {

+ 5 - 2
src/views/warehousenew/warehouseManagement.vue
مشاهده فایل 

@@ -65,12 +65,12 @@
 
       </el-table-column>
 
       <el-table-column label="货名">
 
         <template slot-scope="scope">
 
-          <div
 
+             <div
 
             style="height: 24px"
 
             v-for="(item, i) in scope.row.warehouseNumViewList"
 
             :key="i"
 
           >
 
-            {{ item.goodsName }}
 
+            {{ item.goodsName}}
 
           </div>
 
         </template>
 
       </el-table-column>
 
@@ -362,4 +362,7 @@ export default {
 
 /deep/.top_select .el-input{
 
  width: 220px;
 
 }
 
+/deep/.el-table .el-table__body .cell{
 
+  display: contents !important;
 
+}
 
 </style>

+ 11 - 2
src/views/warehousenew/warehouseManagementList.vue
مشاهده فایل 

@@ -80,7 +80,7 @@
 
       <ws-button @click="outData(2)">打印</ws-button>
 
       <ws-button @click="transformation()" v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`">折转</ws-button>
 
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleall()">全部仓库</ws-button>
 
-        <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="calc(100% - 45px)" v-if="warehouseType == '1'">
 
+        <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi setUp_css" :data="warehouseList" style="width: 100%; margin-top: 20px" height="calc(100% - 45px)" v-if="warehouseType == '1'">
 
         <el-table-column prop="warehouseName" label="仓库名">
 
         </el-table-column>
 
         <el-table-column prop="binNumber" label="仓位编号">
 
@@ -1080,6 +1080,10 @@
 
   height: 500px;
 
   /deep/.el-table .el-table__body .cell,/deep/.el-table .cell{
 
     text-align: center;
 
+    
+  }
 
+   /deep/.setUp_css .cell{
 
+  display: contents !important;
 
   }
 
   .title {
 
   position: relative;
 
@@ -1087,7 +1091,9 @@
 
   height: 60px;
 
   line-height: 60px;
 
   margin-bottom:14px;
 
+ 
 }
 
+
 
 .title::before {
 
   content: '';
 
   display: inline-block;
 
@@ -1272,5 +1278,8 @@
 
       width: 85%;
 
     }
 
   }
 
-  
+    /deep/.el-table td,/deep/.el-table th{
 
+      text-align: center;
 
+     
+    }
 
 </style>