Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
wangchao
/
yiliangyiyun-pc-jj
1
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

zhongtianhaoyuan 3 rokov pred
rodič
573ef0b7d4 a6719cfb03
commit
4479f700ef
12 zmenil súbory, kde vykonal 186 pridanie a 34 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 1 1
      .eslintrc.js
  2. 63 0
      public/static/print.html
  3. 16 3
      src/lang/zh.js
  4. 1 1
      src/model/houseSelfCollect/index.js
  5. 5 5
      src/views/home/index.vue
  6. 13 6
      src/views/houseSelfCollect/acquisitionManagement.vue
  7. 22 14
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  8. 0 0
      src/views/outboundManagement/collectionManagement.vue
  9. 61 0
      src/views/outboundManagement/component/route.js
  10. 0 0
      src/views/outboundManagement/qualityInspectionManagement.vue
  11. 0 0
      src/views/outboundManagement/weighingManagement.vue
  12. 4 4
      src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

+ 1 - 1
.eslintrc.js
Zobraziť súbor 

@@ -28,7 +28,7 @@ module.exports = {
 
     //空行最多不能超过100行
 
     'no-multiple-empty-lines': [0, { max: 50 }],
 
     'no-alert': 0, //禁止使用alert confirm prompt
 
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 
+    // 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 
   },
 
   parserOptions: {

+ 63 - 0
public/static/print.html
Zobraziť súbor 

@@ -0,0 +1,63 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta charset="utf-8">
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <title></title>
 
+  </head>
 
+  <body>
 
+    <div id="app">
 
+       <el-table :data="tableData" style="width: 500px" :row-class-name="tableRowClassName">
 
+         <el-table-column prop="waterMin" label="水分下限(%)">
 
+         </el-table-column>
 
+         <el-table-column prop="waterMax" label="水分上限(%)">
 
+         </el-table-column>
 
+         <el-table-column prop="price1" label="一等单价">
 
+         </el-table-column>
 
+         <el-table-column prop="price2" label="二等单价">
 
+         </el-table-column>
 
+         <el-table-column prop="price3" label="三等单价">
 
+         </el-table-column>
 
+         <el-table-column prop="priceOther" label="等外单价">
 
+         </el-table-column>
 
+       </el-table>
 
+    </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: ""
 
+      },
 
+      computed: {},
 
+      methods: {
 
+  tableRowClassName({
 
+        row,
 
+        rowIndex
 
+      }) {
 
+        if (rowIndex === 1) {
 
+          return 'warning-row';
 
+        } else if (rowIndex === 3) {
 
+          return 'success-row';
 
+        }
 
+        return '';
 
+      }
 
+      },
 
+      mounted() {debugger
 
+       let _data = localStorage.getItem("pricePrintList")
 
+        // var _data = decodeURIComponent(this.getQueryVariable("id"))
 
+        console.log(_data)
 
+        this.tableData = JSON.parse(_data)
 
+        window.print()
 
+        // window.onafterprint = function(event) {
 
+        //   window.history.back(-1)
 
+        // };
 
+      },
 
+      watch: {
 
+      }
 
+    })
 
+  </script>
 
+
 
+</html>

+ 16 - 3
src/lang/zh.js
Zobraziť súbor 

@@ -999,7 +999,14 @@
 
     customerManagementAdd:'客户管理添加',
 
     settlement:'结算',
 
     inspectInfo:'质检信息',
 
-    weightCheck:'检斤'
 
+    weightCheck:'检斤',
 
+
 
+    //出库管理
 
+    outboundManagement: '出库管理',
 
+    weighingManagement: '检斤管理',
 
+    qualityInspectionManagement: '质检管理',
 
+    collectionManagement: '收款管理',
 
+
 
   },
 
   // 后台错误码
 
   message: {
 
@@ -4826,6 +4833,7 @@
 
   financialManagement:{
 
     collectionManagementList:'收款管理',
 
   },
 
+  
   //运输管理
 
   tranManagement: {
 
     tranManagementDriver: '司机管理',
 
@@ -7427,7 +7435,12 @@
 
     settlement:'结算',
 
     inspectInfo:'质检信息',
 
     weightCheck:'检斤'
 
-
 
+  },
 
+  //出库管理
 
+  outboundManagement: {
 
+    weighingManagement: '检斤管理',
 
+    qualityInspectionManagement: '质检管理',
 
+    collectionManagement: '收款管理',
 
   }
 
-
 
+     
 }

+ 1 - 1
src/model/houseSelfCollect/index.js
Zobraziť súbor 

