Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/api/maintenance/salesPolicy.js

@@ -59,3 +59,11 @@ export function itemSubmit(data) {
         data: data
     })
 }
+//请核
+export function pleaseCheck(data) {
+    return request({
+        url: '/api/blade-mocha-item/salespolicy/checkSalesPolicy',
+        method: 'post',
+        data: data
+    })
+}

src/components/bill/billDetailList.vue

@@ -89,6 +89,10 @@
         this.onLoad(this.page);
       },
       searchChange(params,done){
+        if (params.createStart){
+          params.createStartDate = params.createStart[0]
+          params.createEndDate = params.createStart[1]
+        }
         this.onLoad(this.page, params);
         done()
       },

src/components/bill/config/mainList.json

@@ -107,6 +107,21 @@
       "overHidden": true,
       "index": 13,
       "width": 250
+    },
+    {
+      "prop": "createStart",
+      "label": "日期",
+      "type": "date",
+      "searchRange": true,
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "index": 14,
+      "width": 250
     }
   ]
 }

src/components/fee-info/config/wood.json

@@ -0,0 +1,85 @@
+{
+  "tip": false,
+  "addBtn": false,
+  "editBtn": false,
+  "addRowBtn": false,
+  "cellBtn": false,
+  "cancelBtn": false,
+  "delBtn":false,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "refreshBtn": false,
+  "menuWidth": 130,
+  "align":"center",
+  "showSummary": true,
+  "lazy": true,
+  "simplePage": true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "dialogClickModal": false,
+  "indexSlot":true,
+  "column": [
+    {
+      "label": "结算单位",
+      "prop": "corpId",
+      "index": 1,
+      "overHidden": true,
+      "width": 220
+    },
+    {
+      "label": "费用名称",
+      "prop": "feeName",
+      "index": 2,
+      "width": 180,
+      "overHidden": true
+    },
+    {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 3,
+      "slot": true,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "单价",
+      "prop": "price",
+      "index": 4,
+      "slot": true,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "数量",
+      "prop": "quantity",
+      "index": 5,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "金额",
+      "prop": "amount",
+      "index": 6,
+      "cell": true,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "label": "币别",
+      "prop": "currency",
+      "value": "CNY",
+      "index": 7,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "index": 8,
+      "cell": true,
+      "overHidden": true,
+      "width": 150
+    }
+  ]
+}

src/components/fee-info/main.vue

@@ -127,6 +127,7 @@
 
 <script>
 import feeOption from "./config/feeInfo.json";
+import woodOption from "./config/wood.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
 import { delItem, delItem2, getfeesDetails } from "@/api/feeInfo/fee-info";
@@ -239,6 +240,9 @@ export default {
     feeUrl: {
       type: String
     },
+    typeName: {
+      type: String
+    },
     billUrl: {
       type: String
     },
@@ -306,10 +310,7 @@ export default {
   async created() {
     // 判断tabShow的activeName默认的显示
     this.activeName = this.tabShow == 1 ? "first" : this.tabShow == 2 ? "first" : "second";
-    this.feeOption = await this.getColumnData(
-      this.getColumnName(33),
-      feeOption
-    );
+    this.feeOption = await this.getColumnData( this.getColumnName(33),this.typeName === "wood" ? woodOption : feeOption);
     if (this.$store.getters.userInfo.tenant_id === "888390") {
       this.feeOption.column.forEach(item => {
         if (item.prop === "billNo") {
@@ -544,8 +545,10 @@ export default {
     rowAdd() {
       if (this.inCropId) {
         const params = {
-          feesType: this.selectTab
+          feesType: this.selectTab,
+          corpId:this.corpId
         };
+        if (this.typeName === "wood") params.corpId = this.corpId
         this.$refs.feeCrud.rowCellAdd(params);
       } else {
         if (!this.corpId) return this.$message.error("请选择往来单位");
@@ -788,10 +791,7 @@ export default {
       return sums;
     },
     async saveColumn() {
-      const inSave = await this.saveColumnData(
-        this.getColumnName(33),
-        this.feeOption
-      );
+      const inSave = await this.saveColumnData(this.getColumnName(33),this.feeOption);
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -799,13 +799,10 @@ export default {
       }
     },
     async resetColumn() {
-      const inSave = await this.delColumnData(
-        this.getColumnName(33),
-        feeOption
-      );
+      const inSave = await this.delColumnData(this.getColumnName(33),this.typeName === "wood" ? woodOption : feeOption);
       if (inSave) {
         this.$message.success("重置成功");
-        this.feeOption = feeOption;
+        this.feeOption = this.typeName === "wood" ? woodOption : feeOption;
         //关闭窗口
         this.$refs.feeCrud.$refs.dialogColumn.columnBox = false;
       }

src/router/views/index.js

@@ -1805,19 +1805,6 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/purchasingManagement/inStock/index')
   }]
 }, {
-  path: '/salesManagement/outStock/index',
-  component: Layout,
-  hidden: true,
-  children: [{
-    path: '/salesManagement/outStock/index',
-    name: '出库管理',
-    meta: {
-      i18n: '/salesManagement/outStock/index',
-      keepAlive: true,
-    },
-    component: () => import( /* webpackChunkName: "views" */ '@/views/salesManagement/outStock/index')
-  }]
-}, {
   path: '/basicData/agreement/index',
   component: Layout,
   hidden: true,
@@ -1869,5 +1856,31 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/financing/financingLedger/detail')
   }]
-}
+}, {
+  path: '/InventoryManagement/inventoryAccount/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/InventoryManagement/inventoryAccount/index',
+    name: '库存帐',
+    meta: {
+      i18n: '/InventoryManagement/inventoryAccount/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/InventoryManagement/inventoryAccount/index')
+  }]
+}, {
+    path: '/salesManagement/outStock/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/salesManagement/outStock/index',
+      name: '出库管理',
+      meta: {
+        i18n: '/salesManagement/outStock/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/salesManagement/outStock/index')
+    }]
+  }
 ]

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">审核进度
@@ -209,7 +209,7 @@ export default {
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
         res.data.data;
     });
@@ -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() {
@@ -355,7 +356,7 @@ export default {
           delete res.data.data.status
           res.data.data.stockTime = getCurrentDate()
           res.data.data.itemsVOList.forEach(e => {
-            e.surplusLoss = Number(e.inventory ? e.inventory : 0) - Number(e.storageInQuantity ? e.storageInQuantity : 0)
+            e.surplusLoss = (Number(e.inventory ? e.inventory : 0) - Number(e.storageInQuantity ? e.storageInQuantity : 0)).toFixed(2)
             e.srcItemId = e.id
             delete e.id
           })

src/views/InventoryManagement/inventory/index.vue

@@ -1,48 +1,49 @@
 <template>
-    <div>
-        <basic-container v-show="show" class="page-crad">
-            <avue-crud ref="crud" :option="option" :data="dataList" v-model="form" :page.sync="page"
-                :search.sync="search" @search-change="searchChange" @current-change="currentChange"
-                @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading"
-                @saveColumn="saveColumn" @resetColumn="resetColumn" :cell-style="cellStyle"
-                @search-criteria-switch="searchCriteriaSwitch">
-                <template slot="menuLeft">
-                    <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">创建单据
-                    </el-button>
-                </template>
-                <template slot-scope="{ row,index}" slot="menu">
-                    <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0" @click.stop="rowDel(row, index)">删除
-                    </el-button>
-                </template>
-                <template slot-scope="{ row,index}" slot="purchaserId">
+  <div>
+    <basic-container v-show="show" class="page-crad">
+      <avue-crud ref="crud" :option="option" :data="dataList" v-model="form" :page.sync="page"
+                 :search.sync="search" @search-change="searchChange" @current-change="currentChange"
+                 @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading"
+                 @saveColumn="saveColumn" @resetColumn="resetColumn" :cell-style="cellStyle"
+                 @search-criteria-switch="searchCriteriaSwitch">
+        <template slot="menuLeft">
+          <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">创建单据
+          </el-button>
+        </template>
+        <template slot-scope="{ row,index}" slot="menu">
+          <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0"
+                     @click.stop="rowDel(row, index)">删除
+          </el-button>
+        </template>
+        <template slot-scope="{ row,index}" slot="purchaserId">
                     <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.purchaser }}
                     </span>
