提交中电国内木材等

src/views/InventoryManagement/inventory/config/customerContact.json

@@ -80,23 +80,29 @@
       "overHidden": true,
       "cell": true,
       "width": 100
+    },{
+      "index": 13,
+      "prop": "price",
+      "label": "单价",
+      "overHidden": true,
+      "width": 100
     },
     {
-      "index": 13,
+      "index": 14,
       "prop": "storageInQuantity",
       "label": "入库量",
       "overHidden": true,
       "width": 100
     },
     {
-      "index": 14,
+      "index": 15,
       "prop": "balanceMoney",
       "label": "结余金额",
       "overHidden": true,
       "width": 100
     },
     {
-      "index": 15,
+      "index": 16,
       "prop": "surplusLoss",
       "label": "盈亏量",
       "overHidden": true,

src/views/InventoryManagement/inventory/detailsPage.vue

@@ -20,7 +20,7 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审核数据</el-dropdown-item>
+            <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">提交审核</el-dropdown-item>
             <el-dropdown-item v-if="roleName=='admin'" :disabled="form.status!=5" @click.native="revokeCheck">撤销审核
             </el-dropdown-item>
             <el-dropdown-item :disabled="form.status<3" @click.native="checkScheduleDialog = true">审核进度
@@ -248,6 +248,7 @@ export default {
       return "padding:0;height:40px;";
     },
     calculateChange(row) {
+      row.balanceMoney = (Number(row.price?row.price:0) * Number(row.inventory?row.inventory:0)).toFixed(2)
       row.surplusLoss = (Number(row.inventory ? row.inventory : 0) - Number(row.storageInQuantity ? row.storageInQuantity : 0)).toFixed(2)
     },
     getStorage() {

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -121,6 +121,26 @@ export default {
           index: 2,
           search: true
         }, {
+          label: '状态',
+          prop: 'isIssue',
+          type: 'select',
+          index: 19,
+          searchValue: 3,
+          dicData: [{
+            label: "在库",
+            value: 3
+          }, {
+            label: "计划",
+            value: 4
+          }, {
+            label: "待出库",
+            value: 5
+          }, {
+            label: "出库中",
+            value: 6
+          }],
+          search: true
+        }, {
           label: '厚',
           prop: 'thickness',
           index: 5,

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -399,6 +399,23 @@ export default {
           searchDefaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '位置获取来源',
+          prop: 'locationSource',
+          span: 8,
+          searchSpan: 8,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=location_source",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
+        }, {
+          label: 'gpsid',
+          index: 19,
+          prop: 'gpsid',
+          span: 8,
+          searchSpan: 8,
         },
 
           //   {

src/views/businessManagement/inventoryAccount/configuration/mainList.json

@@ -116,7 +116,7 @@
       "search": false,
       "index": 12,
       "width": 100,
-      "cell": true,
+      "cell": false,
       "overHidden": true
     },
     {

src/views/businessManagement/inventoryAccount/index.vue

@@ -27,6 +27,8 @@
           <el-button
             type="text"
             size="small"
+            v-if="!row.$cellEdit"
+            v-show="Number(row.lockingQuantity) <= 0"
             @click="deletePrice(row,index)"
           >删除
           </el-button>

src/views/businessManagement/purchaseOrder/index.vue

@@ -586,6 +586,7 @@ export default {
     createPlant(row, index) {
       console.log(111)
       let ids = [];
+      console.log(row)
       row.itemsList.forEach(item => {
         ids.push(item.id)
       })

src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -214,6 +214,21 @@
           "trigger": "blur"
         }
       ]
+    },{
+      "label": "采购价格",
+      "prop": "purchaseAmount",
+      "index": 11,
+      "width":100,
+      "cell": false,
+      "slot": true,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入采购价格",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "最新单价",

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1797,59 +1797,44 @@ export default {
   methods: {
     judgeNew(){
       if (!this.roleName.includes('salesman')){
-        for (let item of this.customerContact.column) {
-          if (item.prop === 'purchaseAmount') return false
-        }
-        this.customerContact.column.push({
-          "label": "采购价格",
-          "prop": "purchaseAmount",
-          "index": 11,
-          "width":100,
-          "cell": false,
-          "slot": true,
-          "overHidden": true,
-          "rules": [
-            {
-              "required": false,
-              "message": "请输入采购价格",
-              "trigger": "blur"
-            }
-          ]
-        })
+        // for (let item of this.customerContact.column) {
+        //   if (item.prop === 'purchaseAmount') return false
+        // }
+        // this.customerContact.column.push()
         for (let item of this.optionPolicy.column) {
           if (item.prop === 'purchasePrice') return false
         }
-        this.optionPolicy.column.push({
-          "label": "采购价（元）",
-          "prop": "purchasePrice",
-          "index": 5,
-          "width":100,
-          "cell": true,
-          "rules": [
-            {
-              "required": false,
-              "message": " ",
-              "trigger": "blur"
-            }
-          ]
-        })
+        // this.optionPolicy.column.push({
+        //   "label": "采购价（元）",
+        //   "prop": "purchasePrice",
+        //   "index": 5,
+        //   "width":100,
+        //   "cell": true,
+        //   "rules": [
+        //     {
+        //       "required": false,
+        //       "message": " ",
+        //       "trigger": "blur"
+        //     }
+        //   ]
+        // })
         for (let item of this.customerBuyFree.column) {
           if (item.prop === 'purchasePrice') return false
         }
-        this.customerBuyFree.column.push({
-              "label": "采购价（元）",
-              "prop": "purchasePrice",
-              "index": 4,
-              "width":100,
-              "cell": true,
-              "rules": [
-                {
-                  "required": false,
-                  "message": " ",
-                  "trigger": "blur"
-                }
-              ]
-            })
+        // this.customerBuyFree.column.push({
+        //       "label": "采购价（元）",
+        //       "prop": "purchasePrice",
+        //       "index": 4,
+        //       "width":100,
+        //       "cell": true,
+        //       "rules": [
+        //         {
+        //           "required": false,
+        //           "message": " ",
+        //           "trigger": "blur"
+        //         }
+        //       ]
+        //     })
       }
     },
     getGoodsRow(event,row) {
@@ -3953,6 +3938,21 @@ export default {
           }
         })
       }
+      if (this.roleName.includes('业务员')) {
+        oldVal.column.forEach(item => {
+          if (item.prop == 'purchaseAmount') {
+            item.hide = true;
+            item.showColumn = false;
+          }
+        })
+      }else {
+        oldVal.column.forEach(item => {
+          if (item.prop == 'purchaseAmount') {
+            item.hide = false;
+            item.showColumn = true;
+          }
+        })
+      }
     }
   }
 }

