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

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

ccjgmwz 3 سال پیش
والد
98d1f3559d 31ea27a92e
کامیت
41e318fa77
30فایلهای تغییر یافته به همراه645 افزوده شده و 177 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 7 5
      public/static/inspection.html
  2. 7 3
      public/static/weightCheck.html
  3. 229 0
      public/static/weightCheckOut.html
  4. 2 1
      src/api/V2/houseSelfCollect/index.js
  5. 12 1
      src/components/mapdrag/mapdrag.vue
  6. 4 0
      src/layout/index/top/index.vue
  7. 5 2
      src/model/houseSelfCollect/index.js
  8. 1 2
      src/permission.js
  9. 71 43
      src/views/contractManagement/purchaseContractAdd.vue
  10. 6 2
      src/views/contractManagement/purchaseContractEdit.vue
  11. 5 2
      src/views/contractManagement/purchaseContractExamine.vue
  12. 3 3
      src/views/contractManagement/salesContractAdd.vue
  13. 8 4
      src/views/contractManagement/salesContractEdit.vue
  14. 7 3
      src/views/contractManagement/salesContractExamine.vue
  15. 5 5
      src/views/houseSelfCollect/component/inspectInfoPrint.vue
  16. 9 5
      src/views/houseSelfCollect/inspectInfo.vue
  17. 12 2
      src/views/houseSelfCollect/inspectionManagement.vue
  18. 17 0
      src/views/houseSelfCollect/weightCheck.vue
  19. 1 0
      src/views/newTask/listPage.vue
  20. 58 3
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  21. 19 14
      src/views/taskManagement/inOutWarehouseTaskEdit.vue
  22. 40 35
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  23. 19 9
      src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
  24. 21 7
      src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
  25. 15 6
      src/views/warehouse/warehouseManagementAdd.vue
  26. 16 15
      src/views/warehouse/warehouseManagementEdit.vue
  27. 4 2
      src/views/warehouse/warehouseManagementGross.vue
  28. 3 0
      src/views/warehouse/warehouseManagementPerfectput.vue
  29. 27 1
      src/views/warehouse/warehouseManagementTare.vue
  30. 12 2
      src/views/workNotification/utils/index.js

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

@@ -193,17 +193,18 @@
 
             <div>{{tableData.qualityDate}}</div>
 
           </div>
 
           <div class="bottom-row2">
 
-            <!-- <div class="left">
 
+            <div class="left">
 
               <img src="../img/add.png" alt="">
 
-            </div> -->
 
+            </div>
 
             <div class="config">收货单位签名或盖章</div>
 
             <div class="">客户签名</div>
 
           </div>
 
-          <!-- <div class="bottom-row3">扫一扫</div> -->
 
+          <div class="bottom-row3">扫一扫</div>
 
         </div>
 
       </div>
 
       <div class="small-content" v-if="smallContent">
 
         <div class="small-title">
 
+          <div class="numberNo">{{tableData.qualityNo.substring(tableData.qualityNo.length - 3)}}</div>
 
           <div>粮食质检单</div>
 
         </div>
 
         <div class="small-row">
 
@@ -300,7 +301,7 @@
 
         <div class="small-row">
 
           <div>收货单位签名或盖章:</div>
 
           <div class="sign">客户签名:</div>
 
-        </div>
 
+        </div>  
       </div>
 
     </div>
 
   </body>
 
@@ -313,7 +314,8 @@
 
         tableData: "",
 
         name: "",
 
         bigContent: false,
 
-        smallContent: false
 
+        smallContent: false,
 
+        printData :{},
 
       },
 
       computed: {},
 
       methods: {

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

@@ -102,11 +102,14 @@
 
       .small-title {
 
         text-align: center;
 
         font-size: 18px;
 
-        display: flex;
 
+        /* display: flex; */
 
         justify-content: space-between;
 
         align-items: center;
 
       }
 
-
 
+       .numberNo{
 
+          font-size: 26px;
 
+          margin: auto;
 
+        }
 
       .small-row {
 
         display: flex;
 
         justify-content: space-between;
 
@@ -303,7 +306,8 @@
 
 
       <div class="small-content" v-if="smallContent">
 
         <div class="small-title">
 
-          <div>粮食检斤单</div>
 
+          <div  class="numberNo">{{tableData.number.substring(tableData.number.length - 3)}}</div>
 
+          <div style="margin: auto;">粮食检斤单</div>
 
         </div>
 
         <div class="small-row">
 
           <div>编号</div>

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

@@ -0,0 +1,229 @@
 
+<!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;
 
+        position: absolute;
 
+        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;
 
+      }
 
+
 
+      img {
 
+        width: 41px;
 
+        height: 41px;
 
+        margin-right: 118px;
 
+      }
 
+
 
+      .config {
 
+        margin-top: 10px;
 
+        margin-right: 240px;
 
+      }
 
+      .autograph{
 
+    margin-top: 10px;
 
+     }
 
+      .bottom-row3 {
 
+        margin: 10px 0;
 
+      }
 
+
 
+      .title {
 
+        text-align: center;
 
+        font-size: 36px;
 
+        font-weight: 500;
 
+        margin-bottom: 20px;
 
+      }
 
+
 
+      .number {
 
+        text-align: right;
 
+        margin-bottom: 10px;
 
+        margin-top: 20px;
 
+      }
 
+
 
+      .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: 450px;
 
+      }
 
+
 
+      .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;
 
+      }
 
+    </style>
 
+  </head>
 
+  <body>
 
+    <div id="app">
 
+      <div class="content" v-if="true">
 
+        <div class="title">出库检斤单</div>
 
+        <table class="table">
 
+          <tr class="row">
 
+            <td class="col col-bgc">送货单位</td>
 
+            <td class="col" colspan="4">{{tableData.seller}}</td>
 
+            <td class="col col-bgc">车牌号</td>
 
+            <td class="col" colspan="1">{{tableData.carNo}}</td>
 