-                </template>
-                <template slot="purchaserIdSearch">
-                    <crop-select v-model="search.purchaserId" corpType="KH" :refresh="false"></crop-select>
-                </template>
-                <template slot="stockTimeSearch">
-                    <el-date-picker v-model="search.stockTime" type="daterange" start-placeholder="开始日期"
-                        end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-                    </el-date-picker>
-                </template>
-                <template slot-scope="{ row,index}" slot="sysNo">
+        </template>
+        <template slot="purchaserIdSearch">
+          <crop-select v-model="search.purchaserId" corpType="KH" :refresh="false"></crop-select>
+        </template>
+        <template slot="stockTimeSearch">
+          <el-date-picker v-model="search.stockTime" type="daterange" start-placeholder="开始日期"
+                          end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </template>
+        <template slot-scope="{ row,index}" slot="sysNo">
                     <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.sysNo }}
                     </span>
-                </template>
-                <template slot-scope="{ row,index}" slot="corpId">
+        </template>
+        <template slot-scope="{ row,index}" slot="corpId">
                     <span>{{ row.corpName }}
                     </span>
-                </template>
-            </avue-crud>
-        </basic-container>
-        <el-dialog title="入库列表页" :visible.sync="inStockVisible" width="70%" @close="close" append-to-body>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <el-dialog title="盘点" :visible.sync="inStockVisible" width="70%" @close="close" append-to-body>
             <span>
                 <avue-crud ref="crud2" v-model="form2" :data="itemData" :option="itemOption" :page.sync="page2"
-                    :search.sync="search2" @search-change="searchChange2" @current-change="currentChange2"
-                    @size-change="sizeChange2" @refresh-change="refreshChange2" @on-load="onLoad2"
-                    :table-loading="loading2" :cell-style="cellStyle" @selection-change="selectionChange"
-                    @search-criteria-switch="searchCriteriaSwitch2">
+                           :search.sync="search2" @search-change="searchChange2" @current-change="currentChange2"
+                           @size-change="sizeChange2" @refresh-change="refreshChange2" @on-load="onLoad2"
+                           :table-loading="loading2" :cell-style="cellStyle" @selection-change="selectionChange"
+                           @search-criteria-switch="searchCriteriaSwitch2">
                     <template slot="purchaserIdSearch">
                         <crop-select v-model="search2.purchaserId" corpType="KH" :refresh="false"></crop-select>
                     </template>
@@ -59,295 +60,297 @@
                     </template>
                     <template slot="stockTimeSearch">
                         <el-date-picker v-model="search2.stockTime" type="daterange" start-placeholder="开始日期"
-                            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                                        end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </template>
                 </avue-crud>
             </span>
-            <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
                 <el-button @click="inStockVisible= false">取 消</el-button>
                 <el-button type="primary" @click="generate">生 成</el-button>
             </span>
-        </el-dialog>
-        <detail-page @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
-    </div>
+    </el-dialog>
+    <detail-page @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
+  </div>
 </template>
 
 <script>
-import { getList, remove, getStoragetree } from "@/api/purchasingManagement/inStock";
+import {getList, remove, getStoragetree} from "@/api/purchasingManagement/inStock";
 import option from "./config/mainList.json";
 import itemOption from "./config/mainList2.json";
 import detailPage from "./detailsPage";
 import _ from "lodash";
+
 export default {
-    name: "instock",
-    data() {
-        return {
-            itemOption: itemOption,
-            search: {},
-            search2: {},
-            form: {},
-            form2: {},
-            option: {},
-            dataList: [],
-            itemData: [],
-            page: {
-                pageSize: 20,
-                currentPage: 1,
-                total: 0,
-                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
-            },
-            page2: {
-                pageSize: 20,
-                currentPage: 1,
-                total: 0,
-                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
-            },
-            show: true,
-            detailData: {},
-            loading: false,
-            loading2: false,
-            searchShow: true,
-            inStockVisible: false,
-            selectionList: [],
-        };
-    },
-    components: { detailPage },
-    async created() {
-        this.option = await this.getColumnData(this.getColumnName(196), option);
-        this.option.height = window.innerHeight - 210;
-        this.itemOption.height = window.innerHeight - 410;
+  name: "instock",
+  data() {
+    return {
+      itemOption: itemOption,
+      search: {},
+      search2: {},
+      form: {},
+      form2: {},
+      option: {},
+      dataList: [],
+      itemData: [],
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      page2: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      show: true,
+      detailData: {},
+      loading: false,
+      loading2: false,
+      searchShow: true,
+      inStockVisible: false,
+      selectionList: [],
+    };
+  },
+  components: {detailPage},
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(196), option);
+    this.option.height = window.innerHeight - 210;
+    this.itemOption.height = window.innerHeight - 410;
 
-        this.getWorkDicts("approval_status").then(res => {
-            this.findObject(this.itemOption.column, "status").dicData =
-                res.data.data;
-        });
-        this.getWorkDicts("CMY_business_type").then(res => {
-            this.findObject(this.itemOption.column, "businessType").dicData =
-                res.data.data;
-        });
-        getStoragetree().then(res => {
-            this.findObject(this.itemOption.column, "storageId").dicData =
-                res.data.data;
-        })
-        this.getAllWorkDicts()
-        if (this.$route.query.check && this.show){
-          this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-          this.show = false;
-        }
+    this.getWorkDicts("financing_status").then(res => {
+      this.findObject(this.itemOption.column, "status").dicData =
+          res.data.data;
+    });
+    this.getWorkDicts("CMY_business_type").then(res => {
+      this.findObject(this.itemOption.column, "businessType").dicData =
+          res.data.data;
+    });
+    getStoragetree().then(res => {
+      this.findObject(this.itemOption.column, "storageId").dicData =
+          res.data.data;
+    })
+    this.getAllWorkDicts()
+    if (this.$route.query.check && this.show) {
+      this.editOpen({id: this.$route.query.check.srcBillId}, 1)
+      this.show = false;
+    }
+  },
+  activated() {
+    setTimeout(() => {
+      if (this.$route.query.check && this.show) {
+        this.editOpen({id: this.$route.query.check.srcBillId}, 1)
+        this.show = false;
+      }
+    }, 100);
+  },
+  methods: {
+    getAllWorkDicts() {
+      this.getWorkDicts("approval_status").then(res => {
+        this.findObject(this.option.column, "status").dicData =
+            res.data.data;
+      });
+      this.getWorkDicts("CMY_business_type").then(res => {
+        this.findObject(this.option.column, "businessType").dicData =
+            res.data.data;
+      });
+      getStoragetree().then(res => {
+        this.findObject(this.option.column, "storageId").dicData =
+            res.data.data;
+      })
     },
-    activated() {
-        setTimeout(() => {
-            if (this.$route.query.check && this.show) {
-                this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-                this.show = false;
-            }
-        }, 100);
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 191;
+      } else {
+        this.option.height = this.option.height + 191;
+      }
+      this.$refs.crud.getTableHeight();
     },
