提交木材陆运

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("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;
-        }
+    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/bidingDocument/issueTender/detailsPageEdit.vue

@@ -765,6 +765,7 @@ export default {
                   type: 'success',
                   message: '请核成功!'
                 });
+                this.refreshData(this.form.id)
               })
             }).finally(() => {
               this.fullscreenLoading = false
@@ -820,6 +821,7 @@ export default {
             type: 'success',
             message: '作废成功!'
           });
+          this.refreshData(this.form.id)
         })
       }).catch(() => {
         this.$message({
@@ -840,6 +842,7 @@ export default {
             type: 'success',
             message: '发布成功!'
           });
+          this.refreshData(this.form.id)
         })
       }).catch(() => {
         this.$message({

src/views/businessManagement/purchaseOrder/index.vue

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

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/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/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

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

src/views/salesManagement/outStock/detailsPage.vue

@@ -491,6 +491,8 @@ export default {
     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);
         }
@@ -556,7 +558,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 +594,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 {
@@ -767,6 +772,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          this.subLoading = true
           financingExcess({id: this.form.purchaserId}).then(res => {
             if (res.data.data == '操作成功') {
               this.$confirm("确定审核此订单?", {
@@ -774,7 +780,6 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning"
               }).then(() => {
-                this.subLoading = true
                 const data = {
                   id: this.form.id,
                   checkType: 'CK',
@@ -849,10 +854,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, {

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/realtime-data.vue

@@ -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: "未审核数量" }
             ]
           }
         ]