src/views/dealer/stock/config/mainList.json

@@ -25,12 +25,17 @@
   "sumColumnList": [{
       "name": "balanceQuantity",
       "type": "sum",
-      "decimals": 0
+      "decimals": 2
     },
     {
       "name": "surplusRouteQuantity",
       "type": "sum",
-      "decimals": 0
+      "decimals": 2
+    },
+    {
+      "name": "stockPrice",
+      "type": "sum",
+      "decimals": 2
     }
   ],
   "column": [{
@@ -147,6 +152,14 @@
       "width": 100,
       "cell": true,
       "overHidden": true
+    },{
+      "label": "库存价",
+      "prop": "stockPrice",
+      "search": false,
+      "index": 15,
+      "width": 100,
+      "cell": true,
+      "overHidden": true
     },
     {
       "label": "创建日期",
@@ -155,7 +168,7 @@
       "searchRange": true,
       "prop": "createTime",
       "search": false,
-      "index": 15,
+      "index": 16,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -166,7 +179,7 @@
       "label": "创建人",
       "prop": "createUserName",
       "search": false,
-      "index": 16,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
@@ -174,7 +187,7 @@
       "label": "更新日期",
       "prop": "updateTime",
       "search": false,
-      "index": 17,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
@@ -182,7 +195,7 @@
       "label": "更新人",
       "prop": "updateUserName",
       "search": false,
-      "index": 18,
+      "index": 19,
       "width": 100,
       "overHidden": true
     }

src/views/financing/financingManagement/detailsPage.vue

@@ -18,7 +18,7 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审核数据</el-dropdown-item>
+            <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">提交审核</el-dropdown-item>
             <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
             </el-dropdown-item>
             <el-dropdown-item v-if="$route.query.check" :disabled="form.status==3" @click.native="check">审批数据
@@ -32,7 +32,7 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="corpId">
             <crop-select v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getKHData"
-              :disabled="detailData.status == 1"></crop-select>
+              :disabled="form.status > 0"></crop-select>
           </template>
         </avue-form>
       </trade-card>
@@ -261,6 +261,7 @@ export default {
         checkFinancing(data).then(res => {
           if (res.data.success) {
             this.$message.success("操作成功!")
+            this.form.status = 3
             this.option.disabled = true;
           }
         }).finally(() => {

src/views/landTransportation/bulkCargo/index.vue

@@ -392,7 +392,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       key: 0,
       totalData: {},

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -256,7 +256,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       roleName: localStorage.getItem("roleName").split(','),
       goodsList: [],

src/views/landTransportation/dispatchingCars/index.vue

@@ -141,7 +141,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       option: {},
       activeName: '0',

src/views/landTransportation/driver/index.vue

@@ -199,7 +199,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       roleName: localStorage.getItem("roleName").split(',')[0],
       goodsList: [],

src/views/landTransportation/motorcadeDriver/index.vue

@@ -340,7 +340,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       roleName: localStorage.getItem("roleName").split(',')[0],
       goodsList: [],

src/views/landTransportation/placeAnOrder/index.vue

@@ -214,7 +214,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       key: 0,
       screen:{},

src/views/landTransportation/reportAnalysis/index.vue

@@ -283,7 +283,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10, 50, 100, 200, 300, 500, 1000]
       },
       roleName: localStorage.getItem("roleName").split(','),
       goodsList: [],