-    methods: {
-        getAllWorkDicts() {
-            this.getWorkDicts("approval_status").then(res => {
-                this.findObject(this.option.column, "status").dicData =
-                    res.data.data;
-            });
-            this.getWorkDicts("CMY_business_type").then(res => {
-                this.findObject(this.option.column, "businessType").dicData =
-                    res.data.data;
+    searchCriteriaSwitch2(type) {
+      if (type) {
+        this.itemOption.height = this.itemOption.height - 191;
+      } else {
+        this.itemOption.height = this.itemOption.height + 191;
+      }
+      this.$refs.crud2.getTableHeight();
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove({id: row.id}).then(res => {
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+            .finally(() => {
+              this.onLoad(this.page, this.search);
             });
-            getStoragetree().then(res => {
-                this.findObject(this.option.column, "storageId").dicData =
-                    res.data.data;
-            })
-        },
-        searchCriteriaSwitch(type) {
-            if (type) {
-                this.option.height = this.option.height - 191;
-            } else {
-                this.option.height = this.option.height + 191;
-            }
-            this.$refs.crud.getTableHeight();
-        },
-        searchCriteriaSwitch2(type) {
-            if (type) {
-                this.itemOption.height = this.itemOption.height - 191;
-            } else {
-                this.itemOption.height = this.itemOption.height + 191;
-            }
-            this.$refs.crud2.getTableHeight();
-        },
-        cellStyle() {
-            return "padding:0;height:40px;";
-        },
-        rowDel(row, index, done) {
-            this.$confirm("确定删除数据?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                remove({ id: row.id }).then(res => {
-                    this.$message({
-                        type: "success",
-                        message: "删除成功!"
-                    });
-                })
-                    .finally(() => {
-                        this.onLoad(this.page, this.search);
-                    });
 
-            });
-        },
-        selectionChange(list) {
-            this.selectionList = list;
-        },
-        generate() {
-            if (this.selectionList.length == 1) {
-                this.detailData = {
-                    generateId: this.selectionList[0].id,
-                }
-                this.show = false
-                this.inStockVisible = false
-            } else {
-                this.$message.error('请选择一条数据')
-            }
-        },
-        editOpen(row, status) {
-            this.detailData = {
-                id: row.id,
-                status: status
-            };
-            this.show = false;
-        },
-        //点击搜索按钮触发
-        searchChange(params, done) {
-            this.page.currentPage = 1;
-            this.onLoad(this.page, params);
-            done();
-        },
-        searchChange2(params, done) {
-            this.page2.currentPage = 1;
-            this.onLoad2(this.page, params);
-            done();
-        },
-        currentChange(val) {
-            this.page.currentPage = val;
-        },
-        currentChange2(val) {
-            this.page2.currentPage = val;
-        },
-        sizeChange(val) {
-            this.page.currentPage = 1;
-            this.page.pageSize = val;
-        },
-        sizeChange2(val) {
-            this.page2.currentPage = 1;
-            this.page2.pageSize = val;
-        },
-        onLoad(page, params) {
-            if (this.search.stockTime && this.search.stockTime.length > 0) {
-                params = {
-                    ...params,
-                    createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
-                    createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
-                };
-            }
-            let data = this.deepClone(Object.assign({}, params, this.search));
-            delete data.stockTime;
-            data.billType = "PD"
-            this.loading = true;
-            getList(page.currentPage, page.pageSize, data)
-                .then(res => {
-                    this.dataList = res.data.data.records ? res.data.data.records : [];
-                    this.page.total = res.data.data.total;
-                })
-                .finally(() => {
-                    this.loading = false;
-                });
-        },
-        onLoad2(page, params) {
-            if (this.search2.stockTime && this.search2.stockTime.length > 0) {
-                params = {
-                    ...params,
-                    createStartTime: this.search2.stockTime[0] + ' ' + "00:00:00",
-                    createEndTime: this.search2.stockTime[1] + ' ' + "23:59:59"
-                };
-            }
-            let data = this.deepClone(Object.assign({}, params, this.search2));
-            delete data.stockTime;
-            data.billType = "RK"
-            data.status = 3
-            this.loading2 = true;
-            getList(page.currentPage, page.pageSize, data)
-                .then(res => {
-                    this.itemData = res.data.data.records ? res.data.data.records : [];
-                    this.page2.total = res.data.data.total;
-                })
-                .finally(() => {
-                    this.loading2 = false;
-                });
-        },
-        refreshChange() {
-            this.onLoad(this.page, this.search);
-        },
-        refreshChange2() {
-            this.onLoad2(this.page2, this.search2);
-        },
-        newAdd() {
-            this.inStockVisible = true;
-        },
-        goBack() {
-            if (this.$route.query.check) {
-                this.$router.$avueRouter.closeTag(this.$route.fullPath);
-                this.$router.push({
-                    path: "/InventoryManagement/inventory/index"
-                });
-            }
-            this.detailData = this.$options.data().detailData;
-            this.show = true;
-            this.onLoad(this.page, this.search);
-        },
-        close() {
-            this.$refs.crud2.refreshTable()
-        },
-        async saveColumn() {
-            const inSave = await this.saveColumnData(
-                this.getColumnName(196),
-                this.option
-            );
-            if (inSave) {
-                this.$nextTick(() => {
-                    this.$refs.crud.doLayout();
-                });
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs.crud.$refs.dialogColumn.columnBox = false;
-            }
-        },
-        async resetColumn() {
-            this.option = option;
-            const inSave = await this.delColumnData(this.getColumnName(196), this.option);
-            if (inSave) {
-                this.$nextTick(() => {
-                    this.$refs.crud.doLayout();
-                });
-                this.getAllWorkDicts()
-                this.$message.success("重置成功");
-                this.$refs.crud.$refs.dialogColumn.columnBox = false;
-            }
+      });
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    generate() {
+      if (this.selectionList.length == 1) {
+        this.detailData = {
+          generateId: this.selectionList[0].id,
         }
+        this.show = false
+        this.inStockVisible = false
+      } else {
+        this.$message.error('请选择一条数据')
+      }
+    },
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchChange2(params, done) {
+      this.page2.currentPage = 1;
+      this.onLoad2(this.page, params);
+      done();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    currentChange2(val) {
+      this.page2.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    sizeChange2(val) {
+      this.page2.currentPage = 1;
+      this.page2.pageSize = val;
+    },
+    onLoad(page, params) {
+      if (this.search.stockTime && this.search.stockTime.length > 0) {
+        params = {
+          ...params,
+          createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
+          createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
+        };
+      }
+      let data = this.deepClone(Object.assign({}, params, this.search));
+      delete data.stockTime;
+      data.billType = "PD"
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, data)
+          .then(res => {
+            this.dataList = res.data.data.records ? res.data.data.records : [];
+            this.page.total = res.data.data.total;
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+    },
+    onLoad2(page, params) {
+      if (this.search2.stockTime && this.search2.stockTime.length > 0) {
+        params = {
+          ...params,
+          createStartTime: this.search2.stockTime[0] + ' ' + "00:00:00",
+          createEndTime: this.search2.stockTime[1] + ' ' + "23:59:59"
+        };
+      }
+      let data = this.deepClone(Object.assign({}, params, this.search2));
+      delete data.stockTime;
+      data.billType = "RK"
+      data.status = 3
+      this.loading2 = true;
+      data.pdStatus = 'PD'
+      getList(page.currentPage, page.pageSize, data)
+          .then(res => {
+            this.itemData = res.data.data.records ? res.data.data.records : [];
+            this.page2.total = res.data.data.total;
+          })
+          .finally(() => {
+            this.loading2 = false;
+          });
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    refreshChange2() {
+      this.onLoad2(this.page2, this.search2);
+    },
+    newAdd() {
+      this.inStockVisible = true;
+    },
+    goBack() {
+      if (this.$route.query.check) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/InventoryManagement/inventory/index"
+        });
+      }
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.onLoad(this.page, this.search);
+    },
+    close() {
+      this.$refs.crud2.refreshTable()
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+          this.getColumnName(196),
+          this.option
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(196), this.option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.getAllWorkDicts()
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
+  }
 };
 </script>
 
 <style scoped>
 ::v-deep .select-component {
-    display: flex;
+  display: flex;
 }
 
 .page-crad ::v-deep .basic-container__card {
-    height: 94.2vh;
+  height: 94.2vh;
 }
 
 .itemTable ::v-deep .el-table {
-    width: 738px;
+  width: 738px;
 }
 </style>

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -63,7 +63,9 @@ export default {
   data() {
     return {
       key: 0,
-      search: {},
+      search: {
+        isIssue:3,
+      },
       data: [],
       query: {},
       page: {
@@ -102,6 +104,13 @@ export default {
             decimals: 2
           }],
         column: [{
+          label: '货权人',
+          prop: 'purchaser',
+          index: 18,
+          width: 140,
+          overHidden: true,
+          search: true
+        },{
           label: '品名',
           // searchProp: 'goodsName',
           prop: 'itemId',
@@ -116,38 +125,17 @@ export default {
           index: 1,
           search: true
         }, {
-          label: '长',
-          prop: 'length',
-          index: 2,
-          search: true
-        }, {
-          label: '厚',
-          prop: 'thickness',
-          index: 5,
+          label: '提单号',
+          prop: 'morderNo',
+          index: 19,
           search: true
         }, {
-          label: '捆包号',
-          prop: 'billNo',
+          label: '箱号',
+          prop: 'containerNo',
           index: 6,
           width: 100,
           search: true
         }, {
-          label: '可用片数',
-          prop: 'sliceNumber',
-          index: 7
-        }, {
-          label: '可用库存',
-          prop: 'balanceNumber',
-          index: 8
-        }, {
-          label: '库存单价',
-          prop: 'price',
-          index: 9
-        }, {
-          label: '库存金额',
-          prop: 'balanceMoney',
-          index: 10
-        }, {
           label: '仓库',
           prop: 'warehouseId',
           type: "tree",
@@ -165,20 +153,44 @@ export default {
           "overHidden": true,
           search: true
         }, {
-          label: '库位',
-          prop: 'storageName',
-          index: 12
+          label: '捆包号',
+          prop: 'billNo',
+          index: 6,
+          width: 100,
+          search: true
         }, {
-          label: '品牌',
-          prop: 'itemType',
-          index: 13,
+          label: '长',
+          prop: 'length',
+          index: 2,
+          search: true
+        }, {
+          label: '厚',
+          prop: 'thickness',
+          index: 5,
           search: true
         }, {
           label: '等级',
           prop: 'grade',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=goods_grade",
+          type: "select",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
           index: 14,
           search: true
         }, {
+          label: '品牌',
+          prop: 'itemType',
+          index: 13,
+          search: true
+        }, {
+          label: '车船号',
+          prop: 'vehicleShipNumber',
+          index: 17,
+          search: true
+        }, {
           label: '产地',
           prop: 'itemProp',
           index: 15,
@@ -191,23 +203,6 @@ export default {
           overHidden: true,
           search: true
         }, {
-          label: '车船号',
-          prop: 'vehicleShipNumber',
-          index: 17,
-          search: true
-        }, {
-          label: '货权人',
-          prop: 'purchaser',
-          index: 18,
-          width: 140,
-          overHidden: true,
-          search: true
-        }, {
-          label: '提单号',
-          prop: 'morderNo',
-          index: 19,
-          search: true
-        }, {
           label: '状态',
           index: 19,
           prop: 'status',
@@ -218,6 +213,48 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
+        }, {
+          label: '状态',
+          prop: 'isIssue',
+          type: 'select',
+          index: 19,
+          hide: true,
+          showColumn: false,
+          searchValue: 3,
+          dicData: [{
+            label: "在库",
+            value: 3
+          }, {
+            label: "计划",
+            value: 4
+          }, {
+            label: "待出库",
+            value: 5
+          }, {
+            label: "出库中",
+            value: 6
+          }],
+          search: true
+        }, {
+          label: '可用片数',
+          prop: 'sliceNumber',
+          index: 7
+        }, {
+          label: '可用库存',
+          prop: 'balanceNumber',
+          index: 8
+        }, {
+          label: '库存单价',
+          prop: 'price',
+          index: 9
+        }, {
+          label: '库存金额',
+          prop: 'balanceMoney',
+          index: 10
+        }, {
+          label: '库位',
+          prop: 'storageName',
+          index: 12
         }]
       },
       commodityLabel: [],
@@ -230,7 +267,7 @@ export default {
         this.commodityLabel.push({label: res.data.data[item].cname, prop: item, id: res.data.data[item].id})
         this.commodityData[0] = {
           ...this.commodityData[0],
-          [item]: res.data.data[item].sliceNumber + '片,' + res.data.data[item].balanceNumber + '立方'
+          [item]: `${res.data.data[item].sliceNumber?res.data.data[item].sliceNumber:0}片,${res.data.data[item].balanceNumber?res.data.data[item].balanceNumber:0}立方`
         }
       }
     })
@@ -259,7 +296,7 @@ export default {
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
-        ...Object.assign(params, this.query)
+        ...Object.assign(params, this.search)
       }
       getList(queryParams).then(res => {
         this.data = res.data.data.records

src/views/basicData/agreement/index.vue

@@ -148,19 +148,23 @@ export default {
       });
     },
     switchChange(row) {
-      console.log(row.status)
-      this.$confirm("确定要"+row.status==0?"开启":"停用"+row.corpName+"吗?", {
+      let name = row.status == 0?"开启":"停用"
+      this.$confirm("确定要"+ name +row.corpName+"吗?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        submit({ ...row })
-          .then(res => {
+        submit({ ...row }).then(res => {
             this.$message.success("修改成功");
-          })
-          .finally(() => {
+          }).finally(() => {
             this.onLoad(this.page, this.search);
           });
+      }).catch(() => {
+        if (row.status == 0){
+          this.$set(row,'status',"1")
+        }else{
+          this.$set(row,'status',"0")
+        }
       });
 
     },

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/bidingDocument/issueTender/detailsPageEdit.vue

@@ -205,6 +205,7 @@ export default {
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          value:new Date,
           rules: [{
             required: true,
             message: " ",
@@ -746,6 +747,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
+            if (new Date(this.form.deadlineTime) < new Date()) return this.$message.error("截止日期不能小于等于当前日期")
             let form = {
               ...this.form,
               itemsList: this.dataListBox,
@@ -765,6 +767,7 @@ export default {
                   type: 'success',
                   message: '请核成功!'
                 });
+                this.refreshData(this.form.id)
               })
             }).finally(() => {
               this.fullscreenLoading = false
@@ -820,6 +823,7 @@ export default {
             type: 'success',
             message: '作废成功!'
           });
+          this.refreshData(this.form.id)
         })
       }).catch(() => {
         this.$message({
@@ -840,6 +844,7 @@ export default {
             type: 'success',
             message: '发布成功!'
           });
+          this.refreshData(this.form.id)
         })
       }).catch(() => {
         this.$message({

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

@@ -584,8 +584,8 @@ export default {
     },
     // 生成工厂发货
     createPlant(row, index) {
-      console.log(111)
       let ids = [];
+      console.log(row)
       row.itemsList.forEach(item => {
         ids.push(item.id)
       })

src/views/businessManagement/receipt/index.vue

@@ -50,11 +50,19 @@
           <!--            @click.stop="editOpen(scope.row,scope.index)"-->
           <!--          >编辑-->
           <!--          </el-button>-->
-          <el-button type="text" icon="el-icon-delete" size="small" :disabled="scope.row.deliveryStatus !== '录入'"
-                     @click.stop="sendInGoods(scope.row, scope.index)">确认发货
+          <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              :disabled="scope.row.deliveryStatus !== '录入'"
+              @click.stop="sendInGoods(scope.row, scope.index)">确认发货
           </el-button>
-          <el-button type="text" icon="el-icon-delete" size="small" :disabled="scope.row.deliveryStatus === '已发货'"
-                     @click.stop="rowDel(scope.row, scope.index)">删除
+          <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              :disabled="scope.row.deliveryStatus === '已发货'"
+              @click.stop="rowDel(scope.row, scope.index)">删除
           </el-button>
         </template>
       </avue-crud>

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/businessManagement/salesOrder/index.vue

@@ -36,17 +36,13 @@
           </el-table>
         </template>
         <template slot-scope="scope" slot="orderNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
-          scope.row.orgOrderNo
-          }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{scope.row.orgOrderNo}}</span>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
-          scope.row.corpsName
-          }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{scope.row.corpsName}}</span>
         </template>
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}

src/views/dealer/sales/detail.vue

@@ -820,14 +820,7 @@ export default {
             balanceAmount: 0,
             surplusRouteQuantity: 0
           };
-        this.$set(
-          form,
-          "purchaseAmount",
-          a.inQuantity
-            ? a.inQuantity == 0
-              ? 0
-              : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2)
-            : 0
+        this.$set(form,"purchaseAmount",a.inQuantity ? a.inQuantity == 0 ? 0 : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2) : 0
         );
         this.$set(form, "stock", a.surplusRouteQuantity);
       })

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": "inAmount",
+      "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/financialManagement/mBillDetails/billDetails.vue

