提交木材陆运

src/api/purchasingManagement/inStock.js

@@ -56,8 +56,8 @@ export function checkWarehousing(data) {
 
 export function getStoragetree() {
     return request({
-        url: '/api/blade-client/storagetype/tree',
-        method: 'get',
+        url: '/api/blade-client/storagetype/customTree',
+        method: 'get'
     })
 }
 export function getStorage(data) {

src/views/basicData/basicStorageType/configuration/mainList.json

@@ -131,6 +131,22 @@
         "message": "请输入排序",
         "trigger": "blur"
       }]
+    }, {
+      "label": "是否扫描",
+      "prop": "isScanningCode",
+      "minRows": 1,
+      "type": "select",
+      "value": "0",
+      "width": 100,
+      "dicData": [
+        {
+          "label": "是",
+          "value": "0"
+        }, {
+          "label": "否",
+          "value": "1"
+        }
+      ]
     },
     {
       "label": "备注",

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3132,17 +3132,11 @@ export default {
         //费用判断是否需要调用删除接口
         if (row.id) {
           corpsitem(row.id).then(res => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
+            this.$message.success("操作成功!");
             this.advantageProjectData.splice(row.$index, 1);
           })
         } else {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
+          this.$message.success("操作成功!");
           this.advantageProjectData.splice(row.$index, 1);
         }
       })
@@ -3158,6 +3152,12 @@ export default {
             if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
               return this.$message.error('商品信息第' + (Number(i) + 1) + '行订货数量大于库存数量')
             }