+            <td class="col col-bgc">货名</td>
 
+            <td class="col" colspan="1">{{tableData.goodsName}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">收货单位</td>
 
+            <td class="col" colspan="4">{{tableData.buyer}}</td>
 
+            <td class="col col-bgc">类型</td>
 
+            <td class="col"colspan="1">{{tableData.type}}</td>
 
+            <td class="col col-bgc">检斤时间</td>
 
+            <td class="col" colspan="1">{{tableData.updateDate}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">毛重（吨）</td>
 
+            <td class="col" colspan="2">{{tableData.grossWeight}}</td>
 
+            <td class="col col-bgc">皮重（吨）</td>
 
+            <td class="col" colspan="2">{{tableData.tare}}</td>
 
+            <td class="col col-bgc">净重（吨）</td>
 
+            <td class="col" colspan="2">{{tableData.netWeight}}</td>
 
+          </tr>
 
+        </table>
 
+        <div class="bottom">
 
+          <div class="bottom-row1">
 
+            <div>检斤员：{{tableData.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: {
 
+          // qualityInspectionManagement:{}
 
+        },
 
+        name: "",
 
+        bigContent: false,
 
+        smallContent: false
 
+      },
 
+      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() {
 
+        console.log(decodeURIComponent(this.getQueryVariable("tableData")))
 
+        let _data = decodeURIComponent(this.getQueryVariable("tableData"))
 
+        let _type = decodeURIComponent(this.getQueryVariable("type"))
 
+        if (_type == 2) {
 
+          this.bigContent = true
 
+          this.smallContent = false
 
+        } else {
 
+          this.smallContent = true
 
+          this.bigContent = false
 
+        }
 
+        console.log(_data,"sddsd")
 
+        this.tableData = JSON.parse(_data)
 
+        console.log(this.tableData)
 
+        document.title = "粮食检斤单"
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        };
 
+      },
 
+      watch: {}
 
+    })
 
+  </script>
 
+
 
+</html>

+ 2 - 1
src/api/V2/houseSelfCollect/index.js
مشاهده فایل 

@@ -89,4 +89,5 @@ export const API_POST_EXPORT = '/paymentManagement/export'
 
 export const API_GET_SHIPPINGINFOFORMATION = '/shippingInformation/selectShippingInformation'
 
 //确认质检信息
 
 export const API_POST_INSPECTIONCHECK = '/qualityInspectionManagement/api/editQualityInspection'
 
-
 
+//单据二维码
 
+export const API_GAT_QRCODE = '/weighingManagement/generateQRCodeImage'

+ 12 - 1
src/components/mapdrag/mapdrag.vue
مشاهده فایل 