@@ -43,7 +43,7 @@ export const getPurchasePrice = appRx.get(API_GET_PURCHASEPRICE_MANAGE, errorCat
 
 //收购管理添加
 
 export const purchasePriceAdd = appRx.post(API_POST_PURCHASEPRICE_ADD, errorCatcher, errorHandle, filter)
 
 //收购管理查看
 
-export const purchasePriceLook = appRx.post(API_GET_PURCHASEPRICE_LOOK, errorCatcher, errorHandle, filter)
 
+export const purchasePriceLook = appRx.get(API_GET_PURCHASEPRICE_LOOK, errorCatcher, errorHandle, filter)
 
 //收购管理编辑
 
 export const purchasePriceEdit = appRx.post(API_POST_PURCHASEPRICE_EDIT, errorCatcher, errorHandle, filter)
 
 //收购管理删除

+ 5 - 5
src/views/home/index.vue
Zobraziť súbor 

@@ -8,10 +8,10 @@
 
         <Panel :data-list="panelList"
 
                @click="gotoNewRw"></Panel>
 
         <div v-show="true">
 
-          <el-button @click="test">test</el-button>
 
-          <el-button @click="test1">test1</el-button>
 
-          <el-button @click="openPort">openPort</el-button>
 
-          <el-button @click="closePort">closePort</el-button>
 
+          <el-button @click="test()">test</el-button>
 
+          <el-button @click="test1()">test1</el-button>
 
+          <el-button @click="openPort()">openPort</el-button>
 
+          <el-button @click="closePort()">closePort</el-button>
 
           <div>{{text}}</div>
 
         </div>
 
        <!-- <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt=""> -->
 
@@ -543,7 +543,7 @@ export default {
 
       console.log('testtesttesttest111111');
 
     },
 
     async openPort(){
 
-      console.log('openPort');
 
+      console.log('openPort',navigator);
 
       if ('serial' in navigator) {
 
         // The Web Serial API is supported.
 
         console.log('the Web Serial API is supported.');

+ 13 - 6
src/views/houseSelfCollect/acquisitionManagement.vue
Zobraziť súbor 

@@ -61,7 +61,8 @@
 
   import {
 
     getPurchasePrice,
 
     selectWarehouseSelf,
 
-    purchasePriceAllowEdit
 
+    purchasePriceAllowEdit,
 
+    purchasePriceLook
 
   } from '@/model/houseSelfCollect/index'
 
   import acquisitionManagementAdd from './acquisitionManagementAdd.vue'
 
   export default {
 
@@ -136,7 +137,7 @@
 
             break
 
           case "查看":
 
             _query = {
 
-              data: row,
 
+              data:JSON.stringify(row),
 
               type: type
 
             }
 
             break
 
@@ -160,8 +161,6 @@
 
           this.selectVal = this.warehouseList[0].id
 
           // this.tableData = response.records
 
           this.getList()
 
-
 
-
 
         })
 
       },
 
       //获取列表数据
 
@@ -193,8 +192,16 @@
 
         this.visible = true
 
         console.log(index, row);
 
       },
 
-      print() {
 
-        window.location.href="../../../static/print.html"
 
+      print(index,row) {debugger
 
+      // 打印价格对照表
 
+     purchasePriceLook({id:row.id}).toPromise().then((response) => {
 
+            debugger
 
+            console.log(response.detailPrints)
 
+            // this.tableData = response.records
 
+            // this.getList()
 
+            localStorage.setItem('pricePrintList', JSON.stringify(response.detailPrints));
 
+            window.location.href="../../../static/print.html"
 
+          })
 
       }
 
     },
 
   }

+ 22 - 14
src/views/houseSelfCollect/acquisitionManagementAdd.vue
Zobraziť súbor 

@@ -140,7 +140,8 @@
 
 </template>
 
 <script>
 
   import {
 
-    purchasePriceAdd
 
+    purchasePriceAdd,
 
+    purchasePriceLook
 
   } from '@/model/houseSelfCollect/index'
 
   import {
 
     packList,
 
@@ -245,19 +246,20 @@
 
         isEdit: true
 
       }
 
     },
 