@@ -41,6 +41,9 @@
       <template slot-scope="scope" slot="billType">
         <span>{{ scope.row.billType == "申请"?"付费":"收费" }}</span>
       </template>
+      <template slot="menuLeft" slot-scope="{size}">
+        <el-button type="warning" :size="size" @click="handleExport">导出</el-button>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
@@ -59,6 +62,7 @@
   import option from "./configuration/mainList.json";
   import { getBillList, removeDetail } from "@/api/financialManagement/paymentRequest";
   import _ from "lodash";
+  import {getToken} from "@/util/auth";
 
   export default {
     data() {
@@ -112,6 +116,17 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      async handleExport(){
+        let data = await this.paramsAdjustment(this.search)
+        const routeData = this.$router.resolve({
+          path: '/api/trade-finance/acc/exportAcc',      //跳转目标窗口的地址
+          query: {
+            'Blade-Auth': getToken(),
+            ...data    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length));
+      },
       rowStyle(data){
         if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
           return  {

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,11 @@
         <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>
+          <template slot="companyId">
+            <crop-select v-model="form.companyId" corpType="GS" :refresh="false" @getCorpData="getKHDataTwo"
+              :disabled="form.status > 0"></crop-select>
           </template>
         </avue-form>
       </trade-card>
@@ -88,18 +92,26 @@ export default {
             span: 6
           },
           {
+            label: "通过公司",
+            prop: "companyId",
+            rules: [{
+                required: true,
+                message: "",
+                trigger: "blur"
+            }],
+            span: 6
+          },
+          {
             label: "融资日期",
             prop: "financingDate",
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd',
-            rules: [
-              {
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
@@ -112,25 +124,28 @@ export default {
               value: "dictKey"
             },
             dicData: [],
-            rules: [
-              {
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
             label: "融资金额",
             prop: "financingAmount",
-            rules: [
-              {
+            blur:(data)=>{
+              if (data.value < 0){
+                this.form.financingAmount = 0
+              }
+            },
+            controls:false,
+            type:'number',
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
@@ -152,7 +167,7 @@ export default {
             type: "textarea",
             minRows: 2,
             width: 120,
-            span: 12,
+            span: 24,
           },
         ]
 
@@ -183,7 +198,7 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
         res.data.data;
     });
@@ -207,6 +222,9 @@ export default {
     getKHData(row) {
       this.form.corpName = row.cname
     },
+    getKHDataTwo(row) {
+      this.form.company = row.cname
+    },
     getDetail(id) {
       this.pageLoading = true;
       getDetail(id)
@@ -261,6 +279,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/financing/financingManagement/index.vue

@@ -84,7 +84,7 @@ export default {
   },
   methods: {
     getAllWorkDicts() {
-      this.getWorkDicts("approval_status").then(res => {
+      this.getWorkDicts("financing_status").then(res => {
         this.findObject(this.option.column, "status").dicData =
           res.data.data;
       });

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -2873,6 +2873,7 @@ export default {
         if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)) {
           // this.goodsOptionFormTwo.disabled = true
           this.$set(this.goodsOptionFormTwo, 'disabled', false)
+          this.findObject(this.goodsOptionFormTwo.column,"freightPay").disabled = false
         }
       } else {
         this.goodsOptionFormC.disabled = false

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: [],

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -12,13 +12,26 @@
         </el-button>
       </div>
       <el-button
-        class="el-button--small-yh add-customer-btn"
+        class="add-customer-btn"
         type="primary"
         :disabled="disabled"
         size="small"
         @click="editCustomer"
         >{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
+
+<!--      style="margin-right: 110px"-->
+<!--      <el-dropdown class="add-customer-btn">-->
+<!--        <el-button type="primary" size="small">-->
+<!--          审核处理<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--        </el-button>-->
+<!--        <el-dropdown-menu slot="dropdown">-->
+<!--          <el-dropdown-item @click.native="pleaseCheck">请核数据</el-dropdown-item>-->
+<!--          <el-dropdown-item>审核进度</el-dropdown-item>-->
+<!--          <el-dropdown-item>撤销请核</el-dropdown-item>-->
+<!--          <el-dropdown-item>审批数据</el-dropdown-item>-->
+<!--        </el-dropdown-menu>-->
+<!--      </el-dropdown>-->
     </div>
     <div style="margin-top: 60px">
       <el-form
@@ -315,7 +328,8 @@ import {
   corpsattn,
   typeSave,
   getItemdetail,
-  itemSubmit
+  itemSubmit,
+  pleaseCheck
 } from "@/api/maintenance/salesPolicy";
 import {
   submit,
@@ -845,6 +859,26 @@ export default {
         }
       });
     },
+    //请核数据
+    pleaseCheck(){
+      this.$confirm("是否确认提交审批？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const data = {
+          id : this.form.id,
+          checkType: 'xszc',
+          url: '/maintenance/salesPolicy/index',
+          pageStatus:"this.$store.getters.domSaleStatus",
+          pageLabel:"销售政策",
+          checkFlag: 2,
+        }
+        pleaseCheck(data).then(res=>{
+          console.log(res)
+        })
+      })
+    },
     //修改提交触发
     editCustomer() {
       this.$refs["form"].validate(valid => {

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -66,7 +66,7 @@
     {
       "index": 2,
       "prop": "length",
-      "label": "*长度(m)",
+      "label": "*长度",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -81,7 +81,7 @@
     {
       "index": 3,
       "prop": "thickness",
-      "label": "*厚度(m)",
+      "label": "*厚度",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -164,6 +164,13 @@
       "index": 9,
       "prop": "grade",
       "label": "等级",
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dataType": "string",
       "overHidden": true,
       "cell": true,
       "width": 100

src/views/purchasingManagement/inStock/config/mainList.json

@@ -38,41 +38,32 @@
       "overHidden": true
     },
     {
-      "label": "入库单号",
-      "prop": "sysNo",
-      "index": 2,
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 6,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },
     {
-      "label": "业务类型",
-      "prop": "businessType",
-      "index": 3,
-      "width": 120,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
+      "label": "箱号",
+      "prop": "caseNo",
+      "index": 5,
+      "width": 100,
       "search": true,
+      "disabled": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "入库日期",
-      "prop": "stockTime",
-      "index": 4,
+    },{
+      "label": "车船号",
+      "prop": "vehicleShipNumber",
+      "index": 9,
       "width": 120,
-      "type": "date",
-      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
+    },{
       "label": "仓库",
       "prop": "storageId",
       "type": "cascader",
@@ -84,77 +75,88 @@
       "checkStrictly": true,
       "showAllLevels": false,
       "emitPath": false,
-      "index": 5,
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "index": 6,
+    },{
+      "label": "入库单号",
+      "prop": "sysNo",
+      "index": 2,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpId",
-      "index": 7,
+    },{
+      "label": "入库日期",
+      "prop": "stockTime",
+      "index": 4,
       "width": 120,
+      "type": "date",
+      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "车船号",
-      "prop": "vehicleShipNumber",
+    },{
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },{
-      "label": "计划入库数量",
-      "prop": "purchaseQuantity",
-      "index": 9,
-      "width": 120
+      "label": "业务类型",
+      "prop": "businessType",
+      "index": 3,
+      "width": 120,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
-      "label": "计划品名",
-      "prop": "planGoodsName",
-      "index": 10,
-      "width": 120
+      "label": "备注",
+      "prop": "orderRemark",
+      "index": 17,
+      "width": 120,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
       "label": "实际入库数量",
       "prop": "storageQuantity",
-      "index": 11,
+      "index": 12,
       "width": 120
     },{
       "label": "实际品名",
       "prop": "specialRemarks",
-      "index": 12,
+      "index": 13,
       "width": 120
     },
     {
       "label": "制单人",
       "prop": "salesName",
-      "index": 13,
+      "index": 14,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "创建时间",
       "prop": "createTime",
-      "index": 14,
+      "index": 15,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "审核状态",
       "prop": "status",
-      "index": 15,
+      "index": 16,
       "width": 120,
       "type": "select",
       "dataType": "number",
@@ -164,15 +166,6 @@
       },
       "dicData": [],
       "overHidden": true
-    },
-    {
-      "label": "备注",
-      "prop": "orderRemark",
-      "index": 16,
-      "width": 120,
-      "search": true,
-      "searchSpan": 8,
-      "overHidden": true
     }
   ]
 }

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -136,15 +136,14 @@
           </template>
         </avue-crud>
       </trade-card>
-      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="!(form.status < 3)"
+      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" typeName="wood" :corpId="form.purchaserId" :disabled="!(form.status < 3)"
                 feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'"
-                :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false"/>
+                :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" /> -->
       <containerTitle title="上传附件"></containerTitle>
       <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId"
                 :data="orderFilesList" display :enumerationValue="85.6" :disabled="!(form.status < 3)"></c-upload>
-
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                  :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
@@ -250,6 +249,7 @@ export default {
             label: "入库日期",
             prop: "stockTime",
             type: "datetime",
+            value: new Date(),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
@@ -262,20 +262,33 @@ export default {
             span: 6
           },
           {
-            label: "仓库",
-            prop: "storageId",
-            rules: [
-              {
+            label: "箱号",
+            prop: "caseNo",
+            span: 6,
+            blur: (data) => {
+              for (let item of this.itemsVOList){
+                item.containerNo = data.value
+              }
+            }
+          },
+          {
+            label: "提单号",
+            prop: "billNo",
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
-            label: "提单号",
-            prop: "billNo",
+            label: "仓库",
+            prop: "storageId",
+            rules: [{
+                required: true,
+                message: "",
+                trigger: "blur"
+            }],
             span: 6
           },
           {
@@ -292,6 +305,11 @@ export default {
           {
             label: "车船号",
             prop: "vehicleShipNumber",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
             span: 6
           },
           {
@@ -348,30 +366,19 @@ export default {
             change: (data) => {
               if (data.value == 0) {
                 this.findObject(this.tableOption.column, "price").label = "入库单价"
-                this.findObject(this.tableOption.column, "price").rules.required = false
+                this.findObject(this.tableOption.column, "price").rules[0].required = false
               } else {
                 this.findObject(this.tableOption.column, "price").label = "*入库单价"
-                this.findObject(this.tableOption.column, "price").rules.required = true
+                this.findObject(this.tableOption.column, "price").rules[0].required = true
               }
             },
             span: 6
           }, {
-            label: "计划入库数量",
-            prop: "purchaseQuantity",
-            value: 0,
-            minRows: 1,
-            span: 6
-          }, {
-            label: "计划品名",
-            prop: "planGoodsName",
-            minRows: 1,
-            span: 6
-          }, {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 18
+            span: 24
           },
         ]
       },
@@ -413,7 +420,7 @@ export default {
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
           res.data.data;
     });
@@ -446,13 +453,23 @@ export default {
     },
     getAllWorkDicts() {
       getAllgoods().then(res => {
-        this.findObject(this.tableOption.column, "itemId").dicData =
-            res.data.data;
+        this.findObject(this.tableOption.column, "itemId").dicData = res.data.data;
       })
+      this.findObject(this.tableOption.column, "itemId").change = (data)=>{
+        for (let item of this.findObject(this.tableOption.column, "itemId").dicData){
+          if (data.value == item.id){
+            this.itemsVOList[data.index].cname = item.cname
+          }
+        }
+      }
       this.getWorkDicts("unit").then(res => {
         this.findObject(this.tableOption.column, "unit").dicData =
             res.data.data;
       });
+      this.getWorkDicts("goods_grade").then(res => {
+        this.findObject(this.tableOption.column, "grade").dicData =
+            res.data.data;
+      });
     },
     cellStyle() {
       return "padding:0;height:40px;";
@@ -496,7 +513,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          this.itemsVOList.push({$cellEdit: true, unit: '1'});
+          this.itemsVOList.push({$cellEdit: true, unit: '1',containerNo:this.form.caseNo});
           this.getStorage()
         } else {
           return false;
@@ -520,7 +537,7 @@ export default {
         type: "warning"
       }).then(() => {
         if (row.id) {
-          delItem({itemId: row.id}).then(res => {
+          delItem({itemId: row.id,type:"RK"}).then(res => {
             this.$message({
               type: "success",
               message: "删除成功!"
@@ -777,16 +794,20 @@ export default {
       params.valid = true
       params.parentId = this.form.id
       callback(params)
+      console.log('1111')
     },
     getTemplate() {
       window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
     },
     uploadAfter(res, done, loading, column) {
       if (!res.message) {
-        res.forEach(item => this.itemsVOList.push({
-          ...item,
-          $cellEdit: true
-        }))
+        res.forEach(item => {
+          this.itemsVOList.push({
+            ...item,
+            containerNo:this.form.caseNo,
+            $cellEdit: true
+          })
+        })
         this.excelBox = false
         done();
       } else {

src/views/purchasingManagement/inStock/index.vue

@@ -85,7 +85,7 @@ export default {
     },
     methods: {
         getAllWorkDicts() {
-            this.getWorkDicts("approval_status").then(res => {
+            this.getWorkDicts("financing_status").then(res => {
                 this.findObject(this.option.column, "status").dicData =
                     res.data.data;
             });

src/views/salesManagement/outStock/config/customerContact.json

@@ -47,14 +47,14 @@
   },{
     "index": 2,
     "prop": "length",
-    "label": "长度(m)",
+    "label": "长度",
     "overHidden": true,
     "width": 100
   },
     {
       "index": 3,
       "prop": "thickness",
-      "label": "厚度(m)",
+      "label": "厚度",
       "overHidden": true,
       "width": 100
     },

src/views/salesManagement/outStock/config/customerContactTwo.json

@@ -1,6 +1,7 @@
 {
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 24,
+  "searchSpan": 8,
   "border": true,
   "index": true,
   "viewBtn": false,
@@ -9,15 +10,49 @@
   "delBtn": false,
   "menu": true,
   "headerAlign": "center",
+  "searchIcon": true,
+  "searchIndex": 2,
   "menuWidth": 160,
   "refreshBtn": false,
+  "searchMenuPosition": "right",
   "showSumary": true,
+  "selection": true,
   "indexSlot": false,
   "column": [{
+    "prop": "mainBillNo",
+    "label": "提单号",
+    "overHidden": true,
+    "search": true,
+    "hide": true,
+    "index": 0,
+    "showColumn": false,
+    "width": 100
+  },{
+    "index": 11,
+    "prop": "containerNo",
+    "label": "箱号",
+    "overHidden": true,
+    "search": true,
+    "width": 100
+  },{
+    "prop": "stockTime",
+    "label": "入库日期",
+    "type": "date",
+    "searchRange": true,
+    "searchDefaultTime": ["00:00:00", "23:59:59"],
+    "format": "yyyy-MM-dd",
+    "valueFormat": "yyyy-MM-dd HH:mm:ss",
+    "overHidden": true,
+    "search": true,
+    "hide": true,
+    "showColumn": false,
+    "width": 100
+  },{
     "index": 1,
     "prop": "itemId",
     "label": "品名",
     "type": "select",
+    "search": true,
     "props": {
       "label": "cname",
       "value": "id"
@@ -36,15 +71,17 @@
   },{
     "index": 2,
     "prop": "length",
-    "label": "长度(m)",
+    "label": "长度",
     "overHidden": true,
+    "search": true,
     "width": 100
   },
     {
       "index": 3,
       "prop": "thickness",
-      "label": "厚度(m)",
+      "label": "厚度",
       "overHidden": true,
+      "search": true,
       "width": 100
     },
     {
@@ -117,6 +154,7 @@
       "prop": "grade",
       "label": "等级",
       "overHidden": true,
+      "search": true,
       "rules": [
         {
           "required": true,
@@ -147,16 +185,11 @@
       ],
       "width": 100
     },{
-      "index": 11,
-      "prop": "containerNo",
-      "label": "箱号",
-      "overHidden": true,
-      "width": 100
-    },{
       "index": 12,
       "prop": "itemType",
       "label": "品牌",
       "overHidden": true,
+      "search": true,
       "rules": [
         {
           "required": true,

src/views/salesManagement/outStock/config/mainList.json

@@ -19,7 +19,12 @@
     {
       "name": "storageQuantity",
       "type": "sum",
-      "decimals": 3
+      "decimals": 2
+    },
+    {
+      "name": "purchaseQuantity",
+      "type": "sum",
+      "decimals": 2
     },
     {
       "name": "storageAmount",
@@ -36,43 +41,40 @@
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "出库单号",
-      "prop": "sysNo",
-      "index": 2,
+    },{
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "业务类型",
-      "prop": "businessType",
-      "index": 3,
+    },{
+      "label": "箱号",
+      "prop": "caseNo",
+      "index": 6,
+      "width": 100,
+      "search": true,
+      "disabled": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },{
+      "label": "车船号",
+      "prop": "vehicleShipNumber",
+      "index": 9,
       "width": 120,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "出库日期",
-      "prop": "stockTime",
-      "index": 4,
+    },{
+      "label": "司机",
+      "prop": "otherCorpAttn",
+      "index": 10,
       "width": 120,
-      "type": "date",
-      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
+    },{
       "label": "仓库",
       "prop": "storageId",
       "type": "cascader",
@@ -89,45 +91,48 @@
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "index": 6,
+    },{
+      "label": "出库单号",
+      "prop": "sysNo",
+      "index": 2,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpId",
-      "index": 7,
+    },{
+      "label": "出库日期",
+      "prop": "stockTime",
+      "index": 4,
       "width": 120,
+      "type": "date",
+      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "车船号",
-      "prop": "vehicleShipNumber",
+    },{
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },{
-      "label": "计划入库数量",
-      "prop": "purchaseQuantity",
-      "index": 9,
-      "width": 120
-    },{
-      "label": "计划品名",
-      "prop": "planGoodsName",
-      "index": 10,
-      "width": 120
+      "label": "业务类型",
+      "prop": "businessType",
+      "index": 3,
+      "width": 120,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
-      "label": "实际入库数量",
+      "label": "实际出库数量",
       "prop": "storageQuantity",
       "index": 11,
       "width": 120

src/views/salesManagement/outStock/detailsPage.vue

@@ -46,7 +46,8 @@
           </template>
           <template slot="storageId">
             <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false"
-                         :disabled="detailData.status == 1" :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
+                         :disabled="detailData.status == 1"
+                         :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
                          clearable @change="storagetreeChange">
             </el-cascader>
           </template>
@@ -130,7 +131,8 @@
           </template>
         </avue-crud>
       </trade-card>
-      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="!(form.status == 2 || form.status == 0 || !form.status)"
+      <fee-info ref="feeInfo" :orderFeesList="orderFeesList"
+                :disabled="!(form.status == 2 || form.status == 0 || !form.status)"
                 feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'D'"
                 :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false"/>
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 3" :orderFilesList="orderFilesList"
@@ -242,7 +244,7 @@ export default {
     return {
       activeName: 'searchList',
       checkData: {},
-      search:{},
+      search: {},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -255,8 +257,8 @@ export default {
       },
       loading: false,
       dialogVisible: false,
-      dialogList:[],
-      goodsList:[],
+      dialogList: [],
+      goodsList: [],
       checkDialog: false,
       form: {},
       checkScheduleDialog: false,
@@ -286,6 +288,7 @@ export default {
             label: "出库日期",
             prop: "stockTime",
             type: "datetime",
+            value: new Date(),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
@@ -298,6 +301,21 @@ export default {
             span: 6
           },
           {
+            label: "箱号",
+            prop: "caseNo",
+            span: 6,
+            blur: (data) => {
+              for (let item of this.itemsVOList){
+                item.containerNo = data.value
+              }
+            }
+          },
+          {
+            label: "提单号",
+            prop: "billNo",
+            span: 6
+          },
+          {
             label: "仓库",
             prop: "storageId",
             rules: [
@@ -310,11 +328,6 @@ export default {
             span: 6
           },
           {
-            label: "提单号",
-            prop: "billNo",
-            span: 6
-          },
-          {
             label: "业务类型",
             prop: "businessType",
             type: "select",
@@ -328,6 +341,31 @@ export default {
           {
             label: "车船号",
             prop: "vehicleShipNumber",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
+            span: 6
+          },
+          {
+            label: "司机",
+            prop: "otherCorpAttn",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
+            span: 6
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
             span: 6
           }, {
             label: "审核状态",
@@ -379,13 +417,13 @@ export default {
               }
             ],
             span: 6
-          },{
+          }, {
             label: "计划出库数量",
             prop: "purchaseQuantity",
-            value:0,
+            value: 0,
             minRows: 1,
             span: 6
-          },{
+          }, {
             label: "计划品名",
             prop: "planGoodsName",
             minRows: 1,
@@ -396,7 +434,7 @@ export default {
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 18
+            span: 24
           },
         ]
       },
@@ -412,7 +450,7 @@ export default {
       oldorderFeesList: [],
       oldorderFilesList: [],
       roleName: localStorage.getItem("roleName"),
-      selectionList:[]
+      selectionList: []
     };
   },
   props: {
@@ -426,18 +464,6 @@ export default {
     uploadFile,
     check
   },
-  watch: {
-    form: {
-      // handler() {
-      //   if (this.form.status > 0) {
-      //     this.$set(this.option, 'disabled', true)
-      //     // this.$set(this.findObject(this.tableOption.column, "remarks"),'disabled',true)
-      //   } else {
-      //     this.$set(this.option, 'disabled', false)
-      //   }
-      // }
-    }
-  },
   async created() {
     if (this.detailData.status == 3) {
       this.option.disabled = true;
@@ -445,11 +471,12 @@ export default {
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
+    console.log(this.detailData)
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    this.tableOption = await this.getColumnData(this.getColumnName(191),tableOption);
-    this.tableOptionTwo = await this.getColumnData(this.getColumnName(191.1),tableOptionTwo);
+    this.tableOption = await this.getColumnData(this.getColumnName(191), tableOption);
+    this.tableOptionTwo = await this.getColumnData(this.getColumnName(191.1), tableOptionTwo);
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
@@ -494,23 +521,32 @@ export default {
         this.page.total = 0
       }
     },
-    selectionChange(list){
+    selectionChange(list) {
       this.selectionList = list
     },
-    confirmImport(){
+    confirmImport() {
+      let map = new Map();
+      for (let item of this.selectionList.concat(this.goodsListSave)) {
+        delete item.forklift
+        delete item.carry
+        if (!map.has(item.id)) {
+          map.set(item.id, item);
+        }
+      }
+      this.goodsListSave = [...map.values()];
       let data = []
-      for (let it in this.goodsListSave){
-        for (let item in this.goodsListSave){
-          for (let li of this.itemsVOList){
-            if (this.goodsListSave[item].billNo == li.billNo) return this.$message.warning('第'+Number(Number(item)+1)+'条已存在,请勿重复导入！')
+      for (let it in this.goodsListSave) {
+        for (let item in this.goodsListSave) {
+          for (let li of this.itemsVOList) {
+            if (this.goodsListSave[item].billNo == li.billNo) return this.$message.warning('第' + Number(Number(item) + 1) + '条已存在,请勿重复导入！')
           }
         }
         data.push({
           ...this.goodsListSave[it],
-          srcItemId:this.goodsListSave[it].id,
+          srcItemId: this.goodsListSave[it].id,
           $cellEdit: true
         })
-        delete data[data.length-1].id
+        delete data[data.length - 1].id
       }
       this.itemsVOList = this.itemsVOList.concat(data)
       this.goodsListSave = []
@@ -548,6 +584,8 @@ export default {
       this.getWorkDicts("unit").then(res => {
         this.findObject(this.tableOption.column, "unit").dicData =
             res.data.data;
+        this.findObject(this.tableOptionTwo.column, "unit").dicData =
+            res.data.data;
       });
     },
     cellStyle() {
@@ -556,7 +594,6 @@ export default {
     getStorage() {
       getStorage({storageTypeId: this.form.storageId}).then(res => {
         this.findObject(this.tableOption.column, "storageId").dicData = res.data;
-        this.findObject(this.tableOptionTwo.column, "storageId").dicData = res.data;
       })
     },
     storagetreeChange(row) {
@@ -593,6 +630,10 @@ export default {
         done();
         if (valid) {
           this.dialogVisible = true
+          getStorage({storageTypeId: this.form.storageId}).then(res => {
+            this.findObject(this.tableOption.column, "storageId").dicData = res.data;
+            this.findObject(this.tableOptionTwo.column, "storageId").dicData = res.data;
+          })
           // this.itemsVOList.push({$cellEdit: true});
           // this.getStorage()
         } else {
@@ -669,6 +710,8 @@ export default {
             res.data.data.itemsVOList.forEach(e => {
               e.storageInQuantity = e.balanceNumber
               e.srcItemId = e.id
+              e.storageInQuantity = e.balanceNumber
+              e.storageAmount = e.balanceMoney
               delete e.id
               delete e.forklift
               delete e.carry
@@ -744,13 +787,13 @@ export default {
             if (status == "goBack") {
               this.$emit("goBack");
             }
-            if (!this.detailData.id){
+            if (!this.detailData.id) {
               this.detailData.id = res.data.data.id
             }
             this.getDetail(res.data.data.id)
           }).finally(() => {
-                this.subLoading = false;
-              });
+            this.subLoading = false;
+          });
         } else {
           return false;
         }
@@ -759,12 +802,13 @@ export default {
     //请核
     auditCheck() {
       let orderFeesList = this.$refs.feeInfo.submitData();
-      if (orderFeesList.length == 0) {
+      if ((orderFeesList.length == 0 && this.form.status == 2)) {
         this.$confirm("没有应收费用,是否继续提交?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          this.subLoading = true
           financingExcess({id: this.form.purchaserId}).then(res => {
             if (res.data.data == '操作成功') {
               this.$confirm("确定审核此订单?", {
@@ -772,7 +816,6 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning"
               }).then(() => {
-                this.subLoading = true
                 const data = {
                   id: this.form.id,
                   checkType: 'CK',
@@ -847,10 +890,10 @@ export default {
                   this.viewDisabled = true
                   this.approverDisabled = true
                 }
+              }).finally(() => {
+                this.subLoading = false
+                this.getDetail(this.form.id)
               })
-            }).finally(() => {
-              this.subLoading = false
-              this.getDetail(this.form.id)
             })
           } else {
             this.$confirm(res.data.data, {
@@ -1016,8 +1059,12 @@ export default {
         this.$refs.crudTwo.$refs.dialogColumn.columnBox = false;
       }
     },
-    searchChange(params,done) {
-      this.onLoad(this.page,this.search);
+    searchChange(params, done) {
+      if (this.search.stockTime){
+        this.search.stockTimeStart = this.search.stockTime[0]
+        this.search.stockTimeEnd = this.search.stockTime[1]
+      }
+      this.onLoad(this.page, this.search);
       done();
     },
     //商品查询
@@ -1025,10 +1072,10 @@ export default {
       let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
       scanningCodeAddPc({
-        storageId:this.form.storageId,
-        purchaserId:this.form.purchaserId,
+        storageId: this.form.storageId,
+        purchaserId: this.form.purchaserId,
         ...obj
-      }).then(res=>{
+      }).then(res => {
         this.dialogList = res.data.data.records
         this.goodsList = res.data.data.records
         this.page.total = res.data.data.total;

src/views/salesManagement/outStock/index.vue

@@ -73,7 +73,7 @@ export default {
         this.getAllWorkDicts()
     },
     activated() {
-        if (!this.$store.getters.ckglStatus && !this.show) {
+        if (!this.$store.getters.ckglStatus && this.show) {
             this.show = true;
         }
         setTimeout(() => {

src/views/statisticAnalysis/salesDetails/index.vue

@@ -12,6 +12,9 @@
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
+        <template slot-scope="scope" slot="orderNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{scope.row.orderNo}}</span>
+        </template>
         <template slot="businesDateSearch">
           <el-date-picker v-model="search.businesDate" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
@@ -79,6 +82,10 @@ export default {
           name: "feesAmount",
           type: "sum",
           decimals: 2
+        }, {
+          name: "specialPrice",
+          type: "sum",
+          decimals: 2
         }],
         column: [
           {
@@ -182,6 +189,14 @@ export default {
     }
   },
   methods: {
+    //查看跳转页面
+    beforeOpenPage(row, index) {
+      this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+      this.$router.push({
+        path: "/businessManagement/salesOrder/index",
+        query: { id: row.orderId }
+      });
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },

src/views/statisticAnalysis/salesProfitN/index.vue

@@ -22,6 +22,13 @@
               :value="item.dictValue" />
           </el-select>
         </template>
+
+        <template slot-scope="{row}"
+                  slot="source">
+          <div style="text-align:center">
+            <i :class="row.source"/>
+          </div>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -31,6 +38,7 @@
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/salesProfitN"
 import _ from "lodash";
+import iconList from "@/config/iconList";
 export default {
   name: "index",
   data() {
@@ -54,7 +62,7 @@ export default {
         searchSpan: 8,
         border: true,
         index: true,
-        addBtn: false,
+        addBtn: true,
         viewBtn: false,
         editBtn: false,
         delBtn: false,
@@ -62,8 +70,28 @@ export default {
         searchIcon: true,
         searchIndex: 2,
         menu: false,
+        summaryText: "合计",
+        sumColumnList: [{
+          name: "quantity",
+          type: "sum",
+          decimals: 2
+        }],
         column: [
           {
+            label: "菜单图标",
+            prop: "source",
+            type: "icon",
+            slot: true,
+            iconList: iconList,
+            rules: [
+              {
+                required: true,
+                message: "请输入菜单图标",
+                trigger: "click"
+              }
+            ]
+          },
+          {
             label: "客户名称",
             prop: "corpName",
             overHidden: true,

src/views/wel/home/jiatongPage/components/audit-data.vue

@@ -46,7 +46,7 @@ export default {
         { icon: "el-icon-s-order", qty: "0", text: "入库管理/待审核" },
         { icon: "el-icon-s-order", qty: "0", text: "出库管理/待审核" },
         { icon: "el-icon-s-goods", qty: "0", text: "融资管理/待审核" },
-        { icon: "el-icon-s-home", qty: "0", text: "库内盘点/待审核 " }
+        { icon: "el-icon-s-home", qty: "0", text: "库内盘点/待审核" }
       ],
       tradeType: null
     };
@@ -91,33 +91,21 @@ export default {
     },
     getCheckDate() {
       this.loading = true;
-      checkDate({ tradeType: this.tradeType })
-        .then(res => {
-          if (this.sysType == 2){
-            this.domList.forEach(e => {
-              if (e.text == "报价订单/待审核") {
-                e.qty = res.data.data.offerNumber;
-              }
-              if (e.text == "销售订单/待审核") {
-                e.qty = res.data.data.sellNumber;
-              }
-              if (e.text == "采购订单/待审核") {
-                e.qty = res.data.data.purchaseNumber;
-              }
-            });
-          }else {
-            this.list.forEach(e => {
-              if (e.text == "报价订单/待审核") {
-                e.qty = res.data.data.offerNumber;
-              }
-              if (e.text == "销售订单/待审核") {
-                e.qty = res.data.data.sellNumber;
-              }
-              if (e.text == "采购订单/待审核") {
-                e.qty = res.data.data.purchaseNumber;
-              }
-            });
+      checkDate({ tradeType: this.tradeType }).then(res => {
+        this.list.forEach(e => {
+          if (e.text == "入库管理/待审核") {
+            e.qty = res.data.data.purchaseNumber;
+          }
+          if (e.text == "出库管理/待审核") {
+            e.qty = res.data.data.sellNumber;
           }
+          if (e.text == "融资管理/待审核") {
+            e.qty = res.data.data.financingSum;
+          }
+          if (e.text == "库内盘点/待审核") {
+            e.qty = res.data.data.offerNumber;
+          }
+        });
         })
         .finally(() => {
           this.loading = false;
@@ -175,8 +163,6 @@ export default {
     },
     refresh() {
       this.getCheckDate();
-      this.getshipCheckDate();
-      this.getfinanceCheck()
     }
   }
 };

src/views/wel/home/jiatongPage/components/realtime-data.vue

@@ -56,7 +56,7 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">{{ data1.offerNumber || '0' }}立方</span>
+                <span class="card-content-num">{{ data1.purchaseNumber || '0' }}立方</span>
                 <span class="card-content-text">入库</span>
               </div>
             </div>
@@ -144,7 +144,7 @@ export default {
         orderEndDate: this.realDate[1]
       })
         .then(res => {
-          this.data1 = res.data.data;
+          this.data2 = res.data.data;
         })
         .finally(() => {
           this.loading = false;
@@ -158,7 +158,7 @@ export default {
         orderEndDate: this.realDate[1]
       })
         .then(res => {
-          this.data2 = res.data.data;
+          this.data1 = res.data.data;
         })
         .finally(() => {
           this.loading = false;
@@ -233,7 +233,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 15vh;
-  width: 80vw;
+  width: 60vw;
   .divider {
     display: block;
     height: 0px;
@@ -243,7 +243,7 @@ export default {
   &-item {
     margin-left: 1vw;
     .card {
-      width: 130px;
+      width: 180px;
       display: flex;
       align-items: center;
       &-title {
@@ -277,7 +277,6 @@ export default {
         background-color: rgba(66, 188, 111, 0.15);
       }
       &-content {
-        padding-left: 1vw;
         display: flex;
         flex-direction: column;
         &-num {

src/views/wel/home/jiatongPage/components/sales-reached.vue

@@ -20,11 +20,11 @@
             <div>
               <div class="content_item">
                 <div class="content_item_num">{{ data.grossAmount || 0 }}</div>
-                <div class="content_item_text">已报价数量</div>
+                <div class="content_item_text">已审核数量</div>
               </div>
               <div class="content_item">
                 <div class="content_item_num">{{ data.reachAmount || 0 }}</div>
-                <div class="content_item_text">未报价数量</div>
+                <div class="content_item_text">未审核数量</div>
               </div>
               <div class="content_item">
                 <div class="divider" />
@@ -151,8 +151,8 @@ export default {
               show: false
             },
             data: [
-              { value: Number(this.data.reachAmount), name: "已报价数量" },
-              { value: Number(this.data.notReachAmount), name: "未报价数量" }
+              { value: Number(this.data.reachAmount), name: "已审核数量" },
+              { value: Number(this.data.notReachAmount), name: "未审核数量" }
             ]
           }
         ]

src/views/wel/home/jiatongPage/components/sales-trend.vue

@@ -109,6 +109,7 @@ export default {
     getsalesTrend() {
       this.loading = true;
       this.moneyList = [];
+      this.xAxisData = [];
       salesTrendTow({
         year: this.annual
       }).then(res => {