+            if (!Number(data[i].purchaseAmount)) {
+              return this.$message.error('商品信息第' + (parseInt(i) + 1) + '行采购价格不能为空')
+            }
+            if (Number(data[i].purchaseAmount) === 0) {
+              return this.$message.error('商品信息第' + (parseInt(i) + 1) + '行采购价格不能为0')
+            }
           }
           let integral = 0;//积分
           if (length1) {
@@ -3184,7 +3184,7 @@ export default {
           goodsData.filter(item => Number(item.size) >= 17).forEach(item => sizeNum += Number(item.orderQuantity));
           this.$set(this.form, 'specialOfferOf', allNum == 0 ? '0.00' : (specialNum / allNum * 100).toFixed(2));
           this.$set(this.form, 'largeScale', allNum == 0 ? '0.00' : (sizeNum / allNum * 100).toFixed(2));
-          for (let item in this.goodsData) {
+          for (let item in goodsData) {
             if (Number(goodsData[item].orderQuantity) > Number(goodsData[item].storageQuantity)) {
               return this.$message.error('商品信息第' + (parseInt(item) + 1) + '行订货数量不能超过库存')
             }

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -36,7 +36,7 @@
         </el-button>
       </div>
       <div>
-        <div class="el-button&#45;&#45;small-yh add-customer-btn">
+        <div class="el-button&#45;&#45;small-yh add-customer-btn" v-if="!(roleName.indexOf('总经理') !== -1)">
           <el-button
               type="warning"
               size="small"
@@ -631,6 +631,14 @@ export default {
       type: Boolean
     }
   },
+  watch:{
+    goodsForm(){
+      if (this.roleName.indexOf('总经理') !== -1) {
+        this.goodsForm.status = 2
+        this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status !== 0
+      }
+    },
+  },
   data() {
     return {
       returnButton: Boolean,

src/views/landTransportation/reportAnalysis/index.vue

@@ -24,13 +24,11 @@
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
         <template slot-scope="{row}" slot="fleetId">
-          <span>{{ row.fleetName }}</span>
+          <span>{{ row.fleetShortName }}</span>
         </template>
         <template slot="billNo" slot-scope="{row,index}">
           <span v-if="roleName.indexOf('车队') !== -1" style="cursor: pointer">{{ row.billNo }}</span>
-          <span class="el-button--text" v-else style="cursor: pointer" @click.stop="celJump(row,index)">{{
-              row.billNo
-            }}</span>
+          <span class="el-button--text" v-else style="cursor: pointer" @click.stop="celJump(row,index)">{{row.billNo}}</span>
         </template>
         <template slot="fleetShortName" slot-scope="{row,index}">
           <span>{{row.fleetShortName}}</span>

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -84,15 +84,22 @@
                 icon="el-icon-printer"
                 size="small"
                 :disabled="batchPrinting"
-                @click.stop="printStackCard()">批量打印{{batchPrinting}}
+                @click.stop="printStackCard()">批量打印
             </el-button>
             <el-button
                 type="danger"
-                icon="el-icon-printer"
+                icon="el-icon-delete"
                 size="small"
                 :disabled="batchDeletion"
                 @click.stop="batchDeleteDetails()">批量删除
             </el-button>
+            <el-button
+                type="warning"
+                icon="el-icon-printer"
+                size="small"
+                :disabled="!form.id"
+                @click.stop="receiptDoc()">入库单
+            </el-button>
           </template>
           <template slot="headerSerial">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
@@ -189,7 +196,7 @@
         width="70%">
       <div id="printAll">
         <div v-for="(item,index) in printList" :key="index" style="page-break-after:always">
-          <table align="center">
+          <table align="center" style="color: #000000;text-align: center">
             <tr>
               <th colspan="5">垛卡</th>
             </tr>
@@ -199,7 +206,7 @@
               <td>等级:</td>
               <td>{{ item.grade }}</td>
               <td rowspan="3">
-                <img style="width: 100px;height: 100px;" :src="item.qrCode" alt="">
+                <img style="width: 120px;height: 120px;" :src="item.qrCode" alt="">
               </td>
             </tr>
             <tr>
@@ -213,8 +220,8 @@
               <td colspan="3">{{ item.remarks }}</td>
             </tr>
             <tr>
-              <th>包号：</th>
-              <th colspan="5">{{item.billNo}}</th>
+              <th style="font-size: 28px;">包号：</th>
+              <th colspan="5" style="font-size: 28px;">{{item.billNo}}</th>
             </tr>
             <tr>
               <td colspan="5">
@@ -442,27 +449,11 @@ export default {
             },
             span: 6
           }, {
-            label: "是否扫描",
-            prop: "isScanning",
-            minRows: 1,
-            span: 6,
-            type: "select",
-            value: "0",
-            dicData: [
-              {
-                label: "是",
-                value: "0"
-              }, {
-                label: "否",
-                value: "1"
-              }
-            ],
-          }, {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 18
+            span: 24
           },
         ]
       },
@@ -700,6 +691,9 @@ export default {
     rowPrint(row) {
       this.$router.push(`/myiframe/urlPath?name=preview-木材管理-入库垛卡.ureport.xml&src=${this.website.reportUrl}/preview?_u=blade-木材管理-入库垛卡.ureport.xml&id=${row.id}`);
     },
+    receiptDoc(){
+      this.$router.push(`/myiframe/urlPath?name=preview-木材库-入库单.ureport.xml&src=${this.website.reportUrl}/preview%3F_u%3Dblade-木材库-入库单.ureport.xml&id=${this.form.id}`);
+    },
     //提交撤销
     withdraw(type) {
       if (type == 0) {

src/views/purchasingManagement/inStock/index.vue

@@ -11,7 +11,7 @@
                     </el-button>
                 </template>
                 <template slot-scope="{ row,index}" slot="menu">
-                    <el-button type="text" icon="el-icon-plus" size="small" :disabled="row.status!=5"
+                    <el-button type="text" icon="el-icon-plus" size="small" :disabled="row.status<2" v-if="row.specialCheckStatus !== 1"
                         @click.stop="generate(row, index)">生成出库单
                     </el-button>
                     <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0"

src/views/salesManagement/outStock/detailsPage.vue

@@ -429,13 +429,28 @@ export default {
             prop: "planGoodsName",
             minRows: 1,
             span: 6
-          },
-          {
+          }, {
+            label: "是否扫描",
+            prop: "isScanning",
+            minRows: 1,
+            span: 6,
+            type: "select",
+            value: "0",
+            dicData: [
+              {
+                label: "是",
+                value: "0"
+              }, {
+                label: "否",
+                value: "1"
+              }
+            ],
+          },{
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 24
+            span: 18
           },
         ]
       },
@@ -606,6 +621,11 @@ export default {
       })
     },
     storagetreeChange(row) {
+      for (let item of this.storagetreeList){
+        if (item.id === row){
+          this.form.isScanning = item.isScanningCode
+        }
+      }
       if (row) {
         if (this.itemsVOList.length > 0) {
           this.getStorage()