-    created() {
 
-      let _goodsNameList = []
 
-      this.baseInfoForm.warehouseId = this.$route.query.warehouseId
 
-      this.baseInfoForm.warehouseName = this.$route.query.warehouseName
 
-      this.baseInfoForm.compId = this.$route.query.compId
 
-      this.type = this.$route.query.type
 
-      console.log(this.baseInfoForm)
 
-      _goodsNameList = this.$route.query.goodsNameList
 
-      this.priceList[0].detailList[0].water = this.baseInfoForm.waterMin
 
-      this.priceList[0].detailList[2].water = this.baseInfoForm.waterBase
 
-      this.priceList[0].detailList[4].water = this.baseInfoForm.waterMax
 
+    activated() {
 
+debugger
 
       switch (this.$route.query.type) {
 
         case "新增":
 
+        let _goodsNameList = []
 
+        this.baseInfoForm.warehouseId = this.$route.query.warehouseId
 
+        this.baseInfoForm.warehouseName = this.$route.query.warehouseName
 
+        this.baseInfoForm.compId = this.$route.query.compId
 
+        this.type = this.$route.query.type
 
+        console.log(this.baseInfoForm)
 
+        _goodsNameList = this.$route.query.goodsNameList
 
+        this.priceList[0].detailList[0].water = this.baseInfoForm.waterMin
 
+        this.priceList[0].detailList[2].water = this.baseInfoForm.waterBase
 
+        this.priceList[0].detailList[4].water = this.baseInfoForm.waterMax
 
           // 货名
 
           packList({
 
               constId: 'CON2'
 
@@ -284,7 +286,13 @@
 
         case "编辑":
 
           break;
 
         case "查看":
 
-
 
+         this.baseInfoForm =JSON.parse(this.$route.query.data)
 
+       purchasePriceLook({id:this.baseInfoForm.id}).toPromise().then((response) => {
 
+              debugger
 
+              console.log(response)
 
+              // this.tableData = response.records
 
+              // this.getList()
 
+            })
 
           break;
 
         default:
 
           break
 
@@ -509,7 +517,7 @@
 
 
       //打印
 
       print() {
 
-        
+
 
       },
 
       // 提交
 
       submit() {

+ 0 - 0
src/views/outboundManagement/collectionManagement.vue
Zobraziť súbor


+ 61 - 0
src/views/outboundManagement/component/route.js
Zobraziť súbor 

@@ -0,0 +1,61 @@
 
+import Layout from '@/layout/index';
 
+
 
+const outboundManagementRouter = {
 
+    path: '/outboundManagement',
 
+    component: Layout,
 
+    redirect: '/outboundManagement',
 
+    name: 'outboundManagement',
 
+    alwaysShow: true, // will always show the root menu
 
+    meta: {
 
+        title: 'outboundManagement',
 
+        module: 'contractManagement',
 
+        icon: '-hetongguanli'
 
+    },
 
+    children: [
 
+        // 检斤管理
 
+        {
 
+            path: 'weighingManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/weighingManagement'),
 
+            name: 'weighingManagement',
 
+            meta: {
 
+                title: 'weighingManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+        // 质检管理
 
+        {
 
+            path: 'qualityInspectionManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/qualityInspectionManagement'),
 
+            name: 'qualityInspectionManagement',
 
+            meta: {
 
+                title: 'qualityInspectionManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+        // 付款管理
 
+        {
 
+            path: 'collectionManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/collectionManagement'),
 
+            name: 'collectionManagement',
 
+            meta: {
 
+                title: 'collectionManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+    ],
 
+
 
+};
 
+
 
+export default outboundManagementRouter;

+ 0 - 0
src/views/outboundManagement/qualityInspectionManagement.vue
Zobraziť súbor


+ 0 - 0
src/views/outboundManagement/weighingManagement.vue
Zobraziť súbor


+ 4 - 4
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue
Zobraziť súbor 

@@ -138,10 +138,10 @@
 
               <span class="noservice" v-show="item.status == '未装车'">
 
                   未装船
 
                 </span>
 
-                <span class="service" v-show="item.status == '已装车'">
 
+                <span class="noservice" v-show="item.status == '已装车'">
 
                    未卸船
 
                 </span>
 
-                 <span class="serviced" v-show="item.status == '已送达'">
 
+                 <span class="service" v-show="item.status == '已送达'">
 
                    已卸船
 
                 </span>
 
             </div>
 
@@ -150,10 +150,10 @@
 
               <span class="noservice" v-show="item.status == '未装车'">
 
                   未装船
 
                 </span>
 
-                <span class="service" v-show="item.status == '已装车'">
 
+                <span class="noservice" v-show="item.status == '已装车'">
 
                    未卸船
 
                 </span>
 
-                 <span class="serviced" v-show="item.status == '已送达'">
 
+                 <span class="service" v-show="item.status == '已送达'">
 
                    已卸船
 
                 </span>
 
             </div>