修改审批数据和仓储

src/enums/column-name.js

@@ -657,7 +657,6 @@ const columnName = [{
     code: 168,
     name: '货转-明细'
   },
-
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/approveData/configuration/mainList.json

@@ -27,39 +27,15 @@
     {
       "label": "业务类型",
       "prop": "processType",
+      "searchFilterable": true,
       "type": "select",
       "hide": true,
       "showColumn":false,
-      "dicData": [
-        {
-          "label": "付费审批",
-          "value": "付费审批"
-         },
-        {
-          "label": "销售订单",
-          "value": "销售订单"
-        },
-        {
-          "label": "采购订单",
-          "value": "采购订单"
-        },
-        {
-          "label": "付费申请",
-          "value": "付费申请"
-        },
-        {
-          "label": "办公用品采购审批",
-          "value": "办公用品采购审批"
-        },
-        {
-          "label": "费用报销审批",
-          "value": "费用报销审批"
-        },
-        {
-          "label": "交接单审批",
-          "value": "交接单审批"
-        }
-      ],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData":[],
       "search": true,
       "overHidden": true,
       "index": 1

src/views/approveData/index.vue

@@ -173,6 +173,11 @@ export default {
       this.findObject(this.option.column, "auditStatus").dicData =
         res.data.data;
       });
+      this.getWorkDicts("Approval_business_type").then(res => {
+        console.log(res)
+      this.findObject(this.option.column, "processType").dicData =
+        res.data.data;
+      });
     });
   },
   mounted() {

src/views/warehousing/agreement/index.vue

@@ -4,6 +4,7 @@
     <basic-container>
       <avue-crud
           :option="option"
+          ref="crud"
           :data="warehousebillsList">
         <template slot="menuLeft">
           <el-button

src/views/warehousing/analysis/index.vue

@@ -1,6 +1,28 @@
 <template>
   <div class="app-container">
-    <basic-container></basic-container>
+    <basic-container>
+      <avue-crud
+          ref="crud"
+          :option="option"
+          :data="dataList">
+        <template slot="menuLeft">
+          <div style="display:flex;align-items: center;">
+            <el-tabs v-model="activeName" @tab-click="tabsHandle">
+              <el-tab-pane label="出库" name="outStock"></el-tab-pane>
+              <el-tab-pane label="在库" name="inStock"></el-tab-pane>
+            </el-tabs>
+            <div style="margin-left: 20px">
+              <el-button
+                  type="warning"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+              >导出</el-button>
+            </div>
+          </div>
+        </template>
+      </avue-crud>
+    </basic-container>
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -297,6 +319,99 @@ export default {
       //自定义列宽
       allCheck: false,
       drag: false,
+      option:{
+        align: 'center',
+        stripe: true,
+        index: true,
+        menu: false,
+        addBtn: false,
+        editBtn: false,
+        delBtn: false,
+        height: "auto",
+        searchSpan: 8,
+        searchIcon: true,
+        searchIndex: 2,
+        highlightCurrentRow: true,
+        column:[
+          {
+            index: "1",
+            prop: "billtype",
+            label: "业务类型",
+            width: 100,
+          },
+          {
+            index: "2",
+            prop: "corpid",
+            label: "客户名称",
+            width: 120,
+            search: true,
+          },
+          {
+            index: "2",
+            prop: "name",
+            label: "品名",
+            width: 100,
+          },
+          {
+            index: "3",
+            prop: "mblno",
+            label: "提单号",
+            width: 130,
+            search: true,
+          },
+          {
+            index: "4",
+            prop: "qty",
+            label: "件数",
+            width: 80,
+          },
+          {
+            index: "5",
+            prop: "grossweight",
+            label: "毛重",
+            width: 120,
+          },
+          {
+            index: "6",
+            prop: "warehouseInformation",
+            label: "仓库",
+            width: 150,
+            search: true,
+          },
+          {
+            index: "7",
+            prop: "originalbilldate",
+            label: "入库日期",
+            width: 150,
+          },
+          {
+            index: "8",
+            prop: "bsDate",
+            label: "出库日期",
+            width: 150,
+            search: true,
+          },
+          {
+            index: "9",
+            prop: "storekeeper",
+            label: "仓管员",
+            width: 150,
+            search: true,
+          },
+          {
+            index: "10",
+            prop: "createBy",
+            label: "制单人",
+            width: 150,
+          },
+          {
+            index: "11",
+            prop: "createTime",
+            label: "制单日期",
+            width: 150,
+          },
+        ]
+      },
       tableDate:[
         {
           surface: "1",
@@ -400,6 +515,15 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0) {
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
     this.getDicts("data_billtype_type").then((response) => {
       this.billTypeList = response.data;
     });
@@ -546,6 +670,23 @@ export default {
     tabsHandle(data) {
       if (this.disabledName == data.name) return
       this.disabledName = data.name
+      if (this.activeName === "inStock"){
+        this.option.column.forEach(item=>{
+          if (item.prop === "bsDate"){
+            item.index = 9999
+            item.hide = true
+            item.showColumn = false
+          }
+        })
+      }else {
+        this.option.column.forEach(item=>{
+          if (item.prop === "bsDate"){
+            item.hide = false
+            item.showColumn = true
+            item.index = 8
+          }
+        })
+      }
       this.tableDate.forEach(item => {
         if (this.activeName == 'inStock') {
           if (item.label == 'fBsdate') {