@@ -170,9 +170,9 @@
 
     },
 
     async created() {
 
       
-        
     },
 
     mounted() {
 
+      
       // AMapLoader.reset();
 
       // 已载入高德地图API，则直接初始化地图
 
       if (window.AMap && window.AMapUI) {
 
@@ -265,6 +265,7 @@
 
                     geocoder.getAddress(result1.districtList[0].center, function(status, result) {
 
                       if (status === 'complete') {
 
                         var obj = {}
 
+
 
                         that.province = result.regeocode.addressComponent.province
 
                         that.city = result.regeocode.addressComponent.city
 
                         that.district = result.regeocode.addressComponent.district
 
@@ -377,6 +378,16 @@
 
       }
 
     },
 
     methods: {
 
+       clearVal () {
 
+       this.address = ''
 
+       this.center=''
 
+        var status = {
 
+          zoomEnable: true,
 
+          dragEnable: true,
 
+        }
 
+        this.map.setStatus(status)
 
+        this.loadmap()
 
+    },
 
       positions() {
 
         this.status = false
 
         var status = {

+ 4 - 0
src/layout/index/top/index.vue
مشاهده فایل 

@@ -27,6 +27,9 @@
 
         <span style="padding: 0 2px">{{ getDay }}</span
 
         >{{ $t('common.days') }}
 
       </div>
 
+      <div  class="right-menu-item hover-effect dayClass">
 
+      {{compName}}
 
+      </div>
 
       <el-tooltip
 
         v-if="showColor"
 
         effect="dark"
 
@@ -291,6 +294,7 @@ export default {
 
       // deptName: '',
 
       // deptId: '',
 
       // staffName: '',
 
+      compName: localStorage.getItem('ws-pf_compName'),
 
       account: localStorage.getItem('ws-pf_account'),
 
       // compName: '',
 
       companyId: localStorage.getItem('ws-pf_compId'),

+ 5 - 2
src/model/houseSelfCollect/index.js
مشاهده فایل 

@@ -46,7 +46,8 @@ import {
 
   API_POST_INVOICING,
 
   API_POST_EXPORT,
 
   API_GET_SHIPPINGINFOFORMATION,
 
-  API_POST_INSPECTIONCHECK
 
+  API_POST_INSPECTIONCHECK,
 
+  API_GAT_QRCODE
 
 } from '@/api/V2/houseSelfCollect'
 
 //客户管理列表
 
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 
@@ -139,4 +140,6 @@ export const export1 = appRx.post(API_POST_EXPORT)
 
 // 车牌号
 
 export const getshippinginfo  = appRx.get(API_GET_SHIPPINGINFOFORMATION, errorCatcher, errorHandle, filter)
 
 // 确认初检信息
 
-export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, errorHandle, filter)
 
+export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, errorHandle, filter)
 
+// 单据二维码
 
+export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, filter)

+ 1 - 2
src/permission.js
مشاهده فایل 

@@ -20,9 +20,8 @@ router.beforeEach(async (to, _, next) => {
 
   const hasToken = getToken();
 
   if (hasToken) {
 
     if (whiteList.includes(to.path)) {
 
-      console.log(111111)
 
       next({
 
-        path: '/login'
 
+        path: '/'
 
       });
 
       NProgress.done();
 
     } else {

+ 71 - 43
src/views/contractManagement/purchaseContractAdd.vue
مشاهده فایل 

@@ -76,6 +76,12 @@
 
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
 
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
 
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
 
+          <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
 
+              我方自提</el-radio>
 
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
 
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">
 
+              对方送货</el-radio>
 
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方送货</el-radio> -->
 
         </ws-form-item>
 
          <!--卖方-->
 
         <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
 
@@ -83,12 +89,12 @@
 
           <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
 
              @select="handleSelect"></el-autocomplete>
 
              -->
 
-            <ws-select  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
+            <el-select filterable  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
             @change="sellerSelect">
 
 
-            <ws-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
 
+            <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
 
               :value="item.customerName" />
 
-          </ws-select>
 
+          </el-select>
 
         </ws-form-item>
 
            <!-- 发货反馈负责人 -->
 
           <ws-form-item label="发货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '2'">
 
@@ -175,14 +181,20 @@
 
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
 
             value-format="yyyy-MM-dd" />
 
         </ws-form-item>
 
+        <!--价格类型-->
 
+          <ws-form-item label="价格类型" span="1" prop="priceType">
 
+            <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" @change="selectpriceType">
 
+              <ws-option v-for="item in priceTypeList" :key="item" :label="item" :value="item" />
 
+            </ws-select>
 
+          </ws-form-item>
 
         <!--合同单价（元/吨）-->
 
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
 
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
 
             maxlength="100" size="small" />
 
         </ws-form-item>
 
 
         <!--合同总价-->
 
-        <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
 
+        <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
 
         </ws-form-item>
 
 
@@ -465,6 +477,7 @@
 
           },
 
         ],
 
         contractNoList: [],
 
+        priceTypeList: ['定价采购', '随行就市'],
 
         goodnameList: [],
 
         value1: '袋装',
 
         value2: '未回收',
 
@@ -546,6 +559,11 @@
 
       if (!this.restaurants4) this.restaurants4 = [];
 
     },
 
     methods: {
 
+      selectpriceType(e) {
 
+        if (e == '随行就市') {
 
+          this.deptBudgetList.deliverType = '1'
 
+        }
 
+      },
 
       feedbackLeaderChange(e){
 
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
 
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
 
@@ -1006,49 +1024,59 @@
 
           })
 
           return
 
         }
 
-        if (!this.deptBudgetList.unitContractPrice) {
 
-          this.$message({
 
-            message: '请输入合同单价！',
 
-            type: 'warning',
 
-          })
 
-          return
 
-        }
 
-        if (
 
-          isNaN(this.deptBudgetList.unitContractPrice) ||
 
-          (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
 
-            String(this.deptBudgetList.unitContractPrice).length -
 
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
 
-            2) ||
 
-          this.deptBudgetList.unitContractPrice <= 0 ||
 
-          this.deptBudgetList.unitContractPrice > 10000
 
-        ) {
 
-          this.$message({
 
-            message: '合同单价输入有误！',
 
-            type: 'warning',
 
-          })
 
-          return
 
-        }
 
-        if (!this.deptBudgetList.totalContractPrice) {
 
+        if (!this.deptBudgetList.priceType) {
 
           this.$message({
 
-            message: '请输入合同总价！',
 
+            message: '请选择价格类型',
 
             type: 'warning',
 
           })
 
           return
 
         }
 
-        if (
 
-          isNaN(this.deptBudgetList.totalContractPrice) ||
 
-          (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
 
-            String(this.deptBudgetList.totalContractPrice).length -
 
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
 
-            2) ||
 
-          this.deptBudgetList.totalContractPrice <= 0 ||
 
-          this.deptBudgetList.totalContractPrice > 1000000000
 
-        ) {
 
-          this.$message({
 
-            message: '合同总价输入有误！',
 
-            type: 'warning',
 
-          })
 
-          return
 
+        if (this.deptBudgetList.priceType == '定价采购') {
 
+          if (!this.deptBudgetList.unitContractPrice) {
 
+            this.$message({
 
+              message: '请输入合同单价！',
 
+              type: 'warning',
 
+            })
 
+            return
 
+          }
 
+          if (
 
+            isNaN(this.deptBudgetList.unitContractPrice) ||
 
+            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
 
+              String(this.deptBudgetList.unitContractPrice).length -
 
+              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
 
+              2) ||
 
+            this.deptBudgetList.unitContractPrice <= 0 ||
 
+            this.deptBudgetList.unitContractPrice > 10000
 
+          ) {
 
+            this.$message({
 
+              message: '合同单价输入有误！',
 
+              type: 'warning',
 
+            })
 
+            return
 
+          }
 
+          if (!this.deptBudgetList.totalContractPrice) {
 
+            this.$message({
 
+              message: '请输入合同总价！',
 
+              type: 'warning',
 
+            })
 
+            return
 
+          }
 
+          if (
 
+            isNaN(this.deptBudgetList.totalContractPrice) ||
 
+            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
 
+              String(this.deptBudgetList.totalContractPrice).length -
 
+              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
 
+                1) >
 
+              2) ||
 
+            this.deptBudgetList.totalContractPrice <= 0 ||
 
+            this.deptBudgetList.totalContractPrice > 1000000000
 
+          ) {
 
+            this.$message({
 
+              message: '合同总价输入有误！',
 
+              type: 'warning',
 
+            })
 
+            return
 
+          }
 
         }
 
         if (!this.newSelectedOptions) {
 
           this.$message({

+ 6 - 2
src/views/contractManagement/purchaseContractEdit.vue
مشاهده فایل 

@@ -131,14 +131,18 @@
 
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
 
             value-format="yyyy-MM-dd" />
 
         </ws-form-item>
 
+        <!--价格类型-->
 
+          <ws-form-item label="价格类型" span="1" prop="priceType">          
+              {{ deptBudgetList.priceType }}
 
+          </ws-form-item>
 
         <!-- 合同单价（元/吨） -->
 
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
 
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
 
             deptBudgetList.unitContractPrice
 
           }}</span>
 
         </ws-form-item>
 
         <!-- 合同总价（元） -->
 
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
 
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
 
         </ws-form-item>
 
         <!-- 货源所在地区 -->

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

@@ -95,10 +95,13 @@
 
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
 
           {{ deptBudgetList.deliveryDateEnd }}
 
         </ws-form-item>
 
-        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
 
+        <ws-form-item label="价格类型" span="1" prop="priceType">
 
+          {{ deptBudgetList.priceType }}
 
+        </ws-form-item>
 
+        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           {{ deptBudgetList.unitContractPrice }}
 
         </ws-form-item>
 
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
 
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           {{ deptBudgetList.totalContractPrice }}
 
         </ws-form-item>
 
         <ws-form-item label="货源所在地区" span="1">

+ 3 - 3
src/views/contractManagement/salesContractAdd.vue
مشاهده فایل 

@@ -50,11 +50,11 @@
 
             <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
 
             <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
 
               placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete> -->
 
-              <ws-select  v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" 
+              <el-select filterable v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" 
             @change="buyerSelect">
 
-            <ws-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
 
+            <el-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
 
               :value="item.customerName" />
 
-              </ws-select>
 
+              </el-select>
 
           </ws-form-item>
 
           <!--运输方式-->
 
           <ws-form-item label="运输方式" span="1" prop="shippingType">

+ 8 - 4
src/views/contractManagement/salesContractEdit.vue
مشاهده فایل 

@@ -165,17 +165,21 @@
 
             <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
 
               value-format="yyyy-MM-dd" />
 
           </ws-form-item>
 
-
 
+          <!--价格类型-->
 
+          <ws-form-item label="价格类型" span="1" prop="priceType">
 
+            <div class="unchanged">
 
+              {{ deptBudgetList.priceType }}
 
+            </div>
 
+          </ws-form-item>
 
           <!--合同单价（元/吨）-->
 
-          <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo">
 
+          <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo" v-if="deptBudgetList.priceType == '定价销售'">
 
             <div class="unchanged">
 
               {{ deptBudgetList.unitContractPrice }}
 
             </div>
 
             <span class="unchangeable">*</span>
 
           </ws-form-item>
 
-
 
           <!--合同总价-->
 
-          <ws-form-item label="合同总价" span="1" prop="contractNo">
 
+          <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
 
           </ws-form-item>
 
           <!--签订日期-->

+ 7 - 3
src/views/contractManagement/salesContractExamine.vue
مشاهده فایل 

@@ -139,13 +139,17 @@
 
               {{ deptBudgetList.deliveryDateEnd }}
 
             </div>
 
           </ws-form-item>
 
-          <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
 
+          <ws-form-item label="价格类型" span="1" prop="priceType">
 
+            <div class="unchanged">
 
+              {{ deptBudgetList.priceType }}
 
+            </div>
 
+          </ws-form-item>
 
+          <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
             <div class="unchanged">
 
               {{ deptBudgetList.unitContractPrice }}
 
             </div>
 
           </ws-form-item>
 
-
 
-          <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
 
+          <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
             <div class="unchanged">
 
               {{ deptBudgetList.totalContractPrice }}
 
             </div>

+ 5 - 5
src/views/houseSelfCollect/component/inspectInfoPrint.vue
مشاهده فایل 

@@ -78,9 +78,9 @@
 
         <div>{{ printData.qualityDate }}</div>
 
       </div>
 
       <div class="bottom-row2">
 
-        <!-- <div class="left">
 
-          <img src="../../../../public/img/add.png" alt="" />
 
-        </div> -->
 
+        <div class="left">
 
+          <img :src="printData.qrCodeUrl" alt="" />
 
+        </div>
 
         <div class="config">收货单位签名或盖章：</div>
 
         <div class="">客户签名：</div>
 
       </div>
 
@@ -147,8 +147,8 @@
 
 
     .left {
 
       img {
 
-        width: 41px;
 
-        height: 41px;
 
+        width: 80px;
 
+        height: 80px;
 
         margin-right: 118px;
 
       }
 
     }

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

@@ -298,15 +298,19 @@
 
               type: 'warning',
 
             })
 
             .then(() => {
 
-              postCheck({id:this.id,flag:2})
 
+              postCheck(this.inspect)
 
                 .toPromise()
 
                 .then((response) => {
 
-                  if(response == "OK"){
 
+                   postCheck({id:this.id,flag:2})
 
+                    .toPromise()
 
+                    .then((response) => {
 
+                      if(response == "OK"){
 
                       this.$message.success('提交成功')
 
                         this.$router.push({path: 'inspectionManagement' })
 
-                  }else{
 
-                    this.$message.error('提交失败')
 
-                  }
 
+                        }else{
 
+                          this.$message.error('提交失败')
 
+                        }
 
+                    })
 
                 }).catch(() => {
 
               return false
 
             })

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

@@ -135,6 +135,7 @@
 
 		getinspectList,
 
 		getinspectDelete,
 
 		getinspectLook,
 
+		getQRcode
 
 	} from '@/model/houseSelfCollect/index'
 
 	import inspectInfoPrint from './component/inspectInfoPrint.vue'
 
 	export default {
 
@@ -215,6 +216,7 @@
 
 				})
 
 			},
 
 			warehouseNameChange(e) {
 
+				console.log(this.warehouseList)
 
 				for (let i = 0; i < this.warehouseList.length; i++) {
 
 					if (this.warehouseList[i].value == e) {
 
 						this.warehouseName = this.warehouseList[i].value
 
@@ -338,14 +340,22 @@
 
 					})
 
 			},
 
 			print(row) {
 
+				console.log(row)
 
 
 				getinspectLook({
 
 						id: row.id,
 
 					})
 
 					.toPromise()
 
 					.then((response) => {
 
-						this.isShowPrint = true
 
-						this.printData = response
 
+						let printString = row.id+","+1
 
+							getQRcode({printString}).toPromise()
 
+					          .then((res) => {
 
+								this.isShowPrint = true
 
+								this.printData = response
 
+								this.printData.qrCodeUrl = res
 
+							  })
 
+								this.isShowPrint = true
 
+								this.printData = response
 
 						    if (response.compName == '黑龙江秋收有限公司') {
 
                				 this.printData.compName = '黑龙江中天昊元贸易有限公司'
 
               					}

+ 17 - 0
src/views/houseSelfCollect/weightCheck.vue
مشاهده فایل 

@@ -113,6 +113,8 @@
 
             </div>
 
           </div>
 
           <div class="car-right">
 
+            <el-button @click="cutstatus(1)"  :type="status==1?'primary':''">已称重</el-button>
 
+              <el-button @click="cutstatus(2)" :type="status==2?'primary':''">未称重</el-button>
 
             <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
 
               style="width: 100%;overflow:auto;height:680px">
 
               <el-table-column property="number" label="编号">
 
@@ -204,6 +206,7 @@
 
         pList: [],
 
         mList: [],
 
         index: 0,
 
+        status:1,
 
         carList: [],
 
         carWeightInfo: {
 
           carNumber: '',
 
@@ -239,6 +242,7 @@
 
         mListTop: [],
 
         mListBottom: [],
 
         pListTop: [],
 
+        carList1:[],
 
         pListBottom: []
 
       }
 
     },
 
@@ -293,6 +297,18 @@
 
 
     },
 
     methods: {
 
+      cutstatus(status){
 
+        this.status=status
 
+        if(status==1){
 
+          this.carList=this.carList1.filter(function (item) {
 
+            return item.status=='已质检'
 
+        })
 
+        }else{
 
+          this.carList=this.carList1.filter(function (item) {
 
+              return item.status=='已称毛重'
 
+          })
 
+        }
 
+      },
 
       handleSizeChange(val) {
 
         console.log(`每页 ${val} 条`)
 
         this.pageSize = val
 
@@ -375,6 +391,7 @@
 
         if (this.information == '毛重') {
 
           this.index = 0
 
           this.carList = this.mList
 
+          this.carList1 = this.mList
 
           if (this.mList.length != 0) {
 
             let _item = this.mList.filter(function(val) {
 
               console.log(that.$route.query.id)

+ 1 - 0
src/views/newTask/listPage.vue
مشاهده فایل 

@@ -59,6 +59,7 @@
 
           infinite-scroll-distance="30">
 
         <li v-for="(i, index) in listShow"
 
             :key="index"
 
+            v-if='i.businessType!="BUY"&&i.businessType!="SALE"'
 
             class="list-item"
 
             @click="goPath(i)">
 
           <!-- 图标 -->

+ 58 - 3
src/views/statisticalReport/stockPurchaseReceiptReportList.vue
مشاهده فایل 

@@ -221,7 +221,7 @@
 
               height="18"
 
               style="vertical-align: text-top; position: relative; top: -1px"
 
               src="../../../public/img/edit.png"
 
-              @click="whether(scope.row)"
 
+              @click="whether(scope.row,1)"
 
               v-if="scope.row.identification == 'false'"
 
               alt=""
 
             />
 
@@ -234,6 +234,25 @@
 
             <!-- <div>—</div> -->
 
           </template>
 
         </el-table-column>
 
+        <el-table-column class="table_td" prop="settlementPrice" width='150' label="结算单价（元/吨）">
 
+        <template slot-scope="scope">
 
+            <div class="inputChenge">
 
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
 
+              </el-input>
 
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
 
+                <span>{{scope.row.settlementPrice}}</span>
 
+              </div>
 
+            </div>
 
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
 
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
 
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
 
+                @click="whether(scope.row,2)" alt="" />
 
+            </div>
 
+
 
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
 
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
 
+          </template>
 
+          </el-table-column>
 
         <el-table-column
 
           width="100"
 
           class="table_td"
 
@@ -589,6 +608,7 @@ export default {
 
         .then(() => {
 
           this.stockPurchaseInfo.id = row.id
 
           this.stockPurchaseInfo.settlementWeight = row.settlementWeight
 
+          this.stockPurchaseInfo.flag=1
 
           editSettlementWeight(this.stockPurchaseInfo)
 
             .toPromise()
 
             .then((response) => {
 
@@ -604,8 +624,42 @@ export default {
 
           return false
 
         })
 
     },
 
-    whether(row) {
 
-      row.identification = 'true'
 
+    //修改结算单价
 
+     weightClick(row,flag) {
 
+        var title=''
 
+        var data={}
 
+          title='确定要修改结算单价？'
 
+        data={
 
+              settlementPrice: row.settlementPrice,
 
+              id: row.id,
 
+              flag:flag
 
+            }
 
+        this.$confirm(title, {
 
+            confirmButtonText: '确定',
 
+            cancelButtonText: '取消',
 
+            type: 'warning',
 
+          })
 
+          .then(() => {
 
+            editSettlementWeight(data)
 
+              .toPromise()
 
+              .then((response) => {
 
+                  this.$notify.success({
 
+                  title: '成功',
 
+                  message: '结算单价修改成功',
 
+                })
 
+                this.getList()
 
+              })
 
+              .catch(() => {
 
+                return false
 
+              })
 
+          })
 
+      },
 
+    whether(row,flag) {
 
+      if(flag==1){
 
+          row.identification = 'true'
 
+        }else{
 
+          row.identification1 = 'true'
 
+        }
 
     },
 
     handleRowClick(row) {
 
       if (row.approveStatus == null) {
 
@@ -983,6 +1037,7 @@ export default {
 
           this.settlementWeight1 = 0
 
           for (var i = 0; i < response.records.length; i++) {
 
             response.records[i].identification = 'false'
 
+            response.records[i].identification1 = 'false'
 
             this.payingMoney += response.records[i].amountIngPayable
 
             this.payedMoney += response.records[i].amountEdPayable
 
             this.payNotMoney += response.records[i].amountNotPayable

+ 19 - 14
src/views/taskManagement/inOutWarehouseTaskEdit.vue
مشاهده فایل 

@@ -115,7 +115,7 @@
 
             {{dataList.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
             {{dataList.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -123,9 +123,9 @@
 
             {{dataList.predictDate}}
 
           </el-form-item>
 
           	<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1">
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
 
               {{dataList.estimatedFreight}}
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             {{dataList.agent}}
 
@@ -223,7 +223,7 @@
 
             {{dataList1.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
             {{dataList1.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -231,9 +231,9 @@
 
             {{dataList1.predictDate}}
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
               {{dataList1.estimatedFreight}}
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="收货人">
 
             <el-option
 
@@ -337,7 +337,7 @@
 
             {{dataList.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
 
             {{dataList.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -345,9 +345,9 @@
 
             {{dataList.predictDate}}
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
           {{dataList.estimatedFreight}}
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             {{dataList.agent}}
 
@@ -484,6 +484,7 @@ export default {
 
         month: dayjs().format('MM')
 
       },
 
       contractList: [],
 
+      Pricetype:true,
 
       inOutTaskNo: '',
 
       inOutTaskNo1: '',
 
       dataList: { taskTypeKey: '1' },
 
@@ -673,11 +674,15 @@ export default {
 
 					})
 
 					.toPromise()
 
 					.then(response1 => {
 
-            for(let i = 0 ; i < response1.length ; i++){
 
-               if(response1[i].contractNo == this.dataList.contractNo){
 
-                 this.dataList.priceType = response1[i].priceType
 
-               }
 
-            }
 
+             for (let i = 0; i < response1.length; i++) {
 
+                if (response1[i].contractNo == this.dataList.contractNo) {
 
+                    if(response1[i].priceType == "随行就市"){
 
+                      this.Pricetype = false
 
+                    }else{
 
+                      this.Pricetype = true
 
+                    }
 
+                }
 
+             }
 
 					})
 
         })

+ 40 - 35
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
مشاهده فایل 

@@ -109,10 +109,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 						<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1">
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number"/>
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!--经办人-->
 
 					<el-form-item label="发货人">
 
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
 
@@ -204,7 +204,7 @@
 
 							class="huom" />
 
 					</el-form-item>
 
 					<!--单价(元/吨)-->
 
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" >
 
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 
 							class="huom" />
 
@@ -215,10 +215,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 							<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number" />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!-- 经办人-->
 
 					<el-form-item label="收货人">
 
             <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable :filter-method="dataFilter1"
 
@@ -323,10 +323,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 							<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number" />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!--发货人-->
 
 					<el-form-item label="发货人">
 
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
 
@@ -709,6 +709,11 @@
 
 				if (this.dataList1.taskTypeKey != 3) {
 
 					for (let i = 0; i < this.contractNoList.length; i++) {
 
 						if (this.contractNoList[i].contractNo == e) {
 
+							if(this.contractNoList[i].priceType == "随行就市"){
 
+								this.Pricetype = false
 
+							}else{
 
+								this.Pricetype = true
 
+							}
 
 							getGoodsName({
 
 									contractId: this.contractNoList[i].id,
 
 									contractNo: this.contractNoList[i].contractNo
 
@@ -894,13 +899,13 @@
 
 						})
 
 						return
 
 					}
 
-				    if (isNaN(this.dataList.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+				    // if (isNaN(this.dataList.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList.agent) {
 
 					//   this.$message({
 
 					//     message: '出库经办人不能为空！',
 
@@ -1044,13 +1049,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList1.agent) {
 
 					//   this.$message({
 
 					//     message: '入库经办人不能为空！',
 
@@ -1117,13 +1122,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					if (!this.dataList1.predictDate) {
 
 						this.$message({
 
 							message: '预计入库日期不能为空！',
 
@@ -1303,13 +1308,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList.agent) {
 
 					//   this.$message({
 
 					//     message: '出库经办人不能为空！',

+ 19 - 9
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
مشاهده فایل 

@@ -223,7 +223,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               v-model="dataList.unitPrice"
 
@@ -249,14 +249,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -478,7 +478,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               :disabled="dataList.taskTypeKey == 3"
 
@@ -505,14 +505,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList1.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="收货人">
 
             <el-select
 
@@ -716,7 +716,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               disabled
 
               v-model="dataList.unitPrice"
 
@@ -741,14 +741,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -907,6 +907,7 @@ export default {
 
       onChange: {},
 
       deptBudgetList1: [],
 
       gradeList: [],
 
+      Pricetype:true,
 
       rules: {
 
         netWeight: [
 
           {
 
@@ -1407,6 +1408,15 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           this.contractNoList = response
 
+          for (let i = 0; i <  this.contractNoList.length; i++) {
 
+              if ( this.contractNoList[i].contractNo == this.dataList.contractNo) {
 
+                  if( this.contractNoList[i].priceType == "随行就市"){
 
+                    this.Pricetype = false
 
+                  }else{
 
+                    this.Pricetype = true
 
+                  }
 
+              }
 
+            }
 
         })
 
       //仓库名
 
       getwarehousename({

+ 21 - 7
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
مشاهده فایل 

@@ -206,10 +206,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -386,7 +386,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               :disabled="dataList.taskTypeKey == 3"
 
@@ -407,10 +407,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!-- 经办人-->
 
           <el-form-item label="收货人">
 
             <el-select
 
@@ -605,10 +605,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="出库发货人">
 
             <el-select
 
@@ -883,6 +883,11 @@ export default {
 
       if (this.dataList1.taskTypeKey != 3) {
 
         for (let i = 0; i < this.contractNoList.length; i++) {
 
           if (this.contractNoList[i].contractNo == e) {
 
+            	if(this.contractNoList[i].priceType == "随行就市"){
 
+								this.Pricetype = false
 
+							}else{
 
+								this.Pricetype = true
 
+							}
 
             getGoodsName({
 
               contractId: this.contractNoList[i].id,
 
               contractNo: this.contractNoList[i].contractNo
 
@@ -1599,6 +1604,15 @@ export default {
 
         .toPromise()
 
         .then(response => {
 
           this.contractNoList = response
 
+          for (let i = 0; i < this.contractNoList.length; i++) {
 
+            if (this.contractNoList[i].contractNo == this.dataList.contractNo) {
 
+                if(this.contractNoList[i].priceType == "随行就市"){
 
+                  this.Pricetype = false
 
+                }else{
 
+                  this.Pricetype = true
 
+                }
 
+            }
 
+          }
 
         })
 
       // //临时仓库入库类型
 
       // pullDown({ constId: 'WARE1' })

+ 15 - 6
src/views/warehouse/warehouseManagementAdd.vue
مشاهده فایل 

@@ -98,7 +98,7 @@
 
       </div>
 
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
 
       <!-- <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag> -->
 
-      <map-drag @marker="marker" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>
 
+      <map-drag @marker="marker" ref="childMap" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>
 
     </ws-form>
 
     <!-- 提交 -->
 
     <div style="text-align: right; padding: 10px" class="center">
 
@@ -212,6 +212,10 @@
 
     },
 
     mounted() {
 
       this.getList()
 
+       // 调用子组件的方法
 
+    },
 
+    activated(){
 
+      this.$refs.childMap.clearVal()
 
     },
 
     computed: {
 
       totalStorage: function() {
 
@@ -444,8 +448,7 @@
 
             .then(() => {
 
               this.$refs.deptBudgetList.validate((valid) => {
 
                 if (valid) {
 
-                  // this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
 
-                  this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.toString()
 
+                  this.deptBudgetList.otherPersonPhone =this.deptBudgetList.otherPersonPhone?this.deptBudgetList.otherPersonPhone.toString():''
 
                   this.deptBudgetList.compId =
 
                     localStorage.getItem('ws-pf_compId')
 
                   this.deptBudgetList.warehousePositionInfoList =
 
@@ -455,7 +458,10 @@
 
                     .toPromise()
 
                     .then((response) => {
 
                       this.$message.success('添加成功')
 
-                      this.deptBudgetList = {}
 
+                      this.deptBudgetList = {
 
+                        automaticWeightAcquisition:'0',
 
+                        otherPersonPhone:[]
 
+                      }
 
                       this.freightspace = [{
 
                         binNumber: '',
 
                         maxStorage: '',
 
@@ -545,7 +551,7 @@
 
                   this.deptBudgetList.warehousePositionInfoList =
 
                     this.freightspace
 
                   this.deptBudgetList.totalStorage = this.totalStorage
 
-                  this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.toString()
 
+                  this.deptBudgetList.otherPersonPhone =this.deptBudgetList.otherPersonPhone?this.deptBudgetList.otherPersonPhone.toString():''
 
                   if (this.radio == 2) {
 
                     this.deptBudgetList.warehousetype == 2
 
                   }
 
@@ -554,7 +560,10 @@
 
                     .toPromise()
 
                     .then((response) => {
 
                       this.$message.success('添加成功')
 
-                      this.deptBudgetList = {}
 
+                      this.deptBudgetList = {
 
+                        automaticWeightAcquisition:'0',
 
+                        otherPersonPhone:[]
 
+                      }
 
                       this.freightspace = [{
 
                         binNumber: '',
 
                         maxStorage: '',

+ 16 - 15
src/views/warehouse/warehouseManagementEdit.vue
مشاهده فایل 

@@ -468,22 +468,23 @@
 
           .toPromise()
 
           .then((response) => {
 
             var tmp = []
 
-            tmp[0] = TextToCode[response.warehousePrivate].code
 
-            if(response.warehouseCity!=''){
 
-              tmp[1] =
 
-              TextToCode[response.warehousePrivate][response.warehouseCity].code
 
-              tmp[2] =
 
-              TextToCode[response.warehousePrivate][response.warehouseCity][
 
-                response.warehouseArea
 
-              ].code
 
-            }else{
 
-              tmp[1]=TextToCode[response.warehousePrivate]['市辖区'].code
 
-              tmp[2] =
 
-              TextToCode[response.warehousePrivate]['市辖区'][
 
-                response.warehouseArea
 
-              ].code
 
+            if(response.warehousePrivate&&response.warehousePrivate&&response.warehouseCity){
 
+              tmp[0] = TextToCode[response.warehousePrivate].code
 
+              if(response.warehouseCity!=''){
 
+                tmp[1] =
 
+                TextToCode[response.warehousePrivate][response.warehouseCity].code
 
+                tmp[2] =
 
+                TextToCode[response.warehousePrivate][response.warehouseCity][
 
+                  response.warehouseArea
 
+                ].code
 
+              }else{
 
+                tmp[1]=TextToCode[response.warehousePrivate]['市辖区'].code
 
+                tmp[2] =
 
+                TextToCode[response.warehousePrivate]['市辖区'][
 
+                  response.warehouseArea
 
+                ].code
 
+              }
 
             }
 
-           
             this.selectedOptions = tmp
 
             this.deptBudgetList = response
 
             // if(this.deptBudgetList.addressUrl){

+ 4 - 2
src/views/warehouse/warehouseManagementGross.vue
مشاهده فایل 

@@ -2351,6 +2351,7 @@ export default {
 
       }
 
     },
 
     contractNoChange(e) {
 
+      this.disabled1=true
 
       for (let i = 0; i < this.deptBudgetList1.length; i++) {
 
         console.log(this.deptBudgetList1[i])
 
         if (this.deptBudgetList1[i].inOutTaskNo == e) {
 
@@ -2407,7 +2408,6 @@ export default {
 
             }
 
             this.deptBudgetList.inOutTypeKey = 6
 
           }
 
-          console.log(this.outContractNo[i])
 
           // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
 
           this.cost = this.outContractNo[i].contractPrice
 
           if (this.cost) {
 
@@ -2424,6 +2424,9 @@ export default {
 
           } else {
 
             this.isSelectType = true
 
           }
 
+          if(this.outContractNo[i].priceType=='随行就市'){
 
+             this.disabled1 = !this.disabled1
 
+          }
 
           if (this.outContractNo[i].deliverType == '1') {
 
             this.carstatus = true
 
           } else {
 
@@ -2440,7 +2443,6 @@ export default {
 
     contractNoChange1(e) {
 
       for (var i = 0; i < this.outContractNo.length; i++) {
 
         if (this.outContractNo[i].contractNo == e) {
 
-          console.log(this.outContractNo[i])
 
           if (this.outContractNo[i].inOutType == '采购入库') {
 
             this.deptBudgetList.inOutTypeKey = 1
 
           } else if (this.outContractNo[i].inOutType == '移库入库') {

+ 3 - 0
src/views/warehouse/warehouseManagementPerfectput.vue
مشاهده فایل 

@@ -710,6 +710,9 @@ export default {
 
           }else{
 
             this.isSelectType = true
 
           }
 
+          if(this.outContractNo[i].priceType=='随行就市'){
 
+             this.disabled1 = !this.disabled1
 
+          }
 
           if(this.outContractNo[i].tranCarInfoList){
 
             this.options2=this.outContractNo[i].tranCarInfoList
 
             this.tranCarInfoList=this.outContractNo[i].tranCarInfoList

+ 27 - 1
src/views/warehouse/warehouseManagementTare.vue
مشاهده فایل 

@@ -616,6 +616,14 @@
 
           @click="submit()"
 
           >提交</el-button
 
         >
 
+        <el-button
 
+          v-if="!allowEdit"
 
+          class="bg-bottom-up"
 
+          type="primary"
 
+          size="small"
 
+          @click="print()"
 
+          >提交并打印</el-button
 
+        >
 
       </div>
 
     </ws-form>
 
   </div>
 
@@ -712,6 +720,7 @@ export default {
 
         tare: '',
 
         inOutDate: '',
 
       },
 
+      weightbills:{},
 
       historyList: [],
 
 
       pickerBeginDateBefore: {
 
@@ -962,6 +971,9 @@ export default {
 
         }
 
       }
 
     },
 
+    print(){
 
+			this.submit(1)
 
+			},
 
     typeChange(e) {},
 
     contractNoChange(e) {
 
       for (let i = 0; i < this.deptBudgetList1.length; i++) {
 
@@ -978,6 +990,9 @@ export default {
 
         if (
 
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
 
         ) {
 
+          this.weightbills.buyer=this.outContractNo[i].buyer
 
+          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
 
+          this.weightbills.goodsName=this.outContractNo[i].goodsName
 
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
 
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
 
           this.deptBudgetList.grade = this.outContractNo[i].grade
 
@@ -1426,7 +1441,7 @@ export default {
 
         })
 
     },
 
     //提交按钮
 
-    submit() {
 
+    submit(status) {
 
       if (!this.deptBudgetList.goodsName) {
 
         this.$message({
 
           message: '货名不能为空！',
 
@@ -1880,6 +1895,7 @@ export default {
 
               localStorage.getItem('ws-pf_staffName')
 
             this.deptBudgetList.inOutFlag = 1
 
             this.deptBudgetList.statusFlag = 3
 
+            
             addstorageputList(this.deptBudgetList)
 
               .toPromise()
 
               .then((response) => {
 
@@ -1887,6 +1903,16 @@ export default {
 
                   this.reader.cancel()
 
                 }
 
                 this.$message.success('添加成功')
 
+                if(status){
 
+                    this.weightbills.carNo=this.deptBudgetList.carNo
 
+                    this.weightbills.type=this.deptBudgetList.type
 
+                    this.weightbills.grossWeight=this.deptBudgetList.grossWeight
 
+                    this.weightbills.tare=this.deptBudgetList.tare
 
+                    this.weightbills.netWeight=this.deptBudgetList.netWeight
 
+                    var date=new Date()
 
+                    this.weightbills.updateDate=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()+' '+date.getHours()+date.getMinutes()+date.getSeconds()
 
+                    window.open( '../../../../static/weightCheckOut.html?type=2&tableData=' +encodeURIComponent(JSON.stringify(this.weightbills)))
 
+                }
 
                 this.$router.push({
 
                   path: 'warehouseManagementList',
 
                 })

+ 12 - 2
src/views/workNotification/utils/index.js
مشاهده فایل 

@@ -23,6 +23,8 @@ export function code2Url (type, code, state) {
 
       return payment(code, state)
 
     case 'TRADE':
 
       return warehouseReceiptRegulation(code, state)
 
+      case 'ROLE':
 
+      return stock(code, state)
 
     default:
 
       return ''
 
   }
 
@@ -150,7 +152,13 @@ export function checkMateriel (code, state) {
 
   }
 
   return url
 
 }
 
-
 
+export function stock (code, state) {
 
+  if (code === 'TRADE-WAREHOUSE-REPORT') {
 
+    // 现货入库统计
 
+    return 'stockPurchaseReceiptReportList'
 
+  }
 
+  return undefined
 
+}
 
 export function checkSparepart (code, state) {
 
   // 备件
 
   let url = ''
 
@@ -818,12 +826,14 @@ export function payment (code, state) {
 
   return undefined
 
 }
 
 export function warehouseReceiptRegulation (code, state) {
 
-  if (code === 'TRADE-WAREHOUSE-REPORT') {
 
+  if (code === 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
 
     // 付款管理
 
     return 'stockWarehouseReceiptRegulation'
 
   }
 
   return undefined
 
 }
 
+
 
+
 
 // 调度
 
 export function checkDispatch (code, state) {
 
   let url = ''